upgrade: update go mod

Reviewed-on: #9

any.go

@@ -87,7 +87,7 @@ func (at *AnyType) Type() consts.DataType {
 	case reflect.Bool:
 		return consts.DataTypeBool
 	case reflect.Float32, reflect.Float64:
-		return consts.DataTypeFloat
+		return consts.DataTypeFloat64
 	default:
 		return consts.DataTypeUnknown
 	}
@@ -116,7 +116,7 @@ func (at *AnyType) ToString() String {
 		return String(Int(at.data.(int64)).ToString().Value)
 	case consts.DataTypeUint:
 		return String(Int(at.data.(uint)).ToString().Value)
-	case consts.DataTypeFloat:
+	case consts.DataTypeFloat64:
 		return String(Float(at.data.(float64)).ToString().Value)
 	case consts.DataTypeBool:
 		return String(fmt.Sprintf("%v", at.data))

array.go

@@ -55,8 +55,8 @@ func (at *Array[Bt]) IsNil() bool {
 func (at *Array[Bt]) ToStringSlice() []string {
 	list := make([]string, 0)
 	for _, item := range at.value {
-		byteData, _ := json.Marshal(item)
+		str := AnyDataType(item).ToString().Value()
-		list = append(list, strings.Trim(string(byteData), "\""))
+		list = append(list, str)
 	}
 	return list
 }

dynamic_struct.go

@@ -1,198 +0,0 @@
-// Package wrapper ...
-//
-// Description : wrapper ...
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 2024-08-21 16:43
-package wrapper
-
-import (
-	"fmt"
-	"reflect"
-)
-
-func NewDynamic() *DynamicStruct {
-	return &DynamicStruct{
-		structFieldList: make([]reflect.StructField, 0),
-	}
-}
-
-// DynamicStruct 动态生成数据结构
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 16:48 2024/8/21
-type DynamicStruct struct {
-	structFieldList []reflect.StructField // 结构体字段列表
-}
-
-// AddInt 添加int字段统一Int64
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:50 2024/8/21
-func (ds *DynamicStruct) AddInt(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(int64(0)),
-		Tag:     reflect.StructTag(fmt.Sprintf(`json:"%v"`, fieldTag)),
-	})
-}
-
-// AddUint 添加uint字段, 统一 uint64
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:50 2024/8/21
-func (ds *DynamicStruct) AddUint(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(uint64(0)),
-		Tag:     reflect.StructTag(fieldTag),
-	})
-}
-
-// AddString 添加字符串字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:49 2024/8/21
-func (ds *DynamicStruct) AddString(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(""),
-		Tag:     reflect.StructTag(fmt.Sprintf(`json:"%v"`, fieldTag)),
-	})
-}
-
-// AddBool 添加bool字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:49 2024/8/21
-func (ds *DynamicStruct) AddBool(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(true),
-		Tag:     reflect.StructTag(fmt.Sprintf(`json:"%v"`, fieldTag)),
-	})
-}
-
-// AddFloat 添加float字段, 统一 float64
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:48 2024/8/21
-func (ds *DynamicStruct) AddFloat(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(float64(0)),
-		Tag:     reflect.StructTag(fmt.Sprintf(`json:"%v"`, fieldTag)),
-	})
-}
-
-// AddSlice 添加slice
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:47 2024/8/21
-func (ds *DynamicStruct) AddSlice(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf([]any{}),
-		Tag:     reflect.StructTag(fieldTag),
-	})
-}
-
-// AddMap 添加map字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:43 2024/8/21
-func (ds *DynamicStruct) AddMap(fieldName string, fieldTag string, pkgPath string) {
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(map[string]any{}),
-		Tag:     reflect.StructTag(fieldTag),
-	})
-}
-
-// AddAny 添加任意类型字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:52 2024/8/21
-func (ds *DynamicStruct) AddAny(fieldName string, fieldTag string, pkgPath string, value any) {
-	if nil == value {
-		// 不能是空指针
-		return
-	}
-	ds.AddStructField(reflect.StructField{
-		Name:    fieldName,
-		PkgPath: pkgPath,
-		Type:    reflect.TypeOf(value),
-		Tag:     reflect.StructTag(fieldTag),
-	})
-}
-
-// AddStructField 添加结构体字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:42 2024/8/21
-func (ds *DynamicStruct) AddStructField(field reflect.StructField) {
-	if field.Tag == "" {
-		field.Tag = reflect.StructTag(fmt.Sprintf(`json:"%v"`, field.Name))
-	}
-	field.Name = String(field.Name).SnakeCaseToCamel() // 转成大驼峰, 保证对外可访问
-	ds.structFieldList = append(ds.structFieldList, field)
-}
-
-// GetStructType 获取结构体的类型
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 16:58 2024/8/21
-func (ds *DynamicStruct) GetStructType() reflect.Type {
-	return reflect.StructOf(ds.structFieldList)
-}
-
-// ToStructDefaultValue 获取结构体的值, 并采用对应类型默认值填充相关字段
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 16:56 2024/8/21
-func (ds *DynamicStruct) ToStructDefaultValue() any {
-	defer ds.Clear()
-	defaultValue := reflect.New(ds.GetStructType()).Elem().Interface()
-	return defaultValue
-}
-
-// ToStructDefaultSliceValue 自动生成结构体列表
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:04 2024/8/21
-func (ds *DynamicStruct) ToStructDefaultSliceValue() any {
-	defer ds.Clear()
-	tSlice := reflect.MakeSlice(reflect.SliceOf(ds.GetStructType()), 0, 0)
-	return reflect.New(tSlice.Type()).Elem().Interface()
-}
-
-// Clear 清理
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:08 2024/8/21
-func (ds *DynamicStruct) Clear() {
-	// 清理掉已设置的字段, 不然实例复用会互相影响
-	ds.structFieldList = make([]reflect.StructField, 0)
-}

