Merge branch 'main' into del

pkg/base_info/aws_api_struct.go

@@ -0,0 +1,20 @@
+package base_info
+
+type AwsStorageCredentialReq struct {
+	OperationID string `json:"operationID"`
+}
+
+type AwsStorageCredentialRespData struct {
+	AccessKeyId     string `json:"accessKeyID"`
+	SecretAccessKey string `json:"secretAccessKey"`
+	SessionToken    string `json:"sessionToken"`
+	RegionID        string `json:"regionId"`
+	Bucket          string `json:"bucket"`
+	FinalHost       string `json:"FinalHost"`
+}
+
+type AwsStorageCredentialResp struct {
+	CommResp
+	CosData AwsStorageCredentialRespData
+	Data    map[string]interface{} `json:"data"`
+}

pkg/common/config/config.go

@@ -74,6 +74,16 @@ type config struct {
 			StorageTime         int    `yaml:"storageTime"`
 			IsDistributedMod    bool   `yaml:"isDistributedMod"`
 		} `yaml:"minio"`
+		Aws struct {
+			AccessKeyID     string `yaml:"accessKeyID"`
+			AccessKeySecret string `yaml:"accessKeySecret"`
+			Region          string `yaml:"region"`
+			Bucket          string `yaml:"bucket"`
+			FinalHost       string `yaml:"finalHost"`
+			RoleArn         string `yaml:"roleArn"`
+			ExternalId      string `yaml:"externalId"`
+			RoleSessionName string `yaml:"roleSessionName"`
+		} `yaml:"aws"`
 	}
 
 	Dtm struct {
@@ -215,10 +225,10 @@ type config struct {
 			Addr  []string `yaml:"addr"`
 			Topic string   `yaml:"topic"`
 		}
-		Ws2mschatOffline struct {
-			Addr  []string `yaml:"addr"`
-			Topic string   `yaml:"topic"`
-		}
+		//Ws2mschatOffline struct {
+		//	Addr  []string `yaml:"addr"`
+		//	Topic string   `yaml:"topic"`
+		//}
 		MsgToMongo struct {
 			Addr  []string `yaml:"addr"`
 			Topic string   `yaml:"topic"`

pkg/common/constant/constant.go

@@ -185,7 +185,8 @@ const (
 
 	//Minio
 	MinioDurationTimes = 3600
-
+	//Aws
+	AwsDurationTimes = 3600
 	// verificationCode used for
 	VerificationCodeForRegister       = 1
 	VerificationCodeForReset          = 2