初始化导入，测试通过

gct.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# 脚本用法：./git-commit-and-tag.sh "你的提交描述" "版本号"
+
+# 检查参数数量
+if [ $# -ne 2 ]; then
+    echo "错误: 脚本需要2个参数。"
+    echo "用法: $0 \"提交描述\" \"版本号\""
+    echo "示例: $0 \"修复了登录问题\" \"v1.2.3\""
+    exit 1
+fi
+
+# 分配参数
+COMMIT_MESSAGE="$1"
+VERSION_TAG="$2"
+
+# 检查当前目录是否为Git仓库
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo "错误: 当前目录不是一个Git仓库。"
+    exit 1
+fi
+
+echo "开始处理提交和版本标签..."
+echo "提交描述: $COMMIT_MESSAGE"
+echo "版本标签: $VERSION_TAG"
+
+# 检查是否有未提交的更改
+if [ -n "$(git status --porcelain)" ]; then
+    echo "检测到未提交的更改，正在提交..."
+    
+    # 添加所有更改到暂存区
+    git add .
+    
+    # 进行提交
+    git commit -m "$COMMIT_MESSAGE"
+    if [ $? -ne 0 ]; then
+        echo "错误: 提交失败。"
+        exit 1
+    fi
+    echo "✅ 更改已提交"
+else
+    echo "提示: 没有未提交的更改，跳过提交步骤"
+    
+    # 检查是否有未提交的commit但未推送
+    LOCAL_COMMITS=$(git log @{u}..HEAD --oneline 2>/dev/null | wc -l)
+    if [ $LOCAL_COMMITS -eq 0 ]; then
+        echo "错误: 没有需要推送的提交。"
+        exit 1
+    else
+        echo "检测到 $LOCAL_COMMITS 个本地提交等待推送"
+    fi
+fi
+
+# 检查标签是否已存在
+if git rev-parse "$VERSION_TAG" >/dev/null 2>&1; then
+    echo "错误: 标签 '$VERSION_TAG' 已经存在。"
+    exit 1
+fi
+
+# 创建标签
+git tag "$VERSION_TAG"
+if [ $? -ne 0 ]; then
+    echo "错误: 创建标签失败。"
+    exit 1
+fi
+echo "✅ 标签 '$VERSION_TAG' 已创建"
+
+# 推送到远程仓库并推送标签
+echo "正在推送到远程仓库..."
+git push
+if [ $? -ne 0 ]; then
+    echo "错误: 推送提交失败。"
+    exit 1
+fi
+
+git push origin "$VERSION_TAG"
+if [ $? -ne 0 ]; then
+    echo "错误: 推送标签失败。"
+    exit 1
+fi
+
+echo "✅ 完成！提交已推送，版本标签 $VERSION_TAG 已创建并推送。"

go.mod

@@ -0,0 +1,60 @@
+module git.x2erp.com/qdy/go-svc-worker
+
+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/gorilla/mux v1.8.1
+)
+
+require (
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
+)
+
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	git.x2erp.com/qdy/go-service-agent v0.1.13
+	github.com/bytedance/sonic v1.14.0 // indirect
+	github.com/bytedance/sonic/loader v0.3.0 // indirect
+	github.com/cloudwego/base64x v0.1.6 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.27.0 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/microsoft/go-mssqldb v1.9.4 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
+	github.com/quic-go/quic-go v0.54.0 // indirect
+	github.com/sijms/go-ora/v2 v2.9.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.3.0 // indirect
+	go.uber.org/mock v0.5.0 // indirect
+	golang.org/x/arch v0.20.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	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
+)

go.sum

