多数据库测试通过

functions/query_csv.go

@@ -2,36 +2,40 @@ package functions
 
 import (
 	"git.x2erp.com/qdy/go-base/ctx"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-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 {
-	//	logger.ErrorC(reqCtx, "QueryToCSV error: %v", err)
-	//}
-	return csvData, err
+func QueryToCSV(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
+
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryToCSV(req.SQL, req.WriterHeader, reqCtx)
+	}
+
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
+func QueryParamNameToCSV(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
 
-	csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params, reqCtx)
-	//if err != nil {
-	//	logger.ErrorC(reqCtx, "QueryParamsNameToCSV error: %v", err)
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params, reqCtx)
+	}
 
-	//}
-	return csvData, err
 }
 
 // 执行查询，返回CSV数据格式。带占位参数进行查询
-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 {
-	//	logger.ErrorC(reqCtx, "QueryPositionalToCSV error: %v", err)
+func QueryPositionalToCSV(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
+
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams, reqCtx)
+	}
 
-	//}
-	return csvData, err
 }

functions/query_json.go

@@ -2,23 +2,41 @@ package functions
 
 import (
 	"git.x2erp.com/qdy/go-base/ctx"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
-	return dbFactory.QueryToJSON(req.SQL, reqCtx)
+func QueryToJSON(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[[]map[string]interface{}], error) {
+
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryToJSON(req.SQL, reqCtx), nil
+	}
 
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
-	return dbFactory.QueryParamsNameToJSON(req.SQL, req.Params, reqCtx)
+func QueryParamNameToJSON(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[[]map[string]interface{}], error) {
+
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryParamsNameToJSON(req.SQL, req.Params, reqCtx), nil
+	}
+
 }
 
 // 执行查询，返回JSON数据格式。带占位参数进行查询
-func QueryPositionalToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
-	return dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams, reqCtx)
+func QueryPositionalToJSON(dbname string, dbsFactory *database.DBSFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[[]map[string]interface{}], error) {
+
+	if dbFactory, err := dbsFactory.CreateDBFactory(dbname); err != nil {
+		return nil, err
+	} else {
+		return dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams, reqCtx), nil
+	}
 
 }

main.go

@@ -1,54 +1,104 @@
 package main
 
 import (
-	"net/http"
-
-	"git.x2erp.com/qdy/go-base/bootstraps"
-	"git.x2erp.com/qdy/go-base/middleware"
 	"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"
+
+	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/consul"
+	"git.x2erp.com/qdy/go-base/container"
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/middleware"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
+
+	"git.x2erp.com/qdy/go-base/webx"
+	"git.x2erp.com/qdy/go-base/webx/health"
+	"git.x2erp.com/qdy/go-base/webx/router"
 )
 
 var (
-	serviceName    = "svc-agent"
-	serviceVersion = "1.0.0"
+	appName    = "svc-core"
+	appVersion = "1"
 )
 
 func main() {
+	//0.日志
+	//logger.InitBootLog()
+	logBootFactory := logger.InitBootLog()
+
+	//1.获取配置文件
+	cfg := config.GetConfig()
+	cfg.SetAppName(appName)
+	cfg.SetAppVersion(appVersion)
+
+	//2.创建关闭容器
+	ctr := container.NewContainer(cfg)
+
+	//注册日志，实现自动关闭
+	container.Reg(ctr, logBootFactory)
+
+	//3.创建数据库工厂--如果需求
+	dbsFactory := container.Create(ctr, database.CreateDBSFactory)
+
+	// 赋值认证中间件参数
+	middleware.JWTAuthMiddlewareInit(cfg)
 
-	// 创建服务启动器
-	bootstrapper := bootstraps.NewServiceBootstrapper(serviceName, serviceVersion)
+	//得到webservice服务工厂
+	webxFactory := webx.GetWebServiceFactory()
 
-	//加载配置
-	bootstrapper.InitConfig()
+	//建立hhtpService服务
+	webServcie, _ := webxFactory.CreateService(cfg.GetServiceConfig())
 
-	//构建数据库工厂
-	bootstrapper.InitDatabase()
+	//建立路由-api
+	routerService := router.NewWebService(webServcie.GetRouter())
 
-	//dbFactory := bootstrapper.DbFactory
+	//注册路由--api
+	registerDefaultRouter(routerService, dbsFactory)
 
-	// 启动服务，传入路由注册函数
-	bootstrapper.Run(registerRoutes)
+	// 注册健康检查-api
+	health.RegisterConsulHealthCheck(routerService)
 
+	//启动服务
+	webServcie.Run()
+
+	//启用运行日志
+	container.Create(ctr, logger.InitRuntimeLogger)
+
+	//注册到注册中心
+	container.Create(ctr, consul.Register)
+	//等待关闭
+	webServcie.WaitForServiceShutdown(ctr)
 }
 
