修改工厂,实现单例模式

routes/heath.go → functions/heath.go

@@ -1,7 +1,6 @@
-package routes
+package functions
 
 import (
-	"database/sql"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -11,10 +10,11 @@ import (
 )
 
 // HealthHandler 返回一个处理函数
-func HealthHandler(db *sql.DB, dbType string) gin.HandlerFunc {
+func HealthHandler(dbFactory *factory.DBFactory, dbType string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 
-		err := factory.TestConnection(db, dbType)
+		dbFactory.TestConnection(dbType)
+		err := dbFactory.TestConnection(dbType)
 		success := err == nil
 
 		status := "DOWN"

routes/info.go → functions/info.go

@@ -1,10 +1,11 @@
-package routes
+package functions
 
 import (
 	"time"
 
 	"github.com/gin-gonic/gin"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory"
 )
@@ -12,16 +13,16 @@ import (
 // InfoHandler 数据库信息
 func InfoHandler(dbFactory *factory.DBFactory) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		config := dbFactory.GetConfig()
+		dbConfig := config.GetConfig()
 		drivers := dbFactory.GetAvailableDrivers()
 
 		c.JSON(200, &types.QueryResult{
 			Success: true,
 			Data: map[string]interface{}{
-				"database_type":     config.GetDatabase().Type,
-				"database_host":     config.GetDatabase().Host,
-				"database_port":     config.GetDatabase().Port,
-				"database_name":     config.GetDatabase().Database,
+				"database_type":     dbConfig.GetDatabase().Type,
+				"database_host":     dbConfig.GetDatabase().Host,
+				"database_port":     dbConfig.GetDatabase().Port,
+				"database_name":     dbConfig.GetDatabase().Database,
 				"available_drivers": drivers,
 				"service_time":      time.Now().Format(time.RFC3339),
 			},

functions/query.go

@@ -0,0 +1,16 @@
+package functions
+
+import (
+	"github.com/gin-gonic/gin"
+
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory"
+)
+
+// 执行查询，返回JSON格式数据
+func QueryToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+	return func(c *gin.Context, req types.QueryRequest) {
+		result := dbFactory.QueryToJSON(req.SQL)
+		c.JSON(200, result)
+	}
+}

routes/query_csv.go → functions/query_csv.go

@@ -1,8 +1,6 @@
-package routes
+package functions
 
 import (
-	"database/sql"
-
 	"github.com/gin-gonic/gin"
 
 	"git.x2erp.com/qdy/go-base/mycsv"
@@ -11,9 +9,11 @@ import (
 )
 
 // 创建带 db 的 handler
-func QueryHandlerCSV(db *sql.DB) func(c *gin.Context, req types.QueryRequest) {
+func QueryToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
 	return func(c *gin.Context, req types.QueryRequest) {
-		csvData, err := factory.QueryToCSV(db, req.SQL)
+
+		csvData, err := dbFactory.QueryToCSV(req.SQL)
+
 		if err != nil {
 			// 错误时也返回CSV格式，而不是JSON
 			errorCSV := mycsv.CreateStringToCSV(err.Error())

go.mod

@@ -4,7 +4,7 @@ go 1.25.4
 
 require (
 	git.x2erp.com/qdy/go-base v0.1.10
-	git.x2erp.com/qdy/go-db v0.1.15
+	git.x2erp.com/qdy/go-db v0.1.16
 	github.com/gin-gonic/gin v1.11.0
 )
 
@@ -27,6 +27,7 @@ require (
 	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
+	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect

go.sum

@@ -12,6 +12,8 @@ git.x2erp.com/qdy/go-db v0.1.13 h1:gx1Ld+b3QRaO7VvyBm4fipafGkl0Yl+4ERzromAtck4=
 git.x2erp.com/qdy/go-db v0.1.13/go.mod h1:tcHV7sqEFYWbL/196NZxVnbdHevefRppggMTARVXQtE=
 git.x2erp.com/qdy/go-db v0.1.15 h1:YvwT/FyrvQQodzggGLyxlSQu++f7+NHDvkUR7tuDVfY=
 git.x2erp.com/qdy/go-db v0.1.15/go.mod h1:5dnPmDEOhfuKtV1anuSibSNibTINul6/qdRxH1khQ8k=
+git.x2erp.com/qdy/go-db v0.1.16 h1:un5FMemqX6jSDdp6N2+7Elw73iC9zUH5r8UlX+JZfak=
+git.x2erp.com/qdy/go-db v0.1.16/go.mod h1:OrWk/iWygMEWsB7Rzdu7VjPszyEog8bodLx+X+5nWxE=
 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=
@@ -53,6 +55,7 @@ github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHO
 github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
@@ -70,6 +73,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
@@ -82,6 +87,7 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j74pNgs=
 github.com/microsoft/go-mssqldb v1.9.4/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=

main.go

@@ -1,75 +1,33 @@
 package main
 
 import (
-	"database/sql"
 	"fmt"
 	"log"
 	"net/http"
 	"strings"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory"
 	"git.x2erp.com/qdy/go-service-agent/auth"
-	"git.x2erp.com/qdy/go-service-agent/routes"
+	"git.x2erp.com/qdy/go-service-agent/functions"
 	"github.com/gin-gonic/gin"
 )
 
-// 单例实例
-var (
-	dbFactory *factory.DBFactory
-	db        *sql.DB
-)
-
-// initDB 初始化数据库连接（单例）
-func initDB() error {
-	var err error
-
-	// 创建数据库工厂（单例）
-	if dbFactory == nil {
-		dbFactory, err = factory.NewDBFactory()
-		if err != nil {
-			return fmt.Errorf("failed to create DB factory: %v", err)
-		}
-	}
-
-	// 创建数据库连接（单例）
-	if db == nil {
-		db, err = dbFactory.CreateDB()
-		if err != nil {
-			return fmt.Errorf("failed to create database connection: %v", err)
-		}
-	}
-
-	// 测试连接
-	config := dbFactory.GetConfig()
-	if err := factory.TestConnection(db, config.GetDatabase().Type); err != nil {
-		return fmt.Errorf("database connection test failed: %v", err)
-	}
-
-	return nil
-}
-
 func main() {
-	// 1. 初始化数据库（单例）
-	if err := initDB(); err != nil {
-		log.Fatalf("Database initialization failed: %v", err)
-	}
 
-	// 2. 显示基础信息
-	drivers := dbFactory.GetAvailableDrivers()
-	config := dbFactory.GetConfig()
+	cfg := config.GetConfig()
 
-	log.Printf("Service Port: %d", config.GetService().Port)
-	log.Printf("Service IdleTimeout: %d", config.GetService().IdleTimeout)
-	log.Printf("Service ReadTimeout: %d", config.GetService().ReadTimeout)
-	log.Printf("Service WriteTimeout: %d", config.GetService().WriteTimeout)
-	log.Printf("Service TrustedProxies: %s", config.GetService().TrustedProxies)
+	log.Printf("Service Port: %d", cfg.GetService().Port)
+	log.Printf("Service IdleTimeout: %d", cfg.GetService().IdleTimeout)
+	log.Printf("Service ReadTimeout: %d", cfg.GetService().ReadTimeout)
+	log.Printf("Service WriteTimeout: %d", cfg.GetService().WriteTimeout)
+	log.Printf("Service TrustedProxies: %s", cfg.GetService().TrustedProxies)
 
-	log.Printf("Available database drivers: %v", drivers)
-	log.Printf("Using database type: %s", config.GetDatabase().Type)
-	log.Printf("Database host: %s:%d", config.GetDatabase().Host, config.GetDatabase().Port)
-	log.Printf("Database name: %s", config.GetDatabase().Database)
+	log.Printf("Using database type: %s", cfg.GetDatabase().Type)
+	log.Printf("Database host: %s:%d", cfg.GetDatabase().Host, cfg.GetDatabase().Port)
+	log.Printf("Database name: %s", cfg.GetDatabase().Database)
 	log.Println("Database connection test passed!")
 
 	// 3. 启动Gin HTTP服务
@@ -80,14 +38,19 @@ func main() {
 func startHTTPServer() {
 	//建立路由
 	router := gin.Default()
-	config := dbFactory.GetConfig()
-	serviceConfig := config.GetService()
+	cfg := config.GetConfig()
+	serviceConfig := cfg.GetService()
+
+	dbFactory, err := factory.GetDBFactory()
+	if err != nil {
+		log.Fatalf("Failed to create DB factory: %v", err)
+	}
 
 	// 核心路由
-	router.GET("/api/health", routes.HealthHandler(db, config.GetDatabase().Type))
-	router.POST("/api/query", auth.AuthMiddleware(), withQueryRequest(routes.QueryHandler(db)))
-	router.POST("/api/query/csv", auth.AuthMiddleware(), withQueryRequest(routes.QueryHandlerCSV(db)))
-	router.GET("/api/info", routes.InfoHandler(dbFactory))
+	router.GET("/api/health", functions.HealthHandler(dbFactory, cfg.GetDatabase().Type))
+	router.POST("/api/query", auth.AuthMiddleware(), withQueryRequest(functions.QueryToJSON(dbFactory)))
+	router.POST("/api/query/csv", auth.AuthMiddleware(), withQueryRequest(functions.QueryToCSV(dbFactory)))
+	router.GET("/api/info", functions.InfoHandler(dbFactory))
 
 	// 日志输出配置信息
 	log.Printf("Service Port: %d", serviceConfig.Port)

routes/query.go

@@ -1,18 +0,0 @@
-package routes
-
-import (
-	"database/sql"
-
-	"github.com/gin-gonic/gin"
-
-	"git.x2erp.com/qdy/go-base/types"
-	"git.x2erp.com/qdy/go-db/factory"
-)
-
-// 创建带 db 的 handler
-func QueryHandler(db *sql.DB) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-		result := factory.QueryToJSON(db, req.SQL)
-		c.JSON(200, result)
-	}
-}