oss添加内网域名选项

togettoyou · Apr 18, 2023 · a64df94 · a64df94
1 parent 1a7e0ee
commit a64df94
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/server/pkg/ali/oss.go b/server/pkg/ali/oss.go
@@ -10,7 +10,11 @@ import (
 func Verify() error {
 	ossInfo := caches.GetOSSInfo()
 	if ossInfo.Enable() {
-		client, err := oss.New(ossInfo.OSSEndpoint, ossInfo.OSSAccessKeyID, ossInfo.OSSAccessKeySecret)
+		endpoint := ossInfo.OSSEndpoint
+		if ossInfo.OSSLANEndpoint != "" {
+			endpoint = ossInfo.OSSLANEndpoint
+		}
+		client, err := oss.New(endpoint, ossInfo.OSSAccessKeyID, ossInfo.OSSAccessKeySecret)
 		if err != nil {
 			return err
 		}
@@ -30,7 +34,11 @@ func Verify() error {
 func UploadFile(objectKey, filePath string) (string, error) {
 	ossInfo := caches.GetOSSInfo()
 	if ossInfo.Enable() {
-		client, err := oss.New(ossInfo.OSSEndpoint, ossInfo.OSSAccessKeyID, ossInfo.OSSAccessKeySecret)
+		endpoint := ossInfo.OSSEndpoint
+		if ossInfo.OSSLANEndpoint != "" {
+			endpoint = ossInfo.OSSLANEndpoint
+		}
+		client, err := oss.New(endpoint, ossInfo.OSSAccessKeyID, ossInfo.OSSAccessKeySecret)
 		if err != nil {
 			return "", err
 		}

diff --git a/server/pkg/caches/oss_info.go b/server/pkg/caches/oss_info.go
@@ -8,6 +8,7 @@ type OSSInfo struct {
 	EnableOSS          bool   `json:"enable_oss"`
 	OSSBucketName      string `json:"oss_bucket_name"`
 	OSSEndpoint        string `json:"oss_endpoint"`
+	OSSLANEndpoint     string `json:"oss_lan_endpoint"` // 内网地址，可选
 	OSSAccessKeyID     string `json:"oss_access_key_id"`
 	OSSAccessKeySecret string `json:"oss_access_key_secret"`
 }

diff --git a/web/src/views/setting/oss/index.vue b/web/src/views/setting/oss/index.vue
@@ -17,9 +17,12 @@
       <el-form-item label="存储空间（Bucket）" prop="oss_bucket_name">
         <el-input v-model="ruleForm.oss_bucket_name"></el-input>
       </el-form-item>
-      <el-form-item label="访问域名（Endpoint）" prop="oss_endpoint">
+      <el-form-item label="外网访问域名（Endpoint）" prop="oss_endpoint">
         <el-input v-model="ruleForm.oss_endpoint"></el-input>
       </el-form-item>
+      <el-form-item label="内网上传域名（Endpoint）（可选）" prop="oss_lan_endpoint">
+        <el-input v-model="ruleForm.oss_lan_endpoint"></el-input>
+      </el-form-item>
       <el-form-item label="访问密钥（AccessKeyId）" prop="oss_access_key_id">
         <el-input v-model="ruleForm.oss_access_key_id"></el-input>
       </el-form-item>
@@ -54,6 +57,7 @@ export default {
         enable_oss: false,
         oss_bucket_name: '',
         oss_endpoint: '',
+        oss_lan_endpoint: '',
         oss_access_key_id: '',
         oss_access_key_secret: '',
       },