fix: UnmarshalJSON of dst not called when gjson.Scan gogf#3769

encoding/gjson/gjson_z_unit_test.go

@@ -7,7 +7,9 @@
 package gjson_test
 
 import (
+ "encoding/json"
  "fmt"
+ "log"
  "testing"
 
  "github.com/gogf/gf/v2/container/gmap"
@@ -615,3 +617,30 @@ func Test_Issue2520(t *testing.T) {
  t.Assert(gjson.MustEncodeString(t2), gjson.New(t2).MustToJsonString())
  })
 }
+
+type UserIssue3769 struct {
+ Id string
+}
+
+func (u *UserIssue3769) UnmarshalJSON(data []byte) error {
+ var um map[string]string
+ err := json.Unmarshal(data, &um)
+ if err != nil {
+ return err
+ }
+
+ if v, ok := um["uid"]; ok {
+ u.Id = v
+ }
+ return nil
+}
+
+func TestIssue(t *testing.T) {
+ gtest.C(t, func(t *gtest.T) {
+ data := `{"uid": "123", "uname": "456"}`
+ var u UserIssue3769
+ t.AssertNil(gjson.New(data).Scan(&u))
+ log.Println(u)
+ t.Assert(u.Id, `123`)
+ })
+}

util/gconv/gconv_scan.go

@@ -7,6 +7,7 @@
 package gconv
 
 import (
+ stdjson "encoding/json"
  "reflect"
 
  "github.com/gogf/gf/v2/errors/gcode"
@@ -197,6 +198,20 @@ func doConvertWithJsonCheck(srcValue interface{}, dstPointer interface{}) (ok bo
  }
 
  default:
+ switch dst := dstPointer.(type) {
+ case stdjson.Unmarshaler:
+ bytes, err := json.Marshal(srcValue)
+ if err != nil {
+ return false, err
+ }
+
+ err = dst.UnmarshalJSON(bytes)
+ if err != nil {
+ return false, err
+ }
+ return true, nil
+ }
+
  // The `params` might be struct that implements interface function Interface, eg: gvar.Var.
  if v, ok := srcValue.(localinterface.IInterface); ok {
  return doConvertWithJsonCheck(v.Interface(), dstPointer)