多数据库测试通过

factory/database/db_factory.go

@@ -30,87 +30,97 @@ var (
 
 // CreateDBFactory 获取数据库工厂单例
 func CreateDBFactory(cfg config.IConfig) *DBFactory {
+
 	config := cfg.GetDatabaseConfig()
 	instanceDBOnce.Do(func() {
 
-		if config == nil {
-			log.Fatal("配置未初始化，请先在yaml进行配置")
-		}
+		instanceDB, initErrDB = createDBFactoryNew(config)
 
-		// 设置默认值
-		if config.MaxOpenConns == 0 {
-			config.MaxOpenConns = 100
-		}
-		if config.MaxIdleConns == 0 {
-			config.MaxIdleConns = 10
-		}
-		if config.ConnMaxLifetime == 0 {
-			config.ConnMaxLifetime = 5 * 60 // 5分钟，单位秒
-		}
+	})
 
-		// 验证配置
-		if config.Type == "" {
-			initErrDB = fmt.Errorf("database type must be configured")
-			return
-		}
-		if config.Host == "" {
-			initErrDB = fmt.Errorf("database host must be configured")
-			return
-		}
-		if config.Database == "" {
-			initErrDB = fmt.Errorf("database name must be configured")
-			return
-		}
+	if initErrDB != nil {
+		log.Fatalf("DBFactory is error: '%v'", initErrDB)
+	}
 
-		log.Printf("Creating database connection...")
+	return instanceDB
+}
 
-		// 获取对应的驱动
-		dbDriver, err := drivers.Get(config.Type)
-		if err != nil {
-			initErrDB = fmt.Errorf("failed to get database driver: %v", err)
-			return
-		}
+// createDBFactoryNew 获取数据库工厂单例
+func createDBFactoryNew(config *subconfigs.DatabaseConfig) (*DBFactory, error) {
 
-		// 将内部 DBConfig 转换为 drivers.DBConfig
-		driverConfig := drivers.DBConfig{
-			Type:            config.Type,
-			Host:            config.Host,
-			Port:            config.Port,
-			Username:        config.Username,
-			Password:        config.Password,
-			Database:        config.Database,
-			MaxOpenConns:    config.MaxOpenConns,
-			MaxIdleConns:    config.MaxIdleConns,
-			ConnMaxLifetime: config.ConnMaxLifetime,
-		}
+	if config == nil {
+		log.Fatal("配置未初始化，请先在yaml进行配置")
+	}
 
-		// 创建数据库连接
-		db, err := dbDriver.Open(driverConfig)
-		if err != nil {
-			initErrDB = fmt.Errorf("failed to open database connection: %v", err)
-			return
-		}
+	// 设置默认值
+	if config.MaxOpenConns == 0 {
+		config.MaxOpenConns = 100
+	}
+	if config.MaxIdleConns == 0 {
+		config.MaxIdleConns = 10
+	}
+	if config.ConnMaxLifetime == 0 {
+		config.ConnMaxLifetime = 5 * 60 // 5分钟，单位秒
+	}
 
-		// 测试连接
-		if err := functions.TestConnection(db, config.Type); err != nil {
-			db.Close()
-			initErrDB = fmt.Errorf("database connection test failed: %v", err)
-			return
-		}
+	// 验证配置
+	if config.Type == "" {
+		initErrDB = fmt.Errorf("database type must be configured")
+		return nil, initErrDB
+	}
+	if config.Host == "" {
+		initErrDB = fmt.Errorf("database host must be configured")
+		return nil, initErrDB
+	}
+	if config.Database == "" {
+		initErrDB = fmt.Errorf("database name must be configured")
+		return nil, initErrDB
+	}
 
-		log.Printf("DBFactory is successfully created.\n")
+	log.Printf("Creating database connection...")
 
-		instanceDB = &DBFactory{
-			db:     db,
-			config: config,
-		}
-	})
+	// 获取对应的驱动
+	dbDriver, err := drivers.Get(config.Type)
+	if err != nil {
+		initErrDB = fmt.Errorf("failed to get database driver: %v", err)
+		return nil, initErrDB
+	}
 
