发消息时不需要写发件人

Author: c-wind

candy.go

@@ -15,9 +15,9 @@ make
 运行
 依次启动 bin 目录下master, notice, store, gate, 直接运行不需要参数
 默认端口依次为:
-master:9001 
-motice:9003 
-store :9004 
+master:9001
+motice:9003
+store :9004
 gate  :9000
 
 

client/candy.go

@@ -327,13 +327,13 @@ func (c *CandyClient) FileDownload(key string) ([]byte, error) {
 }
 
 // SendMessage 向服务器发送消息.
-func (c *CandyClient) SendMessage(from, group, user int64, body string) error {
-	msg := &meta.GateSendMessageRequest{Msg: &meta.Message{From: from, Group: group, User: user, Body: body}}
-	resp, err := c.api.SendMessage(context.Background(), msg)
+func (c *CandyClient) SendMessage(group, to int64, body string) (int64, error) {
+	req := &meta.GateSendMessageRequest{Msg: &meta.Message{Group: group, User: to, Body: body}}
+	resp, err := c.api.SendMessage(context.Background(), req)
 	if err != nil {
-		return err
+		return 0, err
 	}
-	return resp.Header.Error()
+	return resp.Id, resp.Header.Error()
 }
 
 // loopRecvMessage 一直接收服务器返回消息, 直到退出.

client/client.aar

@@ -284,6 +284,10 @@ func (g *Gate) SendMessage(ctx context.Context, req *meta.GateSendMessageRequest
 		return &meta.GateSendMessageResponse{Header: &meta.ResponseHeader{Code: -1, Msg: err.Error()}}, nil
 	}
 
+	if req.Msg.ID, err = g.master.NewID(); err != nil {
+		return &meta.GateSendMessageResponse{Header: &meta.ResponseHeader{Code: -1, Msg: err.Error()}}, nil
+	}
+
 	//防止乱写
 	req.Msg.From = s.getID()
 	req.Msg.Method = meta.Method_NONE
@@ -292,7 +296,7 @@ func (g *Gate) SendMessage(ctx context.Context, req *meta.GateSendMessageRequest
 		return &meta.GateSendMessageResponse{Header: &meta.ResponseHeader{Code: -1, Msg: err.Error()}}, nil
 	}
 
-	return &meta.GateSendMessageResponse{}, nil
+	return &meta.GateSendMessageResponse{Id: req.Msg.ID}, nil
 }
 
 // Ready 连接成功后立刻调用Ready, 开启推送

gate/server.go

@@ -228,5 +228,6 @@ message GateSendMessageRequest {
 
 message GateSendMessageResponse {
     ResponseHeader header = 1;
+    int64 id = 2;
 }