message send module changes

src/rpc/chat/chat/pull_message.go

@@ -31,7 +31,6 @@ func (rpc *rpcChat) GetNewSeq(_ context.Context, in *pbMsg.GetNewSeqReq) (*pbMsg
 	}
 
 }
-
 func (rpc *rpcChat) PullMessage(_ context.Context, in *pbMsg.PullMessageReq) (*pbMsg.PullMessageResp, error) {
 	log.InfoByKv("rpc pullMessage is arriving", in.OperationID, "args", in.String())
 	resp := new(pbMsg.PullMessageResp)

src/rpc/chat/chat/send_msg.go

@@ -50,7 +50,10 @@ func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*
 	pbData.OfflineInfo = pb.OffLineInfo
 	pbData.Options = pb.Options
 	pbData.PlatformID = pb.PlatformID
+	pbData.ClientMsgID = pb.ClientMsgID
 	pbData.SendID = pb.SendID
+	pbData.SenderNickName = pb.SenderNickName
+	pbData.SenderFaceURL = pb.SenderFaceURL
 	pbData.MsgID = serverMsgID
 	pbData.OperationID = pb.OperationID
 	pbData.Token = pb.Token
@@ -136,7 +139,6 @@ func returnMsg(replay *pbChat.UserSendMsgResp, pb *pbChat.UserSendMsgReq, errCod
 	replay.ErrCode = errCode
 	replay.ErrMsg = errMsg
 	replay.ReqIdentifier = pb.ReqIdentifier
-	replay.MsgIncr = pb.MsgIncr
 	replay.ClientMsgID = pb.ClientMsgID
 	replay.ServerMsgID = serverMsgID
 	replay.SendTime = sendTime

src/rpc/friend/friend/add_friend_response.go

@@ -56,7 +56,7 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
 			logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
 				SendID:      claims.UID,
 				RecvID:      req.Uid,
-				Content:     senderInfo.Name + " agreed to add you as a friend.",
+				Content:     content_struct.NewContentStructString(1, "", senderInfo.Name+" agreed to add you as a friend."),
 				SendTime:    utils.GetCurrentTimestampBySecond(),
 				MsgFrom:     constant.UserMsgType,                //Notification message identification
 				ContentType: constant.AcceptFriendApplicationTip, //Add friend flag