pb change

internal/api/chat/send_msg.go

@@ -49,7 +49,7 @@ func newUserSendMsgReq(token string, params *paramsUserSendMsg) *pbChat.UserSend
 		RecvID:         params.Data.RecvID,
 		ForceList:      params.Data.ForceList,
 		Content:        params.Data.Content,
-		Options:        params.Data.Options,
+		Options:        utils.MapIntToJsonString(params.Data.Options),
 		ClientMsgID:    params.Data.ClientMsgID,
 		OffLineInfo:    utils.MapToJsonString(params.Data.OffLineInfo),
 		Ex:             utils.MapToJsonString(params.Data.Ex),

internal/api/manage/management_chat.go

@@ -72,7 +72,7 @@ func newUserSendMsgReq(params *paramsManagementSendMsg) *pbChat.UserSendMsgReq {
 		ForceList:      params.ForceList,
 		Content:        newContent,
 		ClientMsgID:    utils.GetMsgID(params.SendID),
-		Options:        options,
+		Options:        utils.MapIntToJsonString(options),
 	}
 	return &pbData
 }

internal/msg_gateway/gate/logic.go

@@ -214,7 +214,7 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req, sendTime int64) {
 			SenderNickName: data.SenderNickName,
 			SenderFaceURL:  data.SenderFaceURL,
 			Content:        data.Content,
-			Options:        data.Options,
+			Options:        utils.MapIntToJsonString(data.Options),
 			ClientMsgID:    data.ClientMsgID,
 			SendTime:       sendTime,
 		}

internal/msg_transfer/logic/history_msg_handler.go

@@ -54,10 +54,11 @@ func (mc *HistoryConsumerHandler) handleChatWs2Mongo(msg []byte, msgKey string)
 	pbSaveData.OperationID = pbData.OperationID
 	pbSaveData.RecvID = pbData.RecvID
 	pbSaveData.PlatformID = pbData.PlatformID
+	options := utils.JsonStringToMap(pbData.Options)
 	//Control whether to store offline messages (mongo)
-	isHistory := utils.GetSwitchFromOptions(pbData.Options, "history")
+	isHistory := utils.GetSwitchFromOptions(options, "history")
 	//Control whether to store history messages (mysql)
-	isPersist := utils.GetSwitchFromOptions(pbData.Options, "persistent")
+	isPersist := utils.GetSwitchFromOptions(options, "persistent")
 	switch pbData.SessionType {
 	case constant.SingleChatType:
 		log.NewDebug(pbSaveData.OperationID, "msg_transfer chat type = SingleChatType", isHistory, isPersist)

internal/msg_transfer/logic/persistent_msg_handler.go

@@ -40,8 +40,9 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(msg []byte, msgKey strin
 		log.ErrorByKv("msg_transfer Unmarshal chat err", "", "chat", string(msg), "err", err.Error())
 		return
 	}
+	options := utils.JsonStringToMap(pbData.Options)
 	//Control whether to store history messages (mysql)
-	isPersist := utils.GetSwitchFromOptions(pbData.Options, "persistent")
+	isPersist := utils.GetSwitchFromOptions(options, "persistent")
 	//Only process receiver data
 	if isPersist {
 		if msgKey == pbData.RecvID && pbData.SessionType == constant.SingleChatType {

internal/push/logic/push_handler.go

@@ -12,6 +12,7 @@ import (
 	"Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/chat"
 	pbRelay "Open_IM/pkg/proto/relay"
+	"Open_IM/pkg/utils"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
 )
@@ -53,7 +54,7 @@ func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) {
 	sendPbData.PlatformID = pbData.PlatformID
 	sendPbData.RecvSeq = pbData.RecvSeq
 	//Call push module to send message to the user
-	MsgToUser(&sendPbData, pbData.OfflineInfo, pbData.Options)
+	MsgToUser(&sendPbData, pbData.OfflineInfo, utils.JsonStringToMap(pbData.Options))
 }
 func (PushConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error   { return nil }
 func (PushConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil }

internal/rpc/chat/send_msg.go

@@ -71,7 +71,8 @@ func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*
 	} else {
 		pbData.SendTime = pb.SendTime
 	}
-	isHistory := utils.GetSwitchFromOptions(pbData.Options, "history")
+	options := utils.JsonStringToMap(pbData.Options)
+	isHistory := utils.GetSwitchFromOptions(options, "history")
 	mReq := MsgCallBackReq{
 		SendID:      pb.SendID,
 		RecvID:      pb.RecvID,
@@ -237,10 +238,12 @@ func modifyMessageByUserMessageReceiveOpt(userID, sourceID string, sessionType i
 	case constant.NotReceiveMessage:
 		return false
 	case constant.ReceiveNotNotifyMessage:
-		if msg.Options == nil {
-			msg.Options = make(map[string]int32, 2)
+		options := utils.JsonStringToMap(msg.Options)
+		if options == nil {
+			options = make(map[string]int32, 2)
 		}
-		utils.SetSwitchFromOptions(msg.Options, "offlinePush", 0)
+		utils.SetSwitchFromOptions(options, "offlinePush", 0)
+		msg.Options = utils.MapIntToJsonString(options)
 		return true
 	}