mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 15:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

协议代理枚举类型修复

Browse Source
This commit is contained in:
flswld
2023-01-23 16:35:04 +08:00
parent f9ddb2745c
commit 0b3cfe06cb
3 changed files with 98 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/object/object.go
View File

@@ -39,7 +39,7 @@ func FastDeepCopy(dst, src any) error {
}
func CopyProtoBufSameField(dst, src pb.Message) ([]string, error) {
date, err := protojson.Marshal(src)
data, err := protojson.Marshal(src)
if err != nil {
return nil, err
}
@@ -50,7 +50,7 @@ func CopyProtoBufSameField(dst, src pb.Message) ([]string, error) {
if loopCount > 1000 {
return nil, errors.New("loop count limit")
}
err = protojson.Unmarshal(date, dst)
err = protojson.Unmarshal(data, dst)
if err != nil {
if !strings.Contains(err.Error(), "unknown field") {
return nil, err
@@ -61,13 +61,13 @@ func CopyProtoBufSameField(dst, src pb.Message) ([]string, error) {
}
fieldName := split[1]
jsonObj := make(map[string]any)
err = json.Unmarshal(date, &jsonObj)
err = json.Unmarshal(data, &jsonObj)
if err != nil {
return nil, err
}
DeleteAllKeyNameFromStringAnyMap(jsonObj, fieldName)
delList = append(delList, fieldName)
date, err = json.Marshal(jsonObj)
data, err = json.Marshal(jsonObj)
if err != nil {
return nil, err
}