自动建立表通过

.gitignore

@@ -0,0 +1 @@
+logs/

functions/query_csv.go

@@ -1,40 +1,37 @@
 package functions
 
 import (
-	"log"
-
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
+func QueryToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
 	csvData, err := dbFactory.QueryToCSV(req.SQL, req.WriterHeader, reqCtx)
-	if err != nil {
-		log.Fatalf("QueryToCSV error: %v", err)
-
-	}
-	return csvData
+	//if err != nil {
+	//	logger.ErrorC(reqCtx, "QueryToCSV error: %v", err)
+	//}
+	return csvData, err
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
+func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
 
 	csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params, reqCtx)
-	if err != nil {
-		log.Fatalf("QueryParamNameToCSV Error: %v", err)
+	//if err != nil {
+	//	logger.ErrorC(reqCtx, "QueryParamsNameToCSV error: %v", err)
 
-	}
-	return csvData
+	//}
+	return csvData, err
 }
 
 // 执行查询，返回CSV数据格式。带占位参数进行查询
-func QueryPositionalToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
+func QueryPositionalToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
 	csvData, err := dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams, reqCtx)
-	if err != nil {
-		log.Fatalf("QueryParamNameToCSV Error: %v", err)
+	//if err != nil {
+	//	logger.ErrorC(reqCtx, "QueryPositionalToCSV error: %v", err)
 
-	}
-	return csvData
+	//}
+	return csvData, err
 }

main.go

@@ -1,92 +1,38 @@
 package main
 
 import (
-	"log"
 	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
 
-	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/bootstraps"
 	"git.x2erp.com/qdy/go-base/middleware"
-	"git.x2erp.com/qdy/go-base/myservice"
 	"git.x2erp.com/qdy/go-db/factory/database"
 	"git.x2erp.com/qdy/go-db/myhandle"
 	"git.x2erp.com/qdy/go-svc-agent/functions"
 	"go-micro.dev/v4/web"
 )
 
-func main() {
-	cfg, err := config.GetConfig()
-	if err != nil {
-		log.Printf("failed to load config: %v", err)
-		return
-	}
-
-	serviceConfig := cfg.GetService()
-
-	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!")
-
-	// 启动微服务
-	startMicroService(cfg)
-}
-
-// 启动微服务
-func startMicroService(cfg config.IConfig) {
-
-	serviceConfig := cfg.GetService()
-
-	// 初始化数据库
-	dbFactory, err := database.GetDBFactory()
-	if err != nil {
-		log.Fatalf("Failed to create DB factory: %v", err)
-	}
-	defer func() {
-		if err := dbFactory.Close(); err != nil {
-			log.Printf("Database close error: %v", err)
-		}
-	}()
+var (
+	serviceName    = "svc-agent"
+	serviceVersion = "1.0.0"
+)
 
-	// 设置优雅关闭
-	setupGracefulShutdown(dbFactory)
+func main() {
 
-	webService := myservice.StartStandalone(cfg)
+	// 创建服务启动器
+	bootstrapper := bootstraps.NewServiceBootstrapper(serviceName, serviceVersion)
 
-	// 注册HTTP路由到webService
-	registerRoutes(webService, dbFactory)
+	//加载配置
+	bootstrapper.InitConfig()
 
-	// 等待服务运行
-	log.Printf("Service started successfully")
-	log.Printf("   • Service: %s", serviceConfig.ServiceName)
-	log.Printf("   • Port: %d", serviceConfig.Port)
-	log.Printf("   • Mode: %s", getServiceMode(cfg))
+	//构建数据库工厂
+	bootstrapper.InitDatabase()
+	defer bootstrapper.CleanupDatabase()
 
-	// 保持主程序运行
-	select {}
-}
+	//dbFactory := bootstrapper.DbFactory
 
-// 判断是否使用注册中心
-func shouldUseRegistry(cfg config.IConfig) bool {
-	microConfig := cfg.GetMicro()
-	// 如果有配置注册中心地址且不为空，则使用注册中心
-	return microConfig.RegistryAddress != ""
-}
+	// 启动服务，传入路由注册函数
+	bootstrapper.Run(registerRoutes)
 
-// 获取服务模式描述
-func getServiceMode(cfg config.IConfig) string {
-	if shouldUseRegistry(cfg) {
-		return "With Service Discovery"
-	}
-	return "Standalone"
 }
 
 // 注册所有路由
@@ -107,19 +53,3 @@ func registerRoutes(webService web.Service, dbFactory *database.DBFactory) {
 		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)
-
-	go func() {
-		<-signalCh
-		log.Println("\nReceived shutdown signal, closing database connection...")
-		if err := dbFactory.Close(); err != nil {
-			log.Printf("Error closing database: %v", err)
-		}
-		log.Println("Database connection closed gracefully")
-		os.Exit(0)
-	}()
-}

test/my_post_query_test.go

@@ -0,0 +1,100 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"testing"
+
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/http"
+)
+
+func TestQuery(t *testing.T) {
+	// 记录总开始时间
+	//totalStartTime := time.Now()
+
+	// 1. 获取HTTP工厂实例
+	httpFactory, err := http.GetHTTPFactory()
+	if err != nil {
+		t.Fatalf("Failed to get HTTP factory: %v", err)
+	}
+	fmt.Println("HTTP factory created successfully")
+
+	// 7. 获取Doris工厂实例
+	//dorisFactory1, err := doris.GetDorisFactory(httpFactory)
+	if err != nil {
+		t.Fatalf("Failed to get Doris factory: %v", err)
+	}
+	fmt.Println("Doris factory created successfully")
+
+	// 获取Doris配置
+	//cfg, err := config.GetConfig()
+	if err != nil {
+		t.Fatalf("failed to load config: %v", err)
+		return
+	}
+
+	sql, queryParams := getSQLWithPaginationSQL(0, 10)
+	// 准备查询请求
+	queryRequest := types.QueryRequest{
+		SQL:              sql,
+		PositionalParams: queryParams,
+		WriterHeader:     false,
+	}
+
+	httpClient := httpFactory.CreateClient()
+	// 发送POST请求到 /api/query/csv 获取CSV格式数据
+	resp, err := httpClient.PostWithAuth(
+		"http://localhost:8080/api/query/csv/param",
+		queryRequest,
+		"123", // Bearer Token
+		nil,
+	)
+
+	if err != nil {
+		csvData := string(resp.Body())
+		log.Printf("查询失败:%v", err)
+		log.Printf("csvData--err:%s", csvData)
+
+		return
+	}
+
+	if resp.StatusCode() != 200 {
+		log.Printf("\n 询请求失败, 状态码: %d", resp.StatusCode())
+	}
+
+	// 获取CSV数据
+	csvData := string(resp.Body())
+
+	log.Printf("\n csvData:%s", csvData)
+
+}
+
+// getSQLWithPagination 生成带分页的SQL语句（参数模式）
+// 返回SQL语句和参数映射
+func getSQLWithPaginationSQL(startRow, endRow int) (string, []interface{}) {
+	sql := `SELECT
+    CLOTHING_ID,
+    CLOTHING_YEAR,
+    CLOTHING_NAME
+
+   FROM (
+    SELECT a.*, ROWNUM as rn
+    FROM (
+        SELECT *
+        FROM X6_STOCK_DEV.A3_CLOTHING 
+     
+        ORDER BY CLOTHING_ID
+    ) a
+    WHERE ROWNUM <= :1
+)
+WHERE rn > :2`
+
+	// 创建参数映射
+	params := []interface{}{
+		endRow,
+		startRow - 1, // WHERE rn > :start_row 所以是startRow-1
+	}
+
+	return sql, params
+}