@@ -0,0 +1,145 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+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-base v0.1.10 h1:qHvRNSBoQHZfYrXUpZ42r925OO7aT95tIZK/qh6Cd60=
+git.x2erp.com/qdy/go-base v0.1.10/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
+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=
+git.x2erp.com/qdy/go-db v0.1.15 h1:YvwT/FyrvQQodzggGLyxlSQu++f7+NHDvkUR7tuDVfY=
+git.x2erp.com/qdy/go-db v0.1.15/go.mod h1:5dnPmDEOhfuKtV1anuSibSNibTINul6/qdRxH1khQ8k=
+git.x2erp.com/qdy/go-service-agent v0.1.13 h1:h5kMd9bGu6HcTQ60j/mqdtHC1HfJ7uxwOaYas3EjQZY=
+git.x2erp.com/qdy/go-service-agent v0.1.13/go.mod h1:51jbunlX5YI+LyUYaScojAGhra1dhnQL85QkbgVfnts=
+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=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1/go.mod h1:j2chePtV91HrC22tGoRX3sGY42uF13WzmmV80/OdVAA=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1/go.mod h1:xxCBG/f/4Vbmh2XQJBsOmNdxWUY5j/s27jujKPbQf14=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1/go.mod h1:Vih/3yc6yac2JzU4hzpaDupBJP0Flaia9rXXrU8xyww=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
+github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
+github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
+github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
+github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
+github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
+github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
+github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
+github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
+github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j74pNgs=
+github.com/microsoft/go-mssqldb v1.9.4/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
+github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
+github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg=
+github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
+github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
+github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
+github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
+golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
+google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -0,0 +1,154 @@
+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-db/factory/database"
+	"git.x2erp.com/qdy/go-svc-worker/service"
+	"github.com/gin-gonic/gin"
+)
+
+func main() {
+
+	cfg := config.GetConfig()
+
+	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("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()
+}
+
+// 启动HTTP服务器
+func startHTTPServer() {
+	//建立路由
+	router := gin.Default()
+	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")
+	}()
+
+	// 核心路由
+	//router.GET("/api/health", functions.HealthHandler(dbFactory, cfg.GetDatabase().Type))
+	//router.POST("/api/query", auth.AuthMiddleware(), withQueryRequest(functions.QueryToJSON(dbFactory)))
+	router.POST("/api/data/agent/to/doris", withQueryRequest(service.ServiceAgentToDoris(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)
+
+	// 设置可信代理
+	setupTrustedProxies(router, serviceConfig.TrustedProxies)
+
+	// 创建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,
+	}
+
+	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)
+	}
+
+}
+
+// 参数绑定包装器
+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 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 setupTrustedProxiesRouter(router *gin.Engine, trimmedProxies []string) {
+
+	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)
+	}
+
+}
+
+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...")
+		dbFactory.Close()
+		log.Println("Database connection closed gracefully")
+		os.Exit(0)
+	}()
+}

service/agentToDoris.go

