diff --git a/g/encoding/gjson/gjson_api_new_load.go b/g/encoding/gjson/gjson_api_new_load.go index 0ce5acb8d..f6be8a423 100644 --- a/g/encoding/gjson/gjson_api_new_load.go +++ b/g/encoding/gjson/gjson_api_new_load.go @@ -160,7 +160,7 @@ func doLoadContent(dataType string, data []byte, unsafe ...bool) (*Json, error) case "json", ".json": case "xml", ".xml": - if result, err = gxml.Decode(data); err != nil { + if data, err = gxml.ToJson(data); err != nil { return nil, err } @@ -170,7 +170,7 @@ func doLoadContent(dataType string, data []byte, unsafe ...bool) (*Json, error) } case "toml", ".toml": - if result, err = gtoml.Decode(data); err != nil { + if data, err = gtoml.ToJson(data); err != nil { return nil, err } diff --git a/g/frame/gins/gins_config_test.go b/g/frame/gins/gins_config_test.go index 7aa6c8b6e..cc13260bf 100644 --- a/g/frame/gins/gins_config_test.go +++ b/g/frame/gins/gins_config_test.go @@ -8,12 +8,13 @@ package gins_test import ( "fmt" + "testing" + "time" + "github.com/gogf/gf/g/frame/gins" "github.com/gogf/gf/g/os/gfile" "github.com/gogf/gf/g/os/gtime" "github.com/gogf/gf/g/test/gtest" - "testing" - "time" ) func Test_Config(t *testing.T) {