Merge branch 'main' into tuoyun

# Conflicts:
#	internal/conversation_msg/conversation_msg.go

internal/common/alioss.go

@@ -93,17 +93,14 @@ func (c *OSS) uploadObj(filePath string, fileType string, onProgressFun func(int
 	if err != nil {
 		return "", "", utils.Wrap(err, "")
 	}
-	newName, contentType, err := c.getNewFileNameAndContentType(filePath, fileType)
+	newName, _, err := c.getNewFileNameAndContentType(filePath, fileType)
 	if err != nil {
 		return "", "", utils.Wrap(err, "")
 	}
 	// 带可选参数的签名直传。请确保设置的ContentType值与在前端使用时设置的ContentType值一致。
 	options := []oss.Option{
 		oss.Progress(&OssProgressListener{onProgressFun: onProgressFun}), // 进度条
 	}
-	if fileType == "img" {
-		options = append(options, oss.ContentType(contentType))
-	}
 	// 签名直传。
 	signedURL, err := bucket.SignURL(newName, oss.HTTPPut, 60)
 	if err != nil {

internal/conversation_msg/conversation_msg.go

@@ -103,7 +103,6 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 	phNewConversationSet := make(map[string]*db.LocalConversation)
 	log.Info(operationID, "do Msg come here")
 	for _, v := range allMsg {
-
 		isHistory = utils.GetSwitchFromOptions(v.Options, constant.IsHistory)
 		isUnreadCount = utils.GetSwitchFromOptions(v.Options, constant.IsUnreadCount)
 		isConversationUpdate = utils.GetSwitchFromOptions(v.Options, constant.IsConversationUpdate)
@@ -265,8 +264,6 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 					lc.ShowName = msg.SenderNickname
 					lc.FaceURL = msg.SenderFaceURL
 				case constant.GroupChatType:
-					//Generate At type into Conversation
-					//c.genConversationGroupAtType(&lc, msg)
 					lc.GroupID = v.GroupID
 					lc.ConversationID = utils.GetConversationIDBySessionType(lc.GroupID, constant.GroupChatType)
 					//faceUrl, name, err := u.getGroupNameAndFaceUrlByUid(c.GroupID)