@@ -0,0 +1,186 @@
+package service
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/database"
+	"git.x2erp.com/qdy/go-db/factory/doris"
+	"git.x2erp.com/qdy/go-db/factory/http"
+	"github.com/gin-gonic/gin"
+)
+
+// // QueryRequest 查询请求结构体
+// type QueryRequest struct {
+// 	SQL              string                 `json:"sql" binding:"required"`
+// 	Params           map[string]interface{} `json:"params,omitempty"`           // 名称参数
+// 	PositionalParams []interface{}          `json:"positionalParams,omitempty"` // 位置参数
+// 	WriterHeader     bool                   `json:"writerHeader"`               // 是否写入CSV头行
+// }
+
+// // QueryResult 查询结果
+// type QueryResult struct {
+// 	Success      bool          `json:"success"`
+// 	ErrorMessage string        `json:"errorMessage,omitempty"`
+// 	QueryTime    time.Duration `json:"queryTime"`
+// 	SaveTime     time.Duration `json:"saveTime"`
+// 	TotalRows    int           `json:"totalRows"`
+// 	CSVData      string        `json:"csvData,omitempty"`
+// }
+
+// queryToCSVAndInsert 处理单次查询并将结果插入到Doris
+func queryToCSVAndInsert(dbFactory *database.DBFactory, queryRequest types.QueryRequest) (*types.QueryResult, error) {
+
+	// 记录查询开始时间
+	queryStartTime := time.Now()
+
+	// 1. 获取HTTP工厂实例
+	httpFactory, err := http.GetHTTPFactory()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get HTTP factory: %v", err)
+	}
+	log.Println("HTTP factory created successfully")
+
+	// 2. 获取Doris工厂实例
+	dorisFactory, err := doris.GetDorisFactory(httpFactory)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get Doris factory: %v", err)
+	}
+	log.Println("Doris factory created successfully")
+
+	// 3. 创建HTTP客户端
+	httpClient := httpFactory.CreateClient()
+
+	agentQueryRequest := types.QueryRequest{
+		SQL:              queryRequest.SQL,
+		Params:           queryRequest.Params,
+		PositionalParams: queryRequest.PositionalParams,
+		WriterHeader:     queryRequest.WriterHeader,
+	}
+	// 4. 发送POST请求到 /api/query/csv 获取CSV格式数据
+	resp, err := httpClient.PostWithAuth(
+		queryRequest.AgentUrl,
+		agentQueryRequest,
+		queryRequest.AgentToken,
+		nil,
+	)
+
+	queryEndTime := time.Now()
+	queryDuration := queryEndTime.Sub(queryStartTime)
+
+	if err != nil {
+		return &types.QueryResult{
+			Success:   false,
+			Error:     fmt.Sprintf("查询失败: %v", err),
+			QueryTime: queryDuration,
+		}, nil
+	}
+
+	if resp.StatusCode() != 200 {
+		return &types.QueryResult{
+			Success:   false,
+			Error:     fmt.Sprintf("查询请求失败, 状态码: %d", resp.StatusCode()),
+			QueryTime: queryDuration,
+		}, nil
+	}
+
+	// 5. 获取CSV数据
+	csvData := string(resp.Body())
+	if len(csvData) == 0 {
+		return &types.QueryResult{
+			Success:   false,
+			Error:     "没有查询到数据",
+			QueryTime: queryDuration,
+		}, nil
+	}
+
+	// 估算数据行数（CSV行数）
+	var totalRows int
+	if queryRequest.WriterHeader {
+		// 如果有表头，需要减1
+		lines := strings.Count(csvData, "\n")
+		if lines > 0 {
+			totalRows = lines - 1
+		}
+	} else {
+		totalRows = strings.Count(csvData, "\n")
+	}
+
+	log.Printf("查询成功，获取到 %d 行数据\n", totalRows)
+
+	// 6. 插入数据到Doris
+	database := queryRequest.DorisDatabase
+	table := queryRequest.DorisTable
+	skipHeader := !queryRequest.WriterHeader // 如果包含表头，则跳过
+
+	saveStartTime := time.Now()
+	err = dorisFactory.InsertCSV(database, table, csvData, skipHeader)
+	saveEndTime := time.Now()
+	saveDuration := saveEndTime.Sub(saveStartTime)
+
+	if err != nil {
+		return &types.QueryResult{
+			Success:   false,
+			Error:     fmt.Sprintf("数据插入Doris失败: %v", err),
+			QueryTime: queryDuration,
+			SaveTime:  saveDuration,
+			Count:     totalRows,
+		}, nil
+	}
+
+	return &types.QueryResult{
+		Success:   true,
+		QueryTime: queryDuration,
+		SaveTime:  saveDuration,
+		Count:     totalRows,
+	}, nil
+}
+
+// ServiceHandler 服务处理器（供router使用）
+func ServiceAgentToDoris(dbFactory *database.DBFactory) func(c *gin.Context, req types.QueryRequest) {
+	return func(c *gin.Context, queryRequest types.QueryRequest) {
+		// 创建返回结果对象
+		result := &types.QueryResult{}
+
+		// 添加调试日志，确认 queryRequest 是否有数据
+		//log.Printf("SQL: %s", queryRequest.SQL)
+		//log.Printf("AgentUrl: %s", queryRequest.AgentUrl)
+		//log.Printf("参数数量: %d", len(queryRequest.PositionalParams))
+
+		// 执行查询并插入
+		executionResult, err := queryToCSVAndInsert(dbFactory, queryRequest)
+		if err != nil {
+			result.Success = false
+			result.Error = "服务内部错误: " + err.Error()
+			c.JSON(500, result)
+			return
+		}
+
+		// 使用QueryResult统一返回
+		result.Success = executionResult.Success
+		result.QueryTime = executionResult.QueryTime
+		result.SaveTime = executionResult.SaveTime
+		result.TotalCount = executionResult.TotalCount
+
+		// 计算总时间（秒）
+		totalTime := executionResult.QueryTime + executionResult.SaveTime
+		result.Time = totalTime.String()
+
+		// 根据执行结果设置其他字段
+		if executionResult.Success {
+			result.Data = gin.H{
+				"message": "数据成功插入到Doris",
+			}
+			result.Count = executionResult.TotalCount
+			c.JSON(200, result)
+		} else {
+			result.Error = executionResult.Error
+			result.Count = executionResult.TotalCount
+			// 注意：这里使用200而不是500，因为executionResult.Success=false可能表示业务逻辑失败而非服务器错误
+			c.JSON(200, result)
+		}
+	}
+}

test/my_agent_to_doris_test.go

