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

internal/push/logic/push_to_client.go

@@ -71,32 +71,34 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 					bCustomContent, _ := json.Marshal(customContent)
 					jsonCustomContent := string(bCustomContent)
 					var content string
-					switch pushMsg.MsgData.ContentType {
-					case constant.Text:
-						content = constant.ContentType2PushContent[constant.Text]
-					case constant.Picture:
-						content = constant.ContentType2PushContent[constant.Picture]
-					case constant.Voice:
-						content = constant.ContentType2PushContent[constant.Voice]
-					case constant.Video:
-						content = constant.ContentType2PushContent[constant.Video]
-					case constant.File:
-						content = constant.ContentType2PushContent[constant.File]
-					case constant.AtText:
-						a := AtContent{}
-						_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
-						if utils.IsContain(v.RecvID, a.AtUserList) {
-							content = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
-						} else {
-							content = constant.ContentType2PushContent[constant.GroupMsg]
-						}
-					default:
-						content = constant.ContentType2PushContent[constant.Common]
-					}
 					if pushMsg.MsgData.OfflinePushInfo != nil {
 						content = pushMsg.MsgData.OfflinePushInfo.Title
 
+					} else {
+						switch pushMsg.MsgData.ContentType {
+						case constant.Text:
+							content = constant.ContentType2PushContent[constant.Text]
+						case constant.Picture:
+							content = constant.ContentType2PushContent[constant.Picture]
+						case constant.Voice:
+							content = constant.ContentType2PushContent[constant.Voice]
+						case constant.Video:
+							content = constant.ContentType2PushContent[constant.Video]
+						case constant.File:
+							content = constant.ContentType2PushContent[constant.File]
+						case constant.AtText:
+							a := AtContent{}
+							_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
+							if utils.IsContain(v.RecvID, a.AtUserList) {
+								content = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
+							} else {
+								content = constant.ContentType2PushContent[constant.GroupMsg]
+							}
+						default:
+							content = constant.ContentType2PushContent[constant.Common]
+						}
 					}
+
 					pushResult, err := push.JGAccountListPush(UIDList, content, jsonCustomContent, constant.PlatformIDToName(t))
 					if err != nil {
 						log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error(), constant.PlatformIDToName(t))

pkg/common/db/model_struct.go

@@ -187,7 +187,7 @@ type ChatLog struct {
 	SessionType      int32     `gorm:"column:session_type" json:"sessionType"`
 	MsgFrom          int32     `gorm:"column:msg_from" json:"msgFrom"`
 	ContentType      int32     `gorm:"column:content_type" json:"contentType"`
-	Content          string    `gorm:"column:content;type:varchar(1000)" json:"content"`
+	Content          string    `gorm:"column:content;type:varchar(3000)" json:"content"`
 	Status           int32     `gorm:"column:status" json:"status"`
 	SendTime         time.Time `gorm:"column:send_time" json:"sendTime"`
 	CreateTime       time.Time `gorm:"column:create_time" json:"createTime"`