优化结构

internal/integration/storage/s3_storage.go

@@ -9,7 +9,7 @@ import (
 	"path"
 	"strings"
 
-	"kra/internal/conf"
+	"kra/internal/config"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
@@ -20,7 +20,7 @@ type s3Storage struct {
 	bucket, baseURL, prefix string
 }
 
-func newS3Storage(provider string, config *conf.AdminBackend_ObjectStore) (system.FileStorage, error) {
+func newS3Storage(provider string, config *config.ObjectStore) (system.FileStorage, error) {
 	if config == nil || config.Bucket == "" || config.AccessKey == "" || config.SecretKey == "" {
 		return nil, fmt.Errorf("%s storage configuration is incomplete", provider)
 	}
@@ -30,7 +30,7 @@ func newS3Storage(provider string, config *conf.AdminBackend_ObjectStore) (syste
 		case "aws-s3":
 			endpoint = "s3." + config.Region + ".amazonaws.com"
 		case "cloudflare-r2":
-			endpoint = config.AccountId + ".r2.cloudflarestorage.com"
+			endpoint = config.AccountID + ".r2.cloudflarestorage.com"
 		case "aliyun-oss":
 			endpoint = "oss-" + config.Region + ".aliyuncs.com"
 		case "huawei-obs":
@@ -39,7 +39,7 @@ func newS3Storage(provider string, config *conf.AdminBackend_ObjectStore) (syste
 			endpoint = "cos." + config.Region + ".myqcloud.com"
 		}
 	}
-	secure := config.UseSsl
+	secure := config.UseSSL
 	if parsed, err := url.Parse(endpoint); err == nil && parsed.Host != "" {
 		secure = parsed.Scheme == "https"
 		endpoint = parsed.Host
@@ -56,7 +56,7 @@ func newS3Storage(provider string, config *conf.AdminBackend_ObjectStore) (syste
 	if err != nil {
 		return nil, err
 	}
-	return &s3Storage{client: client, bucket: config.Bucket, baseURL: strings.TrimSuffix(config.BaseUrl, "/"), prefix: strings.Trim(config.PathPrefix, "/")}, nil
+	return &s3Storage{client: client, bucket: config.Bucket, baseURL: strings.TrimSuffix(config.BaseURL, "/"), prefix: strings.Trim(config.PathPrefix, "/")}, nil
 }
 func (s *s3Storage) key(name string) string {
 	if s.prefix == "" {