update

enum/sys_cfg.go

@@ -43,15 +43,16 @@ func (gt VideoReward) String() string {
 type AliyunOss string
 
 const (
-	AliyunOssEndpoint        = "oss_endpoint"
-	AliyunOssBucketName      = "oss_bucket_name"
-	AliyunOssBucketScheme    = "oss_bucket_scheme"
-	AliyunOssAccessKeyID     = "oss_access_key_id"
-	AliyunOssAccessKeySecret = "oss_access_key_secret"
-	AliyunOssDomain          = "oss_domain"
-	AliyunOptions            = "oss_options"
-	AliyunOssAccountId       = "oss_account_id"
-	AliyunOssRoleName        = "oss_role_name"
+	AliyunOssEndpoint                  = "oss_endpoint"
+	AliyunOssBucketName                = "oss_bucket_name"
+	AliyunOssBucketScheme              = "oss_bucket_scheme"
+	AliyunOssAccessKeyID               = "oss_access_key_id"
+	AliyunOssAccessKeySecret           = "oss_access_key_secret"
+	AliyunOssDomain                    = "oss_domain"
+	AliyunOptions                      = "oss_options"
+	AliyunOssAssumeRoleAccessKeyID     = "oss_assume_role_access_key_id"
+	AliyunOssAssumeRoleAccessKeySecret = "oss_assume_role_access_key_secret"
+	AliyunOssAssumeRoleARN             = "oss_assume_arn"
 )
 
 func (gt AliyunOss) String() string {
@@ -70,11 +71,12 @@ func (gt AliyunOss) String() string {
 		return "oss域名"
 	case AliyunOptions:
 		return "文件上传类型"
-	case AliyunOssAccountId:
-		return "阿里云账户id"
-	case AliyunOssRoleName:
-		return "oss RAM角色名称"
-
+	case AliyunOssAssumeRoleAccessKeyID:
+		return "oss RAM角色访问秘钥id"
+	case AliyunOssAssumeRoleAccessKeySecret:
+		return "oss RAM角色访问秘钥"
+	case AliyunOssAssumeRoleARN:
+		return "oss RAM角色ARN"
 	default:
 		return "未知"
 	}

svc/svc_file_img_format.go

@@ -36,10 +36,6 @@ func ImageFormatWithBucketNew(scheme, domain, name string) string {
 
 // ImageFormatWithBucketForDataInfo is 格式化成oss 域名 (只格式化内容中的 url)
 func ImageFormatWithBucketForDataInfo(scheme, domain, name string) string {
-	if strings.Contains(name, "http") {
-		return name
-	}
-
 	prefix := fmt.Sprintf("%s://%s/", scheme, domain)
 	name = strings.ReplaceAll(name, "{{tempHost}}", prefix)
 	return name