Merge remote-tracking branch 'origin/tuoyun' into tuoyun

pkg/common/constant/constant.go

@@ -44,6 +44,7 @@ const (
 	GroupMsg       = 201
 
 	//SysRelated
+	NotificationBegin = 1000
 
 	FriendApplicationApprovedNotification = 1201 //add_friend_response
 	FriendApplicationRejectedNotification = 1202 //add_friend_response
@@ -66,6 +67,7 @@ const (
 	MemberKickedNotification             = 1508
 	MemberInvitedNotification            = 1509
 	MemberEnterNotification              = 1510
+	NotificationEnd                      = 2000
 
 	//MsgFrom
 	UserMsgType = 100

pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go

@@ -10,7 +10,10 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	pbMsg "Open_IM/pkg/proto/chat"
+	"Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
 	"github.com/jinzhu/copier"
 )
 
@@ -27,7 +30,19 @@ func InsertMessageToChatLog(msg pbMsg.MsgDataToMQ) error {
 	case constant.SingleChatType:
 		chatLog.RecvID = msg.MsgData.RecvID
 	}
-	chatLog.Content = string(msg.MsgData.Content)
+	if msg.MsgData.ContentType >= constant.NotificationBegin && msg.MsgData.ContentType <= constant.NotificationEnd {
+		var tips server_api_params.TipsComm
+		_ = proto.Unmarshal(msg.MsgData.Content, &tips)
+		marshaler := jsonpb.Marshaler{
+			OrigName:     true,
+			EnumsAsInts:  false,
+			EmitDefaults: false,
+		}
+		chatLog.Content, _ = marshaler.MarshalToString(&tips)
+
+	} else {
+		chatLog.Content = string(msg.MsgData.Content)
+	}
 	chatLog.CreateTime = utils.UnixMillSecondToTime(msg.MsgData.CreateTime)
 	chatLog.SendTime = utils.UnixMillSecondToTime(msg.MsgData.SendTime)
 	return dbConn.Table("chat_logs").Create(chatLog).Error