修复排序逻辑BUG

Reviewed-on: #8

api2sql/execute.go

@@ -69,32 +69,16 @@ func (e *execute) Run(ctx context.Context, inputParam *define.Api2SqlParam) (any
 	}
 }
 
-// List 方法用于从数据库中查询数据列表。
+// List 列表
-//
-//	参数:
-//	- ctx: 上下文对象，用于传递请求的上下文信息。
-//	- inputParam: 查询参数，包含 SQL 语句、列列表等信息。
-//
-//	返回值:
-//	- any: 查询结果，返回一个结构体切片，其中包含查询到的数据。
-//	- error: 错误信息，如果查询过程中发生错误，将返回相应的错误对象。
-//
-//	使用示例:
-//	result, err := e.List(ctx, inputParam)
-//	if err!= nil {
-//		// 处理错误
-//	}
-//	// 处理查询结果
 //
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 20:52 2024/8/21
-func (e *execute) List(ctx context.Context, inputParam *define.Api2SqlParam) ([]map[string]any, error) {
+func (e *execute) List(ctx context.Context, inputParam *define.Api2SqlParam) (any, error) {
 	var (
 		err        error
 		tx         *gorm.DB
 		optionList []define.SetOption
-		val        []map[string]any
 	)
 	if tx, err = e.getTx(ctx, inputParam); nil != err {
 		return nil, err
@@ -102,44 +86,42 @@ func (e *execute) List(ctx context.Context, inputParam *define.Api2SqlParam) ([]
 	if optionList, err = e.getOptionList(ctx, inputParam); nil != err {
 		return nil, err
 	}
+	// 动态生成结果解析结构体
+	st := wrapper.NewDynamic()
+	for _, columnConfig := range inputParam.ColumnList {
+		tag := fmt.Sprintf(`gorm:"%v" json:"%v"`, columnConfig.Column, columnConfig.Alias)
+		column := wrapper.String(columnConfig.Column).SnakeCaseToCamel()
+		switch columnConfig.Type {
+		case "int", "int8", "int16", "int32", "int64":
+			st.AddInt(column, tag, "")
+		case "uint", "uint8", "uint16", "uint32", "uint64":
+			st.AddUint(column, tag, "")
+		case "bool":
+			st.AddBool(column, tag, "")
+		case "float":
+			st.AddBool(column, tag, "")
+		case "string":
+			st.AddString(column, tag, "")
+		case "map":
+			st.AddMap(column, tag, "")
+		case "slice":
+			st.AddSlice(column, tag, "")
+		}
+	}
+	val := st.ToStructDefaultSliceValue()
 	if err = e.baseDao.List(tx, &val, optionList...); nil != err {
 		return nil, err
 	}
 	return val, nil
 }
 
-// Detail 方法用于获取单个数据的详细信息。
+// Detail 详情
-// 它接受一个上下文对象 ctx 和一个指向输入参数结构体 Api2SqlParam 的指针 inputParam。
-// 首先，它会将 inputParam 的 Limit 属性设置为 1，以限制查询结果为一条记录。
-// 然后，它会调用 e.List 方法来执行查询操作，并将结果存储在 res 变量中。
-// 如果查询过程中发生错误，它会将错误返回。
-// 如果查询成功但结果集为空，它会返回一个错误，表示未找到记录。
-// 如果查询成功且结果集不为空，它会返回结果集中的第一条记录。
-//
-// 参数 :
-//   - ctx : 上下文对象，用于传递请求的上下文信息。
-//   - inputParam : 查询参数，包含了查询所需的条件和限制。
-//
-// 返回值 :
-//   - 返回查询到的单个数据的详细信息
-//   - 如果未找到数据则返回错误
 //
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 20:52 2024/8/21
 func (e *execute) Detail(ctx context.Context, inputParam *define.Api2SqlParam) (any, error) {
-	inputParam.Limit = 1 // 限制查询一条
+	return nil, nil
-	var (
-		list []map[string]any
-		err  error
-	)
-	if list, err = e.List(ctx, inputParam); nil != err {
-		return nil, err
-	}
-	if len(list) == 0 {
-		return nil, gorm.ErrRecordNotFound
-	}
-	return list[0], nil
 }
 
 // Insert 插入
@@ -148,23 +130,7 @@ func (e *execute) Detail(ctx context.Context, inputParam *define.Api2SqlParam) (
 //
 // Date : 20:52 2024/8/21
 func (e *execute) Insert(ctx context.Context, inputParam *define.Api2SqlParam) (any, error) {
-	var (
+	return nil, nil
-		err error
-		tx  *gorm.DB
-	)
-
-	if tx, err = e.getTx(ctx, inputParam); nil != err {
-		return nil, err
-	}
-	// 动态生成结果解析结构体
-	insertVal := map[string]any{}
-	for _, itemColumn := range inputParam.ConditionList {
-		insertVal[itemColumn.Column] = itemColumn.Value
-	}
-	if err = e.baseDao.Create(tx, &insertVal, database.WithTable(inputParam.Table)); nil != err {
-		return nil, err
-	}
-	return insertVal, nil
 }
 
 // Update 更新
@@ -313,33 +279,3 @@ func (e *execute) getOptionList(ctx context.Context, inputParam *define.Api2SqlP
 	}
 	return optionList, nil
 }
-
-// dynamicGenerateStruct 生成动态结构体
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 14:19 2024/8/30
-func (e *execute) dynamicGenerateStruct(columnList []*define.ColumnConfig) *wrapper.DynamicStruct {
-	st := wrapper.NewDynamic()
-	for _, columnConfig := range columnList {
-		tag := fmt.Sprintf(`%v`, columnConfig.Alias)
-		column := wrapper.String(columnConfig.Column).SnakeCaseToCamel()
-		switch columnConfig.Type {
-		case "int", "int8", "int16", "int32", "int64":
-			st.AddInt(column, tag, "")
-		case "uint", "uint8", "uint16", "uint32", "uint64":
-			st.AddUint(column, tag, "")
-		case "bool":
-			st.AddBool(column, tag, "")
-		case "float":
-			st.AddBool(column, tag, "")
-		case "string":
-			st.AddString(column, tag, "")
-		case "map":
-			st.AddMap(column, tag, "")
-		case "slice":
-			st.AddSlice(column, tag, "")
-		}
-	}
-	return st
-}

api2sql/execute_test.go

@@ -14,11 +14,11 @@ import (
 	"git.zhangdeman.cn/zhangdeman/consts"
 	"git.zhangdeman.cn/zhangdeman/database"
 	"git.zhangdeman.cn/zhangdeman/database/define"
+	"reflect"
 	"testing"
-	"time"
 )
 
-func startTest() {
+func Test_execute_Run(t *testing.T) {
 	clientManager := database.NewWrapperClient()
 	if err := clientManager.AddWithConfig("TEST_DATABASE", nil, &define.Database{
 		Master: &define.Driver{
@@ -44,10 +44,6 @@ func startTest() {
 		},
 	})
 	Exec.SetDatabaseClientManager(clientManager)
-}
-
-func Test_execute_List(t *testing.T) {
-	startTest()
 	res, err := Exec.List(context.Background(), &define.Api2SqlParam{
 		DatabaseFlag:     "TEST_DATABASE",
 		Table:            "project",
@@ -61,11 +57,6 @@ func Test_execute_List(t *testing.T) {
 				Alias:  "project_flag",
 				Type:   "string",
 			},
-			&define.ColumnConfig{
-				Column: "connect_timeout",
-				Alias:  "timeout",
-				Type:   "string",
-			},
 		},
 		Limit:             0,
 		Offset:            0,
@@ -78,86 +69,6 @@ func Test_execute_List(t *testing.T) {
 		Tx:                nil,
 	})
 	byteData, _ := json.Marshal(res)
-	fmt.Println(string(byteData), err)
+	tt := reflect.TypeOf(res)
-}
+	fmt.Println(tt.String(), res, err, string(byteData))
-
-func Test_execute_Detail(t *testing.T) {
-	startTest()
-	res, err := Exec.Detail(context.Background(), &define.Api2SqlParam{
-		DatabaseFlag:     "TEST_DATABASE",
-		Table:            "project",
-		ForceMaster:      false,
-		InputSql:         "",
-		TableSplitConfig: define.TableSplitConfig{},
-		SqlType:          consts.SqlTypeList,
-		ColumnList: []*define.ColumnConfig{
-			&define.ColumnConfig{
-				Column: "flag",
-				Alias:  "project_flag",
-				Type:   "string",
-			},
-			&define.ColumnConfig{
-				Column: "description",
-				Alias:  "desc",
-				Type:   "string",
-			},
-		},
-		Limit:             0,
-		Offset:            0,
-		ForceNoLimit:      false,
-		OrderField:        "id",
-		OrderRule:         "desc",
-		WithCount:         false,
-		ConditionList:     nil,
-		TableColumnConfig: nil,
-		Tx:                nil,
-	})
-	byteData, _ := json.Marshal(res)
-	fmt.Println(res, err, string(byteData))
-}
-
-func Test_execute_Insert(t *testing.T) {
-	startTest()
-	res, err := Exec.Insert(context.Background(), &define.Api2SqlParam{
-		DatabaseFlag:     "TEST_DATABASE",
-		Table:            "project",
-		ForceMaster:      false,
-		InputSql:         "",
-		TableSplitConfig: define.TableSplitConfig{},
-		SqlType:          consts.SqlTypeList,
-		ColumnList: []*define.ColumnConfig{
-			&define.ColumnConfig{
-				Column: "flag",
-				Alias:  "project_flag",
-				Type:   "string",
-			},
-			&define.ColumnConfig{
-				Column: "description",
-				Alias:  "desc",
-				Type:   "string",
-			},
-		},
-		Limit:        0,
-		Offset:       0,
-		ForceNoLimit: false,
-		OrderField:   "id",
-		OrderRule:    "desc",
-		WithCount:    false,
-		ConditionList: []define.SqlCondition{
-			define.SqlCondition{
-				Column:  "flag",
-				Operate: "",
-				Value:   fmt.Sprintf("unit_test_flag_%v", time.Now().Unix()),
-			},
-			define.SqlCondition{
-				Column:  "description",
-				Operate: "",
-				Value:   "单元测试生成项目",
-			},
-		},
-		TableColumnConfig: nil,
-		Tx:                nil,
-	})
-	byteData, _ := json.Marshal(res)
-	fmt.Println(res, err, string(byteData))
 }

base.go

@@ -240,6 +240,10 @@ func (b *BaseDao) setTxCondition(tx *gorm.DB, optionFuncList ...define.SetOption
 		}
 	}
 
+	if len(o.Where) > 0 {
+		tx = tx.Where(o.Where)
+	}
+
 	// between
 	for field, betweenVal := range o.Between {
 		tx = tx.Where("`"+field+"` BETWEEN ? AND ?", betweenVal[0], betweenVal[1])
@@ -250,8 +254,8 @@ func (b *BaseDao) setTxCondition(tx *gorm.DB, optionFuncList ...define.SetOption
 	}
 
 	// 排序
-	for _, orderRule := range o.Order {
+	if len(o.Order) == 2 {
-		tx = tx.Order(orderRule)
+		tx = tx.Order(o.Order[0] + " " + o.Order[1])
 	}
 
 	// or 语句

define/api2sql.go

@@ -44,7 +44,6 @@ type Api2SqlParam struct {
 	WithCount         bool             `json:"with_count"`          // 是否返回数据总量, 仅 sqlType = list 生效
 	ConditionList     []SqlCondition   `json:"value_list"`          // 字段列表
 	TableColumnConfig []*ColumnConfig  `json:"table_column_config"` // 表字段配置
-	UpdateData        map[string]any   `json:"update_data"`         // 要更新的数据, 仅对 update语句有效
 	Tx                *gorm.DB         `json:"-"`                   // 前后已有的数据库连接, 直接复用
 }
 

go.mod

@@ -1,8 +1,8 @@
 module git.zhangdeman.cn/zhangdeman/database
 
-go 1.21.0
+go 1.21
 
-toolchain go1.23.0
+toolchain go1.21.3
 
 require (
 	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240823041145-d4df71cf37e5
@@ -28,7 +28,7 @@ require (
 	git.zhangdeman.cn/zhangdeman/websocket v0.0.0-20240723075210-85feada512b2 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 // indirect
-	github.com/bytedance/sonic v1.12.2 // indirect
+	github.com/bytedance/sonic v1.12.1 // indirect
 	github.com/bytedance/sonic/loader v0.2.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
@@ -49,15 +49,15 @@ require (
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
-	github.com/lestrrat-go/strftime v1.1.0 // indirect
+	github.com/lestrrat-go/strftime v1.0.6 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.23 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mozillazg/go-pinyin v0.20.0 // indirect
 	github.com/mssola/user_agent v0.6.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tidwall/gjson v1.17.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
@@ -65,11 +65,11 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.10.0 // indirect
+	golang.org/x/arch v0.9.0 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 // indirect

go.sum

@@ -1,11 +1,19 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240726024939-e424db29c5c4 h1:mibnyzYbZullK0aTHVASHl3UeoVr8IgytQZsuyv+yEM=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240726024939-e424db29c5c4/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240817091513-491f455a23c0 h1:U12XDtyRrmsqb/wRvRZG9+SBKMCGFNADpiLogsp5POw=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240817091513-491f455a23c0/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240821082758-8bf75bab08fb h1:dNnVYynCQhLSbtNUVQsvDIthkNgpTrAJF4dAEj08FdE=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240821082758-8bf75bab08fb/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240823041145-d4df71cf37e5 h1:pmIHln0gWW+5xAB762h3WDsRkZuYLUDndvJDsGMKoOY=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240823041145-d4df71cf37e5/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230731062340-983985c12eda h1:bMD6r9gjRy7cO+T4zRQVYAesgIblBdTnhzT1vN5wjvI=
 git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230731062340-983985c12eda/go.mod h1:dT0rmHcJ9Z9IqWeMIt7YzR88nKkNV2V3dfG0j9Q6lK0=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240311030808-e2a2e6a3c211 h1:I/wOsRpCSRkU9vo1u703slQsmK0wnNeZzsWQOGtIAG0=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240311030808-e2a2e6a3c211/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
+git.zhangdeman.cn/zhangdeman/gin v0.0.0-20240726061047-9b7e714b2932 h1:4UoCcCoTAFmS624lypM0D0Wlb4Q5Ru1saodR8Kj/gCg=
+git.zhangdeman.cn/zhangdeman/gin v0.0.0-20240726061047-9b7e714b2932/go.mod h1:CTcgmcDky34SS+KQvEt/RQgszyTVdNa9VZumGvN7Oqk=
 git.zhangdeman.cn/zhangdeman/gin v0.0.0-20240817122134-195e39123512 h1:j+zH8gl4aEg24GWCutddnH5hw4eAuFJLW6vvJUJiJpM=
 git.zhangdeman.cn/zhangdeman/gin v0.0.0-20240817122134-195e39123512/go.mod h1:twDDFXzPJ56qfAG1ZtPhvwXmtZG+aRlk2dnnjufh/hs=
 git.zhangdeman.cn/zhangdeman/logger v0.0.0-20240725055115-98eb52ae307a h1:22VkxGmpS58zHA8tf75lPr/3S6hmHKP00w/jUa700Ps=
@@ -20,14 +28,20 @@ git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e h1:Q973S6Cc
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI=
 git.zhangdeman.cn/zhangdeman/websocket v0.0.0-20240723075210-85feada512b2 h1:P2kuhU2TFWk9mPbJlZCK6FMDVS7S3NGafWKD4eNqKiI=
 git.zhangdeman.cn/zhangdeman/websocket v0.0.0-20240723075210-85feada512b2/go.mod h1:7KaMpQmWgiNLpEkaV7oDtep7geI1f/VoCoPVcyvMjAE=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240806072320-3533617196fd h1:zcmfmp/1srHldFpa7BCH6Cpp9iVNFM/7W7DoxHp48UU=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240806072320-3533617196fd/go.mod h1:gnaF3v9/om6gaxFKeNVuKeFTYM61gHyW7vign7vrwyo=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240813083016-da44ae07ab9b h1:CcO2t7ssBSZwE7BDTOkCSgOvTGATarOZ0tajZ00McEc=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240813083016-da44ae07ab9b/go.mod h1:gnaF3v9/om6gaxFKeNVuKeFTYM61gHyW7vign7vrwyo=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240821101656-59ba4ebfa5c5 h1:+P+7IDkfOYII4K7BaPiZhnzYgPpJ7mv2hhUSZcxCWiI=
+git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240821101656-59ba4ebfa5c5/go.mod h1:KcojKP22mv9/IZrQWlIBfa1EuBxtEOqfWMgN3SYK2N8=
 git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240823103024-c38d16dc28d3 h1:RcWNxrHmhZksZWrP/HLEwAM8uIIHYlPLQ20HnLzC+j0=
 git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20240823103024-c38d16dc28d3/go.mod h1:KcojKP22mv9/IZrQWlIBfa1EuBxtEOqfWMgN3SYK2N8=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 h1:OYA+5W64v3OgClL+IrOD63t4i/RW7RqrAVl9LTZ9UqQ=
 github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394/go.mod h1:Q8n74mJTIgjX4RBBcHnJ05h//6/k6foqmgE45jTQtxg=
-github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg=
+github.com/bytedance/sonic v1.12.1 h1:jWl5Qz1fy7X1ioY74WqO0KjAMtAGQs4sYnjiEBiyX24=
-github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
+github.com/bytedance/sonic v1.12.1/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
 github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -38,6 +52,7 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ
 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/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbYd8tQGRWacE9kU=
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4=
 github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
@@ -84,16 +99,14 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.1.0 h1:gMESpZy44/4pXLO/m+sL0yBd1W6LjgjrrD4a68Gapyg=
+github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
-github.com/lestrrat-go/strftime v1.1.0/go.mod h1:uzeIB52CeUJenCo1syghlugshMysrqUT51HlxphXVeI=
+github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
 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/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -103,8 +116,8 @@ github.com/mozillazg/go-pinyin v0.20.0 h1:BtR3DsxpApHfKReaPO1fCqF4pThRwH9uwvXzm+
 github.com/mozillazg/go-pinyin v0.20.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
 github.com/mssola/user_agent v0.6.0 h1:uwPR4rtWlCHRFyyP9u2KOV0u8iQXmS7Z7feTrstQwk4=
 github.com/mssola/user_agent v0.6.0/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -114,11 +127,13 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 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/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
@@ -140,18 +155,18 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
+golang.org/x/arch v0.9.0 h1:ub9TgUInamJ8mrZIGlBG6/4TqWeMszd4N8lNorbrr6k=
-golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.9.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=