diff --git a/.github/workflows/gf.yml b/.github/workflows/gf.yml index c1928c718..b6c468d1a 100644 --- a/.github/workflows/gf.yml +++ b/.github/workflows/gf.yml @@ -122,16 +122,16 @@ jobs: cd cmd/gf go mod tidy go build ./... - GOARCH=386 go test ./... || exit 1 - GOARCH=amd64 go test ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 + GOARCH=386 go test -v ./... || exit 1 + GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 - name: Example Build & Test run: | cd example go mod tidy go build ./... - GOARCH=386 go test ./... || exit 1 - GOARCH=amd64 go test ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 + GOARCH=386 go test -v ./... || exit 1 + GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 - name: Contrib Build & Test run: | @@ -145,8 +145,8 @@ jobs: cd $dirpath go mod tidy go build ./... - GOARCH=386 go test ./... || exit 1 - GOARCH=amd64 go test ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 + GOARCH=386 go test -v ./... || exit 1 + GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 cd - done @@ -156,16 +156,6 @@ jobs: GOARCH=386 go test -v ./... || exit 1 GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1 -# - name: Merge Coverage -# run: | -# for file in `find . -name coverage.txt`; do -# # In case of recursively incremental selffile in root directory. -# if [ "./coverage.txt" = $file ]; then -# continue 1 -# fi -# cat $file >> coverage.txt -# done - - name: Report Coverage uses: codecov/codecov-action@v2 with: diff --git a/.gitignore b/.gitignore index b928722a5..547a03284 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,4 @@ bin/ cbuild **/.DS_Store .test/ -main -gf \ No newline at end of file +cmd/gf/main diff --git a/cmd/gf/internal/cmd/cmd_docker.go b/cmd/gf/internal/cmd/cmd_docker.go index 46ca495a2..b111ecbc5 100644 --- a/cmd/gf/internal/cmd/cmd_docker.go +++ b/cmd/gf/internal/cmd/cmd_docker.go @@ -3,6 +3,7 @@ package cmd import ( "context" "fmt" + "runtime" "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" @@ -93,8 +94,8 @@ func (c cDocker) Index(ctx context.Context, in cDockerInput) (out *cDockerOutput } // Shell executing. - if gfile.Exists(in.Shell) { - if err = gproc.ShellRun(gfile.GetContents(in.Shell)); err != nil { + if in.Shell != "" && gfile.Exists(in.Shell) { + if err = c.exeDockerShell(in.Shell); err != nil { return } } @@ -150,3 +151,11 @@ func (c cDocker) Index(ctx context.Context, in cDockerInput) (out *cDockerOutput } return } + +func (c cDocker) exeDockerShell(shellFilePath string) error { + if gfile.ExtName(shellFilePath) == "sh" && runtime.GOOS == "windows" { + mlog.Debugf(`ignore shell file "%s", as it cannot be run on windows system`, shellFilePath) + return nil + } + return gproc.ShellRun(gfile.GetContents(shellFilePath)) +} diff --git a/encoding/gjson/gjson.go b/encoding/gjson/gjson.go index 675a07656..f103be4a6 100644 --- a/encoding/gjson/gjson.go +++ b/encoding/gjson/gjson.go @@ -22,13 +22,14 @@ import ( ) const ( - ContentTypeJson = `json` - ContentTypeJs = `js` - ContentTypeXml = `xml` - ContentTypeIni = `ini` - ContentTypeYaml = `yaml` - ContentTypeYml = `yml` - ContentTypeToml = `toml` + ContentTypeJson = `json` + ContentTypeJs = `js` + ContentTypeXml = `xml` + ContentTypeIni = `ini` + ContentTypeYaml = `yaml` + ContentTypeYml = `yml` + ContentTypeToml = `toml` + ContentTypeProperties = `properties` ) const ( diff --git a/encoding/gjson/gjson_api_encoding.go b/encoding/gjson/gjson_api_encoding.go index 8d95cb946..7f08f0ccc 100644 --- a/encoding/gjson/gjson_api_encoding.go +++ b/encoding/gjson/gjson_api_encoding.go @@ -8,6 +8,7 @@ package gjson import ( "github.com/gogf/gf/v2/encoding/gini" + "github.com/gogf/gf/v2/encoding/gproperties" "github.com/gogf/gf/v2/encoding/gtoml" "github.com/gogf/gf/v2/encoding/gxml" "github.com/gogf/gf/v2/encoding/gyaml" @@ -197,3 +198,30 @@ func (j *Json) MustToIni() []byte { func (j *Json) MustToIniString() string { return string(j.MustToIni()) } + +// ======================================================================== +// properties +// ======================================================================== +// Toproperties json to properties +func (j *Json) ToProperties() ([]byte, error) { + return gproperties.Encode(j.Map()) +} + +// TopropertiesString properties to string +func (j *Json) ToPropertiesString() (string, error) { + b, e := j.ToProperties() + return string(b), e +} + +func (j *Json) MustToProperties() []byte { + result, err := j.ToProperties() + if err != nil { + panic(err) + } + return result +} + +// MustTopropertiesString +func (j *Json) MustToPropertiesString() string { + return string(j.MustToProperties()) +} diff --git a/encoding/gjson/gjson_api_new_load.go b/encoding/gjson/gjson_api_new_load.go index b0a2194f1..23d761fef 100644 --- a/encoding/gjson/gjson_api_new_load.go +++ b/encoding/gjson/gjson_api_new_load.go @@ -11,6 +11,7 @@ import ( "reflect" "github.com/gogf/gf/v2/encoding/gini" + "github.com/gogf/gf/v2/encoding/gproperties" "github.com/gogf/gf/v2/encoding/gtoml" "github.com/gogf/gf/v2/encoding/gxml" "github.com/gogf/gf/v2/encoding/gyaml" @@ -174,6 +175,17 @@ func LoadToml(data interface{}, safe ...bool) (*Json, error) { return doLoadContentWithOptions(gconv.Bytes(data), option) } +// LoadProperties creates a Json object from given TOML format content. +func LoadProperties(data interface{}, safe ...bool) (*Json, error) { + option := Options{ + Type: ContentTypeProperties, + } + if len(safe) > 0 && safe[0] { + option.Safe = true + } + return doLoadContentWithOptions(gconv.Bytes(data), option) +} + // LoadContent creates a Json object from given content, it checks the data type of `content` // automatically, supporting data content type as follows: // JSON, XML, INI, YAML and TOML. @@ -222,7 +234,8 @@ func IsValidDataType(dataType string) bool { ContentTypeYaml, ContentTypeYml, ContentTypeToml, - ContentTypeIni: + ContentTypeIni, + ContentTypeProperties: return true } return false @@ -288,6 +301,10 @@ func doLoadContentWithOptions(data []byte, options Options) (*Json, error) { if data, err = gini.ToJson(data); err != nil { return nil, err } + case ContentTypeProperties: + if data, err = gproperties.ToJson(data); err != nil { + return nil, err + } default: err = gerror.NewCodef( @@ -335,6 +352,8 @@ func checkDataType(content []byte) string { (gregex.IsMatch(`[\n\r]*[\s\t\w\-\."]+\s*=\s*".+"`, content) || gregex.IsMatch(`[\n\r]*[\s\t\w\-\."]+\s*=\s*\w+`, content)) { // Must contain "[xxx]" section. return ContentTypeIni + } else if gregex.IsMatch(`[\n\r]*[\s\t\w\-\."]+\s*=\s*\w+`, content) { + return ContentTypeProperties } else { return "" } diff --git a/encoding/gjson/gjson_z_example_load_test.go b/encoding/gjson/gjson_z_example_load_test.go index 41fe9189d..102029f6f 100644 --- a/encoding/gjson/gjson_z_example_load_test.go +++ b/encoding/gjson/gjson_z_example_load_test.go @@ -182,6 +182,7 @@ func ExampleIsValidDataType() { fmt.Println(gjson.IsValidDataType("txt")) fmt.Println(gjson.IsValidDataType("")) fmt.Println(gjson.IsValidDataType(".json")) + fmt.Println(gjson.IsValidDataType(".properties")) // Output: // true @@ -192,6 +193,7 @@ func ExampleIsValidDataType() { // false // false // true + // true } func ExampleLoad_Xml() { @@ -200,3 +202,16 @@ func ExampleLoad_Xml() { fmt.Println(j.Get("doc.name")) fmt.Println(j.Get("doc.score")) } + +func ExampleLoad_Properties() { + jsonFilePath := gtest.DataPath("properties", "data1.properties") + j, _ := gjson.Load(jsonFilePath) + fmt.Println(j.Get("pr.name")) + fmt.Println(j.Get("pr.score")) + fmt.Println(j.Get("pr.sex")) + + //Output: + // john + // 100 + // 0 +} diff --git a/encoding/gjson/gjson_z_example_test.go b/encoding/gjson/gjson_z_example_test.go index fa765be83..2bda1b8c1 100644 --- a/encoding/gjson/gjson_z_example_test.go +++ b/encoding/gjson/gjson_z_example_test.go @@ -641,6 +641,80 @@ func ExampleJson_MustToIniString() { //Name=John } +// ======================================================================== +// Properties +// ======================================================================== +func ExampleJson_ToProperties() { + type BaseInfo struct { + Name string + Age int + } + + info := BaseInfo{ + Name: "John", + Age: 18, + } + + j := gjson.New(info) + pr, _ := j.ToProperties() + fmt.Println(string(pr)) + + // May Output: + // name = John + // age = 18 +} + +func ExampleJson_ToPropertiesString() { + type BaseInfo struct { + Name string + } + + info := BaseInfo{ + Name: "John", + } + + j := gjson.New(info) + pr, _ := j.ToPropertiesString() + fmt.Println(pr) + + // Output: + // name = John +} + +func ExampleJson_MustToProperties() { + type BaseInfo struct { + Name string + } + + info := BaseInfo{ + Name: "John", + } + + j := gjson.New(info) + pr := j.MustToProperties() + fmt.Println(string(pr)) + + // Output: + // name = John +} + +func ExampleJson_MustToPropertiesString() { + type BaseInfo struct { + Name string + } + + info := BaseInfo{ + Name: "John", + } + + j := gjson.New(info) + pr := j.MustToPropertiesString() + fmt.Println(pr) + + // Output: + // name = John +} + func ExampleJson_MarshalJSON() { type BaseInfo struct { Name string diff --git a/encoding/gjson/gjson_z_unit_feature_load_test.go b/encoding/gjson/gjson_z_unit_feature_load_test.go index 4517989a4..51f9a2d8b 100644 --- a/encoding/gjson/gjson_z_unit_feature_load_test.go +++ b/encoding/gjson/gjson_z_unit_feature_load_test.go @@ -361,3 +361,58 @@ gfcli: t.AssertNil(err) }) } + +func Test_Load_Properties(t *testing.T) { + var data = ` + +#注释 + + +addr.ip = 127.0.0.1 +addr.port=9001 +addr.enable=true +DBINFO.type=mysql +DBINFO.user=root +DBINFO.password=password + +` + + gtest.C(t, func(t *gtest.T) { + j, err := gjson.LoadContent(data) + if err != nil { + gtest.Fatal(err) + } + + t.Assert(j.Get("addr.ip").String(), "127.0.0.1") + t.Assert(j.Get("addr.port").String(), "9001") + t.Assert(j.Get("addr.enable").String(), "true") + t.Assert(j.Get("DBINFO.type").String(), "mysql") + t.Assert(j.Get("DBINFO.user").String(), "root") + t.Assert(j.Get("DBINFO.password").String(), "password") + + _, err = j.ToProperties() + if err != nil { + gtest.Fatal(err) + } + }) + + gtest.C(t, func(t *gtest.T) { + j, err := gjson.LoadProperties(data, true) + if err != nil { + gtest.Fatal(err) + } + + t.Assert(j.Get("addr.ip").String(), "127.0.0.1") + t.Assert(j.Get("addr.port").String(), "9001") + t.Assert(j.Get("addr.enable").String(), "true") + t.Assert(j.Get("DBINFO.type").String(), "mysql") + t.Assert(j.Get("DBINFO.user").String(), "root") + t.Assert(j.Get("DBINFO.password").String(), "password") + }) + + gtest.C(t, func(t *gtest.T) { + errData := []byte("i\\u1 : 123456789") + _, err := gjson.LoadContentType("properties", errData, true) + t.AssertNE(err, nil) + }) +} diff --git a/encoding/gjson/testdata/properties/data1.properties b/encoding/gjson/testdata/properties/data1.properties new file mode 100644 index 000000000..8f9dad5d9 --- /dev/null +++ b/encoding/gjson/testdata/properties/data1.properties @@ -0,0 +1,3 @@ +pr.name=john +pr.score=100 +pr.sex=0 \ No newline at end of file diff --git a/encoding/gproperties/gproperties.go b/encoding/gproperties/gproperties.go new file mode 100644 index 000000000..b26129322 --- /dev/null +++ b/encoding/gproperties/gproperties.go @@ -0,0 +1,137 @@ +// Copyright GoFrame Author(https://goframe.org). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +// Package gproperties provides accessing and converting for .properties content. +package gproperties + +import ( + "bytes" + "sort" + "strings" + + "github.com/gogf/gf/v2/errors/gerror" + "github.com/gogf/gf/v2/internal/json" + "github.com/gogf/gf/v2/util/gconv" + "github.com/magiconair/properties" +) + +// Decode converts properties format to map. +func Decode(data []byte) (res map[string]interface{}, err error) { + res = make(map[string]interface{}) + pr, err := properties.Load(data, properties.UTF8) + if err != nil || pr == nil { + err = gerror.Wrapf(err, `Lib magiconair load Properties data failed.`) + return nil, err + } + for _, key := range pr.Keys() { + // ignore existence check: we know it's there + value, _ := pr.Get(key) + // recursively build nested maps + path := strings.Split(key, ".") + lastKey := strings.ToLower(path[len(path)-1]) + deepestMap := deepSearch(res, path[0:len(path)-1]) + + // set innermost value + deepestMap[lastKey] = value + } + return res, nil +} + +// Encode converts map to properties format. +func Encode(data map[string]interface{}) (res []byte, err error) { + pr := properties.NewProperties() + + flattened := map[string]interface{}{} + + flattened = flattenAndMergeMap(flattened, data, "", ".") + + keys := make([]string, 0, len(flattened)) + + for key := range flattened { + keys = append(keys, key) + } + + sort.Strings(keys) + + for _, key := range keys { + _, _, err := pr.Set(key, gconv.String(flattened[key])) + if err != nil { + err = gerror.Wrapf(err, `Sets the property key to the corresponding value failed.`) + return nil, err + } + } + + var buf bytes.Buffer + + _, err = pr.Write(&buf, properties.UTF8) + if err != nil { + err = gerror.Wrapf(err, `Properties Write buf failed.`) + return nil, err + } + + return buf.Bytes(), nil +} + +// ToJson convert .properties format to JSON. +func ToJson(data []byte) (res []byte, err error) { + prMap, err := Decode(data) + if err != nil { + return nil, err + } + return json.Marshal(prMap) +} + +// deepSearch scans deep maps, following the key indexes listed in the sequence "path". +// The last value is expected to be another map, and is returned. +func deepSearch(m map[string]interface{}, path []string) map[string]interface{} { + for _, k := range path { + m2, ok := m[k] + if !ok { + // intermediate key does not exist + // => create it and continue from there + m3 := make(map[string]interface{}) + m[k] = m3 + m = m3 + continue + } + m3, ok := m2.(map[string]interface{}) + if !ok { + m3 = make(map[string]interface{}) + m[k] = m3 + } + // continue search from here + m = m3 + } + return m +} + +// flattenAndMergeMap recursively flattens the given map into a new map +func flattenAndMergeMap(shadow map[string]interface{}, m map[string]interface{}, prefix string, delimiter string) map[string]interface{} { + if shadow != nil && prefix != "" && shadow[prefix] != nil { + return shadow + } + + var m2 map[string]interface{} + if prefix != "" { + prefix += delimiter + } + for k, val := range m { + fullKey := prefix + k + switch val.(type) { + case map[string]interface{}: + m2 = val.(map[string]interface{}) + case map[interface{}]interface{}: + m2 = gconv.Map(val) + default: + // immediate value + shadow[strings.ToLower(fullKey)] = val + continue + } + // recursively merge to shadow map + shadow = flattenAndMergeMap(shadow, m2, fullKey, delimiter) + } + return shadow +} diff --git a/encoding/gproperties/gproperties_z_unit_test.go b/encoding/gproperties/gproperties_z_unit_test.go new file mode 100644 index 000000000..f3ff79310 --- /dev/null +++ b/encoding/gproperties/gproperties_z_unit_test.go @@ -0,0 +1,132 @@ +// Copyright GoFrame Author(https://goframe.org). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +package gproperties_test + +import ( + "fmt" + "strings" + "testing" + + "github.com/gogf/gf/v2/encoding/gjson" + "github.com/gogf/gf/v2/encoding/gproperties" + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/test/gtest" +) + +var pStr string = ` +# 模板引擎目录 +viewpath = "/home/www/templates/" +# redis数据库配置 +redis.disk = "127.0.0.1:6379,0" +redis.cache = "127.0.0.1:6379,1" +#SQL配置 +sql.mysql.0.type = mysql +sql.mysql.0.ip = 127.0.0.1 +sql.mysql.0.user = root +` +var errorTests = []struct { + input, msg string +}{ + // unicode literals + {"key\\u1 = value", "invalid unicode literal"}, + {"key\\u12 = value", "invalid unicode literal"}, + {"key\\u123 = value", "invalid unicode literal"}, + {"key\\u123g = value", "invalid unicode literal"}, + {"key\\u123", "invalid unicode literal"}, + + // circular references + {"key=${key}", `circular reference in:\nkey=\$\{key\}`}, + {"key1=${key2}\nkey2=${key1}", `circular reference in:\n(key1=\$\{key2\}\nkey2=\$\{key1\}|key2=\$\{key1\}\nkey1=\$\{key2\})`}, + + // malformed expressions + {"key=${ke", "malformed expression"}, + {"key=valu${ke", "malformed expression"}, +} + +func TestDecode(t *testing.T) { + gtest.C(t, func(t *gtest.T) { + m := make(map[string]interface{}) + m["properties"] = pStr + res, err := gproperties.Encode(m) + if err != nil { + t.Errorf("encode failed. %v", err) + return + } + decodeMap, err := gproperties.Decode(res) + if err != nil { + t.Errorf("decode failed. %v", err) + return + } + t.Assert(decodeMap["properties"], pStr) + }) + + gtest.C(t, func(t *gtest.T) { + for _, v := range errorTests { + _, err := gproperties.Decode(([]byte)(v.input)) + if err == nil { + t.Errorf("encode should be failed. %v", err) + return + } + t.AssertIN(`Lib magiconair load Properties data failed.`, strings.Split(err.Error(), ":")) + } + }) +} +func TestEncode(t *testing.T) { + gtest.C(t, func(t *gtest.T) { + m := make(map[string]interface{}) + m["properties"] = pStr + res, err := gproperties.Encode(m) + if err != nil { + t.Errorf("encode failed. %v", err) + return + } + decodeMap, err := gproperties.Decode(res) + if err != nil { + t.Errorf("decode failed. %v", err) + return + } + t.Assert(decodeMap["properties"], pStr) + }) +} + +func TestToJson(t *testing.T) { + gtest.C(t, func(t *gtest.T) { + res, err := gproperties.Encode(map[string]interface{}{ + "sql": g.Map{ + "userName": "admin", + "password": "123456", + }, + "user": "admin", + "no": 123, + }) + fmt.Print(string(res)) + jsonPr, err := gproperties.ToJson(res) + if err != nil { + t.Errorf("ToJson failed. %v", err) + return + } + fmt.Print(string(jsonPr)) + + p := gjson.New(res) + expectJson, err := p.ToJson() + if err != nil { + t.Errorf("parser ToJson failed. %v", err) + return + } + t.Assert(jsonPr, expectJson) + }) + gtest.C(t, func(t *gtest.T) { + for _, v := range errorTests { + _, err := gproperties.ToJson(([]byte)(v.input)) + if err == nil { + t.Errorf("encode should be failed. %v", err) + return + } + t.AssertIN(`Lib magiconair load Properties data failed.`, strings.Split(err.Error(), ":")) + } + }) +} diff --git a/frame/gins/gins_z_unit_view_test.go b/frame/gins/gins_z_unit_view_test.go index 0697583eb..3bff351cf 100644 --- a/frame/gins/gins_z_unit_view_test.go +++ b/frame/gins/gins_z_unit_view_test.go @@ -13,10 +13,8 @@ import ( "github.com/gogf/gf/v2/os/gcfg" "github.com/gogf/gf/v2/os/gfile" - "github.com/gogf/gf/v2/os/gres" "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/test/gtest" - "github.com/gogf/gf/v2/util/gutil" ) func Test_View(t *testing.T) { @@ -60,12 +58,6 @@ func Test_View_Config(t *testing.T) { defer Config().GetAdapter().(*gcfg.AdapterFile).ClearContent() defer localInstances.Clear() - gres.Dump() - gutil.Dump(Config().GetAdapter().(*gcfg.AdapterFile).GetPaths()) - gutil.Dump(Config().GetAdapter().(*gcfg.AdapterFile).GetFileName()) - gutil.Dump(Config().GetAdapter().(*gcfg.AdapterFile).GetContent()) - gutil.Dump(Config().Data(ctx)) - view := View("test1") t.AssertNE(view, nil) err := view.AddPath(dirPath) diff --git a/go.mod b/go.mod index d601a55dd..2a8f5f58c 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,8 @@ require ( github.com/go-redis/redis/v8 v8.11.4 github.com/gorilla/websocket v1.5.0 github.com/grokify/html-strip-tags-go v0.0.1 + github.com/kr/pretty v0.3.0 // indirect + github.com/magiconair/properties v1.8.6 github.com/olekukonko/tablewriter v0.0.5 go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/sdk v1.7.0 diff --git a/go.sum b/go.sum index 1012c9550..73700b678 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E= github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -45,6 +46,15 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0= github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -67,6 +77,8 @@ github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= @@ -139,8 +151,10 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/i18n/gi18n/gi18n_z_unit_test.go b/i18n/gi18n/gi18n_z_unit_test.go index aec748aad..0a84469ae 100644 --- a/i18n/gi18n/gi18n_z_unit_test.go +++ b/i18n/gi18n/gi18n_z_unit_test.go @@ -10,12 +10,13 @@ import ( "context" "testing" + _ "github.com/gogf/gf/v2/os/gres/testdata/data" + "github.com/gogf/gf/v2/debug/gdebug" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/i18n/gi18n" "github.com/gogf/gf/v2/os/gfile" "github.com/gogf/gf/v2/os/gres" - _ "github.com/gogf/gf/v2/os/gres/testdata/data" "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/test/gtest" "github.com/gogf/gf/v2/util/gconv" @@ -133,6 +134,7 @@ func Test_Instance(t *testing.T) { // Default language is: en gtest.C(t, func(t *gtest.T) { m := gi18n.Instance(gconv.String(gtime.TimestampNano())) + m.SetPath("i18n-dir") t.Assert(m.T(context.Background(), "{#hello}{#world}"), "HelloWorld") }) } diff --git a/net/gclient/gclient_response.go b/net/gclient/gclient_response.go index dd3a3815f..84fef34d8 100644 --- a/net/gclient/gclient_response.go +++ b/net/gclient/gclient_response.go @@ -71,9 +71,8 @@ func (r *Response) ReadAllString() string { // Close closes the response when it will never be used. func (r *Response) Close() error { - if r == nil || r.Response == nil || r.Response.Close { + if r == nil || r.Response == nil { return nil } - r.Response.Close = true return r.Response.Body.Close() } diff --git a/net/gclient/gclient_z_example_test.go b/net/gclient/gclient_z_example_test.go index 70e7c46f5..230d57863 100644 --- a/net/gclient/gclient_z_example_test.go +++ b/net/gclient/gclient_z_example_test.go @@ -9,6 +9,9 @@ package gclient_test import ( "context" "fmt" + "github.com/gogf/gf/v2/net/gclient" + "github.com/gogf/gf/v2/os/gctx" + "net/http" "time" "github.com/gogf/gf/v2/frame/g" @@ -98,6 +101,49 @@ func init() { time.Sleep(time.Millisecond * 500) } +func ExampleNew() { + var ( + ctx = gctx.New() + client = gclient.New() + ) + + if r, err := client.Get(ctx, "http://127.0.0.1:8999/var/json"); err != nil { + panic(err) + } else { + defer r.Close() + fmt.Println(r.ReadAllString()) + } + + // Output: + // {"id":1,"name":"john"} +} + +func ExampleNew_MultiConn_Recommend() { + var ( + ctx = gctx.New() + client = g.Client() + ) + + // controls the maximum idle(keep-alive) connections to keep per-host + client.Transport.(*http.Transport).MaxIdleConnsPerHost = 5 + + for i := 0; i < 5; i++ { + if r, err := client.Get(ctx, "http://127.0.0.1:8999/var/json"); err != nil { + panic(err) + } else { + fmt.Println(r.ReadAllString()) + r.Close() + } + } + + // Output: + //{"id":1,"name":"john"} + //{"id":1,"name":"john"} + //{"id":1,"name":"john"} + //{"id":1,"name":"john"} + //{"id":1,"name":"john"} +} + func ExampleClient_Header() { var ( url = "http://127.0.0.1:8999/header" diff --git a/os/gcfg/gcfg_adapter_file.go b/os/gcfg/gcfg_adapter_file.go index 49aacfbec..c2c11db1e 100644 --- a/os/gcfg/gcfg_adapter_file.go +++ b/os/gcfg/gcfg_adapter_file.go @@ -8,7 +8,6 @@ package gcfg import ( "context" - "fmt" "github.com/gogf/gf/v2/container/garray" "github.com/gogf/gf/v2/container/gmap" @@ -207,10 +206,12 @@ func (c *AdapterFile) Available(ctx context.Context, fileName ...string) bool { } else { usedFileName = c.defaultName } - if path, _ := c.GetFilePath(usedFileName); path != "" { + // Custom configuration content exists. + if c.GetContent(usedFileName) != "" { return true } - if c.GetContent(usedFileName) != "" { + // Configuration file exists in system path. + if path, _ := c.GetFilePath(usedFileName); path != "" { return true } return false @@ -258,7 +259,6 @@ func (c *AdapterFile) getJson(fileName ...string) (configJson *gjson.Json, err e return nil } if file := gres.Get(filePath); file != nil { - fmt.Println("retrieve config content from gres:", filePath) content = string(file.Content()) } else { content = gfile.GetContents(filePath) diff --git a/os/gcmd/gcmd_command.go b/os/gcmd/gcmd_command.go index a7d018786..347b8e66d 100644 --- a/os/gcmd/gcmd_command.go +++ b/os/gcmd/gcmd_command.go @@ -28,6 +28,7 @@ type Command struct { Examples string // Usage examples. Additional string // Additional info about this command, which will be appended to the end of help info. Strict bool // Strict parsing options, which means it returns error if invalid option given. + CaseSensitive bool // CaseSensitive parsing options, which means it parses input options in case-sensitive way. Config string // Config node name, which also retrieves the values from config component along with command line. parent *Command // Parent command for internal usage. commands []*Command // Sub commands of this command. diff --git a/os/gcmd/gcmd_command_object.go b/os/gcmd/gcmd_command_object.go index ddf37151d..2dbeb2489 100644 --- a/os/gcmd/gcmd_command_object.go +++ b/os/gcmd/gcmd_command_object.go @@ -9,11 +9,14 @@ package gcmd import ( "context" + "fmt" "reflect" "github.com/gogf/gf/v2/container/gset" + "github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/errors/gcode" "github.com/gogf/gf/v2/errors/gerror" + "github.com/gogf/gf/v2/internal/intlog" "github.com/gogf/gf/v2/internal/reflection" "github.com/gogf/gf/v2/internal/utils" "github.com/gogf/gf/v2/os/gstructs" @@ -285,11 +288,17 @@ func newCommandFromMethod(object interface{}, method reflect.Value) (command *Co } // Construct input parameters. if len(data) > 0 { + intlog.PrintFunc(ctx, func() string { + return fmt.Sprintf(`input command data map: %s`, gjson.MustEncode(data)) + }) if inputObject.Kind() == reflect.Ptr { err = gconv.Scan(data, inputObject.Interface()) } else { err = gconv.Struct(data, inputObject.Addr().Interface()) } + intlog.PrintFunc(ctx, func() string { + return fmt.Sprintf(`input object assigned data: %s`, gjson.MustEncode(inputObject.Interface())) + }) if err != nil { return } diff --git a/os/gcmd/gcmd_command_run.go b/os/gcmd/gcmd_command_run.go index 845900fa8..c267665dc 100644 --- a/os/gcmd/gcmd_command_run.go +++ b/os/gcmd/gcmd_command_run.go @@ -146,7 +146,10 @@ func (c *Command) reParse(ctx context.Context, parser *Parser) (*Parser, error) } supportedOptions[optionKey] = !arg.Orphan } - parser, err := Parse(supportedOptions, c.Strict) + parser, err := Parse(supportedOptions, ParserOption{ + CaseSensitive: c.CaseSensitive, + Strict: c.Strict, + }) if err != nil { return nil, err } diff --git a/os/gcmd/gcmd_parser.go b/os/gcmd/gcmd_parser.go index abbb6f251..9ad006b2b 100644 --- a/os/gcmd/gcmd_parser.go +++ b/os/gcmd/gcmd_parser.go @@ -21,9 +21,15 @@ import ( "github.com/gogf/gf/v2/text/gstr" ) +// ParserOption manages the parsing options. +type ParserOption struct { + CaseSensitive bool // Marks options parsing in case-sensitive way. + Strict bool // Whether stops parsing and returns error if invalid option passed. +} + // Parser for arguments. type Parser struct { - strict bool // Whether stops parsing and returns error if invalid option passed. + option ParserOption // Parse option. parsedArgs []string // As name described. parsedOptions map[string]string // As name described. passedOptions map[string]bool // User passed supported options, like: map[string]bool{"name,n":true} @@ -47,7 +53,7 @@ func ParserFromCtx(ctx context.Context) *Parser { // the value item of `supportedOptions` indicates whether corresponding option name needs argument or not. // // The optional parameter `strict` specifies whether stops parsing and returns error if invalid option passed. -func Parse(supportedOptions map[string]bool, strict ...bool) (*Parser, error) { +func Parse(supportedOptions map[string]bool, option ...ParserOption) (*Parser, error) { if supportedOptions == nil { command.Init(os.Args...) return &Parser{ @@ -55,7 +61,7 @@ func Parse(supportedOptions map[string]bool, strict ...bool) (*Parser, error) { parsedOptions: GetOptAll(), }, nil } - return ParseArgs(os.Args, supportedOptions, strict...) + return ParseArgs(os.Args, supportedOptions, option...) } // ParseArgs creates and returns a new Parser with given arguments and supported options. @@ -64,7 +70,7 @@ func Parse(supportedOptions map[string]bool, strict ...bool) (*Parser, error) { // the value item of `supportedOptions` indicates whether corresponding option name needs argument or not. // // The optional parameter `strict` specifies whether stops parsing and returns error if invalid option passed. -func ParseArgs(args []string, supportedOptions map[string]bool, strict ...bool) (*Parser, error) { +func ParseArgs(args []string, supportedOptions map[string]bool, option ...ParserOption) (*Parser, error) { if supportedOptions == nil { command.Init(args...) return &Parser{ @@ -72,12 +78,12 @@ func ParseArgs(args []string, supportedOptions map[string]bool, strict ...bool) parsedOptions: GetOptAll(), }, nil } - strictParsing := false - if len(strict) > 0 { - strictParsing = strict[0] + var parserOption ParserOption + if len(option) > 0 { + parserOption = option[0] } parser := &Parser{ - strict: strictParsing, + option: parserOption, parsedArgs: make([]string, 0), parsedOptions: make(map[string]string), passedOptions: supportedOptions, @@ -118,7 +124,7 @@ func ParseArgs(args []string, supportedOptions map[string]bool, strict ...bool) } i++ continue - } else if parser.strict { + } else if parser.option.Strict { return nil, gerror.NewCodef(gcode.CodeInvalidParameter, `invalid option '%s'`, args[i]) } } @@ -159,8 +165,18 @@ func (p *Parser) parseOption(argument string) string { } func (p *Parser) isOptionValid(name string) bool { - _, ok := p.supportedOptions[name] - return ok + // Case-Sensitive. + if p.option.CaseSensitive { + _, ok := p.supportedOptions[name] + return ok + } + // Case-InSensitive. + for optionName, _ := range p.supportedOptions { + if gstr.Equal(optionName, name) { + return true + } + } + return false } func (p *Parser) isOptionNeedArgument(name string) bool { diff --git a/os/gcmd/gcmd_z_unit_feature_object3_test.go b/os/gcmd/gcmd_z_unit_feature_object3_test.go new file mode 100644 index 000000000..e388f6fd0 --- /dev/null +++ b/os/gcmd/gcmd_z_unit_feature_object3_test.go @@ -0,0 +1,50 @@ +// Copyright GoFrame Author(https://goframe.org). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +package gcmd_test + +import ( + "context" + "os" + "testing" + + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gcmd" + "github.com/gogf/gf/v2/os/gctx" + "github.com/gogf/gf/v2/test/gtest" +) + +type TestParamsCase struct { + g.Meta `name:"root" root:"root"` +} + +type TestParamsCaseRootInput struct { + g.Meta `name:"root"` + Name string +} +type TestParamsCaseRootOutput struct { + Content string +} + +func (c *TestParamsCase) Root(ctx context.Context, in TestParamsCaseRootInput) (out *TestParamsCaseRootOutput, err error) { + out = &TestParamsCaseRootOutput{ + Content: in.Name, + } + return +} + +func Test_Command_ParamsCase(t *testing.T) { + gtest.C(t, func(t *gtest.T) { + var ctx = gctx.New() + cmd, err := gcmd.NewFromObject(TestParamsCase{}) + t.AssertNil(err) + + os.Args = []string{"root", "-name=john"} + value, err := cmd.RunWithValueError(ctx) + t.AssertNil(err) + t.Assert(value, `{"Content":"john"}`) + }) +} diff --git a/os/gres/gres_z_unit_test.go b/os/gres/gres_z_unit_test.go index b1dc65d82..375c31baa 100644 --- a/os/gres/gres_z_unit_test.go +++ b/os/gres/gres_z_unit_test.go @@ -19,7 +19,7 @@ import ( "github.com/gogf/gf/v2/test/gtest" ) -func Test_PackToGoFile(t *testing.T) { +func Test_PackFolderToGoFile(t *testing.T) { gtest.C(t, func(t *gtest.T) { var ( srcPath = gtest.DataPath("files") @@ -32,6 +32,24 @@ func Test_PackToGoFile(t *testing.T) { }) } +func Test_PackMultiFilesToGoFile(t *testing.T) { + gres.Dump() + gtest.C(t, func(t *gtest.T) { + var ( + srcPath = gtest.DataPath("files") + goFilePath = gfile.Temp(gtime.TimestampNanoStr(), "data.go") + pkgName = "data" + array, err = gfile.ScanDir(srcPath, "*", false) + ) + t.AssertNil(err) + err = gres.PackToGoFile(strings.Join(array, ","), goFilePath, pkgName) + t.AssertNil(err) + defer gfile.Remove(goFilePath) + + t.AssertNil(gfile.CopyFile(goFilePath, gtest.DataPath("data/data.go"))) + }) +} + func Test_Pack(t *testing.T) { gtest.C(t, func(t *gtest.T) { var ( @@ -65,21 +83,6 @@ func Test_PackToFile(t *testing.T) { }) } -func Test_PackMulti(t *testing.T) { - gtest.C(t, func(t *gtest.T) { - var ( - srcPath = gtest.DataPath("files") - goFilePath = gfile.Temp(gtime.TimestampNanoStr(), "data.go") - pkgName = "data" - array, err = gfile.ScanDir(srcPath, "*", false) - ) - t.AssertNil(err) - err = gres.PackToGoFile(strings.Join(array, ","), goFilePath, pkgName) - t.AssertNil(err) - _ = gfile.Remove(goFilePath) - }) -} - func Test_PackWithPrefix1(t *testing.T) { gtest.C(t, func(t *gtest.T) { var ( @@ -235,7 +238,7 @@ func Test_Export(t *testing.T) { gres.Dump() gtest.C(t, func(t *gtest.T) { var ( - src = `template` + src = `template-res` dst = gfile.Temp(gtime.TimestampNanoStr()) err = gres.Export(src, dst) ) @@ -245,15 +248,15 @@ func Test_Export(t *testing.T) { t.AssertNil(err) t.Assert(len(files), 14) - name := `template/index.html` + name := `template-res/index.html` t.Assert(gfile.GetContents(gfile.Join(dst, name)), gres.GetContent(name)) }) gtest.C(t, func(t *gtest.T) { var ( - src = `template` + src = `template-res` dst = gfile.Temp(gtime.TimestampNanoStr()) err = gres.Export(src, dst, gres.ExportOption{ - RemovePrefix: `template`, + RemovePrefix: `template-res`, }) ) defer gfile.Remove(dst) @@ -262,7 +265,7 @@ func Test_Export(t *testing.T) { t.AssertNil(err) t.Assert(len(files), 13) - nameInRes := `template/index.html` + nameInRes := `template-res/index.html` nameInSys := `index.html` t.Assert(gfile.GetContents(gfile.Join(dst, nameInSys)), gres.GetContent(nameInRes)) }) diff --git a/os/gres/testdata/data/data.go b/os/gres/testdata/data/data.go old mode 100644 new mode 100755 index 601b7f3ed..0a154f6af --- a/os/gres/testdata/data/data.go +++ b/os/gres/testdata/data/data.go @@ -3,7 +3,7 @@ package data import "github.com/gogf/gf/v2/os/gres" func init() { - if err := gres.Add("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"); err != nil { + if err := gres.Add("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"); err != nil { panic("add binary content to resource manager failed: " + err.Error()) } } diff --git a/os/gres/testdata/files/config/config.toml b/os/gres/testdata/files/config-res/config.toml similarity index 100% rename from os/gres/testdata/files/config/config.toml rename to os/gres/testdata/files/config-res/config.toml diff --git a/os/gres/testdata/files/config/my.ini b/os/gres/testdata/files/config-res/my.ini similarity index 100% rename from os/gres/testdata/files/config/my.ini rename to os/gres/testdata/files/config-res/my.ini diff --git a/os/gres/testdata/files/i18n/en.toml b/os/gres/testdata/files/i18n-res/en.toml similarity index 100% rename from os/gres/testdata/files/i18n/en.toml rename to os/gres/testdata/files/i18n-res/en.toml diff --git a/os/gres/testdata/files/i18n/ja.toml b/os/gres/testdata/files/i18n-res/ja.toml similarity index 100% rename from os/gres/testdata/files/i18n/ja.toml rename to os/gres/testdata/files/i18n-res/ja.toml diff --git a/os/gres/testdata/files/i18n/ru.toml b/os/gres/testdata/files/i18n-res/ru.toml similarity index 100% rename from os/gres/testdata/files/i18n/ru.toml rename to os/gres/testdata/files/i18n-res/ru.toml diff --git a/os/gres/testdata/files/i18n/zh-CN.toml b/os/gres/testdata/files/i18n-res/zh-CN.toml similarity index 100% rename from os/gres/testdata/files/i18n/zh-CN.toml rename to os/gres/testdata/files/i18n-res/zh-CN.toml diff --git a/os/gres/testdata/files/i18n/zh-TW.toml b/os/gres/testdata/files/i18n-res/zh-TW.toml similarity index 100% rename from os/gres/testdata/files/i18n/zh-TW.toml rename to os/gres/testdata/files/i18n-res/zh-TW.toml diff --git a/os/gres/testdata/files/template/index.html b/os/gres/testdata/files/template-res/index.html similarity index 100% rename from os/gres/testdata/files/template/index.html rename to os/gres/testdata/files/template-res/index.html diff --git a/os/gres/testdata/files/template/layout1/container.html b/os/gres/testdata/files/template-res/layout1/container.html similarity index 100% rename from os/gres/testdata/files/template/layout1/container.html rename to os/gres/testdata/files/template-res/layout1/container.html diff --git a/os/gres/testdata/files/template/layout1/footer.html b/os/gres/testdata/files/template-res/layout1/footer.html similarity index 100% rename from os/gres/testdata/files/template/layout1/footer.html rename to os/gres/testdata/files/template-res/layout1/footer.html diff --git a/os/gres/testdata/files/template/layout1/header.html b/os/gres/testdata/files/template-res/layout1/header.html similarity index 100% rename from os/gres/testdata/files/template/layout1/header.html rename to os/gres/testdata/files/template-res/layout1/header.html diff --git a/os/gres/testdata/files/template/layout1/layout.html b/os/gres/testdata/files/template-res/layout1/layout.html similarity index 100% rename from os/gres/testdata/files/template/layout1/layout.html rename to os/gres/testdata/files/template-res/layout1/layout.html diff --git a/os/gres/testdata/files/template/layout2/footer.html b/os/gres/testdata/files/template-res/layout2/footer.html similarity index 100% rename from os/gres/testdata/files/template/layout2/footer.html rename to os/gres/testdata/files/template-res/layout2/footer.html diff --git a/os/gres/testdata/files/template/layout2/header.html b/os/gres/testdata/files/template-res/layout2/header.html similarity index 100% rename from os/gres/testdata/files/template/layout2/header.html rename to os/gres/testdata/files/template-res/layout2/header.html diff --git a/os/gres/testdata/files/template/layout2/layout.html b/os/gres/testdata/files/template-res/layout2/layout.html similarity index 100% rename from os/gres/testdata/files/template/layout2/layout.html rename to os/gres/testdata/files/template-res/layout2/layout.html diff --git a/os/gres/testdata/files/template/layout2/main/main1.html b/os/gres/testdata/files/template-res/layout2/main/main1.html similarity index 100% rename from os/gres/testdata/files/template/layout2/main/main1.html rename to os/gres/testdata/files/template-res/layout2/main/main1.html diff --git a/os/gres/testdata/files/template/layout2/main/main2.html b/os/gres/testdata/files/template-res/layout2/main/main2.html similarity index 100% rename from os/gres/testdata/files/template/layout2/main/main2.html rename to os/gres/testdata/files/template-res/layout2/main/main2.html diff --git a/protocol/goai/goai.go b/protocol/goai/goai.go index aef00be0e..e25d6e296 100644 --- a/protocol/goai/goai.go +++ b/protocol/goai/goai.go @@ -82,8 +82,8 @@ const ( ) const ( - patternKeyForRequired = `required` - patternKeyForIn = `in:` + validationRuleKeyForRequired = `required` + validationRuleKeyForIn = `in:` ) var ( diff --git a/protocol/goai/goai_parameter_ref.go b/protocol/goai/goai_parameter_ref.go index 416ec7dcc..433956788 100644 --- a/protocol/goai/goai_parameter_ref.go +++ b/protocol/goai/goai_parameter_ref.go @@ -80,8 +80,9 @@ func (oai *OpenApiV3) newParameterRefWithStructMethod(field gstructs.Field, path } // Required check. - if parameter.Schema.Value != nil && parameter.Schema.Value.Pattern != "" { - if gset.NewStrSetFrom(gstr.Split(parameter.Schema.Value.Pattern, "|")).Contains(patternKeyForRequired) { + if parameter.Schema.Value != nil && parameter.Schema.Value.ValidationRules != "" { + validationRuleArray := gstr.Split(parameter.Schema.Value.ValidationRules, "|") + if gset.NewStrSetFrom(validationRuleArray).Contains(validationRuleKeyForRequired) { parameter.Required = true } } diff --git a/protocol/goai/goai_shema.go b/protocol/goai/goai_shema.go index 5f96628f7..fa9819f6c 100644 --- a/protocol/goai/goai_shema.go +++ b/protocol/goai/goai_shema.go @@ -60,6 +60,7 @@ type Schema struct { AdditionalProperties *SchemaRef `json:"additionalProperties,omitempty"` Discriminator *Discriminator `json:"discriminator,omitempty"` XExtensions XExtensions `json:"-"` + ValidationRules string `json:"-"` } func (s Schema) MarshalJSON() ([]byte, error) { @@ -183,9 +184,9 @@ func (oai *OpenApiV3) structToSchema(object interface{}) (*Schema, error) { } schema.Properties.Iterator(func(key string, ref SchemaRef) bool { - if ref.Value != nil && ref.Value.Pattern != "" { - validationRuleSet := gset.NewStrSetFrom(gstr.Split(ref.Value.Pattern, "|")) - if validationRuleSet.Contains(patternKeyForRequired) { + if ref.Value != nil && ref.Value.ValidationRules != "" { + validationRuleSet := gset.NewStrSetFrom(gstr.Split(ref.Value.ValidationRules, "|")) + if validationRuleSet.Contains(validationRuleKeyForRequired) { schema.Required = append(schema.Required, key) } } @@ -212,14 +213,14 @@ func (oai *OpenApiV3) tagMapToSchema(tagMap map[string]string, schema *Schema) e for _, tag := range gvalid.GetTags() { if validationTagValue, ok := tagMap[tag]; ok { _, validationRules, _ := gvalid.ParseTagValue(validationTagValue) - schema.Pattern = validationRules + schema.ValidationRules = validationRules // Enum checks. if len(schema.Enum) == 0 { for _, rule := range gstr.SplitAndTrim(validationRules, "|") { - if gstr.HasPrefix(rule, patternKeyForIn) { + if gstr.HasPrefix(rule, validationRuleKeyForIn) { var ( isAllEnumNumber = true - enumArray = gstr.SplitAndTrim(rule[len(patternKeyForIn):], ",") + enumArray = gstr.SplitAndTrim(rule[len(validationRuleKeyForIn):], ",") ) for _, enum := range enumArray { if !gstr.IsNumeric(enum) { diff --git a/protocol/goai/goai_xextensions.go b/protocol/goai/goai_xextensions.go index cc11ef6a6..1d2f2462e 100644 --- a/protocol/goai/goai_xextensions.go +++ b/protocol/goai/goai_xextensions.go @@ -11,7 +11,7 @@ import ( ) // XExtensions stores the `x-` custom extensions. -type XExtensions map[string]interface{} +type XExtensions map[string]string func (oai *OpenApiV3) tagMapToXExtensions(tagMap map[string]string, extensions XExtensions) { for k, v := range tagMap { diff --git a/text/gstr/gstr_convert.go b/text/gstr/gstr_convert.go index 7c4a6add3..c358dd14e 100644 --- a/text/gstr/gstr_convert.go +++ b/text/gstr/gstr_convert.go @@ -9,12 +9,18 @@ package gstr import ( "bytes" "fmt" - "github.com/gogf/gf/v2/util/grand" "math" "regexp" "strconv" "strings" "unicode" + + "github.com/gogf/gf/v2/util/grand" +) + +var ( + // octReg is the regular expression object for checks octal string. + octReg = regexp.MustCompile(`\\[0-7]{3}`) ) // Chr return the ascii string of a number(0-255). @@ -27,11 +33,6 @@ func Ord(char string) int { return int(char[0]) } -var ( - // octReg is the regular expression object for checks octal string. - octReg = regexp.MustCompile(`\\[0-7]{3}`) -) - // OctStr converts string container octal string to its original string, // for example, to Chinese string. // Eg: `\346\200\241` -> 怡 @@ -175,7 +176,8 @@ func Nl2Br(str string, isXhtml ...bool) string { } // WordWrap wraps a string to a given number of characters. -// TODO: Enable cut parameter, see http://php.net/manual/en/function.wordwrap.php. +// This function supports cut parameters of both english and chinese punctuations. +// TODO: Enable custom cut parameter, see http://php.net/manual/en/function.wordwrap.php. func WordWrap(str string, width int, br string) string { if br == "" { br = "\n" @@ -185,9 +187,11 @@ func WordWrap(str string, width int, br string) string { wordBuf, spaceBuf bytes.Buffer init = make([]byte, 0, len(str)) buf = bytes.NewBuffer(init) + strRunes = []rune(str) ) - for _, char := range []rune(str) { - if char == '\n' { + for _, char := range strRunes { + switch { + case char == '\n': if wordBuf.Len() == 0 { if current+spaceBuf.Len() > width { current = 0 @@ -205,7 +209,8 @@ func WordWrap(str string, width int, br string) string { } buf.WriteRune(char) current = 0 - } else if unicode.IsSpace(char) { + + case unicode.IsSpace(char): if spaceBuf.Len() == 0 || wordBuf.Len() > 0 { current += spaceBuf.Len() + wordBuf.Len() spaceBuf.WriteTo(buf) @@ -214,7 +219,18 @@ func WordWrap(str string, width int, br string) string { wordBuf.Reset() } spaceBuf.WriteRune(char) - } else { + + case isPunctuation(char): + wordBuf.WriteRune(char) + if spaceBuf.Len() == 0 || wordBuf.Len() > 0 { + current += spaceBuf.Len() + wordBuf.Len() + spaceBuf.WriteTo(buf) + spaceBuf.Reset() + wordBuf.WriteTo(buf) + wordBuf.Reset() + } + + default: wordBuf.WriteRune(char) if current+spaceBuf.Len()+wordBuf.Len() > width && wordBuf.Len() < width { buf.WriteString(br) @@ -234,3 +250,16 @@ func WordWrap(str string, width int, br string) string { } return buf.String() } + +func isPunctuation(char int32) bool { + switch char { + // English Punctuations. + case ';', '.', ',', ':', '~': + return true + // Chinese Punctuations. + case '；', '，', '。', '：', '？', '！', '…', '、': + return true + default: + return false + } +} diff --git a/text/gstr/gstr_z_unit_convert_test.go b/text/gstr/gstr_z_unit_convert_test.go index 370689b90..4d0a7a813 100644 --- a/text/gstr/gstr_z_unit_convert_test.go +++ b/text/gstr/gstr_z_unit_convert_test.go @@ -4,8 +4,6 @@ // If a copy of the MIT was not distributed with this file, // You can obtain one at https://github.com/gogf/gf. -// go test *.go -bench=".*" - package gstr_test import ( @@ -20,3 +18,25 @@ func Test_OctStr(t *testing.T) { t.Assert(gstr.OctStr(`\346\200\241`), "怡") }) } + +func Test_WordWrap(t *testing.T) { + gtest.C(t, func(t *gtest.T) { + t.Assert(gstr.WordWrap("12 34", 2, "
"), "12
34") + t.Assert(gstr.WordWrap("12 34", 2, "\n"), "12\n34") + t.Assert(gstr.WordWrap("我爱 GF", 2, "\n"), "我爱\nGF") + t.Assert(gstr.WordWrap("A very long woooooooooooooooooord. and something", 7, "
"), + "A very
long
woooooooooooooooooord.
and
something") + }) + // Chinese Punctuations. + gtest.C(t, func(t *gtest.T) { + var ( + br = " " + content = " DelRouteKeyIPv6 删除VPC内的服务的Route信息;和DelRouteIPv6接口相比，这个接口可以删除满足条件的多条RS\n" + length = 120 + ) + wrappedContent := gstr.WordWrap(content, length, "\n"+br) + t.Assert(wrappedContent, ` DelRouteKeyIPv6 删除VPC内的服务的Route信息;和DelRouteIPv6接口相比， + 这个接口可以删除满足条件的多条RS +`) + }) +} diff --git a/text/gstr/gstr_z_unit_test.go b/text/gstr/gstr_z_unit_test.go index 71e020ea9..1afc3a546 100644 --- a/text/gstr/gstr_z_unit_test.go +++ b/text/gstr/gstr_z_unit_test.go @@ -213,16 +213,6 @@ func Test_CountChars(t *testing.T) { }) } -func Test_WordWrap(t *testing.T) { - gtest.C(t, func(t *gtest.T) { - t.Assert(gstr.WordWrap("12 34", 2, "
"), "12
34") - t.Assert(gstr.WordWrap("12 34", 2, "\n"), "12\n34") - t.Assert(gstr.WordWrap("我爱 GF", 2, "\n"), "我爱\nGF") - t.Assert(gstr.WordWrap("A very long woooooooooooooooooord. and something", 7, "
"), - "A very
long
woooooooooooooooooord.
and
something") - }) -} - func Test_LenRune(t *testing.T) { gtest.C(t, func(t *gtest.T) { t.Assert(gstr.LenRune("1234"), 4)