AwsS3新增配置属性,可以兼容minio (flipped-aurora#932)

Rebellioncry · Rebellioncry · web-flow · commit e0e0e7823c4f · 2022-02-26T20:28:11.000+08:00
Co-authored-by: Rebellioncry &lt;23714@aomai.com&gt;
diff --git a/server/config.yaml b/server/config.yaml
@@ -150,10 +150,13 @@ tencent-cos:
   base-url: 'https://gin.vue.admin'
   path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
 
-# aws s3 configuration
+# aws s3 configuration (minio compatible)
 aws-s3:
   bucket: xxxxx-10005608
   region: ap-shanghai
+  endpoint: ''
+  s3-force-path-style: false
+  disable-ssl: false
   secret-id: xxxxxxxx
   secret-key: xxxxxxxx
   base-url: https://gin.vue.admin
diff --git a/server/config/oss_aws.go b/server/config/oss_aws.go
@@ -1,10 +1,13 @@
 package config
 
 type AwsS3 struct {
-	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
-	Region     string `mapstructure:"region" json:"region" yaml:"region"`
-	SecretID   string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
-	SecretKey  string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
-	BaseURL    string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
-	PathPrefix string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
+	Bucket           string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Region           string `mapstructure:"region" json:"region" yaml:"region"`
+	Endpoint         string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	S3ForcePathStyle bool   `mapstructure:"s3-force-path-style" json:"s3ForcePathStyle" yaml:"s3-force-path-style"`
+	DisableSSL       bool   `mapstructure:"disable-ssl" json:"disableSSL" yaml:"disable-ssl"`
+	SecretID         string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
+	SecretKey        string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
+	BaseURL          string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
+	PathPrefix       string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
 }
diff --git a/server/utils/upload/aws_s3.go b/server/utils/upload/aws_s3.go
@@ -83,7 +83,10 @@ func (*AwsS3) DeleteFile(key string) error {
 // newSession Create S3 session
 func newSession() *session.Session {
 	sess, _ := session.NewSession(&aws.Config{
-		Region: aws.String(global.GVA_CONFIG.AwsS3.Region),
+		Region:           aws.String(global.GVA_CONFIG.AwsS3.Region),
+		Endpoint:         aws.String(global.GVA_CONFIG.AwsS3.Endpoint), //minio在这里设置地址,可以兼容
+		S3ForcePathStyle: aws.Bool(global.GVA_CONFIG.AwsS3.S3ForcePathStyle),
+		DisableSSL:       aws.Bool(global.GVA_CONFIG.AwsS3.DisableSSL),
 		Credentials: credentials.NewStaticCredentials(
 			global.GVA_CONFIG.AwsS3.SecretID,
 			global.GVA_CONFIG.AwsS3.SecretKey,
