Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

pkg/base_info/third_api_struct.go

@@ -7,12 +7,13 @@ type MinioStorageCredentialReq struct {
 }
 
 type MiniostorageCredentialResp struct {
-	SecretAccessKey string `json:"secretAccessKey"`
-	AccessKeyID     string `json:"accessKeyID"`
-	SessionToken    string `json:"sessionToken"`
-	BucketName      string `json:"bucketName"`
-	StsEndpointURL  string `json:"stsEndpointURL"`
-	StorageTime     int    `json:"storageTime"`
+	SecretAccessKey  string `json:"secretAccessKey"`
+	AccessKeyID      string `json:"accessKeyID"`
+	SessionToken     string `json:"sessionToken"`
+	BucketName       string `json:"bucketName"`
+	StsEndpointURL   string `json:"stsEndpointURL"`
+	StorageTime      int    `json:"storageTime"`
+	IsDistributedMod bool   `json:"isDistributedMod"`
 }
 
 type MinioUploadFileReq struct {

pkg/common/config/config.go

@@ -72,6 +72,7 @@ type config struct {
 			EndpointInner       string `yaml:"endpointInner"`
 			EndpointInnerEnable bool   `yaml:"endpointInnerEnable"`
 			StorageTime         int    `yaml:"storageTime"`
+			IsDistributedMod    bool   `yaml:"isDistributedMod"`
 		} `yaml:"minio"`
 	}
 

pkg/common/db/rocks_cache/rocks_cache.go

@@ -8,6 +8,7 @@ import (
 	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"time"
 )
@@ -323,6 +324,9 @@ func GetJoinedSuperGroupListFromCache(userID string) ([]string, error) {
 		if err != nil {
 			return "", utils.Wrap(err, "")
 		}
+		if len(userToSuperGroup.GroupIDList) == 0 {
+			return "", errors.New("GroupIDList == 0")
+		}
 		bytes, err := json.Marshal(userToSuperGroup.GroupIDList)
 		return string(bytes), utils.Wrap(err, "")
 	}