测试通过

go.mod

@@ -4,7 +4,7 @@ go 1.25.4
 
 require (
 	git.x2erp.com/qdy/go-base v0.1.9
-	git.x2erp.com/qdy/go-db v0.1.11
+	git.x2erp.com/qdy/go-db v0.1.13
 	github.com/gin-gonic/gin v1.11.0
 )
 

go.sum

@@ -4,6 +4,10 @@ git.x2erp.com/qdy/go-base v0.1.9 h1:SuyYSt3Gp7aXiUQRCBNwhrusJ53wlCnagiTYs5eITlY=
 git.x2erp.com/qdy/go-base v0.1.9/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
 git.x2erp.com/qdy/go-db v0.1.11 h1:dT22aYhtfk+Y3q2/jc8UZSuCjsLFC/eBrwwTHDUTOsA=
 git.x2erp.com/qdy/go-db v0.1.11/go.mod h1:6dICJn/sZRj0WIMf5y8MfsjBC1wWZcG4lczgeIAGBhM=
+git.x2erp.com/qdy/go-db v0.1.12 h1:z4VfTbIMNhBbpPmjRRtSjEkXet7nvVRjTd92+IFsGbw=
+git.x2erp.com/qdy/go-db v0.1.12/go.mod h1:tcHV7sqEFYWbL/196NZxVnbdHevefRppggMTARVXQtE=
+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=
 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=

main.go

@@ -43,7 +43,7 @@ func initDB() error {
 
 	// 测试连接
 	config := dbFactory.GetConfig()
-	if err := routes.TestConnection(db, config.GetDatabase().Type); err != nil {
+	if err := factory.TestConnection(db, config.GetDatabase().Type); err != nil {
 		return fmt.Errorf("database connection test failed: %v", err)
 	}
 
@@ -80,16 +80,15 @@ func main() {
 func startHTTPServer() {
 	//建立路由
 	router := gin.Default()
+	config := dbFactory.GetConfig()
+	serviceConfig := config.GetService()
 
 	// 核心路由
-	router.GET("/api/health", routes.HealthHandler(db, "oracle"))
+	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))
 
-	config := dbFactory.GetConfig()
-	serviceConfig := config.GetService()
-
 	// 日志输出配置信息
 	log.Printf("Service Port: %d", serviceConfig.Port)
 	log.Printf("Service IdleTimeout: %d", serviceConfig.IdleTimeout)

routes/heath.go

@@ -2,19 +2,19 @@ package routes
 
 import (
 	"database/sql"
-	"fmt"
 	"time"
 
 	"github.com/gin-gonic/gin"
 
 	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory"
 )
 
 // HealthHandler 返回一个处理函数
 func HealthHandler(db *sql.DB, dbType string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 
-		err := TestConnection(db, dbType)
+		err := factory.TestConnection(db, dbType)
 		success := err == nil
 
 		status := "DOWN"
@@ -39,28 +39,3 @@ func HealthHandler(db *sql.DB, dbType string) gin.HandlerFunc {
 		})
 	}
 }
-
-// testConnection 测试数据库连接
-func TestConnection(db *sql.DB, dbType string) error {
-	var query string
-	switch dbType {
-	case "mysql", "postgres", "sqlserver":
-		query = "SELECT 1"
-	case "oracle":
-		query = "SELECT 1 FROM DUAL"
-	default:
-		query = "SELECT 1"
-	}
-
-	var result int
-	err := db.QueryRow(query).Scan(&result)
-	if err != nil {
-		return err
-	}
-
-	if result != 1 {
-		return fmt.Errorf("unexpected test result: %d", result)
-	}
-
-	return nil
-}

routes/query.go

@@ -12,7 +12,7 @@ import (
 // 创建带 db 的 handler
 func QueryHandler(db *sql.DB) func(c *gin.Context, req types.QueryRequest) {
 	return func(c *gin.Context, req types.QueryRequest) {
-		result := factory.QuickQueryToJSON(db, req.SQL)
+		result := factory.QueryToJSON(db, req.SQL)
 		c.JSON(200, result)
 	}
 }

routes/queryCSV.go → routes/query_csv.go

@@ -13,7 +13,7 @@ import (
 // 创建带 db 的 handler
 func QueryHandlerCSV(db *sql.DB) func(c *gin.Context, req types.QueryRequest) {
 	return func(c *gin.Context, req types.QueryRequest) {
-		csvData, err := factory.QuickQueryToCSV(db, req.SQL)
+		csvData, err := factory.QueryToCSV(db, req.SQL)
 		if err != nil {
 			// 错误时也返回CSV格式，而不是JSON
 			errorCSV := mycsv.CreateStringToCSV(err.Error())