diff --git a/.env.example b/.env.example index 62bcc37..c8de1ce 100644 --- a/.env.example +++ b/.env.example @@ -22,7 +22,7 @@ APP_JWT_SECRET=your-secret-key-here-change-in-production APP_JWT_EXPIRE=7200 # Aliyun OSS Configuration -APP_OSS_REGION=oss-cn-hangzhou +APP_OSS_REGION=cn-hangzhou APP_OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com APP_OSS_BUCKET=trace-system APP_OSS_ACCESS_KEY_ID= diff --git a/config.yaml b/config.yaml index 876a0d3..9962247 100644 --- a/config.yaml +++ b/config.yaml @@ -23,7 +23,7 @@ jwt: # 阿里云 OSS 配置 oss: - region: "oss-cn-hangzhou" + region: "cn-hangzhou" endpoint: "oss-cn-hangzhou.aliyuncs.com" bucket: "trace-system" access_key_id: "" diff --git a/config/config.go b/config/config.go index 5a37d9b..dace11e 100644 --- a/config/config.go +++ b/config/config.go @@ -147,7 +147,7 @@ func setDefaults() { viper.SetDefault("jwt.expire", 7200) // 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.bucket", "trace-system") viper.SetDefault("oss.prefix", "aftersales-confirmations") diff --git a/services/oss_service.go b/services/oss_service.go index 57d4d1d..ecb4fda 100644 --- a/services/oss_service.go +++ b/services/oss_service.go @@ -146,15 +146,7 @@ func (s OSSService) newClient() *oss.Client { s.cfg.AccessKeyID, 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://")) 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 -}