修改工厂

db.yaml

+auth:
+  token: "aaaaaawww"
+
+service:
+  read_timeout: 30
+  write_timeout: 30
+  idle_timeout: 60
+
 database:
   type: "oracle"  # mysql, postgres, oracle, sqlserver
   host: "161.189.7.134"
   database: "ORCL"
   max_open_conns: 100
   max_idle_conns: 10
-  conn_max_lifetime: 300
+  conn_max_lifetime: 300

factory/factory.go

 	"database/sql"
 	"fmt"
 	"io"
-	"os"
-	"path/filepath"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/drivers"
-	"gopkg.in/yaml.v2"
 )
 
-// Config 总配置
-type Config struct {
-	Database drivers.DBConfig `yaml:"database"`
-}
-
 // DBFactory 数据库工厂
 type DBFactory struct {
-	config *Config
+	config config.IConfig
 }
 
 // NewDBFactory 创建数据库工厂
 func NewDBFactory() (*DBFactory, error) {
-	configFile, err := findConfigFile()
-	if err != nil {
-		return nil, err
-	}
-
-	fmt.Printf("✅ Using config file: %s\n", configFile)
-
-	// 读取配置文件
-	data, err := os.ReadFile(configFile)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read config file %s: %v", configFile, err)
-	}
-
-	var config Config
-	err = yaml.Unmarshal(data, &config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse config file: %v", err)
-	}
-
-	return &DBFactory{config: &config}, nil
-}
-
-// findConfigFile 查找配置文件
-func findConfigFile() (string, error) {
-	// 1. 首先尝试可执行文件同目录
-	exePath, err := os.Executable()
-	if err == nil {
-		exeDir := filepath.Dir(exePath)
-		configFile := filepath.Join(exeDir, "db.yaml")
-		if _, err := os.Stat(configFile); err == nil {
-			return configFile, nil
-		}
-	}
+	// 使用配置单例
+	cfg := config.GetConfig()
 
-	// 2. 尝试环境变量指定的路径
-	envConfigPath := os.Getenv("DB_CONFIG_PATH")
-	if envConfigPath != "" {
-		if _, err := os.Stat(envConfigPath); err == nil {
-			return envConfigPath, nil
-		}
-		return "", fmt.Errorf("DB_CONFIG_PATH file not found: %s", envConfigPath)
+	// 检查配置初始化是否有错误
+	if err := config.GetInitError(); err != nil {
+		return nil, fmt.Errorf("failed to load config: %v", err)
 	}
 
-	// 3. 如果都没有找到，返回错误
-	exeDir := "unknown"
-	if exePath, err := os.Executable(); err == nil {
-		exeDir = filepath.Dir(exePath)
+	// 检查数据库配置是否完整
+	if !cfg.IsDatabaseConfigured() {
+		return nil, fmt.Errorf("database configuration is incomplete")
 	}
 
-	return "", fmt.Errorf(`No configuration file found!
-
-Tried locations:
-1. Executable directory: %s/db.yaml
-2. Environment variable: DB_CONFIG_PATH
-
-Solutions:
-- Place db.yaml in the same directory as the executable
-- Or set DB_CONFIG_PATH environment variable to config file path
-
-Example:
-  export DB_CONFIG_PATH=/path/to/your/db.yaml`, exeDir)
+	return &DBFactory{config: cfg}, nil
 }
 
 // CreateDB 创建数据库连接
 func (f *DBFactory) CreateDB() (*sql.DB, error) {
-	dbType := f.config.Database.Type
+	dbConfig := f.config.GetDatabase()
+	dbType := dbConfig.Type
 
 	// 获取对应的驱动
 	dbDriver, err := drivers.Get(dbType)
 		return nil, fmt.Errorf("failed to get database driver: %v", err)
 	}
 
+	// 将内部 DBConfig 转换为 drivers.DBConfig
+	driverConfig := drivers.DBConfig{
+		Type:            dbConfig.Type,
+		Host:            dbConfig.Host,
+		Port:            dbConfig.Port,
+		Username:        dbConfig.Username,
+		Password:        dbConfig.Password,
+		Database:        dbConfig.Database,
+		MaxOpenConns:    dbConfig.MaxOpenConns,
+		MaxIdleConns:    dbConfig.MaxIdleConns,
+		ConnMaxLifetime: dbConfig.ConnMaxLifetime,
+	}
+
 	// 创建数据库连接
-	db, err := dbDriver.Open(f.config.Database)
+	db, err := dbDriver.Open(driverConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open database connection: %v", err)
 	}
 }
 
 // GetConfig 获取配置信息
-func (f *DBFactory) GetConfig() *Config {
+func (f *DBFactory) GetConfig() config.IConfig {
 	return f.config
 }
 
 	return drivers.GetAllDrivers()
 }
 
-// CreateQueryExecutor 创建查询执行器（新增方法）
+// CreateQueryExecutor 创建查询执行器
 func (f *DBFactory) CreateQueryExecutor(db *sql.DB) *QueryExecutor {
 	return NewQueryExecutor(db)
 }
 // NewDBQuery 初始化查询实例（对外提供唯一初始化入口）
 // db: 已初始化的数据库连接（由调用方传入，解耦数据库配置）
 func NewDBQuery(db *sql.DB) *QueryExecutor {
-	// 直接复用原文件的构造函数，对外隐藏实现细节
 	return NewQueryExecutor(db)
 }
 

gct.sh

+#!/bin/bash
+
+# 脚本用法：./git-commit-and-tag.sh "你的提交描述" "版本号"
+
+# 检查参数数量
+if [ $# -ne 2 ]; then
+    echo "错误: 脚本需要2个参数。"
+    echo "用法: $0 \"提交描述\" \"版本号\""
+    echo "示例: $0 \"修复了登录问题\" \"v1.2.3\""
+    exit 1
+fi
+
+# 分配参数
+COMMIT_MESSAGE="$1"
+VERSION_TAG="$2"
+
+# 检查当前目录是否为Git仓库
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo "错误: 当前目录不是一个Git仓库。"
+    exit 1
+fi
+
+# 检查是否有未暂存的更改
+if [ -z "$(git status --porcelain)" ]; then
+    echo "提示: 没有检测到任何更改需要提交。"
+    exit 0
+fi
+
+echo "开始提交并打版本标签..."
+echo "提交描述: $COMMIT_MESSAGE"
+echo "版本标签: $VERSION_TAG"
+
+# 添加所有更改到暂存区[citation:4][citation:6]
+git add .
+
+# 进行提交[citation:4][citation:10]
+git commit -m "$COMMIT_MESSAGE"
+if [ $? -ne 0 ]; then
+    echo "错误: 提交失败。"
+    exit 1
+fi
+
+# 创建轻量标签或附注标签（这里创建轻量标签）[citation:4]
+git tag "$VERSION_TAG"
+if [ $? -ne 0 ]; then
+    echo "错误: 创建标签失败。"
+    exit 1
+fi
+
+# 推送到远程仓库并推送标签[citation:4]
+echo "正在推送到远程仓库..."
+git push
+git push origin "$VERSION_TAG"
+
+echo "✅ 完成！提交已推送，版本标签 $VERSION_TAG 已创建并推送。"

go.mod

 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	git.x2erp.com/qdy/go-base v0.1.1
+	git.x2erp.com/qdy/go-base v0.1.2
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect

go.sum

 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.x2erp.com/qdy/go-base v0.1.1 h1:Yj6rFTCL9CShqdQeE6mUYQMugUpI25nWNL0i09SFtXo=
 git.x2erp.com/qdy/go-base v0.1.1/go.mod h1:+NdHouWcxqex8sJUwDTGSl/OIh5fKOT6tJteefD1MMA=
+git.x2erp.com/qdy/go-base v0.1.2 h1:4bdkh+WYV+61/qqf1RvqtK0jPKen4BndLGEHjo2opgY=
+git.x2erp.com/qdy/go-base v0.1.2/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
 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=

test.go

 
 	// 显示当前使用的数据库配置
 	config := dbFactory.GetConfig()
-	fmt.Printf("Using database type: %s\n", config.Database.Type)
-	fmt.Printf("Database host: %s:%d\n", config.Database.Host, config.Database.Port) // 修正这里
-	fmt.Printf("Database name: %s\n", config.Database.Database)                      // 修正这里
+	dbConfig := config.GetDatabase() // 通过接口方法获取数据库配置
+	fmt.Printf("Using database type: %s\n", dbConfig.Type)
+	fmt.Printf("Database host: %s:%d\n", dbConfig.Host, dbConfig.Port)
+	fmt.Printf("Database name: %s\n", dbConfig.Database)
 
 	// 创建数据库连接
 	db, err := dbFactory.CreateDB()
 	fmt.Println("Successfully connected to database!")
 
 	// 测试连接
-	if err := testConnection(db, config.Database.Type); err != nil { // 修正这里
+	if err := testConnection(db, dbConfig.Type); err != nil {
 		log.Printf("Query test failed: %v", err)
 	} else {
 		fmt.Println("Database connection test passed!")