bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve gjson

Browse Source
This commit is contained in:
John
2019-07-16 17:27:21 +08:00
parent 7fae21f255
commit 47d423036f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
g/encoding/gjson/gjson_api_new_load.go
View File

@ -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
}

5
g/frame/gins/gins_config_test.go
View File

@ -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) {