踢出gin

functions/heath.go

@@ -1,41 +0,0 @@
-package functions
-
-import (
-	"time"
-
-	"github.com/gin-gonic/gin"
-
-	"git.x2erp.com/qdy/go-base/types"
-	"git.x2erp.com/qdy/go-db/factory/database"
-)
-
-// HealthHandler 返回一个处理函数
-func HealthHandler(dbFactory *database.DBFactory, dbType string) gin.HandlerFunc {
-	return func(c *gin.Context) {
-
-		dbFactory.TestConnection(dbType)
-		err := dbFactory.TestConnection(dbType)
-		success := err == nil
-
-		status := "DOWN"
-		if success {
-			status = "UP"
-		}
-
-		c.JSON(200, &types.QueryResult{
-			Success: success,
-			Data: map[string]interface{}{
-				"status":         status,
-				"time":           time.Now().Format(time.RFC3339),
-				"database":       dbType,
-				"databaseStatus": status,
-			},
-			Error: func() string {
-				if err != nil {
-					return err.Error()
-				}
-				return ""
-			}(),
-		})
-	}
-}

functions/info.go

@@ -1,32 +0,0 @@
-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/database"
-)
-
-// InfoHandler 数据库信息
-func InfoHandler(dbFactory *database.DBFactory) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		dbConfig := config.GetConfig()
-		drivers := dbFactory.GetAvailableDrivers()
-
-		c.JSON(200, &types.QueryResult{
-			Success: true,
-			Data: map[string]interface{}{
-				"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),
-			},
-			Error: "",
-		})
-	}
-}

functions/query_csv.go

@@ -1,60 +1,39 @@
 package functions
 
 import (
-	"github.com/gin-gonic/gin"
+	"log"
 
-	"git.x2erp.com/qdy/go-base/mycsv"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
-// 统一的错误响应处理
-func handleErrorResponseCSV(c *gin.Context, err error) {
-	errorCSV := mycsv.CreateStringToCSV(err.Error())
-	c.Header("Content-Type", "text/csv; charset=utf-8")
-	c.Header("X-Error", "true")
-	c.Data(400, "text/csv; charset=utf-8", errorCSV)
-}
-
-// 统一的成功响应处理
-func handleSuccessResponseCSV(c *gin.Context, csvData []byte) {
-	c.Header("Content-Type", "text/csv; charset=utf-8")
-	c.Data(200, "text/csv; charset=utf-8", csvData)
-}
-
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToCSV(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-		csvData, err := dbFactory.QueryToCSV(req.SQL, req.WriterHeader)
-		if err != nil {
-			handleErrorResponseCSV(c, err)
-			return
-		}
-		handleSuccessResponseCSV(c, csvData)
+func QueryToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
+	csvData, err := dbFactory.QueryToCSV(req.SQL, req.WriterHeader)
+	if err != nil {
+		log.Fatalf("QueryToCSV error: %v", err)
+
 	}
+	return csvData
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToCSV(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-
-		csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params)
-		if err != nil {
-			handleErrorResponseCSV(c, err)
-			return
-		}
-		handleSuccessResponseCSV(c, csvData)
+func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
+
+	csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params)
+	if err != nil {
+		log.Fatalf("QueryParamNameToCSV Error: %v", err)
+
 	}
+	return csvData
 }
 
 // 执行查询，返回CSV数据格式。带占位参数进行查询
-func QueryPositionalToCSV(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-		csvData, err := dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams)
-		if err != nil {
-			handleErrorResponseCSV(c, err)
-			return
-		}
-		handleSuccessResponseCSV(c, csvData)
+func QueryPositionalToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
+	csvData, err := dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams)
+	if err != nil {
+		log.Fatalf("QueryParamNameToCSV Error: %v", err)
+
 	}
+	return csvData
 }

functions/query_json.go

@@ -1,33 +1,23 @@
 package functions
 
 import (
-	"github.com/gin-gonic/gin"
-
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToJSON(dbFactory *database.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)
-	}
+func QueryToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
+	return dbFactory.QueryToJSON(req.SQL)
+
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToJSON(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-		result := dbFactory.QueryParamsNameToJSON(req.SQL, req.Params)
-		c.JSON(200, result)
-	}
+func QueryParamNameToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
+	return dbFactory.QueryParamsNameToJSON(req.SQL, req.Params)
 }
 
 // 执行查询，返回JSON数据格式。带占位参数进行查询
