Use OSS v2 region format
This commit is contained in:
+1
-1
@@ -22,7 +22,7 @@ APP_JWT_SECRET=your-secret-key-here-change-in-production
|
|||||||
APP_JWT_EXPIRE=7200
|
APP_JWT_EXPIRE=7200
|
||||||
|
|
||||||
# Aliyun OSS Configuration
|
# Aliyun OSS Configuration
|
||||||
APP_OSS_REGION=oss-cn-hangzhou
|
APP_OSS_REGION=cn-hangzhou
|
||||||
APP_OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
|
APP_OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
|
||||||
APP_OSS_BUCKET=trace-system
|
APP_OSS_BUCKET=trace-system
|
||||||
APP_OSS_ACCESS_KEY_ID=
|
APP_OSS_ACCESS_KEY_ID=
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ jwt:
|
|||||||
|
|
||||||
# 阿里云 OSS 配置
|
# 阿里云 OSS 配置
|
||||||
oss:
|
oss:
|
||||||
region: "oss-cn-hangzhou"
|
region: "cn-hangzhou"
|
||||||
endpoint: "oss-cn-hangzhou.aliyuncs.com"
|
endpoint: "oss-cn-hangzhou.aliyuncs.com"
|
||||||
bucket: "trace-system"
|
bucket: "trace-system"
|
||||||
access_key_id: ""
|
access_key_id: ""
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ func setDefaults() {
|
|||||||
viper.SetDefault("jwt.expire", 7200)
|
viper.SetDefault("jwt.expire", 7200)
|
||||||
|
|
||||||
// OSS 默认值
|
// OSS 默认值
|
||||||
viper.SetDefault("oss.region", "oss-cn-hangzhou")
|
viper.SetDefault("oss.region", "cn-hangzhou")
|
||||||
viper.SetDefault("oss.endpoint", "oss-cn-hangzhou.aliyuncs.com")
|
viper.SetDefault("oss.endpoint", "oss-cn-hangzhou.aliyuncs.com")
|
||||||
viper.SetDefault("oss.bucket", "trace-system")
|
viper.SetDefault("oss.bucket", "trace-system")
|
||||||
viper.SetDefault("oss.prefix", "aftersales-confirmations")
|
viper.SetDefault("oss.prefix", "aftersales-confirmations")
|
||||||
|
|||||||
@@ -146,15 +146,7 @@ func (s OSSService) newClient() *oss.Client {
|
|||||||
s.cfg.AccessKeyID,
|
s.cfg.AccessKeyID,
|
||||||
s.cfg.AccessKeySecret,
|
s.cfg.AccessKeySecret,
|
||||||
)).
|
)).
|
||||||
WithRegion(normalizeOSSRegion(s.cfg.Region)).
|
WithRegion(strings.TrimSpace(s.cfg.Region)).
|
||||||
WithEndpoint(strings.TrimPrefix(strings.TrimPrefix(normalizeOSSEndpoint(s.cfg.Endpoint), "https://"), "http://"))
|
WithEndpoint(strings.TrimPrefix(strings.TrimPrefix(normalizeOSSEndpoint(s.cfg.Endpoint), "https://"), "http://"))
|
||||||
return oss.NewClient(cfg)
|
return oss.NewClient(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func normalizeOSSRegion(region string) string {
|
|
||||||
region = strings.TrimSpace(region)
|
|
||||||
if strings.HasPrefix(region, "oss-") {
|
|
||||||
return strings.TrimPrefix(region, "oss-")
|
|
||||||
}
|
|
||||||
return region
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user