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

Author: FGadvancer

Diff for: internal/conversation_msg/conversation_msg.go

@@ -113,8 +113,8 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 		//}
 		msg := new(sdk_struct.MsgStruct)
 		copier.Copy(msg, v)
+		var tips server_api_params.TipsComm
 		if v.ContentType >= constant.NotificationBegin && v.ContentType <= constant.NotificationEnd {
-			var tips server_api_params.TipsComm
 			_ = proto.Unmarshal(v.Content, &tips)
 			marshaler := jsonpb.Marshaler{
 				OrigName:     true,
@@ -175,7 +175,7 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 				c.organization.DoNotification(v, c.ch, operationID)
 			} else if v.ContentType == constant.WorkMomentNotification {
 				log.Info(operationID, "WorkMoment New Notification")
-				c.workMoments.DoNotification(v, operationID)
+				c.workMoments.DoNotification(tips.JsonDetail, operationID)
 			}
 		case constant.GroupChatType:
 			if v.ContentType > constant.GroupNotificationBegin && v.ContentType < constant.GroupNotificationEnd {

Diff for: internal/work_moments/work_moments.go

@@ -1,14 +1,12 @@
 package workMoments
 
 import (
-	"github.com/golang/protobuf/proto"
 	ws "open_im_sdk/internal/interaction"
 	"open_im_sdk/open_im_sdk_callback"
 	"open_im_sdk/pkg/common"
 	"open_im_sdk/pkg/db"
 	"open_im_sdk/pkg/log"
 	"open_im_sdk/pkg/sdk_params_callback"
-	"open_im_sdk/pkg/server_api_params"
 	"open_im_sdk/pkg/utils"
 )
 
@@ -23,14 +21,9 @@ func NewWorkMoments(loginUserID string, db *db.DataBase, p *ws.PostApi) *WorkMom
 	return &WorkMoments{loginUserID: loginUserID, db: db, p: p}
 }
 
-func (w *WorkMoments) DoNotification(msg *server_api_params.MsgData, operationID string) {
-	log.NewInfo(operationID, utils.GetSelfFuncName(), string(msg.Content))
-	var tips server_api_params.TipsComm
-	if err := proto.Unmarshal(msg.Content, &tips); err != nil {
-		log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
-	}
-	log.NewInfo(operationID, utils.GetSelfFuncName(), "json_detail: ", tips.JsonDetail)
-	if err := w.db.InsertWorkMomentsNotification(tips.JsonDetail); err != nil {
+func (w *WorkMoments) DoNotification(jsonDetailStr string, operationID string) {
+	log.NewInfo(operationID, utils.GetSelfFuncName(), "json_detail: ", jsonDetailStr)
+	if err := w.db.InsertWorkMomentsNotification(jsonDetailStr); err != nil {
 		log.NewError(operationID, utils.GetSelfFuncName(), "InsertWorkMomentsNotification failed", err.Error())
 		return
 	}