修改日志输出格式

factory/database/db_factory.go

@@ -2,9 +2,11 @@ package database
 
 import (
 	"fmt"
+	"log"
 	"sync"
 
 	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/drivers"
 	"git.x2erp.com/qdy/go-db/functions"
@@ -28,10 +30,10 @@ func GetDBFactory() (*DBFactory, error) {
 
 	once.Do(func() {
 		// 使用配置单例
-		cfg := config.GetConfig()
+		cfg, err := config.GetConfig()
 
 		// 检查配置初始化是否有错误
-		if err := config.GetInitError(); err != nil {
+		if err != nil {
 			initErr = fmt.Errorf("failed to load config: %v", err)
 			return
 		}
@@ -44,7 +46,7 @@ func GetDBFactory() (*DBFactory, error) {
 
 		// 显示所支持的数据库驱动
 		driversStr := drivers.GetAllDrivers()
-		fmt.Printf("Available database drivers: %v\n", driversStr)
+		log.Printf("Available database drivers: %v\n", driversStr)
 
 		dbConfig := cfg.GetDatabase()
 		dbType := dbConfig.Type
@@ -91,7 +93,7 @@ func GetDBFactory() (*DBFactory, error) {
 		return nil, initErr
 	}
 
-	fmt.Print(msg)
+	log.Print(msg)
 
 	return instanceDBFactory, nil
 }
@@ -106,7 +108,7 @@ func (f *DBFactory) Close() error {
 	if f.db != nil {
 		err := f.db.Close()
 		f.db = nil
-		fmt.Println("Database connection closed gracefully")
+		log.Println("Database connection closed gracefully")
 		return err
 	}
 	return nil
@@ -114,45 +116,44 @@ func (f *DBFactory) Close() error {
 
 // GetDBType 得到当前使用数据库类型
 func (f *DBFactory) GetDBType() string {
-	cfg := config.GetConfig()
-	dbConfig := cfg.GetDatabase()
+	dbConfig := config.GetDatabase()
 	return dbConfig.Type
 }
 
 // QueryToJSON 快捷查询，直接返回 JSON 字节流
-func (f *DBFactory) QueryToJSON(sql string) *types.QueryResult {
-	return functions.QueryToJSON(f.db, sql)
+func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *types.QueryResult {
+	return functions.QueryToJSON(f.db, sql, reqCtx)
 }
 
 // QueryParamsToJSON 位置参数查询并返回 JSON 字节数据
-func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}) *types.QueryResult {
+func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
 
-	return functions.QueryPositionalToJSON(f.db, sql, params)
+	return functions.QueryPositionalToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryParamsNameToJSON 命名参数查询并返回 JSON 字节数据
 // params 可以是 map[string]interface{} 或结构体
-func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}) *types.QueryResult {
+func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
 
-	return functions.QueryParamsNameToJSON(f.db, sql, params)
+	return functions.QueryParamsNameToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryToCSV 快捷查询，直接返回 CSV 字符串（包含表头）
-func (f *DBFactory) QueryToCSV(sql string, writerHeader bool) ([]byte, error) {
-	return functions.QueryToCSV(f.db, sql, writerHeader)
+func (f *DBFactory) QueryToCSV(sql string, writerHeader bool, reqCtx *ctx.RequestContext) ([]byte, error) {
+	return functions.QueryToCSV(f.db, sql, writerHeader, reqCtx)
 }
 
 // QueryParamsToCSV 位置参数查询并返回 CSV 字节数据
-func (f *DBFactory) QueryPositionalToCSV(sql string, writerHeader bool, params []interface{}) ([]byte, error) {
+func (f *DBFactory) QueryPositionalToCSV(sql string, writerHeader bool, params []interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
 
-	return functions.QueryPositionalToCSV(f.db, sql, writerHeader, params)
+	return functions.QueryPositionalToCSV(f.db, sql, writerHeader, params, reqCtx)
 }
 
 // QueryParamsNameToCSV 命名参数查询并返回 CSV 字节数据
 // params 可以是 map[string]interface{} 或结构体
-func (f *DBFactory) QueryParamsNameToCSV(sql string, writerHeader bool, params map[string]interface{}) ([]byte, error) {
+func (f *DBFactory) QueryParamsNameToCSV(sql string, writerHeader bool, params map[string]interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
 
-	return functions.QueryParamsNameToCSV(f.db, sql, writerHeader, params)
+	return functions.QueryParamsNameToCSV(f.db, sql, writerHeader, params, reqCtx)
 }
 
 // ExecuteDDL 快捷执行DDL语句

factory/doris/doris_factory.go

@@ -33,9 +33,9 @@ var (
 func GetDorisFactory(httpFactory *http.HTTPFactory) (*DorisFactory, error) {
 	var initErr error
 	instanceOnce.Do(func() {
-		cfg := config.GetConfig()
+		cfg, err := config.GetConfig()
 
-		if err := config.GetInitError(); err != nil {
+		if err != nil {
 			initErr = fmt.Errorf("failed to load config: %v", err)
 			return
 		}

factory/http/http_factory.go

@@ -31,9 +31,9 @@ var (
 // GetHTTPFactory 获取HTTP工厂单例实例
 func GetHTTPFactory() (*HTTPFactory, error) {
 	httpFactoryOnce.Do(func() {
-		cfg := config.GetConfig()
+		cfg, err := config.GetConfig()
 
-		if err := config.GetInitError(); err != nil {
+		if err != nil {
 			httpFactoryInitErr = fmt.Errorf("failed to load config: %v", err)
 			return
 		}

factory/rabbitmq/rabbitmq_factory.go

@@ -20,9 +20,9 @@ type RabbitMQFactory struct {
 
 // NewRabbitMQFactory 创建RabbitMQ工厂
 func NewRabbitMQFactory() (*RabbitMQFactory, error) {
-	cfg := config.GetConfig()
+	cfg, err := config.GetConfig()
 
-	if err := config.GetInitError(); err != nil {
+	if err != nil {
 		return nil, fmt.Errorf("failed to load config: %v", err)
 	}
 

factory/redis/redis_factory.go

@@ -18,9 +18,9 @@ type RedisFactory struct {
 
 // NewRedisFactory 创建Redis客户端工厂
 func NewRedisFactory() (*RedisFactory, error) {
-	cfg := config.GetConfig()
+	cfg, err := config.GetConfig()
 
-	if err := config.GetInitError(); err != nil {
+	if err != nil {
 		return nil, fmt.Errorf("failed to load config: %v", err)
 	}
 

functions/query_csv.go

@@ -6,11 +6,12 @@ import (
 	"fmt"
 	"strings"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"github.com/jmoiron/sqlx"
 )
 
 // QueryToCSV 无参数查询并返回 CSV 字节数据
-func QueryToCSV(db *sqlx.DB, sql string, writerHeader bool) ([]byte, error) {
+func QueryToCSV(db *sqlx.DB, sql string, writerHeader bool, reqCtx *ctx.RequestContext) ([]byte, error) {
 	if sql == "" {
 		return nil, fmt.Errorf("SQL query cannot be empty")
 	}
@@ -24,7 +25,7 @@ func QueryToCSV(db *sqlx.DB, sql string, writerHeader bool) ([]byte, error) {
 }
 
 // QueryParamsToCSV 位置参数查询并返回 CSV 字节数据
-func QueryPositionalToCSV(db *sqlx.DB, sql string, writerHeader bool, params []interface{}) ([]byte, error) {
+func QueryPositionalToCSV(db *sqlx.DB, sql string, writerHeader bool, params []interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
 	if sql == "" {
 		return nil, fmt.Errorf("SQL query cannot be empty")
 	}
@@ -39,7 +40,7 @@ func QueryPositionalToCSV(db *sqlx.DB, sql string, writerHeader bool, params []i
 
 // QueryParamsNameToCSV 命名参数查询并返回 CSV 字节数据
 // params 可以是 map[string]interface{} 或结构体
-func QueryParamsNameToCSV(db *sqlx.DB, sql string, writerHeader bool, params map[string]interface{}) ([]byte, error) {
+func QueryParamsNameToCSV(db *sqlx.DB, sql string, writerHeader bool, params map[string]interface{}, reqCtx *ctx.RequestContext) ([]byte, error) {
 	if sql == "" {
 		return nil, fmt.Errorf("SQL query cannot be empty")
 	}

functions/query_json.go

@@ -6,29 +6,30 @@ import (
 	"fmt"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"github.com/jmoiron/sqlx"
 )
 
 // QueryParamsNameToJSON 执行带命名参数的查询
-func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}) *types.QueryResult {
+func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
 	startTime := time.Now()
 
 	if sql == "" {
-		return createErrorResult("SQL query cannot be empty", startTime)
+		return createErrorResult("SQL query cannot be empty", startTime, reqCtx)
 	}
 
 	// 处理命名参数
 	query, args, err := sqlx.Named(sql, params)
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Failed to process named parameters: %v", err), startTime)
+		return createErrorResult(fmt.Sprintf("Failed to process named parameters: %v", err), startTime, reqCtx)
 	}
 
 	// 执行查询
 	rows, err := db.Query(sqlx.Rebind(sqlx.DOLLAR, query), args...)
 	//rows, err := sqlx.NamedQuery(db, sql, params)
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime)
+		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
 	}
 	defer rows.Close()
 
@@ -37,19 +38,19 @@ func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{
 }
 
 // QueryPositionalToJSON 执行带位置参数的查询
-func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}) *types.QueryResult {
+func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
 	startTime := time.Now()
 
 	//fmt.Printf("positionalParams: %s", params)
 	//fmt.Printf("sql: %s", sql)
 	if sql == "" {
-		return createErrorResult("SQL query cannot be empty", startTime)
+		return createErrorResult("SQL query cannot be empty", startTime, reqCtx)
 	}
 
 	// 执行查询
 	rows, err := db.Query(sql, params...)
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime)
+		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
 	}
 	defer rows.Close()
 
@@ -58,17 +59,17 @@ func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}) *types
 }
 
 // QueryToJSON 执行无参数的查询
-func QueryToJSON(db *sqlx.DB, sql string) *types.QueryResult {
+func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.QueryResult {
 	startTime := time.Now()
 
 	if sql == "" {
-		return createErrorResult("SQL query cannot be empty", startTime)
+		return createErrorResult("SQL query cannot be empty", startTime, reqCtx)
 	}
 
 	// 执行查询
 	rows, err := db.Query(sql)
 	if err != nil {
-		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime)
+		return createErrorResult(fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
 	}
 	defer rows.Close()
 
@@ -146,10 +147,11 @@ func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult
 }
 
 // createErrorResult 创建错误结果的辅助函数
-func createErrorResult(errorMsg string, startTime time.Time) *types.QueryResult {
+func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult {
 	return &types.QueryResult{
-		Success: false,
-		Error:   errorMsg,
-		Time:    time.Since(startTime).String(),
+		Success:  false,
+		Error:    errorMsg,
+		Time:     time.Since(startTime).String(),
+		Metadata: reqCtx,
 	}
 }

functions/testConnection.go

@@ -2,6 +2,7 @@ package functions
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/jmoiron/sqlx"
 )
@@ -28,6 +29,6 @@ func TestConnection(db *sqlx.DB, dbType string) error {
 		return fmt.Errorf("unexpected test result: %d", result)
 	}
 
-	fmt.Println("test Connection  database is success.")
+	log.Println("test Connection  database is success.")
 	return nil
 }

myhandle/query_handler_bytes.go

@@ -3,6 +3,8 @@ package myhandle
 import (
 	"encoding/json"
 	"net/http"
+
+	"git.x2erp.com/qdy/go-base/ctx"
 )
 
 // 最简单的 queryHandler，只处理 []byte 返回
@@ -10,7 +12,7 @@ func QueryHandlerBytes[T any, F any](
 	w http.ResponseWriter,
 	r *http.Request,
 	factory F,
-	handlerFunc func(F, T) []byte,
+	handlerFunc func(F, T, *ctx.RequestContext) []byte,
 ) {
 	// 解析请求参数
 	var req T
@@ -24,7 +26,7 @@ func QueryHandlerBytes[T any, F any](
 	}
 
 	// 调用业务逻辑函数
-	csvData := handlerFunc(factory, req)
+	csvData := handlerFunc(factory, req, ctx.GetContext(r))
 
 	// 直接返回 CSV 数据（包含错误信息时也会被正确处理）
 	w.Header().Set("Content-Type", "text/csv")

myhandle/query_handler_json.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 )
 
@@ -13,7 +14,7 @@ func QueryHandlerJson[T any, F any](
 	w http.ResponseWriter,
 	r *http.Request,
 	factory F,
-	handlerFunc func(F, T) *types.QueryResult,
+	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult,
 ) {
 	// 解析请求参数
 	var req T
@@ -29,7 +30,7 @@ func QueryHandlerJson[T any, F any](
 	}
 
 	// 执行业务逻辑
-	result := handlerFunc(factory, req)
+	result := handlerFunc(factory, req, ctx.GetContext(r))
 
 	// 设置头，写入结果
 	w.Header().Set("Content-Type", "application/json")

test.go

@@ -11,7 +11,13 @@ import (
 func main() {
 
 	// 显示当前使用的数据库配置
-	config := config.GetConfig()
+	config, err := config.GetConfig()
+	if err != nil {
+		log.Fatalf("failed to load config: %v", err)
+
+		return
+	}
+
 	dbConfig := config.GetDatabase() // 通过接口方法获取数据库配置
 	fmt.Printf("Using database type: %s\n", dbConfig.Type)
 	fmt.Printf("Database host: %s:%d\n", dbConfig.Host, dbConfig.Port)