升级接口约束

abstract/serialize.go

@@ -15,6 +15,8 @@ import "io"
 //
 // Date : 16:55 2024/10/23
 type Serializable interface {
+	// Unmarshal 反序列化
+	Unmarshal(byteData []byte, receiver any) error
 	// UnmarshalWithNumber 反序列化，同时解析数字
 	UnmarshalWithNumber(byteData []byte, receiver any) error
 	// UnmarshalWithNumberIgnoreError 反序列化，同时解析数字, 忽略结果的成功与失败

go.mod

@@ -5,10 +5,12 @@ go 1.23.0
 toolchain go1.24.2
 
 require (
+	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250425024726-cc17224cb995
 	git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e
 	github.com/BurntSushi/toml v1.5.0
 	github.com/go-ini/ini v1.67.0
+	github.com/sbabiv/xml2map v1.2.1
 	gopkg.in/yaml.v3 v3.0.1
- 	git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250425024726-cc17224cb995
+)
- 	github.com/stretchr/testify v1.9.0 // indirect
+
- )
+require github.com/stretchr/testify v1.9.0 // indirect

go.sum

@@ -14,6 +14,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 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=

ini.go

@@ -20,6 +20,10 @@ var (
 type ownIni struct {
 }
 
+func (o *ownIni) Unmarshal(byteData []byte, receiver any) error {
+	return o.UnmarshalWithNumber(byteData, receiver)
+}
+
 func (o *ownIni) UnmarshalWithNumber(byteData []byte, receiver any) error {
 	if nil == receiver {
 		return errors.New("receiver is nil")

json.go

@@ -33,6 +33,10 @@ func init() {
 type ownJSON struct {
 }
 
+func (oj *ownJSON) Unmarshal(byteData []byte, receiver any) error {
+	return oj.UnmarshalWithNumber(byteData, receiver)
+}
+
 // UnmarshalWithNumber 解析json
 //
 // Author : go_developer@163.com<白茶清欢>

toml.go

@@ -21,6 +21,10 @@ var (
 type ownToml struct {
 }
 
+func (o *ownToml) Unmarshal(byteData []byte, receiver any) error {
+	return o.UnmarshalWithNumber(byteData, receiver)
+}
+
 func (o *ownToml) Parse(byteData []byte, receiver any) (*toml.MetaData, error) {
 	if nil == receiver {
 		return nil, errors.New("receiver is nil")

xml.go

@@ -10,6 +10,7 @@ package serialize
 import (
 	"bytes"
 	"encoding/xml"
+	"github.com/sbabiv/xml2map"
 	"io"
 )
 
@@ -19,8 +20,15 @@ var (
 
 type ownXml struct{}
 
+func (o *ownXml) Unmarshal(byteData []byte, receiver any) error {
+	return o.UnmarshalWithNumber(byteData, receiver)
+}
 func (o *ownXml) UnmarshalWithNumber(byteData []byte, receiver any) error {
-	return xml.NewDecoder(bytes.NewReader(byteData)).Decode(receiver)
+	res, err := xml2map.NewDecoder(bytes.NewReader(byteData)).Decode()
+	if nil != err {
+		return err
+	}
+	return JSON.Transition(res, receiver)
 }
 
 func (o *ownXml) UnmarshalWithNumberIgnoreError(byteData []byte, receiver any) {

yml.go

@@ -40,6 +40,9 @@ func (o *ownYml) MarshalForStringIgnoreError(input any) string {
 	return string(o.MarshalForByteIgnoreError(input))
 }
 
+func (o *ownYml) Unmarshal(byteData []byte, receiver any) error {
+	return o.UnmarshalWithNumber(byteData, receiver)
+}
 func (o *ownYml) UnmarshalWithNumber(byteData []byte, receiver any) error {
 	return yaml.NewDecoder(bytes.NewReader(byteData)).Decode(receiver)
 }