diff --git a/tool/gf/README.MD b/tool/gf/README.MD index 718ba82ff..6d0fb4104 100644 --- a/tool/gf/README.MD +++ b/tool/gf/README.MD @@ -7,6 +7,7 @@ Powerful CLI tool for building [GoFrame](https://goframe.org) application with c > You might need setting the goproxy to make through building. 1. Latest version + > Go version >= v1.16 ``` go install github.com/gogf/gf/tool/gf@latest @@ -15,7 +16,9 @@ Powerful CLI tool for building [GoFrame](https://goframe.org) application with c ``` go install github.com/gogf/gf/tool/gf ``` + 1. Specified version + > Go version >= v1.16 ``` go install github.com/gogf/gf/tool/gf@v1.16.0 diff --git a/tool/gf/commands/gen/gen_dao.go b/tool/gf/commands/gen/gen_dao.go index 73701fef7..1832b17b5 100644 --- a/tool/gf/commands/gen/gen_dao.go +++ b/tool/gf/commands/gen/gen_dao.go @@ -214,8 +214,8 @@ func doGenDaoForArray(index int, parser *gcmd.Parser) { match, _ := gregex.MatchString(`([a-z]+):(.+)`, linkInfo) if len(match) == 3 { gdb.AddConfigNode(tempGroup, gdb.ConfigNode{ - Type: gstr.Trim(match[1]), - LinkInfo: gstr.Trim(match[2]), + Type: gstr.Trim(match[1]), + Link: gstr.Trim(match[2]), }) db, _ = gdb.Instance(tempGroup) } diff --git a/tool/gf/commands/gen/gen_pbentity.go b/tool/gf/commands/gen/gen_pbentity.go index 8c270f9e7..a21d81a61 100644 --- a/tool/gf/commands/gen/gen_pbentity.go +++ b/tool/gf/commands/gen/gen_pbentity.go @@ -182,8 +182,8 @@ func doGenPbEntityForArray(index int, parser *gcmd.Parser) { match, _ := gregex.MatchString(`([a-z]+):(.+)`, linkInfo) if len(match) == 3 { gdb.AddConfigNode(tempGroup, gdb.ConfigNode{ - Type: gstr.Trim(match[1]), - LinkInfo: gstr.Trim(match[2]), + Type: gstr.Trim(match[1]), + Link: gstr.Trim(match[2]), }) db, _ = gdb.Instance(tempGroup) } diff --git a/tool/gf/go.mod b/tool/gf/go.mod index 940df97cf..426054699 100644 --- a/tool/gf/go.mod +++ b/tool/gf/go.mod @@ -4,7 +4,7 @@ go 1.11 require ( github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e - github.com/gogf/gf v1.16.1 + github.com/gogf/gf v1.16.4 github.com/gogf/swagger v1.0.4 github.com/gorilla/websocket v1.4.2 // indirect github.com/grokify/html-strip-tags-go v0.0.0-20200322061010-ea0c1cf2f119 // indirect diff --git a/tool/gf/go.sum b/tool/gf/go.sum index 4d7f691bd..737ebaa0a 100644 --- a/tool/gf/go.sum +++ b/tool/gf/go.sum @@ -15,6 +15,10 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/gogf/gf v1.13.8-0.20201010060010-09ce105eeeab/go.mod h1:nGAMjE4ohU2bwj4Gk3h25K6rEkPZMDdvsmyifpFcuMQ= github.com/gogf/gf v1.16.1 h1:J2kcf8ufbuIIGrbeXfMH/CCkH+hUyC9lrQKrLXZrKVg= github.com/gogf/gf v1.16.1/go.mod h1:5eEgE9fWeRQW8dJE3GLpCy0KkNitXh6POesdJiBE/lw= +github.com/gogf/gf v1.16.4 h1:1Y8/P1UMp9BmrtUn0wAg3g6ElRAO0R9QHCdUNt9Z5L4= +github.com/gogf/gf v1.16.4/go.mod h1:EjnxZXddTwfFoLPofDE3NokFWx+immofINtSyFCj280= +github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579 h1:pP/uEy52biKDytlgK/ug8kiYPAiYu6KajKVUHfGrtyw= +github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579/go.mod h1:52e6mXyNnHAsFrXrSnj5JPRSKsZKpHylVtA3j4AtMz8= github.com/gogf/swagger v1.0.4 h1:MILniFKPh52/26s+z8taSh8thn1tq2RaeWM7rYX1dRw= github.com/gogf/swagger v1.0.4/go.mod h1:4rD12TCoDz60jmgtuFnx7ZBWUM92tXc/qtrIrkBIp5Q= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=