-	if initErrDB != nil {
-		log.Fatalf("DBFactory is error: '%v'", initErrDB)
+	// 将内部 DBConfig 转换为 drivers.DBConfig
+	driverConfig := drivers.DBConfig{
+		Type:            config.Type,
+		Host:            config.Host,
+		Port:            config.Port,
+		Username:        config.Username,
+		Password:        config.Password,
+		Database:        config.Database,
+		MaxOpenConns:    config.MaxOpenConns,
+		MaxIdleConns:    config.MaxIdleConns,
+		ConnMaxLifetime: config.ConnMaxLifetime,
 	}
 
-	return instanceDB
+	// 创建数据库连接
+	db, err := dbDriver.Open(driverConfig)
+	if err != nil {
+		initErrDB = fmt.Errorf("failed to open database connection: %v", err)
+		return nil, initErrDB
+	}
+
+	// 测试连接
+	if err := functions.TestConnection(db, config.Type); err != nil {
+		db.Close()
+		initErrDB = fmt.Errorf("database connection test failed: %v", err)
+		return nil, initErrDB
+	}
+
+	log.Printf("DBFactory is successfully created.\n")
+
+	instanceDB = &DBFactory{
+		db:     db,
+		config: config,
+	}
+
+	return instanceDB, initErrDB
 }
 
 // ========== DBFactory 实例方法 ==========

factory/database/dbs_factory.go

@@ -0,0 +1,77 @@
+package database
+
+import (
+	"fmt"
+	"log"
+	"sync"
+
+	"git.x2erp.com/qdy/go-base/config"
+)
+
+// DBSFactory 多数据库工厂管理器
+type DBSFactory struct {
+	factories map[string]*DBFactory // 存储多个数据库工厂
+	config    config.IConfig
+	mu        sync.RWMutex // 并发安全锁
+}
+
+var (
+	// 全局单例的多数据库工厂管理器
+	dbsFactoryInstance     *DBSFactory
+	dbsFactoryInstanceOnce sync.Once
+)
+
+// CreateDBSFactory 获取多数据库工厂管理器单例
+func CreateDBSFactory(cfg config.IConfig) *DBSFactory {
+	dbsFactoryInstanceOnce.Do(func() {
+		dbsFactoryInstance = &DBSFactory{
+			factories: make(map[string]*DBFactory),
+			config:    cfg,
+		}
+		log.Println("DBSFactory initialized.")
+	})
+	return dbsFactoryInstance
+}
+
+// ========== DBSFactory 实例方法 ==========
+
+// / CreateDBFactory 创建指定名称的数据库工厂
+func (d *DBSFactory) CreateDBFactory(name string) (*DBFactory, error) {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	// 如果已存在，直接返回
+	if factory := d.factories[name]; factory != nil {
+		return factory, nil
+	}
+
+	dbConfig, _ := d.config.GetDbsConfig(name)
+	if dbConfig == nil {
+		return nil, fmt.Errorf("数据库配置 '%s' 不存在", name)
+	}
+
+	factory, err := createDBFactoryNew(dbConfig)
+	if err != nil {
+		return nil, fmt.Errorf("创建数据库工厂 '%s' 失败: %v", name, err)
+	}
+
+	d.factories[name] = factory
+	return factory, nil
+}
+
+// Close 关闭所有数据库工厂
+func (d *DBSFactory) Close() {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	for name, factory := range d.factories {
+		log.Printf("Closing DBFactory '%s'...", name)
+		factory.Close()
+	}
+	d.factories = make(map[string]*DBFactory)
+	log.Println("All DBFactory instances closed.")
+}
+
+func (f *DBSFactory) GetName() string {
+	return "DBSFactory"
+}

functions/testConnection.go

@@ -26,9 +26,9 @@ func TestConnection(db *sqlx.DB, dbType string) error {
 	}
 
 	if result != 1 {
-		return fmt.Errorf("unexpected test result: %d", result)
+		return fmt.Errorf("%s unexpected test result: %d", dbType, result)
 	}
 
-	log.Println("test Connection  database is success.")
+	log.Printf("test Connection  database is success. %s", dbType)
 	return nil
 }

go.mod

@@ -4,7 +4,7 @@ module git.x2erp.com/qdy/go-db
 go 1.25.4
 
 require (
-	git.x2erp.com/qdy/go-base v0.1.12-20251231-1
+	git.x2erp.com/qdy/go-base v0.1.13-20251231-1
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/lib/pq v1.10.9
 	github.com/microsoft/go-mssqldb v1.9.4

go.sum

@@ -1,7 +1,7 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-git.x2erp.com/qdy/go-base v0.1.12-20251231-1 h1:xcEdI8zKVNJA50e6Q3fACD3qJH6HAORZyejnvkz2n/I=
-git.x2erp.com/qdy/go-base v0.1.12-20251231-1/go.mod h1:bhbWJO4/dxNNjXjie1E0G41pvKEEm2dPnRXRzYnV9tU=
+git.x2erp.com/qdy/go-base v0.1.13-20251231-1 h1:lalbX9ZF8oFv2f5OV7Uxc85UGD5lb1M45YS3uSrBCJk=
+git.x2erp.com/qdy/go-base v0.1.13-20251231-1/go.mod h1:bhbWJO4/dxNNjXjie1E0G41pvKEEm2dPnRXRzYnV9tU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=