-// 注册所有路由
-func registerRoutes(webService web.Service, dbFactory *database.DBFactory) {
+func registerDefaultRouter(ws *router.RouterService, dbsFactory *database.DBSFactory) {
+
+	ws.POST("/api/query/json/{dbname}",
+		func(dbname string, req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[[]map[string]interface{}], error) {
+
+			return functions.QueryToJSON(dbname, dbsFactory, req, reqCtx)
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
+
+	ws.POST("/api/query/csv/{dbname}",
+		func(dbname string, req request.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
 
-	// 查询接口 - JSON
-	webService.Handle("/api/query/json", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerJson(w, r, dbFactory, functions.QueryToJSON)
-	})))
+			return functions.QueryToCSV(dbname, dbsFactory, req, reqCtx)
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
+
+	ws.POST("/api/query/csv/param/{dbname}",
+		func(dbname string, req request.QueryRequest, reqCtx *ctx.RequestContext) ([]byte, error) {
+
+			return functions.QueryPositionalToCSV(dbname, dbsFactory, req, reqCtx)
+
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
+
+}
 
-	// 查询接口 - CSV
-	webService.Handle("/api/query/csv", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryToCSV)
-	})))
+func getDBFactory(dbname string, dbsFactory *database.DBSFactory) (*database.DBFactory, error) {
 
-	// 查询接口 - CSV with positional params
-	webService.Handle("/api/query/csv/param", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerBytes(w, r, dbFactory, functions.QueryPositionalToCSV)
-	})))
+	return dbsFactory.CreateDBFactory(dbname)
 }

test/my0_test.go

@@ -8,7 +8,8 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/config"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+
 	"git.x2erp.com/qdy/go-db/factory/doris"
 	"git.x2erp.com/qdy/go-db/factory/http"
 )
@@ -73,15 +74,12 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 	fmt.Println("Checking Doris table structure...")
 
 	// 获取Doris配置
-	cfg, err := config.GetConfig()
-	if err != nil {
-		t.Fatalf("failed to load config: %v", err)
-		return
-	}
+	cfg := config.GetConfig()
+
 	database := "X6_STOCK_DEV"
 	table := "A3_CLOTHING_LOG"
 	skipHeader := false // 改为true，跳过CSV头行
-	url := fmt.Sprintf("http://%s:%d/api/%s/%s/_stream_load", cfg.GetDoris().FEHost, cfg.GetDoris().FEPort, database, table)
+	url := fmt.Sprintf("http://%s:%d/api/%s/%s/_stream_load", cfg.GetDorisConfig().FEHost, cfg.GetDorisConfig().FEPort, database, table)
 	fmt.Printf("Doris stream load URL: %s\n", url)
 
 	// 计算需要的页数
@@ -119,7 +117,7 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 				queryStartTime := time.Now()
 
 				// 准备查询请求
