diff --git a/README.MD b/README.MD index f3230b1c2..3681415b3 100644 --- a/README.MD +++ b/README.MD @@ -1,18 +1,20 @@ # GoFrame +
[![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf) [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/gf.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/gf.yml) -[![Go Report](https://goreportcard.com/badge/github.com/gogf/gf?v=1)](https://goreportcard.com/report/github.com/gogf/gf) +[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2) [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf) [![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/gogf/gf) [![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
-`GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework of Golang. +`GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework of Golang. # Features + - modular, loosely coupled design - rich components, out-of-the-box - automatic codes generating for efficiency @@ -27,34 +29,37 @@ - much, much more...ready to explore? # Installation + Enter your repo. directory and execute following command: ## primary module + ```bash go get -u -v github.com/gogf/gf/v2 ``` ## cli tool + ```bash go install github.com/gogf/gf/cmd/gf/v2 ``` # Limitation + ``` golang version >= 1.15 ``` # Architecture +
- # Documentation -* Chinese Official Site(中文官网): [https://goframe.org](https://goframe.org/display/gf) -* GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2) - +- Chinese Official Site(中文官网): [https://goframe.org](https://goframe.org/display/gf) +- GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2) # License @@ -76,32 +81,20 @@ golang version >= 1.15 > We list part of the users here, if your company or products are using `GoFrame`, please let us know [here](https://goframe.org/pages/viewpage.action?pageId=1114415). - # Contributors + This project exists thanks to all the people who contribute. [[Contributors](https://github.com/gogf/gf/graphs/contributors)]. - # Donators If you love `GoFrame`, why not [buy developer a cup of coffee](https://goframe.org/pages/viewpage.action?pageId=1115633)? # Sponsors + We appreciate any kind of sponsorship for `GoFrame` development. If you've got some interesting, please contact WeChat `389961817` / Email `john@goframe.org`. - - # Thanks + JetBrains Atlassian - - - - - - - - - - - diff --git a/cmd/gf/internal/cmd/cmd_build.go b/cmd/gf/internal/cmd/cmd_build.go index 82dd5742c..4340ff388 100644 --- a/cmd/gf/internal/cmd/cmd_build.go +++ b/cmd/gf/internal/cmd/cmd_build.go @@ -242,7 +242,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e if len(customSystems) > 0 && customSystems[0] != "all" && !gstr.InArray(customSystems, system) { continue } - for arch, _ := range item { + for arch := range item { if len(customArches) > 0 && customArches[0] != "all" && !gstr.InArray(customArches, arch) { continue } diff --git a/cmd/gf/internal/cmd/genservice/genservice_generate.go b/cmd/gf/internal/cmd/genservice/genservice_generate.go index 9314eb97d..2ed0f5d0b 100644 --- a/cmd/gf/internal/cmd/genservice/genservice_generate.go +++ b/cmd/gf/internal/cmd/genservice/genservice_generate.go @@ -56,7 +56,7 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool, generatingInterfaceCheck string ) // Variable definitions. - for structName, _ := range in.SrcStructFunctions { + for structName := range in.SrcStructFunctions { generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName) if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) { continue @@ -75,7 +75,7 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool, generatedContent += "\n" } // Variable register function definitions. - for structName, _ := range in.SrcStructFunctions { + for structName := range in.SrcStructFunctions { generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName) if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) { continue diff --git a/container/gset/gset_z_unit_any_test.go b/container/gset/gset_z_unit_any_test.go index f9ce95703..c9c759ef6 100644 --- a/container/gset/gset_z_unit_any_test.go +++ b/container/gset/gset_z_unit_any_test.go @@ -114,8 +114,8 @@ func TestSet_LockFunc(t *testing.T) { t.Assert(s.Size(), 2) s.RLockFunc(func(m map[interface{}]struct{}) { t.Assert(m, map[interface{}]struct{}{ - 3: struct{}{}, - 2: struct{}{}, + 3: {}, + 2: {}, }) }) }) diff --git a/container/gset/gset_z_unit_int_test.go b/container/gset/gset_z_unit_int_test.go index a077a0ad7..8f796eaa2 100644 --- a/container/gset/gset_z_unit_int_test.go +++ b/container/gset/gset_z_unit_int_test.go @@ -94,8 +94,8 @@ func TestIntSet_LockFunc(t *testing.T) { t.Assert(s.Size(), 2) s.RLockFunc(func(m map[int]struct{}) { t.Assert(m, map[int]struct{}{ - 3: struct{}{}, - 2: struct{}{}, + 3: {}, + 2: {}, }) }) }) diff --git a/container/gset/gset_z_unit_str_test.go b/container/gset/gset_z_unit_str_test.go index 310788415..c00470685 100644 --- a/container/gset/gset_z_unit_str_test.go +++ b/container/gset/gset_z_unit_str_test.go @@ -105,8 +105,8 @@ func TestStrSet_LockFunc(t *testing.T) { t.Assert(s.Size(), 2) s.RLockFunc(func(m map[string]struct{}) { t.Assert(m, map[string]struct{}{ - "3": struct{}{}, - "2": struct{}{}, + "3": {}, + "2": {}, }) }) }) diff --git a/contrib/drivers/clickhouse/clickhouse_test.go b/contrib/drivers/clickhouse/clickhouse_test.go index b342d9f82..cc4f202ae 100644 --- a/contrib/drivers/clickhouse/clickhouse_test.go +++ b/contrib/drivers/clickhouse/clickhouse_test.go @@ -455,9 +455,9 @@ func TestDriverClickhouse_NilTime(t *testing.T) { Col9: uuid.New(), Col7: []interface{}{ // Tuple(String, UInt8, Array(Map(String, String))) "String Value", uint8(5), []map[string]string{ - map[string]string{"key": "value"}, - map[string]string{"key": "value"}, - map[string]string{"key": "value"}, + {"key": "value"}, + {"key": "value"}, + {"key": "value"}, }}, Col11: money, Col12: &strMoney, @@ -494,9 +494,9 @@ func TestDriverClickhouse_BatchInsert(t *testing.T) { "Col6": []string{"Q", "W", "E", "R", "T", "Y"}, // Array(String) "Col7": []interface{}{ // Tuple(String, UInt8, Array(Map(String, String))) "String Value", uint8(5), []map[string]string{ - map[string]string{"key": "value"}, - map[string]string{"key": "value"}, - map[string]string{"key": "value"}, + {"key": "value"}, + {"key": "value"}, + {"key": "value"}, }, }, "Col8": gtime.Now(), diff --git a/contrib/nosql/redis/redis_group_list.go b/contrib/nosql/redis/redis_group_list.go index 4b90ed422..829b5d84a 100644 --- a/contrib/nosql/redis/redis_group_list.go +++ b/contrib/nosql/redis/redis_group_list.go @@ -118,10 +118,10 @@ func (r GroupList) LPop(ctx context.Context, key string, count ...int) (*gvar.Va // depending on the list's length. // // It returns: -// - When called without the count argument: -// the value of the last element, or nil when key does not exist. -// - When called with the count argument: -// list of popped elements, or nil when key does not exist. +// - When called without the count argument: +// the value of the last element, or nil when key does not exist. +// - When called with the count argument: +// list of popped elements, or nil when key does not exist. // // https://redis.io/commands/rpop func (r GroupList) RPop(ctx context.Context, key string, count ...int) (*gvar.Var, error) { diff --git a/contrib/nosql/redis/redis_group_set.go b/contrib/nosql/redis/redis_group_set.go index d46cb85ac..a46bd457e 100644 --- a/contrib/nosql/redis/redis_group_set.go +++ b/contrib/nosql/redis/redis_group_set.go @@ -64,10 +64,10 @@ func (r GroupSet) SIsMember(ctx context.Context, key string, member interface{}) // argument, the reply will consist of up to count members, depending on the set's cardinality. // // It returns: -// - When called without the count argument: -// Bulk string reply: the removed member, or nil when key does not exist. -// - When called with the count argument: -// Array reply: the removed members, or an empty array when key does not exist. +// - When called without the count argument: +// Bulk string reply: the removed member, or nil when key does not exist. +// - When called with the count argument: +// Array reply: the removed members, or an empty array when key does not exist. // // https://redis.io/commands/spop/ func (r GroupSet) SPop(ctx context.Context, key string, count ...int) (*gvar.Var, error) { @@ -86,10 +86,10 @@ func (r GroupSet) SPop(ctx context.Context, key string, count ...int) (*gvar.Var // of the specified count. // // It returns: -// - Bulk string reply: without the additional count argument, the command returns a Bulk Reply with the -// randomly selected element, or nil when key does not exist. -// - Array reply: when the additional count argument is passed, the command returns an array of elements, -// or an empty array when key does not exist. +// - Bulk string reply: without the additional count argument, the command returns a Bulk Reply with the +// randomly selected element, or nil when key does not exist. +// - Array reply: when the additional count argument is passed, the command returns an array of elements, +// or an empty array when key does not exist. // // https://redis.io/commands/srandmember/ func (r GroupSet) SRandMember(ctx context.Context, key string, count ...int) (*gvar.Var, error) { @@ -212,7 +212,7 @@ func (r GroupSet) SUnion(ctx context.Context, key string, keys ...string) (gvar. // SUnionStore is equal to SUnion, but instead of returning the resulting set, it is stored in destination. // -// If destination already exists, it is overwritten. +// If destination already exists, it is overwritten. // // It returns the number of elements in the resulting set. // diff --git a/contrib/nosql/redis/redis_group_string.go b/contrib/nosql/redis/redis_group_string.go index 89af65dbd..0fd714af3 100644 --- a/contrib/nosql/redis/redis_group_string.go +++ b/contrib/nosql/redis/redis_group_string.go @@ -59,8 +59,8 @@ func (r GroupString) SetNX(ctx context.Context, key string, value interface{}) ( // SetEX sets key to hold the string value and set key to timeout after a given number of seconds. // This command is equivalent to executing the following commands: // -// SET myKey value -// EXPIRE myKey seconds +// SET myKey value +// EXPIRE myKey seconds // // SetEX is atomic, and can be reproduced by using the previous two commands inside an MULTI / EXEC block. // It is provided as a faster alternative to the given sequence of operations, because this operation is very diff --git a/encoding/gjson/gjson_z_example_test.go b/encoding/gjson/gjson_z_example_test.go index 793ee1a9c..d262be3ce 100644 --- a/encoding/gjson/gjson_z_example_test.go +++ b/encoding/gjson/gjson_z_example_test.go @@ -796,11 +796,11 @@ func ExampleJson_Interfaces() { } infoList := []BaseInfo{ - BaseInfo{ + { Name: "John", Age: 18, }, - BaseInfo{ + { Name: "Tom", Age: 20, }, diff --git a/internal/deepcopy/deepcopy_test.go b/internal/deepcopy/deepcopy_test.go index f150b1ac3..060001ed7 100644 --- a/internal/deepcopy/deepcopy_test.go +++ b/internal/deepcopy/deepcopy_test.go @@ -576,7 +576,7 @@ Interfaces: // not meant to be exhaustive func TestComplexSlices(t *testing.T) { - orig3Int := [][][]int{[][]int{[]int{1, 2, 3}, []int{11, 22, 33}}, [][]int{[]int{7, 8, 9}, []int{66, 77, 88, 99}}} + orig3Int := [][][]int{{{1, 2, 3}, {11, 22, 33}}, {{7, 8, 9}, {66, 77, 88, 99}}} cpyI := Copy(orig3Int).([][][]int) if (*reflect.SliceHeader)(unsafe.Pointer(&orig3Int)).Data == (*reflect.SliceHeader)(unsafe.Pointer(&cpyI)).Data { t.Error("[][][]int: address of copy was the same as original; they should be different") @@ -606,7 +606,7 @@ func TestComplexSlices(t *testing.T) { } sliceMap: - slMap := []map[int]string{map[int]string{0: "a", 1: "b"}, map[int]string{10: "k", 11: "l", 12: "m"}} + slMap := []map[int]string{{0: "a", 1: "b"}, {10: "k", 11: "l", 12: "m"}} cpyM := Copy(slMap).([]map[int]string) if (*reflect.SliceHeader)(unsafe.Pointer(&slMap)).Data == (*reflect.SliceHeader)(unsafe.Pointer(&cpyM)).Data { t.Error("[]map[int]string: address of copy was the same as original; they should be different") @@ -656,11 +656,11 @@ var AStruct = A{ UintSl: []uint{0, 1, 2, 3}, Map: map[string]int{"a": 1, "b": 2}, MapB: map[string]*B{ - "hi": &B{Vals: []string{"hello", "bonjour"}}, - "bye": &B{Vals: []string{"good-bye", "au revoir"}}, + "hi": {Vals: []string{"hello", "bonjour"}}, + "bye": {Vals: []string{"good-bye", "au revoir"}}, }, SliceB: []B{ - B{Vals: []string{"Ciao", "Aloha"}}, + {Vals: []string{"Ciao", "Aloha"}}, }, B: B{Vals: []string{"42"}}, T: time.Now(), @@ -943,13 +943,13 @@ func TestIssue9(t *testing.T) { testB := Biz{ Epsilon: map[int]*Bar{ - 0: &Bar{}, - 1: &Bar{ + 0: {}, + 1: { Beta: "don't panic", Gamma: 42, Delta: nil, }, - 2: &Bar{ + 2: { Beta: "sudo make me a sandwich.", Gamma: 11, Delta: &Foo{ @@ -1005,10 +1005,10 @@ func TestIssue9(t *testing.T) { // test that map keys are deep copied testC := map[*Foo][]string{ - &Foo{Alpha: "Henry Dorsett Case"}: []string{ + {Alpha: "Henry Dorsett Case"}: { "Cutter", }, - &Foo{Alpha: "Molly Millions"}: []string{ + {Alpha: "Molly Millions"}: { "Rose Kolodny", "Cat Mother", "Steppin' Razor", @@ -1051,8 +1051,8 @@ func TestIssue9(t *testing.T) { } testD := map[Bizz]string{ - Bizz{&Foo{"Neuromancer"}}: "Rio", - Bizz{&Foo{"Wintermute"}}: "Berne", + {&Foo{"Neuromancer"}}: "Rio", + {&Foo{"Wintermute"}}: "Berne", } copyD := Copy(testD).(map[Bizz]string) if len(copyD) != len(testD) { diff --git a/net/gtcp/gtcp_z_unit_test.go b/net/gtcp/gtcp_z_unit_test.go index 2f9e3b188..9e529b7d7 100644 --- a/net/gtcp/gtcp_z_unit_test.go +++ b/net/gtcp/gtcp_z_unit_test.go @@ -63,7 +63,7 @@ func startTCPTLSServer(addr string) *gtcp.Server { tlsConfig := &tls.Config{ InsecureSkipVerify: true, Certificates: []tls.Certificate{ - tls.Certificate{}, + {}, }, } s := gtcp.NewServerTLS(addr, tlsConfig, func(conn *gtcp.Conn) { @@ -171,7 +171,7 @@ func TestNewConnTLS(t *testing.T) { conn, err := gtcp.NewConnTLS(s.GetListenedAddress(), &tls.Config{ InsecureSkipVerify: true, Certificates: []tls.Certificate{ - tls.Certificate{}, + {}, }, }) t.AssertNil(conn) diff --git a/os/gcron/gcron_z_unit_schedule_test.go b/os/gcron/gcron_z_unit_schedule_test.go index 277389a6a..d0efb61de 100644 --- a/os/gcron/gcron_z_unit_schedule_test.go +++ b/os/gcron/gcron_z_unit_schedule_test.go @@ -19,8 +19,8 @@ func TestSlash(t *testing.T) { spec string expected map[int]struct{} }{ - {"0 0 0 * Feb Mon/2", map[int]struct{}{1: struct{}{}, 3: struct{}{}, 5: struct{}{}}}, - {"0 0 0 * Feb *", map[int]struct{}{1: struct{}{}, 2: struct{}{}, 3: struct{}{}, 4: struct{}{}, 5: struct{}{}, 6: struct{}{}, 0: struct{}{}}}, + {"0 0 0 * Feb Mon/2", map[int]struct{}{1: {}, 3: {}, 5: {}}}, + {"0 0 0 * Feb *", map[int]struct{}{1: {}, 2: {}, 3: {}, 4: {}, 5: {}, 6: {}, 0: {}}}, } gtest.C(t, func(t *gtest.T) { for _, c := range runs { diff --git a/util/gconv/gconv_z_unit_slice_test.go b/util/gconv/gconv_z_unit_slice_test.go index 73dad1443..e1afb2eed 100644 --- a/util/gconv/gconv_z_unit_slice_test.go +++ b/util/gconv/gconv_z_unit_slice_test.go @@ -53,7 +53,7 @@ func Test_Slice_Ints(t *testing.T) { t.AssertEQ(gconv.Ints(" [26, 27] "), []int{26, 27}) t.AssertEQ(gconv.Ints([]uint8(`[{"id": 1, "name":"john"},{"id": 2, "name":"huang"}]`)), []int{0, 0}) t.AssertEQ(gconv.Ints([]bool{true, false}), []int{1, 0}) - t.AssertEQ(gconv.Ints([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []int{1, 2}) + t.AssertEQ(gconv.Ints([][]byte{{byte(1)}, {byte(2)}}), []int{1, 2}) }) } @@ -76,7 +76,7 @@ func Test_Slice_Int32s(t *testing.T) { t.AssertEQ(gconv.Int32s([]bool{true, false}), []int32{1, 0}) t.AssertEQ(gconv.Int32s([]float32{1, 2}), []int32{1, 2}) t.AssertEQ(gconv.Int32s([]float64{1, 2}), []int32{1, 2}) - t.AssertEQ(gconv.Int32s([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []int32{1, 2}) + t.AssertEQ(gconv.Int32s([][]byte{{byte(1)}, {byte(2)}}), []int32{1, 2}) s := gvar.Vars{ gvar.New(1), @@ -105,7 +105,7 @@ func Test_Slice_Int64s(t *testing.T) { t.AssertEQ(gconv.Int64s([]bool{true, false}), []int64{1, 0}) t.AssertEQ(gconv.Int64s([]float32{1, 2}), []int64{1, 2}) t.AssertEQ(gconv.Int64s([]float64{1, 2}), []int64{1, 2}) - t.AssertEQ(gconv.Int64s([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []int64{1, 2}) + t.AssertEQ(gconv.Int64s([][]byte{{byte(1)}, {byte(2)}}), []int64{1, 2}) s := gvar.Vars{ gvar.New(1), @@ -135,7 +135,7 @@ func Test_Slice_Uints(t *testing.T) { t.AssertEQ(gconv.Uints([]bool{true, false}), []uint{1, 0}) t.AssertEQ(gconv.Uints([]float32{1, 2}), []uint{1, 2}) t.AssertEQ(gconv.Uints([]float64{1, 2}), []uint{1, 2}) - t.AssertEQ(gconv.Uints([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []uint{1, 2}) + t.AssertEQ(gconv.Uints([][]byte{{byte(1)}, {byte(2)}}), []uint{1, 2}) s := gvar.Vars{ gvar.New(1), @@ -165,7 +165,7 @@ func Test_Slice_Uint32s(t *testing.T) { t.AssertEQ(gconv.Uint32s([]bool{true, false}), []uint32{1, 0}) t.AssertEQ(gconv.Uint32s([]float32{1, 2}), []uint32{1, 2}) t.AssertEQ(gconv.Uint32s([]float64{1, 2}), []uint32{1, 2}) - t.AssertEQ(gconv.Uint32s([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []uint32{1, 2}) + t.AssertEQ(gconv.Uint32s([][]byte{{byte(1)}, {byte(2)}}), []uint32{1, 2}) s := gvar.Vars{ gvar.New(1), @@ -195,7 +195,7 @@ func Test_Slice_Uint64s(t *testing.T) { t.AssertEQ(gconv.Uint64s([]bool{true, false}), []uint64{1, 0}) t.AssertEQ(gconv.Uint64s([]float32{1, 2}), []uint64{1, 2}) t.AssertEQ(gconv.Uint64s([]float64{1, 2}), []uint64{1, 2}) - t.AssertEQ(gconv.Uint64s([][]byte{[]byte{byte(1)}, []byte{byte(2)}}), []uint64{1, 2}) + t.AssertEQ(gconv.Uint64s([][]byte{{byte(1)}, {byte(2)}}), []uint64{1, 2}) s := gvar.Vars{ gvar.New(1), diff --git a/util/gutil/gutil_z_unit_dump_test.go b/util/gutil/gutil_z_unit_dump_test.go index f40fff647..3e255e91f 100755 --- a/util/gutil/gutil_z_unit_dump_test.go +++ b/util/gutil/gutil_z_unit_dump_test.go @@ -189,7 +189,7 @@ func Test_Dump_Issue1661(t *testing.T) { x := []string{"11", "22"} for _, iv2 := range x { ls := q1v - for i, _ := range ls.cc { + for i := range ls.cc { sj := iv2 ls.cc[i].bb = sj }