@@ -0,0 +1,182 @@
+package test
+
+import (
+	"fmt"
+	"log"
+	"testing"
+
+	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-db/factory/http"
+)
+
+// 函数名改为 TestAgentToDorisDirect 以符合 Go 测试约定
+func TestAgentToDorisDirect(t *testing.T) {
+	err := agentToDorisDirect(t)
+	if err != nil {
+		t.Errorf("测试失败: %v", err)
+	}
+}
+
+func agentToDorisDirect(t *testing.T) error {
+	startRow := 0
+	endRow := 5000
+	// 生成查询SQL（使用参数模式）
+	querySQL, queryParams := getSQLWithPagination(startRow, endRow)
+
+	// 准备查询请求
+	queryRequest := types.QueryRequest{
+		SQL:              querySQL,
+		PositionalParams: queryParams,
+		WriterHeader:     false,
+		AgentUrl:         "http://localhost:8080/api/query/csv/param",
+		AgentToken:       "123",
+		DorisDatabase:    "X6_STOCK_DEV",
+		DorisTable:       "A3_CLOTHING",
+	}
+
+	// 1. 获取HTTP工厂实例
+	httpFactory, err := http.GetHTTPFactory()
+	if err != nil {
+		log.Printf("Failed to get HTTP factory: %v", err)
+		return fmt.Errorf("Failed to get HTTP factory: %v", err)
+	}
+	fmt.Println("HTTP factory created successfully")
+
+	log.Printf("queryRequest:\n%s", "queryRequest")
+
+	// 发送POST请求到 /api/query/csv 获取CSV格式数据
+	httpClient := httpFactory.CreateClient()
+	resp, err := httpClient.PostWithAuth(
+		"http://localhost:9090/api/data/agent/to/doris",
+		queryRequest,
+		"123", // Bearer Token
+		nil,
+	)
+
+	if err != nil {
+		errMsg := fmt.Sprintf("请求失败: %v", err)
+		t.Error(errMsg)
+		return nil
+	}
+	log.Printf("查询结果:\n%s", resp)
+
+	//t.Logf("查询成功，响应数据长度: %d", resp)
+
+	return nil
+}
+
+// getSQLWithPagination 生成带分页的SQL语句（参数模式）
+// 返回SQL语句和参数映射
+func getSQLWithPagination(startRow, endRow int) (string, []interface{}) {
+	sql := `SELECT
+    CLOTHING_ID,
+    CLOTHING_YEAR,
+    CLOTHING_NAME,
+    STYLECOLOR_ID,
+    STYLE_ID,
+    COLOR_ID,
+    SIZE_ID,
+    CREATE_DATE,
+    STYLE_GROUP,
+    J_PRICE,
+    X_PRICE,
+    V_PRICE,
+    CLERK_ROYALTYRATE,
+    CLERK_ROYALTYPRICE,
+    BRAND_CODE,
+    STYLEVER_ID,
+    J_COST,
+    CLOTHING_IMG,
+    STYLE_UNIT_CODE,
+    STYLE_SEX_CODE,
+    STYLE_KIND_CODE,
+    STYLE_CLASS_CODE,
+    STYLE_SUBCLASS_CODE,
+    STYLE_DESIGNER_CODE,
+    STYLE_PLATER_CODE,
+    STYLE_STYLES_CODE,
+    STYLE_LOCATE_CODE,
+    STYLE_SALETYPE_CODE,
+    STYLE_COLORSYSTEM_CODE,
+    STYLE_THEME_CODE,
+    STYLE_INDENTTYPE_CODE,
+    STYLE_PRICEBAND_CODE,
+    STYLE_MONTH_CODE,
+    STYLE_COMPOSITION_CODE,
+    STYLE_SUPPLIER_CODE,
+    STYLE_SPARE1_CODE,
+    STYLE_SPARE2_CODE,
+    STYLE_SPARE4_CODE,
+    STYLE_SPARE5_CODE,
+    CATEGORY_CODE,
+    BRAND_ID,
+    STYCOLVER_ID,
+    STYLE_SAME,
+    CLOTHING_BARCODE,
+    CLOTHING_HELPID,
+    CLOTHING_GBCODE,
+    CLOTHING_RFID,
+    STYLE_SUBJECT_ID,
+    SIZEGRP_ID,
+    STYLE_HELPID,
+    CLOTHING_GBCODE1,
+    COLOR_NAME,
+    STYLEVER_NAME,
+    SIZE_NAME,
+    STYLE_UNIT,
+    STYLE_SEX,
+    STYLE_KIND,
+    STYLE_CLASS,
+    STYLE_SUBCLASS,
+    STYLE_DESIGNER,
+    STYLE_PLATER,
+    STYLE_BAND,
+    STYLE_STYLES,
+    STYLE_LOCATE,
+    STYLE_SALETYPE,
+    STYLE_COLORSYSTEM,
+    STYLE_THEME,
+    STYLE_INDENTTYPE,
+    STYLE_PRICEBAND,
+    STYLE_MONTH,
+    STYLE_COMPOSITION,
+    STYLE_SUPPLIER,
+    STYLE_SPARE1,
+    STYLE_SPARE2,
+    STYLE_SPARE3,
+    STYLE_SPARE4,
+    STYLE_SPARE5,
+    CATEGORY_NAME,
+    BRAND_NAME,
+    STYLE_YEAR_NAME,
+    STYLE_SEARCH_KEY,
+    STYLE_SUBJECT_NAME,
+    CLOTHING_REMARK,
+    STYLE_SPARE3_CODE,
+    COST,
+    BRAND_GROUPCODE,
+    CLASS_GROUPCODE,
+    MONTH_GROUPCODE,
+    RETURNSUBJECT_ID,
+    PRODUCT_SORT,
+    CLOTHING_PARTITION
+   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, // WHERE rn > :start_row 所以是startRow-1
+	}
+
+	return sql, params
+}