-				queryRequest := types.QueryRequest{
+				queryRequest := request.QueryRequest{
 					SQL:              task.QuerySQL,
 					PositionalParams: task.QueryParams,
 					WriterHeader:     false,

test/my_ora_clothingToDoris_test.go

@@ -8,7 +8,8 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/config"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+
 	"git.x2erp.com/qdy/go-db/factory/doris"
 	"git.x2erp.com/qdy/go-db/factory/http"
 )
@@ -76,15 +77,12 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 	fmt.Println("Checking Doris table structure...")
 
 	// 获取Doris配置
-	cfg, err := config.GetConfig()
-	if err != nil {
-		fmt.Println("failed to load config: %v", err)
-		return
-	}
+	cfg := config.GetConfig()
+
 	database := "X6_STOCK_DEV"
 	table := "A3_CLOTHING"
 	skipHeader := false // 改为true，跳过CSV头行
-	url := fmt.Sprintf("http://%s:%d/api/%s/%s/_stream_load", cfg.GetDoris().FEHost, cfg.GetDoris().FEPort, database, table)
+	url := fmt.Sprintf("http://%s:%d/api/%s/%s/_stream_load", cfg.GetDorisConfig().FEHost, cfg.GetDorisConfig().FEPort, database, table)
 	fmt.Printf("Doris stream load URL: %s\n", url)
 
 	// 计算需要的页数
@@ -122,7 +120,7 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 				queryStartTime := time.Now()
 
 				// 准备查询请求
-				queryRequest := types.QueryRequest{
+				queryRequest := request.QueryRequest{
 					SQL:              task.QuerySQL,
 					PositionalParams: task.QueryParams,
 					WriterHeader:     false,

test/my_post_query_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"testing"
 
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
 	"git.x2erp.com/qdy/go-db/factory/http"
 )
 
@@ -36,7 +36,7 @@ func TestQuery(t *testing.T) {
 
 	sql, queryParams := getSQLWithPaginationSQL(0, 10)
 	// 准备查询请求
-	queryRequest := types.QueryRequest{
+	queryRequest := request.QueryRequest{
 		SQL:              sql,
 		PositionalParams: queryParams,
 		WriterHeader:     false,
@@ -45,7 +45,7 @@ func TestQuery(t *testing.T) {
 	httpClient := httpFactory.CreateClient()
 	// 发送POST请求到 /api/query/csv 获取CSV格式数据
 	resp, err := httpClient.PostWithAuth(
-		"http://localhost:8080/api/query/csv/param",
+		"http://localhost:8080/api/query/csv/param/bills",
 		queryRequest,
 		"123", // Bearer Token
 		nil,

test/mycsv_test.go

@@ -5,14 +5,14 @@ import (
 	"log"
 	"testing"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 func TestNamedParamsQueryCSV(t *testing.T) {
-	factory, err := database.GetDBFactory()
-	if err != nil {
-		t.Fatalf("Failed to get DB factory: %v", err)
-	}
+	cfg := config.GetConfig()
+	factory := database.CreateDBFactory(cfg)
+
 	defer factory.Close()
 
 	// 简化的SQL，只测试3个参数
@@ -50,20 +50,14 @@ func TestNamedParamsQueryCSV(t *testing.T) {
 	// 执行查询
 	result := factory.QueryPositionalToJSON(sql, params, nil)
 
-	// 检查结果 - 根据你的错误信息，result.Error 是 string 类型
-	if err != nil { // 改成检查空字符串
-		t.Errorf("Named parameters query failed: %s", err)
+	// 将请求参数输出为格式化的 JSON 日志
+	reqJSON, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		log.Printf("无法序列化请求参数: %v", err)
 	} else {
-		// 将请求参数输出为格式化的 JSON 日志
-		reqJSON, err := json.MarshalIndent(result, "", "  ")
-		if err != nil {
-			log.Printf("无法序列化请求参数: %v", err)
-		} else {
-			log.Printf("QueryRequest 参数:\n%s", string(reqJSON))
-		}
-
-		// 或者使用 fmt 输出
-		//fmt.Printf("=== QueryRequest ===\n%s\n====================\n", string(reqJSON))
+		log.Printf("QueryRequest 参数:\n%s", string(reqJSON))
 	}
 
+	// 或者使用 fmt 输出
+	//fmt.Printf("=== QueryRequest ===\n%s\n====================\n", string(reqJSON))
 }

test/mysql_test.go

@@ -5,16 +5,15 @@ import (
 	"log"
 	"testing"
 
+	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 func TestNamedParamsQuery(t *testing.T) {
-	factory, err := database.GetDBFactory()
-	if err != nil {
-		t.Fatalf("Failed to get DB factory: %v", err)
-	}
-	defer factory.Close()
+	cfg := config.GetConfig()
+	factory := database.CreateDBFactory(cfg)
 
+	defer factory.Close()
 	// 简化的SQL，只测试3个参数
 	sql := `
 		SELECT * FROM (