From 88d3066307ec99755e2c834b6150508fdaba81ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Wed, 27 Dec 2023 17:52:48 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E6=AF=94=E8=BE=83=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/define/version.go | 15 +++++++
 tool/version.go        | 88 ++++++++++++++++++++++++++++++++++++++++++
 tool/version_test.go   | 22 +++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 tool/define/version.go
 create mode 100644 tool/version.go
 create mode 100644 tool/version_test.go

diff --git a/tool/define/version.go b/tool/define/version.go
new file mode 100644
index 0000000..5db13b4
--- /dev/null
+++ b/tool/define/version.go
@@ -0,0 +1,15 @@
+// Package define ...
+//
+// Description : define ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2023-12-27 17:08
+package define
+
+const (
+	VersionCompareFail = -2 // 版本比较失败
+	VersionOneMax      = -1 // 第一个版本号大
+	VersionEqual       = 0  // 两个版本号相等
+	VersionTwoMax      = 1  // 第二个版本号大
+)
diff --git a/tool/version.go b/tool/version.go
new file mode 100644
index 0000000..01a78e1
--- /dev/null
+++ b/tool/version.go
@@ -0,0 +1,88 @@
+// Package tool ...
+//
+// Description : util ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2023-12-27 17:06
+package tool
+
+import (
+	"git.zhangdeman.cn/zhangdeman/wrapper"
+	"git.zhangdeman.cn/zhangdeman/wrapper/tool/define"
+)
+
+var (
+	Version = &version{}
+)
+
+type version struct {
+}
+
+// getVersionArr 解析版本号
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 17:42 2023/12/27
+func (v *version) getVersionArr(versionOne string, versionTwo string) ([]int64, []int64, error) {
+	oneWrapper := wrapper.String(versionOne).ToInt64Slice(".")
+	twoWrapper := wrapper.String(versionTwo).ToInt64Slice(".")
+	if oneWrapper.Err != nil {
+		return nil, nil, oneWrapper.Err
+	}
+	if twoWrapper.Err != nil {
+		return nil, nil, twoWrapper.Err
+	}
+	return oneWrapper.Value, twoWrapper.Value, nil
+}
+
+// Compare 比较版本号的大小， 版本号格式必须是 x.y.z 的形式，几个 . 不限制, x、y、z 必须是是数字
+//
+// strictMode 严格模式, 非严格模式下, 2.4 == 2.4.0 , 开启严格模式, 则认为 2.4 < 2.4.0 , 因为 2.4 没有小版本号
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 17:07 2023/12/27
+func (v *version) Compare(versionOne string, versionTwo string, strictMode bool) (int, error) {
+	oneVersionArr, twoVersionArr, err := v.getVersionArr(versionOne, versionTwo)
+	if nil != err {
+		return define.VersionCompareFail, err
+	}
+	oneVersionLength := len(oneVersionArr)
+	twoVersionLength := len(twoVersionArr)
+	// 版本号长度不一致补位
+	if oneVersionLength > twoVersionLength {
+		for fill := 0; fill < oneVersionLength-twoVersionLength; fill++ {
+			twoVersionArr = append(twoVersionArr, 0)
+		}
+	}
+	if oneVersionLength < twoVersionLength {
+		for fill := 0; fill < twoVersionLength-oneVersionLength; fill++ {
+			oneVersionArr = append(oneVersionArr, 0)
+		}
+	}
+
+	// 开始比较
+	for offset := 0; offset < len(oneVersionArr); offset++ {
+		if oneVersionArr[offset] == twoVersionArr[offset] {
+			// 当前位版本相等
+			continue
+		}
+		if oneVersionArr[offset] > twoVersionArr[offset] {
+			// 第一个版本号大
+			return define.VersionOneMax, nil
+		} else {
+			// 第二个版本号大
+			return define.VersionTwoMax, nil
+		}
+	}
+	// 版本号一致， 判断严格模式与非严格模式
+	if !strictMode || oneVersionLength == twoVersionLength {
+		return define.VersionEqual, nil
+	}
+	return wrapper.TernaryOperator.Int(
+		oneVersionLength > twoVersionLength,
+		wrapper.Int(define.VersionOneMax),
+		wrapper.Int(define.VersionTwoMax),
+	).ToInt().Value, nil
+}
diff --git a/tool/version_test.go b/tool/version_test.go
new file mode 100644
index 0000000..54ec3b9
--- /dev/null
+++ b/tool/version_test.go
@@ -0,0 +1,22 @@
+// Package tool ...
+//
+// Description : tool ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2023-12-27 17:51
+package tool
+
+import (
+	"fmt"
+	"testing"
+)
+
+func Test_version_Compare(t *testing.T) {
+	fmt.Println(Version.Compare("2.4.1", "2.4.1.0", true))
+	fmt.Println(Version.Compare("2.4.1", "2.4.1.0", false))
+	fmt.Println(Version.Compare("2.4.0", "2.4.1", true))
+	fmt.Println(Version.Compare("2.4.2", "2.4.1", true))
+	fmt.Println(Version.Compare("2.4", "2.4.1", true))
+	fmt.Println(Version.Compare("2.4.2", "2.4", true))
+}

From 6da972b1128ae57ffe3c44a0e281522e8dd057a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Wed, 27 Dec 2023 17:59:33 +0800
Subject: [PATCH 02/19] migrate ConverAssign

---
 convert.go | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 go.mod     |   2 +-
 go.sum     |  14 +-
 string.go  |  27 ++--
 4 files changed, 412 insertions(+), 25 deletions(-)
 create mode 100644 convert.go