-func QueryPositionalToJSON(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
-	return func(c *gin.Context, req types.QueryRequest) {
-		result := dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams)
+func QueryPositionalToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
+	return dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams)
 
-		c.JSON(200, result)
-	}
 }

go.mod

@@ -5,8 +5,6 @@ go 1.25.4
 require (
 	git.x2erp.com/qdy/go-base v0.1.44
 	git.x2erp.com/qdy/go-db v0.1.42
-	github.com/gin-gonic/gin v1.11.0
-	github.com/go-sql-driver/mysql v1.9.3
 )
 
 require (
@@ -52,6 +50,5 @@ require (
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/tools v0.38.0 // indirect
-	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

main.go

@@ -1,146 +1,109 @@
 package main
 
 import (
-	"fmt"
 	"log"
 	"net/http"
 	"os"
 	"os/signal"
-	"strings"
 	"syscall"
-	"time"
 
 	"git.x2erp.com/qdy/go-base/config"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/micro"
+	mymiddleware "git.x2erp.com/qdy/go-base/myMiddleware"
 	"git.x2erp.com/qdy/go-db/factory/database"
-	"git.x2erp.com/qdy/go-service-agent/auth"
+	"git.x2erp.com/qdy/go-db/myhandle"
 	"git.x2erp.com/qdy/go-service-agent/functions"
-	"github.com/gin-gonic/gin"
+	"go-micro.dev/v4/web"
 )
 
 func main() {
-
 	cfg := config.GetConfig()
+	serviceConfig := cfg.GetService()
 
-	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("Service Port: %d", serviceConfig.Port)
+	log.Printf("Service IdleTimeout: %d", serviceConfig.IdleTimeout)
+	log.Printf("Service ReadTimeout: %d", serviceConfig.ReadTimeout)
+	log.Printf("Service WriteTimeout: %d", serviceConfig.WriteTimeout)
+	log.Printf("Service TrustedProxies: %s", serviceConfig.TrustedProxies)
 
 	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服务
-	startHTTPServer()
+	// 启动微服务
+	startMicroService()
 }
 
-// 启动HTTP服务器
-func startHTTPServer() {
-	//建立路由
-	router := gin.Default()
+// 启动微服务
+func startMicroService() {
 	cfg := config.GetConfig()
 	serviceConfig := cfg.GetService()
 
+	// 初始化数据库
 	dbFactory, err := database.GetDBFactory()
 	if err != nil {
 		log.Fatalf("Failed to create DB factory: %v", err)
 	}
-	// 设置优雅关闭
-	setupGracefulShutdown(dbFactory)
 	defer func() {
-		dbFactory.Close()
-		log.Println("Database connection closed")
+		if err := dbFactory.Close(); err != nil {
+			log.Printf("Database close error: %v", err)
+		}
 	}()
 
-	// 核心路由
-	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.POST("/api/query/csv/param", auth.AuthMiddleware(), withQueryRequest(functions.QueryPositionalToCSV(dbFactory)))
-	router.GET("/api/info", functions.InfoHandler(dbFactory))
-
-	// 日志输出配置信息
-	log.Printf("Service Port: %d", serviceConfig.Port)
-	log.Printf("Service IdleTimeout: %d", serviceConfig.IdleTimeout)
-	log.Printf("Service ReadTimeout: %d", serviceConfig.ReadTimeout)
-	log.Printf("Service WriteTimeout: %d", serviceConfig.WriteTimeout)
-	log.Printf("Service TrustedProxies: %s", serviceConfig.TrustedProxies)
+	// 设置优雅关闭
+	setupGracefulShutdown(dbFactory)
 
-	// 设置可信代理
-	setupTrustedProxies(router, serviceConfig.TrustedProxies)
+	webService := micro.StartStandalone(cfg)
 
-	// 创建HTTP服务器配置
-	server := &http.Server{
-		Addr:         fmt.Sprintf(":%d", serviceConfig.Port),
-		Handler:      router,
-		IdleTimeout:  time.Duration(serviceConfig.IdleTimeout) * time.Second,
-		ReadTimeout:  time.Duration(serviceConfig.ReadTimeout) * time.Second,
-		WriteTimeout: time.Duration(serviceConfig.WriteTimeout) * time.Second,
-	}
+	// 注册HTTP路由到webService
+	registerRoutes(webService, dbFactory, cfg)
 
-	log.Printf("Starting HTTP server on port %d", serviceConfig.Port)
-	if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-		log.Fatalf("Failed to start server: %v", err)
-	}
+	// 等待服务运行
+	log.Printf("Service started successfully")
+	log.Printf("   • Service: %s", serviceConfig.ServiceName)
+	log.Printf("   • Port: %d", serviceConfig.Port)
+	log.Printf("   • Mode: %s", getServiceMode(cfg))
 
+	// 保持主程序运行
+	select {}
 }
 
-// 参数绑定包装器
-func withQueryRequest(handler func(c *gin.Context, req types.QueryRequest)) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		var req types.QueryRequest
-		if err := c.ShouldBindJSON(&req); err != nil {
-			c.JSON(400, &types.QueryResult{
-				Success: false,
-				Error:   "Invalid request: " + err.Error(),
-				Data:    nil,
-			})
-			return
-		}
-
-		handler(c, req)
-	}
+// 判断是否使用注册中心
+func shouldUseRegistry(cfg config.IConfig) bool {
+	microConfig := cfg.GetMicro()
+	// 如果有配置注册中心地址且不为空，则使用注册中心
+	return microConfig.RegistryAddress != ""
 }
 
-// 设置可信代理
-func setupTrustedProxies(router *gin.Engine, trustedProxiesStr string) {
-	if trustedProxiesStr == "" {
-		setupTrustedProxiesRouter(router, nil)
-		return
-	}
-
-	// 按逗号分割字符串，并去除空格
-	proxies := strings.Split(trustedProxiesStr, ",")
-	trimmedProxies := make([]string, 0, len(proxies))
-
-	for _, proxy := range proxies {
-		trimmed := strings.TrimSpace(proxy)
-		if trimmed != "" {
-			trimmedProxies = append(trimmedProxies, trimmed)
-		}
-	}
-
-	if len(trimmedProxies) > 0 {
-		setupTrustedProxiesRouter(router, trimmedProxies)
-	} else {
-		setupTrustedProxiesRouter(router, nil)
+// 获取服务模式描述
+func getServiceMode(cfg config.IConfig) string {
+	if shouldUseRegistry(cfg) {
+		return "With Service Discovery"
 	}
+	return "Standalone"
 }
 
-func setupTrustedProxiesRouter(router *gin.Engine, trimmedProxies []string) {
+// 注册所有路由
+func registerRoutes(webService web.Service, dbFactory *database.DBFactory, cfg config.IConfig) {
 
-	err := router.SetTrustedProxies(trimmedProxies)
-	if err != nil {
-		log.Printf("Warning: Failed to set trusted proxies: %v", err)
-	} else {
-		log.Printf("Trusted proxies set: %v", trimmedProxies)
-	}
+	// 查询接口 - JSON
+	webService.Handle("/api/query/json", mymiddleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		myhandle.QueryHandlerJson(w, r, dbFactory, functions.QueryToJSON)
+	})))
 
+	// 查询接口 - CSV
+	webService.Handle("/api/query/csv", mymiddleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryToCSV)
+	})))
+
+	// 查询接口 - CSV with positional params
+	webService.Handle("/api/query/csv/param", mymiddleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryPositionalToCSV)
+	})))
 }
 
+// 设置优雅关闭
 func setupGracefulShutdown(dbFactory *database.DBFactory) {
 	signalCh := make(chan os.Signal, 1)
 	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
@@ -148,7 +111,9 @@ func setupGracefulShutdown(dbFactory *database.DBFactory) {
 	go func() {
 		<-signalCh
 		log.Println("\nReceived shutdown signal, closing database connection...")
-		dbFactory.Close()
+		if err := dbFactory.Close(); err != nil {
+			log.Printf("Error closing database: %v", err)
+		}
 		log.Println("Database connection closed gracefully")
 		os.Exit(0)
 	}()