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

Improved import, by group improt.

Browse Source
This commit is contained in:
houseme
2021-11-13 23:23:55 +08:00
parent 684fa9b9c9
commit be03b3cdda
286 changed files with 942 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
encoding/gjson/gjson.go
View File

@ -8,12 +8,12 @@
package gjson
import (
"github.com/gogf/gf/v2/internal/utils"
"reflect"
"strconv"
"strings"
"github.com/gogf/gf/v2/internal/rwmutex"
"github.com/gogf/gf/v2/internal/utils"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
)

4
encoding/gjson/gjson_api.go
View File

@ -8,11 +8,11 @@ package gjson
import (
"fmt"
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/util/gutil"
"github.com/gogf/gf/v2/container/gvar"
)
// Interface returns the json value.

13
encoding/gjson/gjson_api_new_load.go
View File

@ -8,18 +8,17 @@ package gjson
import (
"bytes"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/utils"
"reflect"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/encoding/gini"
"github.com/gogf/gf/v2/encoding/gtoml"
"github.com/gogf/gf/v2/encoding/gxml"
"github.com/gogf/gf/v2/encoding/gyaml"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/internal/rwmutex"
"github.com/gogf/gf/v2/internal/utils"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/text/gregex"
"github.com/gogf/gf/v2/util/gconv"
@ -178,7 +177,7 @@ func LoadContentType(dataType string, data interface{}, safe ...bool) (*Json, er
if len(content) == 0 {
return New(nil, safe...), nil
}
//ignore UTF8-BOM
// ignore UTF8-BOM
if content[0] == 0xEF && content[1] == 0xBB && content[2] == 0xBF {
content = content[3:]
}
@ -217,7 +216,7 @@ func loadContentTypeWithOptions(dataType string, data interface{}, options Optio
if len(content) == 0 {
return NewWithOptions(nil, options), nil
}
//ignore UTF8-BOM
// ignore UTF8-BOM
if content[0] == 0xEF && content[1] == 0xBB && content[2] == 0xBF {
content = content[3:]
}

3
encoding/gjson/gjson_stdlib_json_util.go
View File

@ -8,6 +8,7 @@ package gjson
import (
"bytes"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/util/gconv"
)
@ -43,7 +44,7 @@ func DecodeTo(data interface{}, v interface{}) error {
// Do not use number, it converts float64 to json.Number type,
// which actually a string type. It causes converting issue for other data formats,
// for example: yaml.
//decoder.UseNumber()
// decoder.UseNumber()
return decoder.Decode(v)
}

1
encoding/gjson/gjson_z_example_conversion_test.go
View File

@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
)

1
encoding/gjson/gjson_z_example_dataset_test.go
View File

@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
)

1
encoding/gjson/gjson_z_example_load_test.go
View File

@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
"github.com/gogf/gf/v2/debug/gdebug"
"github.com/gogf/gf/v2/encoding/gjson"
)

1
encoding/gjson/gjson_z_example_new_test.go
View File

@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
)

1
encoding/gjson/gjson_z_example_pattern_test.go
View File

@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
)

6
encoding/gjson/gjson_z_unit_basic_test.go
View File

@ -7,9 +7,9 @@
package gjson_test
import (
"github.com/gogf/gf/v2/container/gmap"
"testing"
"github.com/gogf/gf/v2/container/gmap"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
@ -372,7 +372,7 @@ func Test_Convert2(t *testing.T) {
err := j.Var().Scan(&name)
t.Assert(err, nil)
t.Assert(name.Name, "gf")
//j.Dump()
// j.Dump()
t.Assert(err, nil)
j = gjson.New(`{"person":{"name":"gf"}}`)
@ -381,7 +381,7 @@ func Test_Convert2(t *testing.T) {
t.Assert(name.Name, "gf")
j = gjson.New(`{"name":"gf""}`)
//j.Dump()
// j.Dump()
t.Assert(err, nil)
j = gjson.New(`[1,2,3]`)

4
encoding/gjson/gjson_z_unit_implements_test.go
View File

@ -7,13 +7,13 @@
package gjson_test
import (
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/util/gconv"
"testing"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
)
func TestJson_UnmarshalJSON(t *testing.T) {

13
encoding/gjson/gjson_z_unit_internal_test.go
View File

@ -7,8 +7,9 @@
package gjson
import (
"github.com/gogf/gf/v2/test/gtest"
"testing"
"github.com/gogf/gf/v2/test/gtest"
)
func Test_checkDataType(t *testing.T) {
@ -80,11 +81,11 @@ dd = 11
"gf.gvalid.rule.not-in" = "The :attribute value is not in acceptable range"
"gf.gvalid.rule.regex" = "The :attribute value is invalid"
`)
//fmt.Println(gregex.IsMatch(`^[\s\t\n\r]*[\w\-]+\s*:\s*".+"`, data))
//fmt.Println(gregex.IsMatch(`^[\s\t\n\r]*[\w\-]+\s*:\s*\w+`, data))
//fmt.Println(gregex.IsMatch(`[\s\t\n\r]+[\w\-]+\s*:\s*".+"`, data))
//fmt.Println(gregex.IsMatch(`[\n\r]+[\w\-\s\t]+\s*:\s*\w+`, data))
//fmt.Println(gregex.MatchString(`[\n\r]+[\w\-\s\t]+\s*:\s*\w+`, string(data)))
// fmt.Println(gregex.IsMatch(`^[\s\t\n\r]*[\w\-]+\s*:\s*".+"`, data))
// fmt.Println(gregex.IsMatch(`^[\s\t\n\r]*[\w\-]+\s*:\s*\w+`, data))
// fmt.Println(gregex.IsMatch(`[\s\t\n\r]+[\w\-]+\s*:\s*".+"`, data))
// fmt.Println(gregex.IsMatch(`[\n\r]+[\w\-\s\t]+\s*:\s*\w+`, data))
// fmt.Println(gregex.MatchString(`[\n\r]+[\w\-\s\t]+\s*:\s*\w+`, string(data)))
t.Assert(checkDataType(data), "toml")
})

3
encoding/gjson/gjson_z_unit_json_test.go
View File

@ -7,11 +7,12 @@
package gjson_test
import (
"testing"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
"testing"
)
func Test_ToJson(t *testing.T) {

6
encoding/gjson/gjson_z_unit_set_test.go
View File

@ -8,12 +8,12 @@ package gjson_test
import (
"bytes"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
"testing"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
)
func Test_Set1(t *testing.T) {

3
encoding/gjson/gjson_z_unit_struct_test.go
View File

@ -7,9 +7,10 @@
package gjson_test
import (
"testing"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/test/gtest"
"testing"
)
func Test_GetScan(t *testing.T) {