dynamic_struct_test.go

@@ -1,27 +0,0 @@
-// Package wrapper ...
-//
-// Description : wrapper ...
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 2024-08-21 17:56
-package wrapper
-
-import (
-	"fmt"
-	"github.com/mitchellh/mapstructure"
-	"testing"
-)
-
-func TestNewDynamic(t *testing.T) {
-	instance := NewDynamic()
-	instance.AddInt("Age", "age", "")
-	instance.AddString("Name", "name", "")
-	defaultVal := instance.ToStructDefaultValue()
-	testMap := map[string]any{
-		"name": "白茶",
-		"age":  18,
-	}
-	_ = mapstructure.Decode(testMap, &defaultVal)
-	fmt.Println(defaultVal)
-}

float.go

@@ -107,7 +107,7 @@ func (f Float) ToString() StringResult {
 		}
 	}
 	return StringResult{
-		Value: fmt.Sprintf("%v", floatVal),
+		Value: fmt.Sprintf("%v", floatVal.Value),
 		Err:   nil,
 	}
 }

go.mod

@@ -1,29 +1,27 @@
 module git.zhangdeman.cn/zhangdeman/wrapper
 
-go 1.21
+go 1.23.0
-
-toolchain go1.21.4
 
 require (
-	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241125065114-f919222003d9
+	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250916024308-d378e6c57772
 	git.zhangdeman.cn/zhangdeman/op_type v0.0.0-20240122104027-4928421213c0
-	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20241108082010-42ae8fe5ebdc
+	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20250504055908-8d68e6106ea9
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
-	github.com/mitchellh/mapstructure v1.5.0
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.11.1
 	github.com/tidwall/gjson v1.18.0
 )
 
 require (
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mozillazg/go-pinyin v0.20.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
+	github.com/sbabiv/xml2map v1.2.1 // indirect
+	github.com/tidwall/match v1.2.0 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,41 +1,48 @@
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241104082108-0f97a870bbc3 h1:BiAlBJ+DuRs/xD7nDQD2JT8Oc+V+0Uwt36qZwdXGvzI=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250916024308-d378e6c57772 h1:Yo1ur3LnDF5s7F7tpJsNrdUSF8LwYKnN9TdQU32F3eU=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241104082108-0f97a870bbc3/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250916024308-d378e6c57772/go.mod h1:5p8CEKGBxi7qPtTXDI3HDmqKAfIm5i/aBWdrbkbdNjc=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241125061350-1f5050978fc3 h1:/40XIygeSxRhPQc3/7pKGpV5hg8jwrMwh1+YiyCHdNI=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241125061350-1f5050978fc3/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241125065114-f919222003d9 h1:TP/M3WnGsxh0Vr6YuS1i28hw1oV//YbdCoI46PUBIA0=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20241125065114-f919222003d9/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/op_type v0.0.0-20240122104027-4928421213c0 h1:gUDlQMuJ4xNfP2Abl1Msmpa3fASLWYkNlqDFF/6GN0Y=
 git.zhangdeman.cn/zhangdeman/op_type v0.0.0-20240122104027-4928421213c0/go.mod h1:VHb9qmhaPDAQDcS6vUiDCamYjZ4R5lD1XtVsh55KsMI=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20241104092308-ecb02113459e h1:A045F67AMSqFKGD9kk2uLa+6c/zpmW8vjjSRmSsdjPs=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20250504055908-8d68e6106ea9 h1:/GLQaFoLb+ciHOtAS2BIyPNnf4O5ME3AC5PUaJY9kfs=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20241104092308-ecb02113459e/go.mod h1:XqgER4jDYwskFgj2riJ9XptIjzgYWubY+Zq8iB2WkY0=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20250504055908-8d68e6106ea9/go.mod h1:ABJ655C5QenQNOzf7LjCe4sSB52CXvaWLX2Zg4uwDJY=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20241108082010-42ae8fe5ebdc h1:jtdEMr/xNchJDEoCnvMr4JXT9+biYQu625Cj+dz025w=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20241108082010-42ae8fe5ebdc/go.mod h1:XqgER4jDYwskFgj2riJ9XptIjzgYWubY+Zq8iB2WkY0=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e h1:Q973S6CcWr1ICZhFI1STFOJ+KUImCl2BaIXm6YppBqI=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.5.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/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/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
+github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 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/mozillazg/go-pinyin v0.20.0 h1:BtR3DsxpApHfKReaPO1fCqF4pThRwH9uwvXzm+GnMFQ=
 github.com/mozillazg/go-pinyin v0.20.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
 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/sbabiv/xml2map v1.2.1 h1:1lT7t0hhUvXZCkdxqtq4n8/ZCnwLWGq4rDuDv5XOoFE=
+github.com/sbabiv/xml2map v1.2.1/go.mod h1:2TPoAfcaM7+Sd4iriPvzyntb2mx7GY+kkQpB/GQa/eo=
+github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
+github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
+github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
+github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 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/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
+github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=