message send module changes

src/push/content_struct/content.go

@@ -44,6 +44,11 @@ type AgreeOrRejectGroupMember struct {
 	FaceUrl  string `json:"faceUrl"`
 	Reason   string `json:"reason"`
 }
+type AtTextContent struct {
+	Text       string   `json:"text"`
+	AtUserList []string `json:"atUserList"`
+	IsAtSelf   bool     `json:"isAtSelf"`
+}
 
 type CreateGroupSysMsg struct {
 	uIdCreator     string                `creatorUid`

src/push/logic/push_handler.go

@@ -47,9 +47,11 @@ func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) {
 	sendPbData.RecvID = pbData.RecvID
 	sendPbData.Content = pbData.Content
 	sendPbData.SendID = pbData.SendID
+	sendPbData.SenderNickName = pbData.SenderNickName
+	sendPbData.SenderFaceURL = pbData.SenderFaceURL
+	sendPbData.ClientMsgID = pbData.ClientMsgID
 	sendPbData.PlatformID = pbData.PlatformID
 	sendPbData.RecvSeq = pbData.RecvSeq
-	sendPbData.IsEmphasize = pbData.IsEmphasize
 	//Call push module to send message to the user
 	MsgToUser(&sendPbData, pbData.OfflineInfo, pbData.Options)
 }

src/push/logic/push_rpc_server.go

@@ -55,13 +55,15 @@ func (r *RPCServer) PushMsg(_ context.Context, pbData *pbPush.PushMsgReq) (*pbPu
 	sendPbData.ServerMsgID = pbData.MsgID
 	sendPbData.MsgFrom = pbData.MsgFrom
 	sendPbData.ContentType = pbData.ContentType
+	sendPbData.SenderNickName = pbData.SenderNickName
+	sendPbData.SenderFaceURL = pbData.SenderFaceURL
+	sendPbData.ClientMsgID = pbData.ClientMsgID
 	sendPbData.SessionType = pbData.SessionType
 	sendPbData.RecvID = pbData.RecvID
 	sendPbData.Content = pbData.Content
 	sendPbData.SendID = pbData.SendID
 	sendPbData.PlatformID = pbData.PlatformID
 	sendPbData.RecvSeq = pbData.RecvSeq
-	sendPbData.IsEmphasize = pbData.IsEmphasize
 	//Call push module to send message to the user
 	MsgToUser(&sendPbData, pbData.OfflineInfo, pbData.Options)
 	return &pbPush.PushMsgResp{

src/push/logic/push_to_client.go

@@ -108,6 +108,7 @@ func MsgToUser(sendPbData *pbRelay.MsgToUserReq, OfflineInfo, Options string) {
 
 func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) {
 	m.MsgID = rpcChat.GetMsgID(m.SendID)
+	m.ClientMsgID = m.MsgID
 	switch m.SessionType {
 	case constant.SingleChatType:
 		sendMsgToKafka(m, m.SendID, "msgKey--sendID")