Merge branch 'master' of https://code.fnuoos.com/EggPlanet/system_rules

enum/sys_cfg.go

@@ -43,13 +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"
+	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 {
@@ -68,7 +71,12 @@ func (gt AliyunOss) String() string {
 		return "oss域名"
 	case AliyunOptions:
 		return "文件上传类型"
-
+	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

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