测试通过

functions/heath.go

@@ -6,11 +6,11 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"git.x2erp.com/qdy/go-base/types"
-	"git.x2erp.com/qdy/go-db/factory"
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // HealthHandler 返回一个处理函数
-func HealthHandler(dbFactory *factory.DBFactory, dbType string) gin.HandlerFunc {
+func HealthHandler(dbFactory *database.DBFactory, dbType string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 
 		dbFactory.TestConnection(dbType)

functions/info.go

@@ -7,11 +7,11 @@ import (
 
 	"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-db/factory/database"
 )
 
 // InfoHandler 数据库信息
-func InfoHandler(dbFactory *factory.DBFactory) gin.HandlerFunc {
+func InfoHandler(dbFactory *database.DBFactory) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		dbConfig := config.GetConfig()
 		drivers := dbFactory.GetAvailableDrivers()

functions/query_csv.go

@@ -5,7 +5,7 @@ import (
 
 	"git.x2erp.com/qdy/go-base/mycsv"
 	"git.x2erp.com/qdy/go-base/types"
-	"git.x2erp.com/qdy/go-db/factory"
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 统一的错误响应处理
@@ -23,7 +23,7 @@ func handleSuccessResponseCSV(c *gin.Context, csvData []byte) {
 }
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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 {
@@ -35,7 +35,7 @@ func QueryToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req types.Que
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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)
@@ -48,7 +48,7 @@ func QueryParamNameToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req
 }
 
 // 执行查询，返回CSV数据格式。带占位参数进行查询
-func QueryPositionalToCSV(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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 {

functions/query_json.go

@@ -4,11 +4,11 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"git.x2erp.com/qdy/go-base/types"
-	"git.x2erp.com/qdy/go-db/factory"
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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)
@@ -16,7 +16,7 @@ func QueryToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req types.Qu
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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)
@@ -24,7 +24,7 @@ func QueryParamNameToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req
 }
 
 // 执行查询，返回JSON数据格式。带占位参数进行查询
-func QueryPositionalToJSON(dbFactory *factory.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+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)
 

main.go

@@ -12,7 +12,7 @@ import (
 
 	"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-db/factory/database"
 	"git.x2erp.com/qdy/go-service-agent/auth"
 	"git.x2erp.com/qdy/go-service-agent/functions"
 	"github.com/gin-gonic/gin"
@@ -44,7 +44,7 @@ func startHTTPServer() {
 	cfg := config.GetConfig()
 	serviceConfig := cfg.GetService()
 
-	dbFactory, err := factory.GetDBFactory()
+	dbFactory, err := database.GetDBFactory()
 	if err != nil {
 		log.Fatalf("Failed to create DB factory: %v", err)
 	}
@@ -141,7 +141,7 @@ func setupTrustedProxiesRouter(router *gin.Engine, trimmedProxies []string) {
 
 }
 
-func setupGracefulShutdown(dbFactory *factory.DBFactory) {
+func setupGracefulShutdown(dbFactory *database.DBFactory) {
 	signalCh := make(chan os.Signal, 1)
 	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
 

test/my0_test.go

@@ -3,14 +3,14 @@ package main
 import (
 	"fmt"
 	"log"
-	"strings"
 	"sync"
 	"testing"
 	"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-db/factory/doris"
+	"git.x2erp.com/qdy/go-db/factory/http"
 )
 
 // // QueryRequest 查询请求结构体
@@ -30,16 +30,15 @@ type PageConfig1 struct {
 
 // 查询任务
 type QueryTask1 struct {
-	Page           int
-	StartRow       int
-	EndRow         int
-	QuerySQL       string
-	QueryParams    []interface{}
-	CSVData        string
-	Error          error
-	QueryTime      time.Duration
-	SaveTime       time.Duration
-	LastClothingID string // 上一页最后一条记录的CLOTHING_ID
+	Page        int
+	StartRow    int
+	EndRow      int
+	QuerySQL    string
+	QueryParams []interface{}
+	CSVData     string
+	Error       error
+	QueryTime   time.Duration
+	SaveTime    time.Duration
 }
 
 func TestQueryAndInsertToDoris1(t *testing.T) {
@@ -57,14 +56,14 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 	fmt.Printf("开始执行分页查询，总共%d行，每页%d条，%d线程工作\n", pageConfig.TotalRows, pageConfig.PageSize, pageConfig.MaxWorkers)
 
 	// 1. 获取HTTP工厂实例
-	httpFactory, err := factory.GetHTTPFactory()
+	httpFactory, err := http.GetHTTPFactory()
 	if err != nil {
 		t.Fatalf("Failed to get HTTP factory: %v", err)
 	}
 	fmt.Println("HTTP factory created successfully")
 
 	// 7. 获取Doris工厂实例
-	dorisFactory, err := factory.GetDorisFactory(httpFactory)
+	dorisFactory, err := doris.GetDorisFactory(httpFactory)
 	if err != nil {
 		t.Fatalf("Failed to get Doris factory: %v", err)
 	}
@@ -110,7 +109,7 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 
 			for task := range taskChan {
 				fmt.Printf("Worker %d 处理第 %d 页 (行 %d-%d, CLOTHING_ID > %s)...\n",
-					workerID, task.Page, task.StartRow, task.EndRow, task.LastClothingID)
+					workerID, task.Page, task.StartRow, task.EndRow)
 
 				// 记录查询开始时间
 				queryStartTime := time.Now()
@@ -196,26 +195,10 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 				completedTasks++
 
 				fmt.Printf("✅ Worker 完成第 %d 页 (行 %d-%d, CLOTHING_ID > %s)\n",
-					task.Page, task.StartRow, task.EndRow, task.LastClothingID)
+					task.Page, task.StartRow, task.EndRow)
 				fmt.Printf("   查询耗时: %v, 保存耗时: %v\n", task.QueryTime, task.SaveTime)
 				fmt.Printf("   估算数据行数: %d\n", estimatedRows)
 
-				// 从CSV数据中提取最后一行的CLOTHING_ID
-				if task.CSVData != "" {
-					// 简单实现：取最后一行第一列的第一个记录
-					// 这里假设CSV格式是逗号分隔，没有标题行
-					lines := strings.Split(strings.TrimSpace(task.CSVData), "\n")
-					if len(lines) > 0 {
-						// 取最后一行（如果有多行数据）
-						lastLine := lines[len(lines)-1]
-						fields := strings.Split(lastLine, ",")
-						if len(fields) > 0 {
-							// 更新任务的LastClothingID
-							task.LastClothingID = strings.TrimSpace(fields[0]) // CLOTHING_ID是第一列
-							fmt.Printf("   提取到最后一个CLOTHING_ID: %s\n", task.LastClothingID)
-						}
-					}
-				}
 			}
 
 			mu.Unlock()
@@ -231,9 +214,6 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 	// 生成任务并发送到任务通道
 	fmt.Println("\n📋 开始生成查询任务...")
 
-	// 初始CLOTHING_ID为"0"
-	lastClothingID := "A"
-
 	for page := 1; page <= totalPages; page++ {
 		startRow := pageConfig.StartRow + (page-1)*pageConfig.PageSize + 1
 		endRow := pageConfig.StartRow + page*pageConfig.PageSize
@@ -245,24 +225,19 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 		}
 
 		// 生成查询SQL（使用参数模式）
-		querySQL, queryParams := getSQLWithPagination(startRow, endRow, lastClothingID)
+		querySQL, queryParams := getSQLWithPagination(startRow, endRow)
 
 		task := QueryTask{
-			Page:           page,
-			StartRow:       startRow,
-			EndRow:         endRow,
-			QuerySQL:       querySQL,
-			QueryParams:    queryParams,
-			LastClothingID: lastClothingID,
+			Page:        page,
+			StartRow:    startRow,
+			EndRow:      endRow,
+			QuerySQL:    querySQL,
+			QueryParams: queryParams,
 		}
 
-		fmt.Printf("生成第 %d 页任务 (行 %d-%d), 使用CLOTHING_ID > '%s'\n",
-			page, startRow, endRow, lastClothingID)
+		fmt.Printf("生成第 %d 页任务 (行 %d-%d), 使用CLOTHING_ID > '%s'\n", page, startRow, endRow)
 		taskChan <- task
 
-		// 注意：在实际场景中，lastClothingID需要在任务完成后更新
-		// 这里简化处理，每个任务使用相同的lastClothingID
-		// 更好的做法是使用任务队列和结果回调来更新lastClothingID
 	}
 
 	// 关闭任务通道，通知worker没有更多任务
@@ -299,7 +274,7 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 
 // getSQLWithPagination 生成带分页的SQL语句（参数模式）
 // 返回SQL语句和参数映射
-func getSQLWithPagination1(startRow, endRow int, lastClothingID string) (string, []interface{}) {
+func getSQLWithPagination1(startRow, endRow int) (string, []interface{}) {
 	sql := `SELECT
     CLOTHING_ID,
     CLOTHING_YEAR,
@@ -319,7 +294,6 @@ WHERE rn > :3`
 
 	// 创建参数映射
 	params := []interface{}{
-		lastClothingID,
 		endRow,
 		startRow - 1, // WHERE rn > :start_row 所以是startRow-1
 	}

test/my_ora_clothingToDoris_test.go

@@ -3,14 +3,14 @@ package main
 import (
 	"fmt"
 	"log"
-	"strings"
 	"sync"
 	"testing"
 	"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-db/factory/doris"
+	"git.x2erp.com/qdy/go-db/factory/http"
 )
 
 // 一定要执行环境变量
@@ -33,16 +33,15 @@ type PageConfig struct {
 
 // 查询任务
 type QueryTask struct {
-	Page           int
-	StartRow       int
-	EndRow         int
-	QuerySQL       string
-	QueryParams    []interface{}
-	CSVData        string
-	Error          error
-	QueryTime      time.Duration
-	SaveTime       time.Duration
-	LastClothingID string // 上一页最后一条记录的CLOTHING_ID
+	Page        int
+	StartRow    int
+	EndRow      int
+	QuerySQL    string
+	QueryParams []interface{}
+	CSVData     string
+	Error       error
+	QueryTime   time.Duration
+	SaveTime    time.Duration
 }
 
 func TestQueryAndInsertToDoris(t *testing.T) {
@@ -60,14 +59,14 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 	fmt.Printf("开始执行分页查询，总共%d行，每页%d条，%d线程工作\n", pageConfig.TotalRows, pageConfig.PageSize, pageConfig.MaxWorkers)
 
 	// 1. 获取HTTP工厂实例
-	httpFactory, err := factory.GetHTTPFactory()
+	httpFactory, err := http.GetHTTPFactory()
 	if err != nil {
 		t.Fatalf("Failed to get HTTP factory: %v", err)
 	}
 	fmt.Println("HTTP factory created successfully")
 
 	// 7. 获取Doris工厂实例
-	dorisFactory, err := factory.GetDorisFactory(httpFactory)
+	dorisFactory, err := doris.GetDorisFactory(httpFactory)
 	if err != nil {
 		t.Fatalf("Failed to get Doris factory: %v", err)
 	}
@@ -113,7 +112,7 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 
 			for task := range taskChan {
 				fmt.Printf("Worker %d 处理第 %d 页 (行 %d-%d, CLOTHING_ID > %s)...\n",
-					workerID, task.Page, task.StartRow, task.EndRow, task.LastClothingID)
+					workerID, task.Page, task.StartRow, task.EndRow)
 
 				// 记录查询开始时间
 				queryStartTime := time.Now()
@@ -199,26 +198,10 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 				completedTasks++
 
 				fmt.Printf("✅ Worker 完成第 %d 页 (行 %d-%d, CLOTHING_ID > %s)\n",
-					task.Page, task.StartRow, task.EndRow, task.LastClothingID)
+					task.Page, task.StartRow, task.EndRow)
 				fmt.Printf("   查询耗时: %v, 保存耗时: %v\n", task.QueryTime, task.SaveTime)
 				fmt.Printf("   估算数据行数: %d\n", estimatedRows)
 
-				// 从CSV数据中提取最后一行的CLOTHING_ID
-				if task.CSVData != "" {
-					// 简单实现：取最后一行第一列的第一个记录
-					// 这里假设CSV格式是逗号分隔，没有标题行
-					lines := strings.Split(strings.TrimSpace(task.CSVData), "\n")
-					if len(lines) > 0 {
-						// 取最后一行（如果有多行数据）
-						lastLine := lines[len(lines)-1]
-						fields := strings.Split(lastLine, ",")
-						if len(fields) > 0 {
-							// 更新任务的LastClothingID
-							task.LastClothingID = strings.TrimSpace(fields[0]) // CLOTHING_ID是第一列
-							fmt.Printf("   提取到最后一个CLOTHING_ID: %s\n", task.LastClothingID)
-						}
-					}
-				}
 			}
 
 			mu.Unlock()
@@ -234,9 +217,6 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 	// 生成任务并发送到任务通道
 	fmt.Println("\n📋 开始生成查询任务...")
 
-	// 初始CLOTHING_ID为"0"
-	lastClothingID := "0"
-
 	for page := 1; page <= totalPages; page++ {
 		startRow := pageConfig.StartRow + (page-1)*pageConfig.PageSize + 1
 		endRow := pageConfig.StartRow + page*pageConfig.PageSize
@@ -248,24 +228,20 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 		}
 
 		// 生成查询SQL（使用参数模式）
-		querySQL, queryParams := getSQLWithPagination(startRow, endRow, lastClothingID)
+		querySQL, queryParams := getSQLWithPagination(startRow, endRow)
 
 		task := QueryTask{
-			Page:           page,
-			StartRow:       startRow,
-			EndRow:         endRow,
-			QuerySQL:       querySQL,
-			QueryParams:    queryParams,
-			LastClothingID: lastClothingID,
+			Page:        page,
+			StartRow:    startRow,
+			EndRow:      endRow,
+			QuerySQL:    querySQL,
+			QueryParams: queryParams,
 		}
 
-		fmt.Printf("生成第 %d 页任务 (行 %d-%d), 使用CLOTHING_ID > '%s'\n",
-			page, startRow, endRow, lastClothingID)
+		fmt.Printf("生成第 %d 页任务 (行 %d-%d), 使用CLOTHING_ID > '%s'\n", page, startRow, endRow)
+
 		taskChan <- task
 
-		// 注意：在实际场景中，lastClothingID需要在任务完成后更新
-		// 这里简化处理，每个任务使用相同的lastClothingID
-		// 更好的做法是使用任务队列和结果回调来更新lastClothingID
 	}
 
 	// 关闭任务通道，通知worker没有更多任务
@@ -302,7 +278,7 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 
 // getSQLWithPagination 生成带分页的SQL语句（参数模式）
 // 返回SQL语句和参数映射
-func getSQLWithPagination(startRow, endRow int, lastClothingID string) (string, []interface{}) {
+func getSQLWithPagination(startRow, endRow int) (string, []interface{}) {
 	sql := `SELECT
     CLOTHING_ID,
     CLOTHING_YEAR,

test/mycsv_test.go

@@ -5,11 +5,11 @@ import (
 	"log"
 	"testing"
 
-	"git.x2erp.com/qdy/go-db/factory"
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 func TestNamedParamsQueryCSV(t *testing.T) {
-	factory, err := factory.GetDBFactory()
+	factory, err := database.GetDBFactory()
 	if err != nil {
 		t.Fatalf("Failed to get DB factory: %v", err)
 	}

test/mysql_test.go

@@ -5,11 +5,11 @@ import (
 	"log"
 	"testing"
 
-	"git.x2erp.com/qdy/go-db/factory"
+	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 func TestNamedParamsQuery(t *testing.T) {
-	factory, err := factory.GetDBFactory()
+	factory, err := database.GetDBFactory()
 	if err != nil {
 		t.Fatalf("Failed to get DB factory: %v", err)
 	}