diff --git a/convert.go b/convert.go
new file mode 100644
index 0000000..05c0331
--- /dev/null
+++ b/convert.go
@@ -0,0 +1,394 @@
+// Package wrapper ...
+//
+// Description : 任意类型之间的相互转换
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2021-02-23 10:23 下午
+package wrapper
+
+/*
+   Desc : 在处理一些参数的时候，可能需要将参数转换为各种类型，这里实现一个通用的转换函数，实现各种类型之间的相互转换。
+
+    当然，如果源数据格式和目标数据类型不一致，是会返回错误的。例如将字符串“一二三”转换为数值类型则会报错，而将字符串“123”转换为数值类型则OK。
+
+    这段代码实际抄自go自带的“database/sql”库，只是源代码作为内部函数无法在外面调用，可以单独把需要的功能拎出来使用：
+
+    代码中有一个Scaner接口，可以自行实现，然后通过"convertAssign()"函数，作为dst参数传入。
+
+   Author : zhangdeman001@ke.com<白茶清欢>
+
+*/
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"time"
+)
+
+// RawBytes is a byte slice that holds a reference to memory owned by
+// the database itself. After a Scan into a RawBytes, the slice is only
+// valid until the next call to Next, Scan, or Close.
+type RawBytes []byte
+
+var errNilPtr = errors.New("destination pointer is nil") // embedded in descriptive error
+
+// ConvertAssign ...
+// convertAssign copies to dest the value in src, converting it if possible.
+// An error is returned if the copy would result in loss of information.
+// dest should be a pointer type.
+func ConvertAssign(dest, src interface{}) error {
+	// Common cases, without reflect.
+	switch s := src.(type) {
+	case string:
+		switch d := dest.(type) {
+		case *string:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = s
+			return nil
+		case *[]byte:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = []byte(s)
+			return nil
+		case *RawBytes:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = append((*d)[:0], s...)
+			return nil
+		}
+	case []byte:
+		switch d := dest.(type) {
+		case *string:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = string(s)
+			return nil
+		case *interface{}:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = cloneBytes(s)
+			return nil
+		case *[]byte:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = cloneBytes(s)
+			return nil
+		case *RawBytes:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = s
+			return nil
+		}
+	case time.Time:
+		switch d := dest.(type) {
+		case *time.Time:
+			*d = s
+			return nil
+		case *string:
+			*d = s.Format(time.RFC3339Nano)
+			return nil
+		case *[]byte:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = []byte(s.Format(time.RFC3339Nano))
+			return nil
+		case *RawBytes:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = s.AppendFormat((*d)[:0], time.RFC3339Nano)
+			return nil
+		}
+	case nil:
+		switch d := dest.(type) {
+		case *interface{}:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = nil
+			return nil
+		case *[]byte:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = nil
+			return nil
+		case *RawBytes:
+			if d == nil {
+				return errNilPtr
+			}
+			*d = nil
+			return nil
+		}
+	}
+
+	var sv reflect.Value
+
+	switch d := dest.(type) {
+	case *string:
+		sv = reflect.ValueOf(src)
+		switch sv.Kind() {
+		case reflect.Bool,
+			reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+			reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+			reflect.Float32, reflect.Float64:
+			*d = asString(src)
+			return nil
+		}
+	case *[]byte:
+		sv = reflect.ValueOf(src)
+		if b, ok := asBytes(nil, sv); ok {
+			*d = b
+			return nil
+		}
+	case *RawBytes:
+		sv = reflect.ValueOf(src)
+		if b, ok := asBytes([]byte(*d)[:0], sv); ok {
+			*d = RawBytes(b)
+			return nil
+		}
+	case *bool:
+		bv, err := Bool.ConvertValue(src)
+		if err == nil {
+			*d = bv.(bool)
+		}
+		return err
+	case *interface{}:
+		*d = src
+		return nil
+	}
+
+	if scanner, ok := dest.(Scanner); ok {
+		return scanner.Scan(src)
+	}
+
+	dpv := reflect.ValueOf(dest)
+	if dpv.Kind() != reflect.Ptr {
+		return errors.New("destination not a pointer")
+	}
+	if dpv.IsNil() {
+		return errNilPtr
+	}
+
+	if !sv.IsValid() {
+		sv = reflect.ValueOf(src)
+	}
+
+	dv := reflect.Indirect(dpv)
+	if sv.IsValid() && sv.Type().AssignableTo(dv.Type()) {
+		switch b := src.(type) {
+		case []byte:
+			dv.Set(reflect.ValueOf(cloneBytes(b)))
+		default:
+			dv.Set(sv)
+		}
+		return nil
+	}
+
+	if dv.Kind() == sv.Kind() && sv.Type().ConvertibleTo(dv.Type()) {
+		dv.Set(sv.Convert(dv.Type()))
+		return nil
+	}
+
+	// The following conversions use a string value as an intermediate representation
+	// to convert between various numeric types.
+	//
+	// This also allows scanning into user defined types such as "type Int int64".
+	// For symmetry, also check for string destination types.
+	switch dv.Kind() {
+	case reflect.Ptr:
+		if src == nil {
+			dv.Set(reflect.Zero(dv.Type()))
+			return nil
+		}
+		dv.Set(reflect.New(dv.Type().Elem()))
+		return ConvertAssign(dv.Interface(), src)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		s := asString(src)
+		i64, err := strconv.ParseInt(s, 10, dv.Type().Bits())
+		if err != nil {
+			err = strconvErr(err)
+			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
+		}
+		dv.SetInt(i64)
+		return nil
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		s := asString(src)
+		u64, err := strconv.ParseUint(s, 10, dv.Type().Bits())
+		if err != nil {
+			err = strconvErr(err)
+			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
+		}
+		dv.SetUint(u64)
+		return nil
+	case reflect.Float32, reflect.Float64:
+		s := asString(src)
+		f64, err := strconv.ParseFloat(s, dv.Type().Bits())
+		if err != nil {
+			err = strconvErr(err)
+			return fmt.Errorf("converting driver.Value type %T (%q) to a %s: %v", src, s, dv.Kind(), err)
+		}
+		dv.SetFloat(f64)
+		return nil
+	case reflect.String:
+		switch v := src.(type) {
+		case string:
+			dv.SetString(v)
+			return nil
+		case []byte:
+			dv.SetString(string(v))
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unsupported Scan, storing driver.Value type %T into type %T", src, dest)
+}
+
+func strconvErr(err error) error {
+	if ne, ok := err.(*strconv.NumError); ok {
+		return ne.Err
+	}
+	return err
+}
+
+func cloneBytes(b []byte) []byte {
+	if b == nil {
+		return nil
+	}
+	c := make([]byte, len(b))
+	copy(c, b)
+	return c
+}
+
+func ToString(src interface{}) string {
+	return asString(src)
+}
+
+func asString(src interface{}) string {
+	switch v := src.(type) {
+	case string:
+		return v
+	case []byte:
+		return string(v)
+	}
+	rv := reflect.ValueOf(src)
+	switch rv.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return strconv.FormatInt(rv.Int(), 10)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return strconv.FormatUint(rv.Uint(), 10)
+	case reflect.Float64:
+		return strconv.FormatFloat(rv.Float(), 'g', -1, 64)
+	case reflect.Float32:
+		return strconv.FormatFloat(rv.Float(), 'g', -1, 32)
+	case reflect.Bool:
+		return strconv.FormatBool(rv.Bool())
+	}
+	return fmt.Sprintf("%v", src)
+}
+
+func asBytes(buf []byte, rv reflect.Value) (b []byte, ok bool) {
+	switch rv.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return strconv.AppendInt(buf, rv.Int(), 10), true
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return strconv.AppendUint(buf, rv.Uint(), 10), true
+	case reflect.Float32:
+		return strconv.AppendFloat(buf, rv.Float(), 'g', -1, 32), true
+	case reflect.Float64:
+		return strconv.AppendFloat(buf, rv.Float(), 'g', -1, 64), true
+	case reflect.Bool:
+		return strconv.AppendBool(buf, rv.Bool()), true
+	case reflect.String:
+		s := rv.String()
+		return append(buf, s...), true
+	}
+	return
+}
+
+// Value is a value that drivers must be able to handle.
+// It is either nil, a type handled by a database driver's NamedValueChecker
+// interface, or an instance of one of these types:
+//
+//	int64
+//	float64
+//	bool
+//	[]byte
+//	string
+//	time.Time
+type Value interface{}
+
+type boolType struct{}
+
+var Bool boolType
+
+func (boolType) String() string { return "Bool" }
+func (boolType) ConvertValue(src interface{}) (Value, error) {
+	switch s := src.(type) {
+	case bool:
+		return s, nil
+	case string:
+		b, err := strconv.ParseBool(s)
+		if err != nil {
+			return nil, fmt.Errorf("sql/driver: couldn't convert %q into type bool", s)
+		}
+		return b, nil
+	case []byte:
+		b, err := strconv.ParseBool(string(s))
+		if err != nil {
+			return nil, fmt.Errorf("sql/driver: couldn't convert %q into type bool", s)
+		}
+		return b, nil
+	}
+
+	sv := reflect.ValueOf(src)
+	switch sv.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		iv := sv.Int()
+		if iv == 1 || iv == 0 {
+			return iv == 1, nil
+		}
+		return nil, fmt.Errorf("sql/driver: couldn't convert %d into type bool", iv)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		uv := sv.Uint()
+		if uv == 1 || uv == 0 {
+			return uv == 1, nil
+		}
+		return nil, fmt.Errorf("sql/driver: couldn't convert %d into type bool", uv)
+	}
+
+	return nil, fmt.Errorf("sql/driver: couldn't convert %v (%T) into type bool", src, src)
+}
+
+type Scanner interface {
+	// Scan assigns a value from a database driver.
+	//
+	// The src value will be of one of the following types:
+	//
+	//    int64
+	//    float64
+	//    bool
+	//    []byte
+	//    string
+	//    time.Time
+	//    nil - for NULL values
+	//
+	// An error should be returned if the value cannot be stored
+	// without loss of information.
+	//
+	// Reference types such as []byte are only valid until the next call to Scan
+	// and should not be retained. Their underlying memory is owned by the driver.
+	// If retention is necessary, copy their values before the next call to Scan.
+	Scan(src interface{}) error
+}
diff --git a/go.mod b/go.mod
index 22eed4c..e0ec1d5 100644
--- a/go.mod
+++ b/go.mod
@@ -7,12 +7,12 @@ toolchain go1.21.4
 require (
 	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71
 	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d
-	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231014142840-445c6407db92
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 )
 
 require (
 	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b // indirect
+	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
diff --git a/go.sum b/go.sum
index 481ffaa..ce50060 100644
--- a/go.sum
+++ b/go.sum
@@ -1,24 +1,17 @@
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b h1:C7KftnLh7dOqzNRs5dn/9yqMDvuqMn5RCglvV6bY758=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20230826152035-90f7ba59144a h1:B37yGkb/ETYInbS3j5JR6lgXPsvGjKcY26fsIlSpKxA=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20230826152035-90f7ba59144a/go.mod h1:l9S40lsDnTd/VAZjh1kmfYvz0B9z+7oT86pMQ/KurWo=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71 h1:nvVSH+Ju8EmoPiPHTae5lxHo4kDjROYChs19Yayz+NY=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20230909065133-098dcddf1fca h1:CoazDbdGF/bKooOdbyW4R9bmu+i+XvymKuxNFEi/UCE=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20230909065133-098dcddf1fca/go.mod h1:AWyjclAKRM7HiUNzm2wKhYw+s4Jz7fg8YngN+PYdKNo=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231123090055-0d2a068178aa h1:l835yJ1Ja5JTCrt+FkW+IKMFalBXHHlRUvQmav2C7KA=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231123090055-0d2a068178aa/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d h1:TV0BCQQewBEtLsv3i9gXkxLFd5A5bWBTiNd3D/I5o4Q=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
-git.zhangdeman.cn/zhangdeman/util v0.0.0-20230815042559-b34984be7444 h1:JVp575weLUX4sfhgjjxotJPxfHio7Ua8KHH3LMRRs2E=
-git.zhangdeman.cn/zhangdeman/util v0.0.0-20230815042559-b34984be7444/go.mod h1:IqS3vAMyt1fVCWS7RqGeUw1EFnL/ruUMha45G2T+YNM=
-git.zhangdeman.cn/zhangdeman/util v0.0.0-20231014142840-445c6407db92 h1:p1GVRYJc3NNoZeLs4CukitAbM3O/ALNq3l31cnbBQDM=
-git.zhangdeman.cn/zhangdeman/util v0.0.0-20231014142840-445c6407db92/go.mod h1:6OBeuwKy2J1TjdAwStEyC6aYC3kStmJiCg1eFC7g0fk=
+git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 h1:GO3oZa5a2sqwAzGcLDJtQzmshSWRmoP7IDS8bwFqvC4=
+git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 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/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -26,6 +19,7 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 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/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
diff --git a/string.go b/string.go
index 5b1a440..596ca3f 100644
--- a/string.go
+++ b/string.go
@@ -12,7 +12,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"git.zhangdeman.cn/zhangdeman/serialize"
-	"git.zhangdeman.cn/zhangdeman/util"
 	"github.com/axgle/mahonia"
 	"io"
 	"math/rand"
@@ -58,7 +57,7 @@ func (str String) ToFloat32() Float32Result {
 	var (
 		res Float32Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -90,7 +89,7 @@ func (str String) ToFloat64() Float64Result {
 	var (
 		res Float64Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -158,7 +157,7 @@ func (str String) ToInt8() Int8Result {
 	var (
 		res Int8Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -190,7 +189,7 @@ func (str String) ToInt16() Int16Result {
 	var (
 		res Int16Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -222,7 +221,7 @@ func (str String) ToInt32() Int32Result {
 	var (
 		res Int32Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -254,7 +253,7 @@ func (str String) ToInt64() Int64Result {
 	var (
 		res Int64Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -286,7 +285,7 @@ func (str String) ToInt() IntResult {
 	var (
 		res IntResult
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -318,7 +317,7 @@ func (str String) ToUint8() Uint8Result {
 	var (
 		res Uint8Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -350,7 +349,7 @@ func (str String) ToUint16() Uint16Result {
 	var (
 		res Uint16Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -382,7 +381,7 @@ func (str String) ToUint32() Uint32Result {
 	var (
 		res Uint32Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -414,7 +413,7 @@ func (str String) ToUint64() Uint64Result {
 	var (
 		res Uint64Result
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -446,7 +445,7 @@ func (str String) ToUint() UintResult {
 	var (
 		res UintResult
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 
@@ -478,7 +477,7 @@ func (str String) ToBool() BoolResult {
 	var (
 		res BoolResult
 	)
-	res.Err = util.ConvertAssign(&res.Value, str)
+	res.Err = ConvertAssign(&res.Value, str)
 	return res
 }
 

From 448b472c533600d6ea7b2e997b52c3980cea1786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Wed, 27 Dec 2023 18:20:49 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=AF=94=E8=BE=83,?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0ignore=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/version.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tool/version.go b/tool/version.go
index 01a78e1..9120ed2 100644
--- a/tool/version.go
+++ b/tool/version.go
@@ -86,3 +86,13 @@ func (v *version) Compare(versionOne string, versionTwo string, strictMode bool)
 		wrapper.Int(define.VersionTwoMax),
 	).ToInt().Value, nil
 }
+
+// CompareIgnoreError 忽略error
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 18:20 2023/12/27
+func (v *version) CompareIgnoreError(versionOne string, versionTwo string, strictMode bool) int {
+	res, _ := v.Compare(versionOne, versionTwo, strictMode)
+	return res
+}

From 5a536794003320f2069dd04c3d19b49c68a9b8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Tue, 23 Jan 2024 10:42:03 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E4=BC=98=E5=8C=96toAnySlice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 define.go      | 20 ++++++++++----------
 string.go      | 25 +++++++++++++++++++++++--
 string_test.go |  6 ++++++
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/define.go b/define.go
index f1368b2..5a21d40 100644
--- a/define.go
+++ b/define.go
@@ -472,16 +472,6 @@ type StringSliceResult struct {
 	Err   error
 }
 
-// AnySliceResult ...
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 18:28 2023/5/8
-type AnySliceResult struct {
-	Value []interface{}
-	Err   error
-}
-
 // MapResult 转map的结果
 //
 // Author : go_developer@163.com<白茶清欢>
@@ -491,3 +481,13 @@ type MapResult struct {
 	Value Map
 	Err   error
 }
+
+// AnySliceResult ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 18:28 2023/5/8
+type AnySliceResult struct {
+	Value []interface{}
+	Err   error
+}
diff --git a/string.go b/string.go
index 596ca3f..4aaa19b 100644
--- a/string.go
+++ b/string.go
@@ -990,13 +990,34 @@ func (str String) ToStringSlice(splitChar ...string) StringSliceResult {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 15:01 2023/5/5
-func (str String) ToAnySlice() AnySliceResult {
+func (str String) ToAnySlice(splitCharList ...string) AnySliceResult {
 	result := AnySliceResult{
 		Value: []interface{}{},
 		Err:   nil,
 	}
 
-	result.Err = serialize.JSON.UnmarshalWithNumber([]byte(str), &result.Value)
+	if len(splitCharList) == 0 {
+		result.Err = serialize.JSON.UnmarshalWithNumber([]byte(str), &result.Value)
+		return result
+	}
+
+	valArr := strings.Split(str.Value(), splitCharList[0])
+	valList := make([]interface{}, 0)
+	for _, item := range valArr {
+		v := String(item)
+		if res := v.ToInt64(); nil == res.Err {
+			valList = append(valList, res.Value)
+		} else if res := v.ToUint64(); nil == res.Err {
+			valList = append(valList, res.Value)
+		} else if res := v.ToFloat64(); nil == res.Err {
+			valList = append(valList, res.Value)
+		} else if res := v.ToBool(); nil == res.Err {
+			valList = append(valList, res.Value)
+		} else {
+			valList = append(valList, item)
+		}
+	}
+	result.Value = valList
 	return result
 }
 
diff --git a/string_test.go b/string_test.go
index e6d43b4..76f1f98 100644
--- a/string_test.go
+++ b/string_test.go
@@ -23,3 +23,9 @@ func TestString_ToFloat32(t *testing.T) {
 	fmt.Println(str.ToInt())
 	fmt.Println(str.ToUint())
 }
+
+func TestString_ToAnySlice(t *testing.T) {
+	str := "1,2,3"
+	r := String(str).ToAnySlice(",")
+	fmt.Println(r)
+}

From 75fd00c4cf531d55c2ed15b632bf94550608f49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Tue, 23 Jan 2024 10:42:58 +0800
Subject: [PATCH 05/19] update go mod

---
 go.mod | 6 +++---
 go.sum | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index e0ec1d5..c628d2c 100644
--- a/go.mod
+++ b/go.mod
@@ -5,13 +5,13 @@ go 1.21
 toolchain go1.21.4
 
 require (
-	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71
-	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d
+	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704
+	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 )
 
 require (
-	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b // indirect
+	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 // indirect
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
diff --git a/go.sum b/go.sum
index ce50060..624fffb 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,15 @@
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b h1:C7KftnLh7dOqzNRs5dn/9yqMDvuqMn5RCglvV6bY758=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 h1:ytpXTP3oxp480BAZQoOzqlBP4XP73NcpMplZ1/fA1lQ=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71 h1:nvVSH+Ju8EmoPiPHTae5lxHo4kDjROYChs19Yayz+NY=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
+git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704 h1:y/hXa0Ez+u0ka+QLv1abiCRy+rlJlnNdaH4H/eI6ZJ0=
+git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d h1:TV0BCQQewBEtLsv3i9gXkxLFd5A5bWBTiNd3D/I5o4Q=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 h1:GO3oZa5a2sqwAzGcLDJtQzmshSWRmoP7IDS8bwFqvC4=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=

From 270c4fcfd4d7ec6219b6c5c06226517655e84f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 11:00:51 +0800
Subject: [PATCH 06/19] update go mod

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index c628d2c..6ffce81 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.21.4
 
 require (
-	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704
+	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4
 	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 )
diff --git a/go.sum b/go.sum
index 624fffb..74f2e60 100644
--- a/go.sum
+++ b/go.sum
@@ -6,6 +6,8 @@ git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71 h1:nvVSH
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704 h1:y/hXa0Ez+u0ka+QLv1abiCRy+rlJlnNdaH4H/eI6ZJ0=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
+git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY8JLbFcrlq37q/uKyxs2r2e3modsjvfSbnZQ/UI=
+git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d h1:TV0BCQQewBEtLsv3i9gXkxLFd5A5bWBTiNd3D/I5o4Q=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=

From 9b469e0ac2294a2f1defec5dd331ee4d5a112d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 11:33:54 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0diff=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E7=BB=93=E6=9E=84=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/define/diff.go | 93 +++++++++++++++++++++++++++++++++++++++++++++
 tool/diff.go        | 15 ++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 tool/define/diff.go
 create mode 100644 tool/diff.go

diff --git a/tool/define/diff.go b/tool/define/diff.go
new file mode 100644
index 0000000..6270cc4
--- /dev/null
+++ b/tool/define/diff.go
@@ -0,0 +1,93 @@
+// Package define ...
+//
+// Description : define ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2024-03-08 11:04
+package define
+
+import (
+	"git.zhangdeman.cn/zhangdeman/wrapper"
+	"reflect"
+)
+
+// DiffOption 做数据对比时的选项
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:12 2024/3/8
+type DiffOption struct {
+	StrictMode          bool                      `json:"strict_mode"`         // 采用严格模式: 1 != "1" , 采用非严格模式 1 == "1"
+	IgnoreEmptyString   bool                      `json:"ignore_empty_string"` // 忽略空字符串, 若输入值为空字符串, 则不做比较, 认为两个值相同
+	IgnoreZeroNumber    bool                      `json:"ignore_zero_number"`  // 忽略置为0的数字, 若输入的数据为数字类型, 则不做比较, 认为两个值相同
+	IgnoreNil           bool                      `json:"ignore_nil"`          // 忽略 nil 值, 若输入值为NIL , 则不做比较, 认为两个值相同
+	CustomDiffFuncTable map[string]CustomDiffFunc `json:"-"`                   // 外部自定义的字段是否相同的比较函数, 会优先使用外部输入的比较函数
+}
+
+// CustomDiffFunc 自定义字段对比方法
+//
+// 输入分别如下:
+//
+// field : 要对比的字段
+//
+// inputVal : 输入的原始数据
+//
+// storageVal : 当前存储的数据
+//
+// option : 对比时的额外选项
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:06 2024/3/8
+type CustomDiffFunc func(field string, inputVal wrapper.Map, storageVal wrapper.Map, option *DiffOption) *DiffResult
+
+// DiffResult 对比结果
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:10 2024/3/8
+type DiffResult struct {
+	OldVal     interface{} `json:"old_val"`     // 当前field在storageVal中的值
+	NewVal     interface{} `json:"new_val"`     // 当前field在inputVal中的值
+	IsSame     bool        `json:"is_same"`     // 两个值是否相同
+	DiffReason string      `json:"diff_reason"` // 两个值不同的原因
+	Err        error       `json:"err"`         // 对比过程中是否出现异常
+}
+
+const (
+	DiffReasonTypeNotMatch  = "TYPE_NOT_MATCH"  // 类型不匹配
+	DiffReasonValueNotMatch = "VALUE_NOT_MATCH" // 数据值不匹配
+)
+
+var (
+	// 当前仅支持基础类型的比较，不支持slice/map/struct等复杂类型的比较
+	supportValueTypeTable = map[reflect.Kind]interface{}{
+		reflect.Bool:    true,
+		reflect.Int:     true,
+		reflect.Int8:    true,
+		reflect.Int16:   true,
+		reflect.Int32:   true,
+		reflect.Int64:   true,
+		reflect.Uint:    true,
+		reflect.Uint8:   true,
+		reflect.Uint16:  true,
+		reflect.Uint32:  true,
+		reflect.Uint64:  true,
+		reflect.Float32: true,
+		reflect.Float64: true,
+		// reflect.Ptr:     true,
+	}
+)
+
+// IsSupportValueType ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:23 2024/3/8
+func IsSupportValueType(kind reflect.Kind) bool {
+	if _, exist := supportValueTypeTable[kind]; exist {
+		return true
+	}
+	return false
+}
diff --git a/tool/diff.go b/tool/diff.go
new file mode 100644
index 0000000..9e3e575
--- /dev/null
+++ b/tool/diff.go
@@ -0,0 +1,15 @@
+// Package tool ...
+//
+// Description : 对比两个数据是否相同 + 构建不同数据的前后值
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2024-03-08 11:03
+package tool
+
+var (
+	Diff = &diff{}
+)
+
+type diff struct {
+}

From e8fc0addfcf6c8c06cbd6d07168f3d0c28fb0d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 15:46:14 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E7=9B=B8=E7=AD=89=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod                   |   4 +-
 go.sum                   |   8 --
 tool/define/diff.go      | 159 +++++++++++++++++++++++++++++++++++++--
 tool/define/diff_test.go |  48 ++++++++++++
 4 files changed, 203 insertions(+), 16 deletions(-)
 create mode 100644 tool/define/diff_test.go

diff --git a/go.mod b/go.mod
index 6ffce81..ab84572 100644
--- a/go.mod
+++ b/go.mod
@@ -8,16 +8,18 @@ require (
 	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4
 	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 // indirect
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // 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/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 74f2e60..8f4228b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,15 +1,7 @@
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b h1:C7KftnLh7dOqzNRs5dn/9yqMDvuqMn5RCglvV6bY758=
-git.zhangdeman.cn/zhangdeman/consts v0.0.0-20230815040024-2b12dd51d19b/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 h1:ytpXTP3oxp480BAZQoOzqlBP4XP73NcpMplZ1/fA1lQ=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71 h1:nvVSH+Ju8EmoPiPHTae5lxHo4kDjROYChs19Yayz+NY=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231224145141-489e31b07a71/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704 h1:y/hXa0Ez+u0ka+QLv1abiCRy+rlJlnNdaH4H/eI6ZJ0=
-git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20231229032122-804bc9822704/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY8JLbFcrlq37q/uKyxs2r2e3modsjvfSbnZQ/UI=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d h1:TV0BCQQewBEtLsv3i9gXkxLFd5A5bWBTiNd3D/I5o4Q=
-git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20231224125439-01f39b6ea08d/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 h1:GO3oZa5a2sqwAzGcLDJtQzmshSWRmoP7IDS8bwFqvC4=
diff --git a/tool/define/diff.go b/tool/define/diff.go
index 6270cc4..5b9d50a 100644
--- a/tool/define/diff.go
+++ b/tool/define/diff.go
@@ -8,8 +8,11 @@
 package define
 
 import (
+	"fmt"
+	"git.zhangdeman.cn/zhangdeman/util"
 	"git.zhangdeman.cn/zhangdeman/wrapper"
 	"reflect"
+	"strings"
 )
 
 // DiffOption 做数据对比时的选项
@@ -18,11 +21,28 @@ import (
 //
 // Date : 11:12 2024/3/8
 type DiffOption struct {
-	StrictMode          bool                      `json:"strict_mode"`         // 采用严格模式: 1 != "1" , 采用非严格模式 1 == "1"
-	IgnoreEmptyString   bool                      `json:"ignore_empty_string"` // 忽略空字符串, 若输入值为空字符串, 则不做比较, 认为两个值相同
-	IgnoreZeroNumber    bool                      `json:"ignore_zero_number"`  // 忽略置为0的数字, 若输入的数据为数字类型, 则不做比较, 认为两个值相同
-	IgnoreNil           bool                      `json:"ignore_nil"`          // 忽略 nil 值, 若输入值为NIL , 则不做比较, 认为两个值相同
-	CustomDiffFuncTable map[string]CustomDiffFunc `json:"-"`                   // 外部自定义的字段是否相同的比较函数, 会优先使用外部输入的比较函数
+	StrictMode          bool                      `json:"strict_mode"`            // 采用严格模式: 1 != "1", 1 != 1.0 , 采用非严格模式 1 == "1", 1 == 1.0
+	IgnoreNotFoundField bool                      `json:"ignore_not_found_field"` // 忽略不存在的字段
+	IgnoreEmptyString   bool                      `json:"ignore_empty_string"`    // 忽略空字符串, 若输入值为空字符串, 则不做比较, 认为两个值相同
+	IgnoreZeroNumber    bool                      `json:"ignore_zero_number"`     // 忽略置为0的数字, 若输入的数据为数字类型, 则不做比较, 认为两个值相同
+	IgnoreNil           bool                      `json:"ignore_nil"`             // 忽略 nil 值, 若输入值为NIL , 则不做比较, 认为两个值相同
+	CustomDiffFuncTable map[string]CustomDiffFunc `json:"-"`                      // 外部自定义的字段是否相同的比较函数, 会优先使用外部输入的比较函数
+}
+
+// NewDiffOption ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 12:06 2024/3/8
+func NewDiffOption() *DiffOption {
+	return &DiffOption{
+		StrictMode:          false,
+		IgnoreNotFoundField: false,
+		IgnoreEmptyString:   false,
+		IgnoreZeroNumber:    false,
+		IgnoreNil:           false,
+		CustomDiffFuncTable: make(map[string]CustomDiffFunc),
+	}
 }
 
 // CustomDiffFunc 自定义字段对比方法
@@ -56,8 +76,10 @@ type DiffResult struct {
 }
 
 const (
-	DiffReasonTypeNotMatch  = "TYPE_NOT_MATCH"  // 类型不匹配
-	DiffReasonValueNotMatch = "VALUE_NOT_MATCH" // 数据值不匹配
+	DiffReasonTypeNotMatch         = "TYPE_NOT_MATCH"          // 类型不匹配
+	DiffReasonValueNotMatch        = "VALUE_NOT_MATCH"         // 数据值不匹配
+	DiffReasonInputFieldNotFound   = "INPUT_FIELD_NOT_FOUND"   // 输入数据中不存在相关字段
+	DiffReasonStorageFieldNotFound = "STORAGE_FIELD_NOT_FOUND" // 存储数据中不存在相关字段
 )
 
 var (
@@ -76,6 +98,7 @@ var (
 		reflect.Uint64:  true,
 		reflect.Float32: true,
 		reflect.Float64: true,
+		reflect.String:  true,
 		// reflect.Ptr:     true,
 	}
 )
@@ -91,3 +114,125 @@ func IsSupportValueType(kind reflect.Kind) bool {
 	}
 	return false
 }
+
+// DefaultDiffFunc 默认的diff函数
+//
+// Author : zhangdeman001@ke.com<张德满>
+//
+// Date : 12:05 2024/3/8
+func DefaultDiffFunc(field string, inputVal wrapper.Map, storageVal wrapper.Map, option *DiffOption) *DiffResult {
+	if nil == option {
+		option = NewDiffOption()
+	}
+	result := &DiffResult{
+		OldVal:     nil,
+		NewVal:     nil,
+		IsSame:     true,
+		DiffReason: "",
+		Err:        nil,
+	}
+	var (
+		inputFieldVal        interface{}
+		inputFieldValExist   bool
+		storageFieldVal      interface{}
+		storageFieldValExist bool
+	)
+
+	inputFieldVal, inputFieldValExist = inputVal.Get(field)
+	storageFieldVal, storageFieldValExist = storageVal.Get(field)
+	// 字段在输入数据和存储数据中均不存在
+	if !inputFieldValExist && !storageFieldValExist {
+		// 输入和存储都没这个字段
+		return result
+	}
+
+	// 判断输入字段是否存在
+	if !inputFieldValExist {
+		if option.IgnoreNotFoundField {
+			// 忽略不存在的字段
+			return result
+		}
+		// 由于前置逻辑保证了, 输入不存在相关字段, 则现存数据一定存在相关字段
+		result.IsSame = false
+		result.DiffReason = DiffReasonInputFieldNotFound
+		result.OldVal = storageFieldVal
+		return result
+	}
+	// 判断存储字段是否存在
+	if !storageFieldValExist {
+		result.IsSame = false
+		result.DiffReason = DiffReasonStorageFieldNotFound
+		result.NewVal = inputFieldVal
+		return result
+	}
+	// 校验类型
+	inputFieldValType := reflect.TypeOf(inputFieldVal)
+	storageFieldValType := reflect.TypeOf(storageFieldVal)
+	if inputFieldValType.Kind() == reflect.Ptr {
+		inputReflect := reflect.ValueOf(inputFieldVal)
+		inputFieldValType = inputReflect.Type()
+		inputFieldVal = inputReflect.Interface()
+	}
+	if storageFieldValType.Kind() == reflect.Ptr {
+		storageReflect := reflect.ValueOf(storageFieldValType)
+		storageFieldValType = storageReflect.Type()
+		storageFieldVal = storageReflect.Interface()
+	}
+	result.NewVal = inputFieldVal
+	result.OldVal = storageFieldVal
+	if inputFieldValType.Kind() != storageFieldValType.Kind() && option.StrictMode {
+		// 严格模式下, 类型不相同
+		result.IsSame = false
+		result.DiffReason = DiffReasonTypeNotMatch
+		return result
+	}
+	// 类型相同, 或者非严格模式下不校验类型
+	if option.StrictMode {
+		// 严格模式
+		if inputFieldVal != storageFieldVal {
+			result.IsSame = false
+			result.DiffReason = DiffReasonValueNotMatch
+			return result
+		}
+		// return result
+	}
+	// 非严格模式
+	// 存储值尝试转 float64
+	inputValStr := fmt.Sprintf("%v", inputFieldVal)
+	storageValStr := fmt.Sprintf("%v", storageFieldVal)
+	var (
+		storageFloat64 float64
+		inputFloat64   float64
+	)
+	if err := util.ConvertAssign(&storageFloat64, storageValStr); nil == err {
+		if err := util.ConvertAssign(&inputFloat64, inputValStr); nil == err {
+			if storageFloat64 == inputFloat64 {
+				return result
+			}
+		}
+	}
+	if inputValStr == storageValStr {
+		return result
+	}
+	// 浮点型数字. 去小数部分最右侧的0
+	if inputFieldValType.Kind() == reflect.Float64 || inputFieldValType.Kind() == reflect.Float32 {
+		inputValStrArr := strings.Split(inputValStr, ".")
+		if len(inputValStrArr) == 2 {
+			inputValStrArr[1] = strings.TrimRight(inputValStrArr[1], "0")
+			inputValStr = strings.Join(inputValStrArr, ".")
+		}
+	}
+	if storageFieldValType.Kind() == reflect.Float64 || storageFieldValType.Kind() == reflect.Float32 {
+		storageValStrArr := strings.Split(storageValStr, ".")
+		if len(storageValStrArr) == 2 {
+			storageValStrArr[1] = strings.TrimRight(storageValStrArr[1], "0")
+			storageValStr = strings.Join(storageValStrArr, ".")
+		}
+	}
+	if inputValStr != storageValStr {
+		result.IsSame = false
+		result.DiffReason = DiffReasonValueNotMatch
+		return result
+	}
+	return result
+}
diff --git a/tool/define/diff_test.go b/tool/define/diff_test.go
new file mode 100644
index 0000000..1f36560
--- /dev/null
+++ b/tool/define/diff_test.go
@@ -0,0 +1,48 @@
+// Package define ...
+//
+// Description : define ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2024-03-08 15:24
+package define
+
+import (
+	"git.zhangdeman.cn/zhangdeman/wrapper"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestDefaultDiffFunc(t *testing.T) {
+	var (
+		num1 float64 = 1.0
+		num2 float32 = 1.00
+		num3 string  = "1"
+		num4 string  = "1.00"
+	)
+	input := wrapper.EasyMap(map[string]interface{}{
+		"num":  num1,
+		"num3": num3,
+		"num4": num4,
+		"num5": num1,
+	})
+	storage := wrapper.EasyMap(map[string]interface{}{
+		"num":  num2,
+		"num3": num2,
+		"num4": num2,
+		"num5": num1,
+	})
+	diffOption := NewDiffOption()
+	diffOption.StrictMode = true
+	res := DefaultDiffFunc("num", input, storage, diffOption)
+	assert.EqualValues(t, false, res.IsSame, "严格模式下, float32与float64不相等")
+	res = DefaultDiffFunc("num5", input, storage, diffOption)
+	assert.EqualValues(t, true, res.IsSame, "严格模式下, float32与float32相等")
+	diffOption.StrictMode = false
+	res = DefaultDiffFunc("num", input, storage, diffOption)
+	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与float64相等")
+	res = DefaultDiffFunc("num3", input, storage, diffOption)
+	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与string相等")
+	res = DefaultDiffFunc("num4", input, storage, diffOption)
+	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与string相等")
+}

From ab1f877b3c3a0a347fa304d5297b500c9de85a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 15:51:38 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E6=95=B0=E5=AD=97=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/define/diff.go      | 29 +++++++++++++++++------------
 tool/define/diff_test.go |  1 +
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tool/define/diff.go b/tool/define/diff.go
index 5b9d50a..8b63d9e 100644
--- a/tool/define/diff.go
+++ b/tool/define/diff.go
@@ -21,7 +21,8 @@ import (
 //
 // Date : 11:12 2024/3/8
 type DiffOption struct {
-	StrictMode          bool                      `json:"strict_mode"`            // 采用严格模式: 1 != "1", 1 != 1.0 , 采用非严格模式 1 == "1", 1 == 1.0
+	StrictMode          bool                      `json:"strict_mode"`            // 采用严格模式:  1 != 1.0 , 采用非严格模式  1 == 1.0
+	AllowStringNumber   bool                      `json:"allow_string_number"`    // 是否允许字符串数字, 在非严格模式下, 若允许, 则 1 == "1" , 不允许, 则 1 != "1"
 	IgnoreNotFoundField bool                      `json:"ignore_not_found_field"` // 忽略不存在的字段
 	IgnoreEmptyString   bool                      `json:"ignore_empty_string"`    // 忽略空字符串, 若输入值为空字符串, 则不做比较, 认为两个值相同
 	IgnoreZeroNumber    bool                      `json:"ignore_zero_number"`     // 忽略置为0的数字, 若输入的数据为数字类型, 则不做比较, 认为两个值相同
@@ -200,20 +201,24 @@ func DefaultDiffFunc(field string, inputVal wrapper.Map, storageVal wrapper.Map,
 	// 存储值尝试转 float64
 	inputValStr := fmt.Sprintf("%v", inputFieldVal)
 	storageValStr := fmt.Sprintf("%v", storageFieldVal)
-	var (
-		storageFloat64 float64
-		inputFloat64   float64
-	)
-	if err := util.ConvertAssign(&storageFloat64, storageValStr); nil == err {
-		if err := util.ConvertAssign(&inputFloat64, inputValStr); nil == err {
-			if storageFloat64 == inputFloat64 {
-				return result
-			}
-		}
-	}
 	if inputValStr == storageValStr {
 		return result
 	}
+	if option.AllowStringNumber {
+		// 允许字符串数字
+		var (
+			storageFloat64 float64
+			inputFloat64   float64
+		)
+		if err := util.ConvertAssign(&storageFloat64, storageValStr); nil == err {
+			if err := util.ConvertAssign(&inputFloat64, inputValStr); nil == err {
+				if storageFloat64 == inputFloat64 {
+					return result
+				}
+			}
+		}
+	}
+
 	// 浮点型数字. 去小数部分最右侧的0
 	if inputFieldValType.Kind() == reflect.Float64 || inputFieldValType.Kind() == reflect.Float32 {
 		inputValStrArr := strings.Split(inputValStr, ".")
diff --git a/tool/define/diff_test.go b/tool/define/diff_test.go
index 1f36560..d805e90 100644
--- a/tool/define/diff_test.go
+++ b/tool/define/diff_test.go
@@ -43,6 +43,7 @@ func TestDefaultDiffFunc(t *testing.T) {
 	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与float64相等")
 	res = DefaultDiffFunc("num3", input, storage, diffOption)
 	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与string相等")
+	diffOption.AllowStringNumber = true
 	res = DefaultDiffFunc("num4", input, storage, diffOption)
 	assert.EqualValues(t, true, res.IsSame, "非严格模式下, float32与string相等")
 }

From 4d25a2a6500d4a358492f0600a16382d40ec4997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 15:56:53 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=9A=B4=E9=9C=B2compa?=
 =?UTF-8?q?re=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/define/diff.go |  2 ++
 tool/diff.go        | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/tool/define/diff.go b/tool/define/diff.go
index 8b63d9e..e8a969c 100644
--- a/tool/define/diff.go
+++ b/tool/define/diff.go
@@ -69,6 +69,7 @@ type CustomDiffFunc func(field string, inputVal wrapper.Map, storageVal wrapper.
 //
 // Date : 11:10 2024/3/8
 type DiffResult struct {
+	Field      string      `json:"field"`       // 字段名
 	OldVal     interface{} `json:"old_val"`     // 当前field在storageVal中的值
 	NewVal     interface{} `json:"new_val"`     // 当前field在inputVal中的值
 	IsSame     bool        `json:"is_same"`     // 两个值是否相同
@@ -126,6 +127,7 @@ func DefaultDiffFunc(field string, inputVal wrapper.Map, storageVal wrapper.Map,
 		option = NewDiffOption()
 	}
 	result := &DiffResult{
+		Field:      field,
 		OldVal:     nil,
 		NewVal:     nil,
 		IsSame:     true,
diff --git a/tool/diff.go b/tool/diff.go
index 9e3e575..1b47618 100644
--- a/tool/diff.go
+++ b/tool/diff.go
@@ -7,9 +7,34 @@
 // Date : 2024-03-08 11:03
 package tool
 
+import (
+	"git.zhangdeman.cn/zhangdeman/wrapper"
+	"git.zhangdeman.cn/zhangdeman/wrapper/tool/define"
+)
+
 var (
 	Diff = &diff{}
 )
 
 type diff struct {
 }
+
+// Compare 比较两个数据源的指定字段
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 15:53 2024/3/8
+func (d *diff) Compare(fieldList []string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) map[string]*define.DiffResult {
+	if nil == option {
+		option = define.NewDiffOption()
+	}
+	res := make(map[string]*define.DiffResult)
+	for _, itemField := range fieldList {
+		if compareFunc, exist := option.CustomDiffFuncTable[itemField]; exist && nil != compareFunc {
+			res[itemField] = compareFunc(itemField, input, storage, option)
+		} else {
+			res[itemField] = define.DefaultDiffFunc(itemField, input, storage, option)
+		}
+	}
+	return res
+}

From c07adaf24995178f93d171ac42bf127749ce3c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 8 Mar 2024 15:58:58 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=85=E6=AF=94?=
 =?UTF-8?q?=E8=BE=83=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/diff.go | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tool/diff.go b/tool/diff.go
index 1b47618..3d2783a 100644
--- a/tool/diff.go
+++ b/tool/diff.go
@@ -30,11 +30,23 @@ func (d *diff) Compare(fieldList []string, input wrapper.Map, storage wrapper.Ma
 	}
 	res := make(map[string]*define.DiffResult)
 	for _, itemField := range fieldList {
-		if compareFunc, exist := option.CustomDiffFuncTable[itemField]; exist && nil != compareFunc {
-			res[itemField] = compareFunc(itemField, input, storage, option)
-		} else {
-			res[itemField] = define.DefaultDiffFunc(itemField, input, storage, option)
-		}
+		res[itemField] = d.CompareSingle(itemField, input, storage, option)
 	}
 	return res
 }
+
+// CompareSingle 比较一个字段
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 15:57 2024/3/8
+func (d *diff) CompareSingle(field string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) *define.DiffResult {
+	if nil == option {
+		option = define.NewDiffOption()
+	}
+	if compareFunc, exist := option.CustomDiffFuncTable[field]; exist && nil != compareFunc {
+		return compareFunc(field, input, storage, option)
+	} else {
+		return define.DefaultDiffFunc(field, input, storage, option)
+	}
+}

From 1e1db094998e10382fa72907fb39d75ed0a2cc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 11 Mar 2024 11:18:25 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84IsSame=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/diff.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tool/diff.go b/tool/diff.go
index 3d2783a..3a7defb 100644
--- a/tool/diff.go
+++ b/tool/diff.go
@@ -50,3 +50,19 @@ func (d *diff) CompareSingle(field string, input wrapper.Map, storage wrapper.Ma
 		return define.DefaultDiffFunc(field, input, storage, option)
 	}
 }
+
+// IsSame 判断连个数据是否一致
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:16 2024/3/11
+func (d *diff) IsSame(fieldList []string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) bool {
+	res := d.Compare(fieldList, input, storage, option)
+	for _, item := range res {
+		if item.IsSame {
+			continue
+		}
+		return false
+	}
+	return true
+}

From e125c7e75dfba078bb8a0022ecaa3917f4b12750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Wed, 20 Mar 2024 12:07:04 +0800
Subject: [PATCH 13/19] update go mod

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index ab84572..82b1079 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.21.4
 
 require (
-	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4
+	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240311030808-e2a2e6a3c211
 	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 	github.com/stretchr/testify v1.8.4
diff --git a/go.sum b/go.sum
index 8f4228b..e8fe001 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 h1:ytpXTP
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY8JLbFcrlq37q/uKyxs2r2e3modsjvfSbnZQ/UI=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
+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/serialize v0.0.0-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 h1:GO3oZa5a2sqwAzGcLDJtQzmshSWRmoP7IDS8bwFqvC4=

From ee726ea6bcff0362017894b49e99eabb2c9edf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Fri, 19 Apr 2024 18:39:25 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E5=AD=90=E4=B8=B2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod    |  4 ++--
 go.sum    |  4 ++++
 string.go | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 82b1079..9b25df3 100644
--- a/go.mod
+++ b/go.mod
@@ -6,13 +6,13 @@ toolchain go1.21.4
 
 require (
 	git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240311030808-e2a2e6a3c211
-	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c
+	git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240325080031-1f58204e8687
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 // indirect
+	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008 // indirect
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index e8fe001..f4b3153 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,15 @@
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 h1:ytpXTP3oxp480BAZQoOzqlBP4XP73NcpMplZ1/fA1lQ=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008 h1:6z99+X/B/G9sCZ+aTLYGWk3YLVVODzevA4wjWj9jvq0=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY8JLbFcrlq37q/uKyxs2r2e3modsjvfSbnZQ/UI=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 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/serialize v0.0.0-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240325080031-1f58204e8687 h1:uQcGqdzi4UdpZlp4f4FUPeBqoygP58pEKJkmN3ROsE0=
+git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240325080031-1f58204e8687/go.mod h1:gf7SW2TXATgux8pfdFedMkXWv2515OtIIM/5c4atkFw=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 h1:GO3oZa5a2sqwAzGcLDJtQzmshSWRmoP7IDS8bwFqvC4=
 git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
diff --git a/string.go b/string.go
index 4aaa19b..d9f963c 100644
--- a/string.go
+++ b/string.go
@@ -1157,3 +1157,21 @@ func (str String) ReplaceChar(charTable map[string]string) String {
 	}
 	return String(formatStr)
 }
+
+// HasSubStr 是否包含指定的子串
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 18:37 2024/4/19
+func (str String) HasSubStr(subStrList []string) bool {
+	if len(subStrList) == 0 {
+		return true
+	}
+	v := str.Value()
+	for _, item := range subStrList {
+		if strings.Contains(v, item) {
+			return true
+		}
+	}
+	return false
+}

From 8c922be06d956c75463778c571f983d7e9944e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 22 Apr 2024 11:44:17 +0800
Subject: [PATCH 15/19] =?UTF-8?q?array=20=E5=A2=9E=E5=8A=A0=20to=20string?=
 =?UTF-8?q?=20slice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 array.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/array.go b/array.go
index 43fef7a..279031e 100644
--- a/array.go
+++ b/array.go
@@ -231,6 +231,20 @@ func (at *Array) ConvertIgnoreError() []interface{} {
 	return res
 }
 
+// ToStringSlice ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 11:42 2024/4/22
+func (at *Array) ToStringSlice() []string {
+	res := at.ConvertIgnoreError()
+	list := make([]string, 0)
+	for _, item := range res {
+		list = append(list, fmt.Sprintf("%v", item))
+	}
+	return list
+}
+
 // Unique 对数据结果进行去重
 //
 // Author : go_developer@163.com<白茶清欢>

From d1b9779946715fd50fd3f5812394a87d77a1dcdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 6 May 2024 14:19:37 +0800
Subject: [PATCH 16/19] update go mod

---
 go.mod | 2 +-
 go.sum | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 9b25df3..ad5ec74 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 )
 
 require (
-	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008 // indirect
+	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240501142503-e31a270e50cc // indirect
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index f4b3153..db2872e 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6 h1:ytpXTP
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240104123641-b3f23974e5d6/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008 h1:6z99+X/B/G9sCZ+aTLYGWk3YLVVODzevA4wjWj9jvq0=
 git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240419080457-9d9562469008/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240501142503-e31a270e50cc h1:kPz9xiUVruM8kwbUUVpxyCTX8pGgyKt60K5zX77oyC4=
+git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240501142503-e31a270e50cc/go.mod h1:IXXaZkb7vGzGnGM5RRWrASAuwrVSNxuoe0DmeXx5g6k=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY8JLbFcrlq37q/uKyxs2r2e3modsjvfSbnZQ/UI=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240311030808-e2a2e6a3c211 h1:I/wOsRpCSRkU9vo1u703slQsmK0wnNeZzsWQOGtIAG0=

From 9ae0c8f4beb1b06037f46c8adbd4bc8ddd4e3adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 6 May 2024 14:29:33 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 array.go | 92 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/array.go b/array.go
index 279031e..40716bf 100644
--- a/array.go
+++ b/array.go
@@ -20,7 +20,7 @@ import (
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 21:03 2023/6/11
-func ArrayType(value interface{}) *Array {
+func ArrayType(value any) *Array {
 	at := &Array{
 		value: value,
 	}
@@ -34,8 +34,8 @@ func ArrayType(value interface{}) *Array {
 //
 // Date : 21:05 2023/6/11
 type Array struct {
-	value         interface{}
-	convertResult []interface{}
+	value         any
+	convertResult []any
 	convertErr    error
 	isSimpleSlice bool         // 是否简单list, 即数据的每一项类型相同, 且都是基础内置数据类型
 	itemType      reflect.Kind // 简单list场景下, 每一项的数据类型
@@ -75,7 +75,7 @@ func (at *Array) ItemIsInterface() bool {
 	if !at.IsValid() {
 		return false
 	}
-	if _, ok := at.value.([]interface{}); ok {
+	if _, ok := at.value.([]any); ok {
 		return true
 	}
 	return false
@@ -86,10 +86,10 @@ func (at *Array) ItemIsInterface() bool {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 17:59 2023/6/12
-func (at *Array) Convert() ([]interface{}, error) {
+func (at *Array) Convert() ([]any, error) {
 	if at.IsNil() {
 		// 空指针
-		at.convertResult = make([]interface{}, 0)
+		at.convertResult = make([]any, 0)
 		return at.convertResult, nil
 	}
 	if !at.IsValid() {
@@ -101,117 +101,117 @@ func (at *Array) Convert() ([]interface{}, error) {
 	case []int8:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int8
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []int16:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int16
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []int32:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int32
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []int64:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int64
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []int:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []uint:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Uint
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []uint8:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Uint8
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []uint16:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Uint16
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []uint32:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int32
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []uint64:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Int64
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []float32:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Float32
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []float64:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Float64
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []bool:
 		at.isSimpleSlice = true
 		at.itemType = reflect.Bool
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
 	case []string:
 		at.isSimpleSlice = true
 		at.itemType = reflect.String
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
-	case []interface{}:
+	case []any:
 		at.isSimpleSlice = false
 		at.itemType = reflect.Interface
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		copy(at.convertResult, val)
 	case []struct{}:
 		at.isSimpleSlice = false
 		at.itemType = reflect.Interface
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
-	case []map[string]interface{}:
+	case []map[string]any:
 		at.isSimpleSlice = false
 		at.itemType = reflect.Interface
-		at.convertResult = make([]interface{}, len(val))
+		at.convertResult = make([]any, len(val))
 		for i := 0; i < len(val); i++ {
 			at.convertResult[i] = val[i]
 		}
@@ -226,7 +226,7 @@ func (at *Array) Convert() ([]interface{}, error) {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 18:07 2023/6/26
-func (at *Array) ConvertIgnoreError() []interface{} {
+func (at *Array) ConvertIgnoreError() []any {
 	res, _ := at.Convert()
 	return res
 }
@@ -250,22 +250,32 @@ func (at *Array) ToStringSlice() []string {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 17:43 2023/6/12
-func (at *Array) Unique() []interface{} {
-	result := make([]interface{}, 0)
-	if at.isSimpleSlice {
-		// 简单数据类型
-		dataTable := make(map[string]bool)
-		for _, item := range at.convertResult {
-			k := fmt.Sprintf("%v", item)
-			if _, exist := dataTable[k]; exist {
-				continue
-			}
-			dataTable[k] = true
-			result = append(result, item)
+func (at *Array) Unique() StringResult {
+	result := make([]any, 0)
+	dataTable := make(map[string]bool)
+
+	for _, item := range at.convertResult {
+		k := ""
+		if at.isSimpleSlice {
+			// 简单数据类型
+			k = fmt.Sprintf("%v", item)
+		} else {
+			// 非简单类型
+			byteData, _ := json.Marshal(item)
+			k = string(byteData)
 		}
-		return result
+		if _, exist := dataTable[k]; exist {
+			continue
+		}
+		dataTable[k] = true
+		result = append(result, item)
 	}
-	return []interface{}{}
+	byteData, _ := json.Marshal(result)
+	return StringResult{
+		Value: string(byteData),
+		Err:   nil,
+	}
+
 }
 
 // Has 查询一个值是否在列表里, 在的话, 返回首次出现的索引, 不在返回-1
@@ -273,7 +283,7 @@ func (at *Array) Unique() []interface{} {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 16:28 2023/7/31
-func (at *Array) Has(input interface{}) int {
+func (at *Array) Has(input any) int {
 	for idx := 0; idx < len(at.convertResult); idx++ {
 		if nil == input {
 			if nil != at.convertResult[idx] {

From 3caad964bcffdb3a3a637bbe6656f2cec6468959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 6 May 2024 14:56:35 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 array.go            | 254 +++++---------------------------------------
 array_test.go       |  18 ++++
 go.mod              |   1 +
 go.sum              |   2 +
 ternary_operator.go |  24 -----
 5 files changed, 47 insertions(+), 252 deletions(-)
 create mode 100644 array_test.go

diff --git a/array.go b/array.go
index 40716bf..98076f6 100644
--- a/array.go
+++ b/array.go
@@ -9,8 +9,7 @@ package wrapper
 
 import (
 	"encoding/json"
-	"errors"
-	"fmt"
+	"git.zhangdeman.cn/zhangdeman/op_type"
 	"reflect"
 	"strings"
 )
@@ -20,11 +19,10 @@ import (
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 21:03 2023/6/11
-func ArrayType(value any) *Array {
-	at := &Array{
+func ArrayType[Bt op_type.BaseType](value []Bt) *Array[Bt] {
+	at := &Array[Bt]{
 		value: value,
 	}
-	_, _ = at.Convert()
 	return at
 }
 
@@ -33,12 +31,10 @@ func ArrayType(value any) *Array {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 21:05 2023/6/11
-type Array struct {
-	value         any
-	convertResult []any
-	convertErr    error
-	isSimpleSlice bool         // 是否简单list, 即数据的每一项类型相同, 且都是基础内置数据类型
-	itemType      reflect.Kind // 简单list场景下, 每一项的数据类型
+type Array[Bt op_type.BaseType] struct {
+	value      []Bt
+	convertErr error
+	itemType   reflect.Kind // 简单list场景下, 每一项的数据类型
 }
 
 // IsNil 输入是否为nil
@@ -46,201 +42,20 @@ type Array struct {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 21:11 2023/6/11
-func (at *Array) IsNil() bool {
+func (at *Array[Bt]) IsNil() bool {
 	return at.value == nil
 }
 
-// IsValid 检测是否为数组类型
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 21:06 2023/6/11
-func (at *Array) IsValid() bool {
-	if at.IsNil() {
-		return false
-	}
-	byteData, err := json.Marshal(at.value)
-	if nil != err {
-		return false
-	}
-	return strings.HasPrefix(string(byteData), "[") && strings.HasSuffix(string(byteData), "]")
-}
-
-// ItemIsInterface 数组每一项是否为interface
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 21:20 2023/6/11
-func (at *Array) ItemIsInterface() bool {
-	if !at.IsValid() {
-		return false
-	}
-	if _, ok := at.value.([]any); ok {
-		return true
-	}
-	return false
-}
-
-// Convert 类型转换
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 17:59 2023/6/12
-func (at *Array) Convert() ([]any, error) {
-	if at.IsNil() {
-		// 空指针
-		at.convertResult = make([]any, 0)
-		return at.convertResult, nil
-	}
-	if !at.IsValid() {
-		// 无效slice
-		at.convertErr = errors.New("input slice is invalid")
-		return nil, at.convertErr
-	}
-	switch val := at.value.(type) {
-	case []int8:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int8
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []int16:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int16
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []int32:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int32
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []int64:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int64
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []int:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []uint:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Uint
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []uint8:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Uint8
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []uint16:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Uint16
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []uint32:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int32
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []uint64:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Int64
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []float32:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Float32
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []float64:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Float64
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []bool:
-		at.isSimpleSlice = true
-		at.itemType = reflect.Bool
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []string:
-		at.isSimpleSlice = true
-		at.itemType = reflect.String
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []any:
-		at.isSimpleSlice = false
-		at.itemType = reflect.Interface
-		at.convertResult = make([]any, len(val))
-		copy(at.convertResult, val)
-	case []struct{}:
-		at.isSimpleSlice = false
-		at.itemType = reflect.Interface
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	case []map[string]any:
-		at.isSimpleSlice = false
-		at.itemType = reflect.Interface
-		at.convertResult = make([]any, len(val))
-		for i := 0; i < len(val); i++ {
-			at.convertResult[i] = val[i]
-		}
-	default:
-
-	}
-	return at.convertResult, nil
-}
-
-// ConvertIgnoreError 类型转换并忽略异常
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 18:07 2023/6/26
-func (at *Array) ConvertIgnoreError() []any {
-	res, _ := at.Convert()
-	return res
-}
-
 // ToStringSlice ...
 //
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 11:42 2024/4/22
-func (at *Array) ToStringSlice() []string {
-	res := at.ConvertIgnoreError()
+func (at *Array[Bt]) ToStringSlice() []string {
 	list := make([]string, 0)
-	for _, item := range res {
-		list = append(list, fmt.Sprintf("%v", item))
+	for _, item := range at.value {
+		byteData, _ := json.Marshal(item)
+		list = append(list, strings.Trim(string(byteData), "\""))
 	}
 	return list
 }
@@ -250,19 +65,15 @@ func (at *Array) ToStringSlice() []string {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 17:43 2023/6/12
-func (at *Array) Unique() StringResult {
+func (at *Array[Bt]) Unique() StringResult {
 	result := make([]any, 0)
 	dataTable := make(map[string]bool)
 
-	for _, item := range at.convertResult {
-		k := ""
-		if at.isSimpleSlice {
-			// 简单数据类型
-			k = fmt.Sprintf("%v", item)
-		} else {
-			// 非简单类型
-			byteData, _ := json.Marshal(item)
-			k = string(byteData)
+	for _, item := range at.value {
+		byteData, _ := json.Marshal(item)
+		k := string(byteData)
+		if strings.HasPrefix(k, "\"\"") && strings.HasSuffix(k, "\"\"") {
+			k = string(byteData[1 : len(byteData)-1])
 		}
 		if _, exist := dataTable[k]; exist {
 			continue
@@ -283,22 +94,13 @@ func (at *Array) Unique() StringResult {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 16:28 2023/7/31
-func (at *Array) Has(input any) int {
-	for idx := 0; idx < len(at.convertResult); idx++ {
-		if nil == input {
-			if nil != at.convertResult[idx] {
-				continue
-			}
-			return idx
-		}
-		if at.convertResult[idx] == nil {
-			continue
-		}
-		if reflect.TypeOf(at.convertResult[idx]).String() != reflect.TypeOf(input).String() {
+func (at *Array[Bt]) Has(input Bt) int {
+	for idx := 0; idx < len(at.value); idx++ {
+		if reflect.TypeOf(at.value[idx]).String() != reflect.TypeOf(input).String() {
 			// 类型不同
 			continue
 		}
-		sourceByte, _ := json.Marshal(at.convertResult[idx])
+		sourceByte, _ := json.Marshal(at.value[idx])
 		inputByte, _ := json.Marshal(input)
 		if string(sourceByte) != string(inputByte) {
 			continue
@@ -313,14 +115,14 @@ func (at *Array) Has(input any) int {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 16:57 2023/9/28
-func (at *Array) ToString() StringResult {
+func (at *Array[Bt]) ToString() StringResult {
 	if at.IsNil() {
 		return StringResult{
 			Value: "",
 			Err:   nil,
 		}
 	}
-	byteData, err := json.Marshal(at.convertResult)
+	byteData, err := json.Marshal(at.value)
 	return StringResult{
 		Value: string(byteData),
 		Err:   err,
@@ -332,19 +134,15 @@ func (at *Array) ToString() StringResult {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 17:42 2023/10/25
-func (at *Array) ToStringWithSplit(split string) StringResult {
+func (at *Array[Bt]) ToStringWithSplit(split string) StringResult {
 	if at.IsNil() {
 		return StringResult{
 			Value: "",
 			Err:   nil,
 		}
 	}
-	strList := make([]string, 0)
-	for _, item := range at.convertResult {
-		strList = append(strList, fmt.Sprintf("%v", item))
-	}
 	return StringResult{
-		Value: strings.Join(strList, split),
+		Value: strings.Join(at.ToStringSlice(), split),
 		Err:   nil,
 	}
 }
diff --git a/array_test.go b/array_test.go
new file mode 100644
index 0000000..032d65e
--- /dev/null
+++ b/array_test.go
@@ -0,0 +1,18 @@
+// Package wrapper ...
+//
+// Description : wrapper ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 2024-05-06 下午2:48
+package wrapper
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestArray_Unique(t *testing.T) {
+	fmt.Println(ArrayType([]any{"1", 1, 1, "1", 2, 3}).Unique().Value)
+	fmt.Println(ArrayType([]int{1, 1, 2, 3}).Unique().Value)
+}
diff --git a/go.mod b/go.mod
index ad5ec74..7febffc 100644
--- a/go.mod
+++ b/go.mod
@@ -13,6 +13,7 @@ require (
 
 require (
 	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20240501142503-e31a270e50cc // indirect
+	git.zhangdeman.cn/zhangdeman/op_type v0.0.0-20240122104027-4928421213c0 // indirect
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20231227095334-7eb5cdbf9253 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index db2872e..ae21fca 100644
--- a/go.sum
+++ b/go.sum
@@ -8,6 +8,8 @@ git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4 h1:93JYY
 git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20240130062251-a87a97b0e8d4/go.mod h1:SrtvrQRdzt+8KfYzvosH++gWxo2ShPTzR1m3VQ6uX7U=
 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/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-20240110090803-399e964daa0c h1:k7VCn9GfRGTilvdF/TcTFVMDBfKLe3VeGAtMTiDSnS0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240110090803-399e964daa0c/go.mod h1:w7kG4zyTJ1uPFaTWhze+OQuaUBINT2XnDxpyiM6ctc0=
 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20240325080031-1f58204e8687 h1:uQcGqdzi4UdpZlp4f4FUPeBqoygP58pEKJkmN3ROsE0=
diff --git a/ternary_operator.go b/ternary_operator.go
index f8052c3..2dd2fea 100644
--- a/ternary_operator.go
+++ b/ternary_operator.go
@@ -108,30 +108,6 @@ func (to *ternaryOperator) StringWithFunc(condFunc CondFunc, trueVal String, fal
 	return to.String(condFunc(), trueVal, falseVal)
 }
 
-// Array ...
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 16:22 2023/11/28
-func (to *ternaryOperator) Array(cond bool, trueVal *Array, falseVal *Array) *Array {
-	if cond {
-		return trueVal
-	}
-	return falseVal
-}
-
-// ArrayWithFunc ...
-//
-// Author : go_developer@163.com<白茶清欢>
-//
-// Date : 16:22 2023/11/28
-func (to *ternaryOperator) ArrayWithFunc(condFunc CondFunc, trueVal *Array, falseVal *Array) *Array {
-	if nil == condFunc {
-		condFunc = defaultCondFunc
-	}
-	return to.Array(condFunc(), trueVal, falseVal)
-}
-
 // Map ...
 //
 // Author : go_developer@163.com<白茶清欢>

From e228983e7306a6e854379f42b49d6f1a37e66fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Mon, 6 May 2024 15:00:32 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E4=BC=98=E5=8C=96uniqueue=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 array.go      | 10 +++-------
 array_test.go |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/array.go b/array.go
index 98076f6..9604988 100644
--- a/array.go
+++ b/array.go
@@ -65,8 +65,8 @@ func (at *Array[Bt]) ToStringSlice() []string {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 17:43 2023/6/12
-func (at *Array[Bt]) Unique() StringResult {
-	result := make([]any, 0)
+func (at *Array[Bt]) Unique() []Bt {
+	result := make([]Bt, 0)
 	dataTable := make(map[string]bool)
 
 	for _, item := range at.value {
@@ -81,11 +81,7 @@ func (at *Array[Bt]) Unique() StringResult {
 		dataTable[k] = true
 		result = append(result, item)
 	}
-	byteData, _ := json.Marshal(result)
-	return StringResult{
-		Value: string(byteData),
-		Err:   nil,
-	}
+	return result
 
 }
 
diff --git a/array_test.go b/array_test.go
index 032d65e..86d4258 100644
--- a/array_test.go
+++ b/array_test.go
@@ -13,6 +13,6 @@ import (
 )
 
 func TestArray_Unique(t *testing.T) {
-	fmt.Println(ArrayType([]any{"1", 1, 1, "1", 2, 3}).Unique().Value)
-	fmt.Println(ArrayType([]int{1, 1, 2, 3}).Unique().Value)
+	fmt.Println(ArrayType([]any{"1", 1, 1, "1", 2, 3}).Unique())
+	fmt.Println(ArrayType([]int{1, 1, 2, 3}).Unique())
 }