修改日志输出格式

functions/query_csv.go

@@ -3,13 +3,14 @@ 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) []byte {
-	csvData, err := dbFactory.QueryToCSV(req.SQL, req.WriterHeader)
+func QueryToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
+	csvData, err := dbFactory.QueryToCSV(req.SQL, req.WriterHeader, reqCtx)
 	if err != nil {
 		log.Fatalf("QueryToCSV error: %v", err)
 
@@ -18,9 +19,9 @@ func QueryToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
+func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
 
-	csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params)
+	csvData, err := dbFactory.QueryParamsNameToCSV(req.SQL, req.WriterHeader, req.Params, reqCtx)
 	if err != nil {
 		log.Fatalf("QueryParamNameToCSV Error: %v", err)
 
@@ -29,8 +30,8 @@ func QueryParamNameToCSV(dbFactory *database.DBFactory, req types.QueryRequest)
 }
 
 // 执行查询，返回CSV数据格式。带占位参数进行查询
-func QueryPositionalToCSV(dbFactory *database.DBFactory, req types.QueryRequest) []byte {
-	csvData, err := dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams)
+func QueryPositionalToCSV(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) []byte {
+	csvData, err := dbFactory.QueryPositionalToCSV(req.SQL, req.WriterHeader, req.PositionalParams, reqCtx)
 	if err != nil {
 		log.Fatalf("QueryParamNameToCSV Error: %v", err)
 

functions/query_json.go

@@ -1,23 +1,24 @@
 package functions
 
 import (
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/database"
 )
 
 // 执行查询，返回CSV数据格式。无参数查询
-func QueryToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
-	return dbFactory.QueryToJSON(req.SQL)
+func QueryToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
+	return dbFactory.QueryToJSON(req.SQL, reqCtx)
 
 }
 
 // 执行查询，返回CSV数据格式。带参数名称进行查询
-func QueryParamNameToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
-	return dbFactory.QueryParamsNameToJSON(req.SQL, req.Params)
+func QueryParamNameToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
+	return dbFactory.QueryParamsNameToJSON(req.SQL, req.Params, reqCtx)
 }
 
 // 执行查询，返回JSON数据格式。带占位参数进行查询
-func QueryPositionalToJSON(dbFactory *database.DBFactory, req types.QueryRequest) *types.QueryResult {
-	return dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams)
+func QueryPositionalToJSON(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
+	return dbFactory.QueryPositionalToJSON(req.SQL, req.PositionalParams, reqCtx)
 
 }

gct.sh

@@ -1,82 +1,25 @@
 #!/bin/bash
 
-# 脚本用法：./git-commit-and-tag.sh "你的提交描述" "版本号"
+# 使用命令行参数，如果没有提供则使用默认值
+COMMIT_MSG="${1:-初始提交}"
+TAG_VERSION="${2:-v0.1.0}"
 
-# 检查参数数量
-if [ $# -ne 2 ]; then
-    echo "错误: 脚本需要2个参数。"
-    echo "用法: $0 \"提交描述\" \"版本号\""
-    echo "示例: $0 \"修复了登录问题\" \"v1.2.3\""
-    exit 1
-fi
+echo "提交信息: $COMMIT_MSG"
+echo "标签版本: $TAG_VERSION"
 
-# 分配参数
-COMMIT_MESSAGE="$1"
-VERSION_TAG="$2"
+# 提交和推送
+git add .
+git commit -m "$COMMIT_MSG"
+git push -u origin master
 
-# 检查当前目录是否为Git仓库
-if ! git rev-parse --git-dir > /dev/null 2>&1; then
-    echo "错误: 当前目录不是一个Git仓库。"
-    exit 1
-fi
+# 创建标签（关键修改在这里）
+# 方法1：使用注释标签（推荐，不会打开编辑器）
+git tag -a "$TAG_VERSION" -m "Release $TAG_VERSION"
 
-echo "开始处理提交和版本标签..."
-echo "提交描述: $COMMIT_MESSAGE"
-echo "版本标签: $VERSION_TAG"
+# 或者方法2：如果你需要GPG签名，使用这个
+# GIT_EDITOR=true git tag -s "$TAG_VERSION" -m "Release $TAG_VERSION"
 
-# 检查是否有未提交的更改
-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
+# 推送标签
+git push origin "$TAG_VERSION"
 
-# 检查标签是否已存在
-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 已创建并推送。"
+echo "完成！"

main.go

@@ -17,7 +17,12 @@ import (
 )
 
 func main() {
-	cfg := config.GetConfig()
+	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)
@@ -32,12 +37,12 @@ func main() {
 	log.Println("Database connection test passed!")
 
 	// 启动微服务
-	startMicroService()
+	startMicroService(cfg)
 }
 
 // 启动微服务
-func startMicroService() {
-	cfg := config.GetConfig()
+func startMicroService(cfg config.IConfig) {
+
 	serviceConfig := cfg.GetService()
 
 	// 初始化数据库

test/my0_test.go

@@ -73,7 +73,11 @@ func TestQueryAndInsertToDoris1(t *testing.T) {
 	fmt.Println("Checking Doris table structure...")
 
 	// 获取Doris配置
-	cfg := config.GetConfig()
+	cfg, err := config.GetConfig()
+	if err != nil {
+		t.Fatalf("failed to load config: %v", err)
+		return
+	}
 	database := "X6_STOCK_DEV"
 	table := "A3_CLOTHING_LOG"
 	skipHeader := false // 改为true，跳过CSV头行

test/my_ora_clothingToDoris_test.go

@@ -76,7 +76,11 @@ func TestQueryAndInsertToDoris(t *testing.T) {
 	fmt.Println("Checking Doris table structure...")
 
 	// 获取Doris配置
-	cfg := config.GetConfig()
+	cfg, err := config.GetConfig()
+	if err != nil {
+		fmt.Println("failed to load config: %v", err)
+		return
+	}
 	database := "X6_STOCK_DEV"
 	table := "A3_CLOTHING"
 	skipHeader := false // 改为true，跳过CSV头行

test/mycsv_test.go

@@ -48,7 +48,7 @@ func TestNamedParamsQueryCSV(t *testing.T) {
 	// }
 
 	// 执行查询
-	result := factory.QueryPositionalToJSON(sql, params)
+	result := factory.QueryPositionalToJSON(sql, params, nil)
 
 	// 检查结果 - 根据你的错误信息，result.Error 是 string 类型
 	if err != nil { // 改成检查空字符串