Fix: S3 adaption for minio

qxj006 · Oct 11, 2020 · 7739431 · 7739431
1 parent 41eb84a
commit 7739431
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/assets b/assets
diff --git a/models/policy.go b/models/policy.go
@@ -3,6 +3,7 @@ package model
 import (
 	"encoding/gob"
 	"encoding/json"
+	"fmt"
 	"net/url"
 	"path"
 	"path/filepath"
@@ -239,7 +240,7 @@ func (policy *Policy) GetUploadURL() string {
 		return policy.Server
 	}
 
-	var controller *url.URL
+	controller, _ := url.Parse("")
 	switch policy.Type {
 	case "local", "onedrive":
 		return "/api/v3/file/upload"
@@ -251,9 +252,17 @@ func (policy *Policy) GetUploadURL() string {
 		return policy.Server
 	case "upyun":
 		return "https://v0.api.upyun.com/" + policy.BucketName
-	default:
-		controller, _ = url.Parse("")
+	case "s3":
+		if policy.Server == "" {
+			return fmt.Sprintf("https://%s.s3.%s.amazonaws.com/", policy.BucketName,
+				policy.OptionsSerialized.Region)
+		}
+
+		if !strings.Contains(policy.Server, policy.BucketName) {
+			controller, _ = url.Parse("/" + policy.BucketName)
+		}
 	}
+
 	return server.ResolveReference(controller).String()
 }
 

diff --git a/pkg/filesystem/driver/s3/handler.go b/pkg/filesystem/driver/s3/handler.go
@@ -62,6 +62,7 @@ func (handler *Driver) InitS3Client() error {
 			Region:           &handler.Policy.OptionsSerialized.Region,
 			S3ForcePathStyle: aws.Bool(false),
 		})
+
 		if err != nil {
 			return err
 		}

diff --git a/routers/controllers/callback.go b/routers/controllers/callback.go
@@ -110,6 +110,7 @@ func COSCallback(c *gin.Context) {
 
 // S3Callback S3上传完成客户端回调
 func S3Callback(c *gin.Context) {
+	c.Header("Access-Control-Allow-Origin", "*")
 	var callbackBody callback.S3Callback
 	if err := c.ShouldBindQuery(&callbackBody); err == nil {
 		res := callbackBody.PreProcess(c)
+0 −2		src/App.js
+2 −6		src/component/Common/ICPFooter.js
+3 −0		src/component/Login/LoginForm.js