From 822f689c482dcdb4c920006545044b9f76c5967f Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 8 Dec 2021 18:17:57 +0800
Subject: [PATCH] rpc protocol update

---
 internal/msg_gateway/gate/logic.go                    | 2 +-
 internal/msg_transfer/logic/history_msg_handler.go    | 5 ++---
 internal/msg_transfer/logic/persistent_msg_handler.go | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go
index 9b449d4b2..58358a1e6 100644
--- a/internal/msg_gateway/gate/logic.go
+++ b/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:        utils.MapIntToJsonString(data.Options),
+			Options:        data.Options,
 			ClientMsgID:    data.ClientMsgID,
 			SendTime:       sendTime,
 		}
diff --git a/internal/msg_transfer/logic/history_msg_handler.go b/internal/msg_transfer/logic/history_msg_handler.go
index e3b5efb05..ce6e2ade5 100644
--- a/internal/msg_transfer/logic/history_msg_handler.go
+++ b/internal/msg_transfer/logic/history_msg_handler.go
@@ -54,11 +54,10 @@ 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(Options, "history")
+	isHistory := utils.GetSwitchFromOptions(pbData.Options, "history")
 	//Control whether to store history messages (mysql)
-	isPersist := utils.GetSwitchFromOptions(Options, "persistent")
+	isPersist := utils.GetSwitchFromOptions(pbData.Options, "persistent")
 	switch pbData.SessionType {
 	case constant.SingleChatType:
 		log.NewDebug(pbSaveData.OperationID, "msg_transfer chat type = SingleChatType", isHistory, isPersist)
diff --git a/internal/msg_transfer/logic/persistent_msg_handler.go b/internal/msg_transfer/logic/persistent_msg_handler.go
index 88039041c..aa4c0c7ba 100644
--- a/internal/msg_transfer/logic/persistent_msg_handler.go
+++ b/internal/msg_transfer/logic/persistent_msg_handler.go
@@ -40,9 +40,8 @@ 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(Options, "persistent")
+	isPersist := utils.GetSwitchFromOptions(pbData.Options, "persistent")
 	//Only process receiver data
 	if isPersist {
 		if msgKey == pbData.RecvID && pbData.SessionType == constant.SingleChatType {