improve gjson

lienze · Jul 16, 2019 · 47d4230 · 47d4230
1 parent 7fae21f
commit 47d4230
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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) {