Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

internal/api/third/tencent_cloud_storage_credential.go

@@ -6,6 +6,9 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
+	"github.com/fatih/structs"
+
+	//"github.com/fatih/structs"
 	"github.com/gin-gonic/gin"
 	sts "github.com/tencentyun/qcloud-cos-sts-sdk/go"
 	"net/http"
@@ -57,9 +60,13 @@ func TencentCloudStorageCredential(c *gin.Context) {
 		resp.ErrCode = constant.ErrTencentCredential.ErrCode
 		resp.ErrMsg = err.Error()
 	} else {
-		resp.Data.Bucket = config.Config.Credential.Tencent.Bucket
-		resp.Data.Region = config.Config.Credential.Tencent.Region
-		resp.Data.CredentialResult = res
+		resp.CosData.Bucket = config.Config.Credential.Tencent.Bucket
+		resp.CosData.Region = config.Config.Credential.Tencent.Region
+		resp.CosData.CredentialResult = res
 	}
+
+	resp.Data = structs.Map(&resp.CosData)
+	log.NewInfo(req.OperationID, "TencentCloudStorageCredential return ", resp)
+
 	c.JSON(http.StatusOK, resp)
 }

internal/rpc/msg/send_msg.go

@@ -250,7 +250,7 @@ func returnMsg(replay *pbChat.SendMsgResp, pb *pbChat.SendMsgReq, errCode int32,
 func modifyMessageByUserMessageReceiveOpt(userID, sourceID string, sessionType int, pb *pbChat.SendMsgReq) bool {
 	conversationID := utils.GetConversationIDBySessionType(sourceID, sessionType)
 	opt, err := db.DB.GetSingleConversationMsgOpt(userID, conversationID)
-	if err != nil || err != redis.ErrNil {
+	if err != nil && err != redis.ErrNil {
 		log.NewError(pb.OperationID, "GetSingleConversationMsgOpt from redis err", conversationID, pb.String(), err.Error())
 		return true
 	}

pkg/base_info/cos_api_struct.go

@@ -14,5 +14,7 @@ type TencentCloudStorageCredentialRespData struct {
 
 type TencentCloudStorageCredentialResp struct {
 	CommResp
-	Data TencentCloudStorageCredentialRespData `json:"data"`
+	CosData TencentCloudStorageCredentialRespData `json:"-"`
+
+	Data map[string]interface{} `json:"data"`
 }