添加好友请求日志

Author: c-wind

candy.go

@@ -222,7 +222,7 @@ func addFriend(c *candy.CandyClient, reader *bufio.Reader) {
 	data, _, _ = reader.ReadLine()
 	msg := string(data)
 
-	if err = c.Friend(id, meta.Relation_ADD, msg); err != nil {
+	if err = c.Friend(id, int32(meta.Relation_ADD), msg); err != nil {
 		e := candy.ErrorParse(err.Error())
 		log.Errorf("addFriend code:%v error:%v", e.Code, e.Msg)
 		return
@@ -246,7 +246,7 @@ func confirmFriend(c *candy.CandyClient, reader *bufio.Reader) {
 		return
 	}
 
-	if err = c.Friend(id, meta.Relation_CONFIRM, ""); err != nil {
+	if err = c.Friend(id, int32(meta.Relation_CONFIRM), ""); err != nil {
 		e := candy.ErrorParse(err.Error())
 		log.Errorf("confirmFriend code:%v error:%v", e.Code, e.Msg)
 		return
@@ -382,8 +382,8 @@ func updateUserPasswd(c *candy.CandyClient, reader *bufio.Reader) {
 type cmdClient struct{}
 
 // OnRecv 这函数理论上是多线程调用，客户端需要注意下
-func (c *cmdClient) OnRecv(event meta.Event, operate meta.Relation, id int64, group int64, from int64, to int64, body string) {
-	log.Debugf("recv msg id:%d event:%v, operate:%v, group:%d, from:%d, to:%d, body:%s\n", id, event, operate, group, from, to, body)
+func (c *cmdClient) OnRecv(event int32, operate int32, id int64, group int64, from int64, to int64, body string) {
+	log.Debugf("recv msg id:%d event:%v, operate:%v, group:%d, from:%d, to:%d, body:%s\n", id, meta.Event(event), meta.Relation(operate), group, from, to, body)
 }
 
 // OnError 连接被服务器断开，或其它错误

client/candy.go

@@ -20,7 +20,7 @@ const (
 // MessageHandler 接收服务器端推送来的消息
 type MessageHandler interface {
 	// OnRecv 这函数理论上是多线程调用，客户端需要注意下
-	OnRecv(event meta.Event, operate meta.Relation, id int64, group int64, from int64, to int64, body string)
+	OnRecv(event int32, operate int32, id int64, group int64, from int64, to int64, body string)
 
 	// OnError 连接被服务器断开，或其它错误
 	OnError(msg string)
@@ -223,8 +223,8 @@ func (c *CandyClient) getUserInfoByID(userID int64) (*UserInfo, error) {
 }
 
 // Friend 添加好友
-func (c *CandyClient) Friend(userID int64, operate meta.Relation, msg string) error {
-	req := &meta.GateFriendRequest{UserID: userID, Operate: operate, Msg: msg}
+func (c *CandyClient) Friend(userID int64, operate int32, msg string) error {
+	req := &meta.GateFriendRequest{UserID: userID, Operate: meta.Relation(operate), Msg: msg}
 	resp, err := c.api.Friend(context.Background(), req)
 	if err != nil {
 		return err
@@ -348,7 +348,7 @@ func (c *CandyClient) loopRecvMessage() {
 			break
 		}
 
-		c.handler.OnRecv(pm.Event, pm.Operate, pm.Msg.ID, pm.Msg.Group, pm.Msg.From, pm.Msg.To, pm.Msg.Body)
+		c.handler.OnRecv(int32(pm.Event), int32(pm.Operate), pm.Msg.ID, pm.Msg.Group, pm.Msg.From, pm.Msg.To, pm.Msg.Body)
 	}
 }
 

client/client.aar

@@ -353,6 +353,7 @@ func (g *Gate) Push(ctx context.Context, req *meta.GatePushRequest) (*meta.GateP
 
 // Friend 添加好友或确认接受添加.
 func (g *Gate) Friend(ctx context.Context, req *meta.GateFriendRequest) (*meta.GateFriendResponse, error) {
+	log.Debugf("begin Friend req:%v", req)
 	s, err := g.getOnlineSession(ctx)
 	if err != nil {
 		return &meta.GateFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorGetOnlineSession, Msg: err.Error()}}, nil
@@ -369,6 +370,7 @@ func (g *Gate) Friend(ctx context.Context, req *meta.GateFriendRequest) (*meta.G
 		return &meta.GateFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorAddFriend, Msg: err.Error()}}, nil
 	}
 
+	log.Debugf("end Friend req:%v", req)
 	return &meta.GateFriendResponse{}, nil
 }
 

gate/server.go

@@ -57,9 +57,9 @@ func (n *Notifer) UnSubscribe(_ context.Context, req *meta.UnSubscribeRequest) (
 
 // Push push a message to gate.
 func (n *Notifer) Push(_ context.Context, req *meta.PushRequest) (*meta.PushResponse, error) {
-	log.Debugf("begin push message, msg:%v", req.Msg)
+	log.Debugf("begin push message:%v, ids:%v", req.Msg, req.ID)
 	n.broker.Push(*req.Msg, req.ID...)
-	log.Debugf("end push message ok, msg:%v", req.Msg)
+	log.Debugf("end push message:%v, ids:%v", req.Msg, req.ID)
 
 	return &meta.PushResponse{}, nil
 }

notice/server.go

@@ -74,7 +74,7 @@ func (p *postman) sendToGroup(pm meta.PushMessage) error {
 		ids = append(ids, &meta.PushID{Before: before, User: uid})
 	}
 
-	log.Debugf("send msg:%v, ids:%v", ids)
+	log.Debugf("send msg:%v, ids:%v", pm, ids)
 	return p.notice.Push(pm, ids...)
 }