Skip to content

Commit

Permalink
fix: 修复 super 包 JSON 解析部分零值不正确的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
kercylan98 committed Jan 16, 2024
1 parent bbf70fa commit 36de593
Showing 1 changed file with 22 additions and 12 deletions.
34 changes: 22 additions & 12 deletions utils/super/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ var json = jsonIter.ConfigCompatibleWithStandardLibrary
func MarshalJSON(v interface{}) []byte {
b, err := json.Marshal(v)
if err != nil {
switch reflect.TypeOf(v).Kind() {
case reflect.Array, reflect.Slice:
return StringToBytes("[]")
default:
return StringToBytes("{}")
}
return jsonZero(v)
}
return b
}
Expand All @@ -37,12 +32,7 @@ func UnmarshalJSON(data []byte, v interface{}) error {
func MarshalIndentJSON(v interface{}, prefix, indent string) []byte {
b, err := json.MarshalIndent(v, prefix, indent)
if err != nil {
switch reflect.TypeOf(v).Kind() {
case reflect.Array, reflect.Slice:
return StringToBytes("[]")
default:
return StringToBytes("{}")
}
return jsonZero(v)
}
return b
}
Expand All @@ -51,3 +41,23 @@ func MarshalIndentJSON(v interface{}, prefix, indent string) []byte {
func MarshalToTargetWithJSON(src, dest interface{}) error {
return json.Unmarshal(MarshalJSON(src), dest)
}

// 获取 json 格式的空对象
func jsonZero(v any) []byte {
vof := reflect.Indirect(reflect.ValueOf(v))
switch vof.Kind() {
case reflect.Array, reflect.Slice:
return StringToBytes("[]")
case reflect.Bool:
return StringToBytes("false") // false 在 JSON 中是不合法的,但是 Golang 中能够正确解析
case
reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
reflect.Float32, reflect.Float64:
return StringToBytes("0") // 0 在 JSON 中是不合法的,但是 Golang 中能够正确解析
case reflect.String:
return StringToBytes("\"\"")
default:
return StringToBytes("{}")
}
}

0 comments on commit 36de593

Please sign in to comment.