mongodb测试通过-推送大版本号

factory/database/db_factory.go

@@ -9,7 +9,7 @@ import (
 	"git.x2erp.com/qdy/go-base/config/subconfigs"
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/response"
 	"git.x2erp.com/qdy/go-db/drivers"
 	"git.x2erp.com/qdy/go-db/functions"
 
@@ -149,17 +149,17 @@ func (f *DBFactory) TestConnection() error {
 // ========== 快捷操作方法 ==========
 
 // QueryToJSON 快捷查询，直接返回 JSON 字节流
-func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	return functions.QueryToJSON(f.db, sql, reqCtx)
 }
 
 // QueryPositionalToJSON 位置参数查询并返回 JSON 字节数据
-func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	return functions.QueryPositionalToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryParamsNameToJSON 命名参数查询并返回 JSON 字节数据
-func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	return functions.QueryParamsNameToJSON(f.db, sql, params, reqCtx)
 }
 

factory/mongodb/mongodb_factory.go

@@ -11,6 +11,7 @@ import (
 	"git.x2erp.com/qdy/go-base/config"
 	"git.x2erp.com/qdy/go-base/config/subconfigs"
 	"git.x2erp.com/qdy/go-base/logger"
+	"git.x2erp.com/qdy/go-base/model/response"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
@@ -201,17 +202,23 @@ func (f *MongoDBFactory) GetConfig() subconfigs.MongoDBConfig {
 // ========== 快捷操作方法（增强版） ==========
 
 // InsertOne 插入单个文档，返回是否成功
-func (f *MongoDBFactory) InsertOne(collectionName string, document interface{}) bool {
+func (f *MongoDBFactory) InsertOne(collectionName string, document interface{}) (*response.QueryResult[interface{}], error) {
 	collection := f.GetCollection(collectionName)
 	ctx, cancel := context.WithTimeout(context.Background(), f.config.GetTimeout())
 	defer cancel()
 
-	_, err := collection.InsertOne(ctx, document)
+	result, err := collection.InsertOne(ctx, document)
 	if err != nil {
 		logger.Errorf("插入文档失败，集合：%s，错误：%v", collectionName, err)
-		return false
+		return &response.QueryResult[interface{}]{
+			Success: false,
+			Error:   err.Error(),
+		}, err
 	}
-	return true
+	return &response.QueryResult[interface{}]{
+		Success: true,
+		Data:    result.InsertedID,
+	}, nil
 }
 
 // InsertOneWithResult 插入单个文档并返回结果

factory/rabbitmq/consumer_factory.go

@@ -3,13 +3,14 @@ package rabbitmq
 import (
 	"fmt"
 
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
 	amqp "github.com/streadway/amqp"
 )
 
 // MessageHandler 消息处理器接口
 type MessageHandler interface {
-	Process(ueueRequest *types.QueueRequest, body []byte) types.QueryResult[interface{}]
+	Process(ueueRequest *request.QueueRequest, body []byte) response.QueryResult[interface{}]
 }
 
 // Consumer 消费者结构体
@@ -17,12 +18,12 @@ type Consumer struct {
 	Channel      *amqp.Channel
 	QueueName    string
 	Handler      MessageHandler
-	QueueRequest *types.QueueRequest
+	QueueRequest *request.QueueRequest
 }
 
 // CreateConsumer 创建消费者
 // 返回Consumer对象，创建后自动开始消费
-func (f *RabbitMQFactory) CreateConsumer(queueRequest *types.QueueRequest, consumerID string, handler MessageHandler) (*Consumer, error) {
+func (f *RabbitMQFactory) CreateConsumer(queueRequest *request.QueueRequest, consumerID string, handler MessageHandler) (*Consumer, error) {
 	// 生成唯一的通道名称
 	channelName := fmt.Sprintf("%s_%s", queueRequest.QueueName, consumerID)
 

functions/query_json.go

@@ -6,12 +6,12 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/ctx"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/response"
 	"github.com/jmoiron/sqlx"
 )
 
 // QueryParamsNameToJSON 执行带命名参数的查询
-func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	if sql == "" {
@@ -37,7 +37,7 @@ func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{
 }
 
 // QueryPositionalToJSON 执行带位置参数的查询
-func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	//fmt.Printf("positionalParams: %s", params)
@@ -58,7 +58,7 @@ func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx
 }
 
 // QueryToJSON 执行无参数的查询
-func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	if sql == "" {
@@ -77,9 +77,9 @@ func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.Que
 }
 
 // processQueryResult 处理查询结果（公共部分）
-func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult[[]map[string]interface{}] {
+func processQueryResult(rows *sql.Rows, startTime time.Time) *response.QueryResult[[]map[string]interface{}] {
 
-	result := &types.QueryResult[[]map[string]interface{}]{}
+	result := &response.QueryResult[[]map[string]interface{}]{}
 	// 获取列信息
 	columns, err := rows.Columns()
 	if err != nil {
@@ -133,8 +133,8 @@ func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult[
 }
 
 // createErrorResult 创建错误结果的辅助函数
-func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
-	return &types.QueryResult[[]map[string]interface{}]{
+func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}] {
+	return &response.QueryResult[[]map[string]interface{}]{
 		Success:  false,
 		Error:    errorMsg,
 		Time:     time.Since(startTime).String(),

go.mod

@@ -4,11 +4,12 @@ module git.x2erp.com/qdy/go-db
 go 1.25.4
 
 require (
-	git.x2erp.com/qdy/go-base v0.1.51
+	git.x2erp.com/qdy/go-base v0.1.12-20251231-1
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/lib/pq v1.10.9
 	github.com/microsoft/go-mssqldb v1.9.4
 	github.com/sijms/go-ora/v2 v2.9.0
+	go.uber.org/zap v1.27.1
 )
 
 require (
@@ -21,8 +22,10 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

go.sum

@@ -1,8 +1,7 @@
 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.51/go.mod h1:IYkjIY0xiqPKIOBojsR9miER2ceyly6+iwv4Zd64OT0=
-git.x2erp.com/qdy/go-base v0.1.60 h1:eGexgp8fUNMBmecpR7pelNsvr8ujYFZf1phLNFlGjVE=
-git.x2erp.com/qdy/go-base v0.1.60/go.mod h1:IYkjIY0xiqPKIOBojsR9miER2ceyly6+iwv4Zd64OT0=
+git.x2erp.com/qdy/go-base v0.1.12-20251231-1 h1:xcEdI8zKVNJA50e6Q3fACD3qJH6HAORZyejnvkz2n/I=
+git.x2erp.com/qdy/go-base v0.1.12-20251231-1/go.mod h1:bhbWJO4/dxNNjXjie1E0G41pvKEEm2dPnRXRzYnV9tU=
 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=
@@ -21,8 +20,8 @@ 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/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 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-resty/resty/v2 v2.17.0 h1:pW9DeXcaL4Rrym4EZ8v7L19zZiIlWPg5YXAcVmt+gN0=
@@ -38,12 +37,18 @@ github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
 github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 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/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
@@ -54,8 +59,8 @@ github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j7
 github.com/microsoft/go-mssqldb v1.9.4/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
-github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
@@ -64,12 +69,14 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
 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/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 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/streadway/amqp v1.1.0 h1:py12iX8XSyI7aN/3dUT8DFIDJazNJsVJdxNVEpnQTZM=
 github.com/streadway/amqp v1.1.0/go.mod h1:WYSrTEYHOXHd0nwFeUXAe2G2hRnQT+deZJJf88uS9Bg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+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/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -81,6 +88,12 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfS
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
 go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
@@ -116,8 +129,11 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

myhandle/query_handler_bytes.go → util/query_handler_bytes.go

@@ -1,4 +1,4 @@
-package myhandle
+package util
 
 import (
 	"encoding/json"

myhandle/query_handler_json.go → util/query_handler_json.go

@@ -1,4 +1,4 @@
-package myhandle
+package util
 
 import (
 	"encoding/json"
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/ctx"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/response"
 )
 
 // queryHandler - 最简单的版本
@@ -14,14 +14,14 @@ func QueryHandlerJson[T any, F any](
 	w http.ResponseWriter,
 	r *http.Request,
 	factory F,
-	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}],
+	handlerFunc func(F, T, *ctx.RequestContext) *response.QueryResult[[]map[string]interface{}],
 ) {
 	// 解析请求参数
 	var req T
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		// 如果解析失败，也返回 QueryResult 格式
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(&types.QueryResult[[]map[string]interface{}]{
+		json.NewEncoder(w).Encode(&response.QueryResult[[]map[string]interface{}]{
 			Success: false,
 			Error:   "Invalid request body: " + err.Error(),
 			Time:    time.Now().Format(time.RFC3339),

myhandle/query_handler_map.go → util/query_handler_map.go

@@ -1,4 +1,4 @@
-package myhandle
+package util
 
 import (
 	"encoding/json"
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"git.x2erp.com/qdy/go-base/ctx"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/response"
 )
 
 // queryHandler - 最简单的版本
@@ -14,14 +14,14 @@ func QueryHandlerMap[T any, F any](
 	w http.ResponseWriter,
 	r *http.Request,
 	factory F,
-	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult[map[string]interface{}],
+	handlerFunc func(F, T, *ctx.RequestContext) *response.QueryResult[map[string]interface{}],
 ) {
 	// 解析请求参数
 	var req T
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		// 如果解析失败，也返回 QueryResult 格式
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(&types.QueryResult[[]map[string]interface{}]{
+		json.NewEncoder(w).Encode(&response.QueryResult[[]map[string]interface{}]{
 			Success: false,
 			Error:   "Invalid request body: " + err.Error(),
 			Time:    time.Now().Format(time.RFC3339),