支付，OSS 服务重构完成

api/service/oss/aliyun_oss.go

@@ -28,30 +28,32 @@ type AliYunOss struct {
 	proxyURL string
 }
 
-func NewAliYunOss(appConfig *types.AppConfig) (*AliYunOss, error) {
-	config := &appConfig.OSS.AliYun
-	// 创建 OSS 客户端
+func NewAliYunOss(sysConfig *types.SystemConfig, appConfig *types.AppConfig) (*AliYunOss, error) {
+	s := &AliYunOss{
+		proxyURL: appConfig.ProxyURL,
+	}
+	if sysConfig.OSS.Active == AliYun {
+		err := s.UpdateConfig(&sysConfig.OSS.AliYun)
+		if err != nil {
+			logger.Errorf("阿里云OSS初始化失败: %v", err)
+		}
+	}
+	return s, nil
+
+}
+
+func (s *AliYunOss) UpdateConfig(config *types.AliYunOssConfig) error {
 	client, err := oss.New(config.Endpoint, config.AccessKey, config.AccessSecret)
 	if err != nil {
-		return nil, err
+		return err
 	}
-
-	// 获取存储空间
 	bucket, err := client.Bucket(config.Bucket)
 	if err != nil {
-		return nil, err
+		return err
 	}
-
-	if config.SubDir == "" {
-		config.SubDir = "gpt"
-	}
-
-	return &AliYunOss{
-		config:   config,
-		bucket:   bucket,
-		proxyURL: appConfig.ProxyURL,
-	}, nil
-
+	s.bucket = bucket
+	s.config = config
+	return nil
 }
 
 func (s AliYunOss) PutFile(ctx *gin.Context, name string) (File, error) {

api/service/oss/localstorage.go

@@ -25,13 +25,17 @@ type LocalStorage struct {
 	proxyURL string
 }
 
-func NewLocalStorage(config *types.AppConfig) LocalStorage {
-	return LocalStorage{
-		config:   &config.OSS.Local,
-		proxyURL: config.ProxyURL,
+func NewLocalStorage(sysConfig *types.SystemConfig, appConfig *types.AppConfig) *LocalStorage {
+	return &LocalStorage{
+		config:   &sysConfig.OSS.Local,
+		proxyURL: appConfig.ProxyURL,
 	}
 }
 
+func (s *LocalStorage) UpdateConfig(config *types.LocalStorageConfig) {
+	s.config = config
+}
+
 func (s LocalStorage) PutFile(ctx *gin.Context, name string) (File, error) {
 	file, err := ctx.FormFile(name)
 	if err != nil {

api/service/oss/minio_oss.go

@@ -29,19 +29,29 @@ type MiniOss struct {
 	proxyURL string
 }
 
-func NewMiniOss(appConfig *types.AppConfig) (MiniOss, error) {
-	config := &appConfig.OSS.Minio
+func NewMiniOss(sysConfig *types.SystemConfig, appConfig *types.AppConfig) (*MiniOss, error) {
+
+	s := &MiniOss{proxyURL: appConfig.ProxyURL}
+	if sysConfig.OSS.Active == Minio {
+		err := s.UpdateConfig(&sysConfig.OSS.Minio)
+		if err != nil {
+			logger.Errorf("MinioOSS初始化失败: %v", err)
+		}
+	}
+	return s, nil
+}
+
+func (s *MiniOss) UpdateConfig(config *types.MiniOssConfig) error {
 	minioClient, err := minio.New(config.Endpoint, &minio.Options{
 		Creds:  credentials.NewStaticV4(config.AccessKey, config.AccessSecret, ""),
 		Secure: config.UseSSL,
 	})
 	if err != nil {
-		return MiniOss{}, err
+		return err
 	}
-	if config.SubDir == "" {
-		config.SubDir = "gpt"
-	}
-	return MiniOss{config: config, client: minioClient, proxyURL: appConfig.ProxyURL}, nil
+	s.config = config
+	s.client = minioClient
+	return nil
 }
 
 func (s MiniOss) PutUrlFile(fileURL string, ext string, useProxy bool) (string, error) {

api/service/oss/qiniu_oss.go

@@ -29,13 +29,21 @@ type QinNiuOss struct {
 	mac       *qbox.Mac
 	putPolicy storage.PutPolicy
 	uploader  *storage.FormUploader
-	manager   *storage.BucketManager
+	bucket    *storage.BucketManager
 	proxyURL  string
 }
 
-func NewQiNiuOss(appConfig *types.AppConfig) QinNiuOss {
-	config := &appConfig.OSS.QiNiu
-	// build storage uploader
+func NewQiNiuOss(sysConfig *types.SystemConfig, appConfig *types.AppConfig) *QinNiuOss {
+	s := &QinNiuOss{
+		proxyURL: appConfig.ProxyURL,
+	}
+	if sysConfig.OSS.Active == QiNiu {
+		s.UpdateConfig(&sysConfig.OSS.QiNiu)
+	}
+	return s
+}
+
+func (s *QinNiuOss) UpdateConfig(config *types.QiNiuOssConfig) {
 	zone, ok := storage.GetRegionByID(storage.RegionID(config.Zone))
 	if !ok {
 		zone = storage.ZoneHuanan
@@ -47,19 +55,12 @@ func NewQiNiuOss(appConfig *types.AppConfig) QinNiuOss {
 	putPolicy := storage.PutPolicy{
 		Scope: config.Bucket,
 	}
-	if config.SubDir == "" {
-		config.SubDir = "gpt"
-	}
-	return QinNiuOss{
-		config:    config,
-		mac:       mac,
-		putPolicy: putPolicy,
-		uploader:  formUploader,
-		manager:   storage.NewBucketManager(mac, &storeConfig),
-		proxyURL:  appConfig.ProxyURL,
-	}
+	s.config = config
+	s.mac = mac
+	s.putPolicy = putPolicy
+	s.uploader = formUploader
+	s.bucket = storage.NewBucketManager(mac, &storeConfig)
 }
-
 func (s QinNiuOss) PutFile(ctx *gin.Context, name string) (File, error) {
 	// 解析表单
 	file, err := ctx.FormFile(name)
@@ -147,7 +148,7 @@ func (s QinNiuOss) Delete(fileURL string) error {
 		objectKey = fileURL
 	}
 
-	return s.manager.Delete(s.config.Bucket, objectKey)
+	return s.bucket.Delete(s.config.Bucket, objectKey)
 }
 
 var _ Uploader = QinNiuOss{}

api/service/oss/uploader_manager.go

@@ -10,44 +10,45 @@ package oss
 import (
 	"geekai/core/types"
 	"strings"
+
+	logger2 "geekai/logger"
 )
 
+var logger = logger2.GetLogger()
+
 type UploaderManager struct {
-	handler Uploader
+	local  *LocalStorage
+	aliyun *AliYunOss
+	mini   *MiniOss
+	qiniu  *QinNiuOss
+	config *types.OSSConfig
 }
 
-func NewUploaderManager(config *types.AppConfig) (*UploaderManager, error) {
-	active := Local
-	if config.OSS.Active != "" {
-		active = strings.ToUpper(config.OSS.Active)
-	}
-	var handler Uploader
-	switch active {
-	case Local:
-		handler = NewLocalStorage(config)
-		break
-	case Minio:
-		client, err := NewMiniOss(config)
-		if err != nil {
-			return nil, err
-		}
-		handler = client
-		break
-	case QiNiu:
-		handler = NewQiNiuOss(config)
-		break
-	case AliYun:
-		client, err := NewAliYunOss(config)
-		if err != nil {
-			return nil, err
-		}
-		handler = client
-		break
+func NewUploaderManager(sysConfig *types.SystemConfig, local *LocalStorage, aliyun *AliYunOss, mini *MiniOss, qiniu *QinNiuOss) (*UploaderManager, error) {
+	if sysConfig.OSS.Active == "" {
+		sysConfig.OSS.Active = Local
 	}
+	sysConfig.OSS.Active = strings.ToLower(sysConfig.OSS.Active)
 
-	return &UploaderManager{handler: handler}, nil
+	return &UploaderManager{
+		config: &sysConfig.OSS,
+		local:  local,
+		aliyun: aliyun,
+		mini:   mini,
+		qiniu:  qiniu,
+	}, nil
 }
 
 func (m *UploaderManager) GetUploadHandler() Uploader {
-	return m.handler
+	switch m.config.Active {
+	case Local:
+		return m.local
+	case AliYun:
+		return m.aliyun
+	case Minio:
+		return m.mini
+	case QiNiu:
+		return m.qiniu
+	}
+	return m.local
 }