From 3bd56c17a8b6db08a3e8d59190e705849718f86b Mon Sep 17 00:00:00 2001 From: "bingxiang.cheng" Date: Mon, 13 Apr 2026 11:57:47 +0800 Subject: [PATCH] feat(oss): register OSS in factory and container initialization Co-Authored-By: Claude Opus 4.6 --- internal/application/service/file/factory.go | 24 ++++++++++++++++++++ internal/container/container.go | 22 ++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/internal/application/service/file/factory.go b/internal/application/service/file/factory.go index 5cc8d008..405400bd 100644 --- a/internal/application/service/file/factory.go +++ b/internal/application/service/file/factory.go @@ -101,6 +101,30 @@ func NewFileServiceFromStorageConfig( svc, err := NewS3FileService(sec.S3.Endpoint, sec.S3.AccessKey, sec.S3.SecretKey, sec.S3.BucketName, sec.S3.Region, pathPrefix) return svc, p, err + case "oss": + if sec == nil || sec.OSS == nil || sec.OSS.Endpoint == "" || sec.OSS.Region == "" || sec.OSS.AccessKey == "" || sec.OSS.SecretKey == "" || sec.OSS.BucketName == "" { + return nil, p, fmt.Errorf("incomplete oss config") + } + pathPrefix := strings.TrimSpace(sec.OSS.PathPrefix) + if pathPrefix == "" { + pathPrefix = "weknora/" + } + var svc interfaces.FileService + var err error + if sec.OSS.UseTempBucket && sec.OSS.TempBucketName != "" { + svc, err = NewOssFileServiceWithTempBucket( + sec.OSS.Endpoint, sec.OSS.Region, sec.OSS.AccessKey, sec.OSS.SecretKey, + sec.OSS.BucketName, pathPrefix, + sec.OSS.TempBucketName, sec.OSS.TempRegion, + ) + } else { + svc, err = NewOssFileService( + sec.OSS.Endpoint, sec.OSS.Region, sec.OSS.AccessKey, sec.OSS.SecretKey, + sec.OSS.BucketName, pathPrefix, + ) + } + return svc, p, err + default: return nil, p, fmt.Errorf("unsupported provider %q", p) } diff --git a/internal/container/container.go b/internal/container/container.go index 761b09b6..7fadb17c 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -644,6 +644,28 @@ func initFileService(cfg *config.Config) (interfaces.FileService, error) { os.Getenv("S3_REGION"), pathPrefix, ) + case "oss": + if os.Getenv("OSS_ENDPOINT") == "" || + os.Getenv("OSS_REGION") == "" || + os.Getenv("OSS_ACCESS_KEY") == "" || + os.Getenv("OSS_SECRET_KEY") == "" || + os.Getenv("OSS_BUCKET_NAME") == "" { + return nil, fmt.Errorf("missing OSS configuration") + } + pathPrefix := os.Getenv("OSS_PATH_PREFIX") + if pathPrefix == "" { + pathPrefix = "weknora/" + } + return file.NewOssFileServiceWithTempBucket( + os.Getenv("OSS_ENDPOINT"), + os.Getenv("OSS_REGION"), + os.Getenv("OSS_ACCESS_KEY"), + os.Getenv("OSS_SECRET_KEY"), + os.Getenv("OSS_BUCKET_NAME"), + pathPrefix, + os.Getenv("OSS_TEMP_BUCKET_NAME"), + os.Getenv("OSS_TEMP_REGION"), + ) case "local": baseDir := os.Getenv("LOCAL_STORAGE_BASE_DIR") if baseDir == "" {