优化结构

internal/data/data.go

@@ -11,10 +11,30 @@ import (
 	"github.com/google/wire"
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
+	"kra/internal/biz"
 	"kra/internal/conf"
+	datapayment "kra/internal/data/payment"
+	datasystem "kra/internal/data/system"
+	"kra/internal/integration/cache"
+	"kra/internal/integration/email"
+	"kra/internal/integration/storage"
 )
 
-var ProviderSet = wire.NewSet(NewData, NewRuntimeSettings, NewTokenIssuer, NewUserRepo, NewInitializationRepo, NewAuthorityAccessRepo, NewAPIRepo, NewPermissionRepo, NewMenuRepo, NewDepartmentRepo, NewPositionRepo, NewDictionaryRepo, NewParameterRepo, NewAPITokenRepo, NewSecurityRepo, NewVersionRepo, NewExportRepo, NewAuditRepo, NewAuditRecorderRepo, NewLogFileRepo, NewTaskRepo, NewMediaRepo, NewAnnouncementRepo, NewEmailRepo, NewPaymentRepo, NewPaymentOrderRepo, NewCache, NewFileStorage)
+var ProviderSet = wire.NewSet(
+	NewData,
+	wire.Bind(new(datasystem.Provider), new(*Data)),
+	wire.Bind(new(datasystem.DatabaseProvider), new(*Data)),
+	wire.Bind(new(datapayment.Provider), new(*Data)),
+	wire.Bind(new(cache.RedisProvider), new(*Data)),
+	wire.Bind(new(biz.FileStorage), new(*storage.Reloadable)),
+	datasystem.NewRuntimeSettings,
+	datasystem.NewTokenIssuer,
+	datasystem.NewUserRepo, NewInitializationRepo, datasystem.NewAuthorityAccessRepo, datasystem.NewAPIRepo, datasystem.NewPermissionRepo,
+	datasystem.NewMenuRepo, datasystem.NewDepartmentRepo, datasystem.NewPositionRepo, datasystem.NewDictionaryRepo, datasystem.NewParameterRepo, datasystem.NewAPITokenRepo,
+	datasystem.NewSecurityRepo,
+	datasystem.NewVersionRepo, datasystem.NewExportRepo, datasystem.NewAuditRepo, datasystem.NewAuditRecorderRepo, datasystem.NewLogFileRepo, datasystem.NewTaskRepo,
+	datasystem.NewMediaRepo, datasystem.NewAnnouncementRepo, email.NewEmailRepo, datapayment.NewPaymentRepo, datapayment.NewPaymentOrderRepo, cache.New, storage.NewFileStorage,
+)
 
 type Data struct {
 	initMu        sync.Mutex
@@ -24,13 +44,50 @@ type Data struct {
 	redis         *reloadableRedis
 	mongo         *reloadableMongo
 	runtime       *conf.Runtime
-	storage       *reloadableStorage
+	storage       *storage.Reloadable
 	dbListMu      sync.RWMutex
 	dbList        map[string]*gorm.DB
 	appLogger     *slog.Logger
 	auditLog      *dataScopeAuditWriter
 }
 
+// DB exposes the active primary database to narrowly scoped data submodules.
+func (d *Data) DB() *gorm.DB {
+	if d == nil || d.gormDB == nil {
+		return nil
+	}
+	return d.gormDB.DB()
+}
+
+// DatabaseReady reports whether the configured primary database has been
+// initialized. It is intentionally small so system repositories do not depend
+// on the full Data implementation.
+func (d *Data) DatabaseReady() bool {
+	return d != nil && d.databaseReady.Load()
+}
+
+// Runtime exposes the immutable runtime configuration snapshot to data
+// submodules that need system settings while keeping Data itself private.
+func (d *Data) Runtime() *conf.Runtime {
+	if d == nil {
+		return nil
+	}
+	return d.runtime
+}
+
+// Database resolves the primary or a named database for repositories such as
+// the system export module.
+func (d *Data) Database(name string) (*gorm.DB, error) {
+	return d.database(name)
+}
+
+func (d *Data) RedisClient() redis.UniversalClient {
+	if d == nil || d.redis == nil {
+		return nil
+	}
+	return d.redis.load()
+}
+
 func (d *Data) logger() *slog.Logger {
 	if d != nil && d.appLogger != nil {
 		return d.appLogger
@@ -87,7 +144,7 @@ func (d *Data) database(name string) (*gorm.DB, error) {
 	return db, nil
 }
 
-func NewData(runtime *conf.Runtime, appLogger *slog.Logger) (*Data, func(), error) {
+func NewData(runtime *conf.Runtime, appLogger *slog.Logger, storageManager *storage.Reloadable) (*Data, func(), error) {
 	if appLogger == nil {
 		appLogger = slog.Default()
 	}
@@ -101,7 +158,7 @@ func NewData(runtime *conf.Runtime, appLogger *slog.Logger) (*Data, func(), erro
 		// and /init/initdb remain available.
 		c.Database = &conf.Data_Database{}
 	}
-	d := &Data{runtime: runtime, appLogger: appLogger}
+	d := &Data{runtime: runtime, appLogger: appLogger, storage: storageManager}
 	usingFallback := !databaseConnectionConfigured(c.Database)
 	var db *gorm.DB
 	var err error
@@ -154,12 +211,22 @@ func NewData(runtime *conf.Runtime, appLogger *slog.Logger) (*Data, func(), erro
 		admin.Storage = storageConfig
 		admin.Email = emailConfig
 		runtime.Replace(c, admin)
+		activeStorage, storageErr := storage.New(admin)
+		if storageErr != nil {
+			return nil, nil, fmt.Errorf("initialize storage: %w", storageErr)
+		}
+		if storageManager != nil {
+			storageManager.Replace(activeStorage)
+		}
 		if db.Migrator().HasTable(&integrationConfigPO{}) {
 			if removeErr := d.removeIntegrationConfigFromFile(); removeErr != nil {
 				appLogger.Warn("remove legacy integration configuration from file", "mod", "integration", "error", removeErr)
 			}
 		}
 	}
+	if storageManager == nil {
+		return nil, nil, fmt.Errorf("storage manager is nil")
+	}
 	useRedis := admin != nil && admin.System != nil && admin.System.UseRedis
 	d.redis = newReloadableRedis(openRedis(c.Redis, useRedis, appLogger))
 	useMongo := admin != nil && admin.System != nil && admin.System.UseMongo