@@ -21,7 +21,7 @@ import (
2121const (
2222 TCP = "tcp"
2323 SERVER_IP = "127.0.0.1"
24- SERVER_PORT = "9180" //服务器默认端口 9180
24+ SERVER_PORT = "9180" //服务器默认端口 9180
2525 SERVER_ADDR = SERVER_IP + ":" + SERVER_PORT
2626)
2727
@@ -32,18 +32,18 @@ type Message struct {
3232}
3333
3434type Reply struct {
35- State int8
36- Content string
35+ StateCode int32
36+ Content string
37+ Error string
3738}
3839
39- func sendMsgToUser (message * Message ) * Reply {
40- reply := & Reply {}
40+ func sendMsgToUser (message * Message ) (reply * Reply ) {
4141 toUserName := message .To .UserName
4242 toUser := getUser (toUserName )
4343 if toUser == nil {
44- reply .State = 0
45- reply .Content = "sendMsgToUser fail: toUser not exsist!"
46- return nil
44+ reply .StateCode = 503
45+ reply .Error = "sendMsgToUser fail: toUser not exsist!"
46+ return reply
4747 }
4848 method := "User.ShowMessage"
4949 replyCall := callClientUser (toUser , method , message , & Reply {})
@@ -52,33 +52,38 @@ func sendMsgToUser(message *Message) *Reply {
5252}
5353
5454//服务器向在线用户发信息
55- func sendMsg (args []string ) * Reply {
56- reply := & Reply {}
55+ func sendMsg (args []string ) (reply * Reply ) {
5756 if len (args ) != 3 {
5857 fmt .Println ("Need 3 args: <method> <to-user-name> <message-content>" )
59- return nil
58+ reply .StateCode = 503
59+ reply .Error = "Args error"
60+ return reply
6061 }
6162 toUserName := args [1 ]
6263 messageContent := args [2 ]
6364 toUser := getUser (toUserName )
6465 if toUser == nil {
65- reply .State = 0
66- reply .Content = "SendMsg failed: toUser not exists..."
66+ reply .StateCode = 503
67+ reply .Error = "SendMsg failed: toUser not exists..."
6768 return reply
6869 }
6970 message := & Message {To :toUser , Content :messageContent }
7071 return sendMsgToUser (message )
7172}
7273
73- func startAccept (args []string ) * Reply {
74+ func startAccept (args []string ) ( reply * Reply ) {
7475 if len (args ) != 1 {
7576 fmt .Println ("Need one args <method>" )
76- return nil
77+ reply .StateCode = 503
78+ reply .Error = "Args error"
79+ return reply
7780 }
7881 l , e := net .Listen (TCP , SERVER_ADDR )
7982 if e != nil {
8083 fmt .Println ("Listen error" , e )
81- return nil
84+ reply .StateCode = 503
85+ reply .Error = "Listen error"
86+ return reply
8287 }
8388
8489 fmt .Println ("Server: listened on PORT " , SERVER_PORT )
@@ -107,7 +112,7 @@ func startAccept(args []string) *Reply {
107112
108113}
109114
110- //启动服务器,默认端口8888 。必须在客户端启动前启动服务器
115+ //启动服务器,默认端口9180 。必须在客户端启动前启动服务器
111116func Start () {
112117 r := bufio .NewReader (os .Stdin )
113118 handlers := getCommandHandler ()
0 commit comments