From 4b7a680ac507dde8aedabe697fc025d679b9fe8a Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Tue, 25 Jan 2022 23:15:07 +0800 Subject: [PATCH] refactor: rename from tal-tech to zeromicro for goctl (#1481) --- tools/goctl/api/apigen/gen.go | 4 +- tools/goctl/api/apigen/template.go | 2 +- tools/goctl/api/dartgen/gen.go | 4 +- tools/goctl/api/dartgen/genapi.go | 2 +- tools/goctl/api/dartgen/gendata.go | 2 +- tools/goctl/api/dartgen/util.go | 4 +- tools/goctl/api/docgen/doc.go | 8 +- tools/goctl/api/docgen/gen.go | 4 +- tools/goctl/api/format/format.go | 8 +- tools/goctl/api/gogen/gen.go | 14 ++-- tools/goctl/api/gogen/gen_test.go | 2 +- tools/goctl/api/gogen/genconfig.go | 8 +- tools/goctl/api/gogen/genetc.go | 6 +- tools/goctl/api/gogen/genhandlers.go | 14 ++-- tools/goctl/api/gogen/genlogic.go | 12 +-- tools/goctl/api/gogen/genmain.go | 10 +-- tools/goctl/api/gogen/genmiddleware.go | 6 +- tools/goctl/api/gogen/genroutes.go | 12 +-- tools/goctl/api/gogen/gensvc.go | 10 +-- tools/goctl/api/gogen/gentypes.go | 10 +-- tools/goctl/api/gogen/template.go | 2 +- tools/goctl/api/gogen/template_test.go | 2 +- tools/goctl/api/gogen/util.go | 10 +-- tools/goctl/api/javagen/gen.go | 6 +- tools/goctl/api/javagen/gencomponents.go | 10 +-- tools/goctl/api/javagen/genpacket.go | 8 +- tools/goctl/api/javagen/util.go | 6 +- tools/goctl/api/ktgen/cmd.go | 2 +- tools/goctl/api/ktgen/funcs.go | 2 +- tools/goctl/api/ktgen/gen.go | 2 +- tools/goctl/api/new/newservice.go | 8 +- tools/goctl/api/new/template.go | 2 +- tools/goctl/api/parser/g4/ast/api.go | 2 +- tools/goctl/api/parser/g4/ast/apiparser.go | 4 +- tools/goctl/api/parser/g4/ast/ast.go | 4 +- tools/goctl/api/parser/g4/ast/import.go | 2 +- tools/goctl/api/parser/g4/ast/info.go | 2 +- tools/goctl/api/parser/g4/ast/kv.go | 2 +- tools/goctl/api/parser/g4/ast/service.go | 2 +- tools/goctl/api/parser/g4/ast/syntax.go | 2 +- tools/goctl/api/parser/g4/ast/type.go | 2 +- .../api/parser/g4/test/apiparser_test.go | 4 +- tools/goctl/api/parser/g4/test/ast_test.go | 4 +- tools/goctl/api/parser/g4/test/import_test.go | 4 +- tools/goctl/api/parser/g4/test/info_test.go | 4 +- .../goctl/api/parser/g4/test/service_test.go | 4 +- tools/goctl/api/parser/g4/test/syntax_test.go | 4 +- tools/goctl/api/parser/g4/test/type_test.go | 4 +- tools/goctl/api/parser/parser.go | 6 +- tools/goctl/api/parser/parser_test.go | 2 +- tools/goctl/api/spec/fn.go | 4 +- tools/goctl/api/tsgen/gen.go | 6 +- tools/goctl/api/tsgen/gencomponents.go | 6 +- tools/goctl/api/tsgen/genpacket.go | 8 +- tools/goctl/api/tsgen/util.go | 6 +- tools/goctl/api/util/util.go | 6 +- tools/goctl/api/validate/validate.go | 2 +- tools/goctl/bug/bug.go | 2 +- tools/goctl/bug/env.go | 2 +- tools/goctl/docker/docker.go | 4 +- tools/goctl/docker/template.go | 2 +- tools/goctl/go.mod | 12 +-- tools/goctl/go.sum | 79 +++++++++---------- tools/goctl/goctl.go | 50 ++++++------ tools/goctl/internal/errorx/errorx.go | 2 +- tools/goctl/kube/kube.go | 4 +- tools/goctl/migrate/migrate.go | 4 +- tools/goctl/migrate/mod.go | 10 +-- tools/goctl/migrate/proxy.go | 4 +- tools/goctl/migrate/version.go | 2 +- tools/goctl/model/mongo/generate/generate.go | 10 +-- .../model/mongo/generate/generate_test.go | 4 +- tools/goctl/model/mongo/generate/template.go | 4 +- tools/goctl/model/mongo/mongo.go | 8 +- tools/goctl/model/sql/README.MD | 14 ++-- tools/goctl/model/sql/builderx/builder.go | 2 +- tools/goctl/model/sql/command/command.go | 20 ++--- tools/goctl/model/sql/command/command_test.go | 6 +- tools/goctl/model/sql/gen/delete.go | 10 +-- tools/goctl/model/sql/gen/field.go | 8 +- tools/goctl/model/sql/gen/findone.go | 8 +- tools/goctl/model/sql/gen/findonebyfield.go | 8 +- tools/goctl/model/sql/gen/gen.go | 20 ++--- tools/goctl/model/sql/gen/gen_test.go | 10 +-- tools/goctl/model/sql/gen/imports.go | 6 +- tools/goctl/model/sql/gen/insert.go | 10 +-- tools/goctl/model/sql/gen/keys.go | 6 +- tools/goctl/model/sql/gen/keys_test.go | 4 +- tools/goctl/model/sql/gen/new.go | 6 +- tools/goctl/model/sql/gen/tag.go | 6 +- tools/goctl/model/sql/gen/template.go | 4 +- tools/goctl/model/sql/gen/template_test.go | 4 +- tools/goctl/model/sql/gen/types.go | 6 +- tools/goctl/model/sql/gen/update.go | 10 +-- tools/goctl/model/sql/gen/vars.go | 8 +- .../model/sql/model/informationschemamodel.go | 6 +- .../goctl/model/sql/model/postgresqlmodel.go | 2 +- tools/goctl/model/sql/parser/parser.go | 14 ++-- tools/goctl/model/sql/parser/parser_test.go | 6 +- .../goctl/model/sql/test/model/model_test.go | 8 +- .../model/sql/test/model/studentmodel.go | 10 +-- tools/goctl/model/sql/test/model/usermodel.go | 8 +- tools/goctl/model/sql/test/model/vars.go | 2 +- tools/goctl/model/sql/test/orm.go | 2 +- tools/goctl/model/sql/test/sqlconn.go | 2 +- tools/goctl/model/sql/test/stmt.go | 4 +- tools/goctl/model/sql/test/utils.go | 4 +- tools/goctl/plugin/demo/goctlplugin.go | 2 +- tools/goctl/plugin/plugin.go | 8 +- tools/goctl/rpc/cli/cli.go | 10 +-- tools/goctl/rpc/cli/zrpc.go | 6 +- tools/goctl/rpc/cli/zrpc_test.go | 2 +- tools/goctl/rpc/execx/execx.go | 4 +- tools/goctl/rpc/generator/defaultgenerator.go | 2 +- tools/goctl/rpc/generator/gen.go | 10 +-- tools/goctl/rpc/generator/gen_test.go | 10 +-- tools/goctl/rpc/generator/gencall.go | 14 ++-- tools/goctl/rpc/generator/genconfig.go | 10 +-- tools/goctl/rpc/generator/generator.go | 4 +- tools/goctl/rpc/generator/genetc.go | 12 +-- tools/goctl/rpc/generator/genlogic.go | 14 ++-- tools/goctl/rpc/generator/genmain.go | 12 +-- tools/goctl/rpc/generator/genpb.go | 8 +- tools/goctl/rpc/generator/genserver.go | 14 ++-- tools/goctl/rpc/generator/gensvc.go | 10 +-- tools/goctl/rpc/generator/mkdir.go | 10 +-- tools/goctl/rpc/generator/prototmpl.go | 6 +- tools/goctl/rpc/generator/prototmpl_test.go | 2 +- tools/goctl/rpc/generator/template.go | 2 +- tools/goctl/rpc/generator/template_test.go | 2 +- tools/goctl/tpl/templates.go | 20 ++--- tools/goctl/update/config/config.go | 2 +- tools/goctl/update/update.go | 10 +-- tools/goctl/upgrade/upgrade.go | 2 +- tools/goctl/util/console/console.go | 2 +- tools/goctl/util/ctx/context.go | 2 +- tools/goctl/util/ctx/gomod.go | 6 +- tools/goctl/util/ctx/gomod_test.go | 6 +- tools/goctl/util/ctx/gopath.go | 2 +- tools/goctl/util/ctx/gopath_test.go | 4 +- tools/goctl/util/ctx/modcheck.go | 4 +- tools/goctl/util/ctx/modcheck_test.go | 6 +- tools/goctl/util/env/env.go | 2 +- tools/goctl/util/env/env_test.go | 4 +- tools/goctl/util/git.go | 4 +- tools/goctl/util/name/naming.go | 2 +- tools/goctl/util/pathx/file.go | 2 +- tools/goctl/util/pathx/file_test.go | 2 +- tools/goctl/util/pathx/path.go | 2 +- tools/goctl/util/string.go | 2 +- tools/goctl/util/templatex.go | 4 +- 151 files changed, 502 insertions(+), 507 deletions(-) diff --git a/tools/goctl/api/apigen/gen.go b/tools/goctl/api/apigen/gen.go index 8fe56143..7da3aa2f 100644 --- a/tools/goctl/api/apigen/gen.go +++ b/tools/goctl/api/apigen/gen.go @@ -8,8 +8,8 @@ import ( "text/template" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/apigen/template.go b/tools/goctl/api/apigen/template.go index 11629696..265ff80a 100644 --- a/tools/goctl/api/apigen/template.go +++ b/tools/goctl/api/apigen/template.go @@ -3,7 +3,7 @@ package apigen import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/dartgen/gen.go b/tools/goctl/api/dartgen/gen.go index 972e02c1..6edeb9da 100644 --- a/tools/goctl/api/dartgen/gen.go +++ b/tools/goctl/api/dartgen/gen.go @@ -4,8 +4,8 @@ import ( "errors" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/dartgen/genapi.go b/tools/goctl/api/dartgen/genapi.go index 3a87e158..380b858a 100644 --- a/tools/goctl/api/dartgen/genapi.go +++ b/tools/goctl/api/dartgen/genapi.go @@ -4,7 +4,7 @@ import ( "os" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" ) const apiTemplate = `import 'api.dart'; diff --git a/tools/goctl/api/dartgen/gendata.go b/tools/goctl/api/dartgen/gendata.go index 4b5b6afb..6b33e610 100644 --- a/tools/goctl/api/dartgen/gendata.go +++ b/tools/goctl/api/dartgen/gendata.go @@ -4,7 +4,7 @@ import ( "os" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" ) const dataTemplate = `// --{{with .Info}}{{.Title}}{{end}}-- diff --git a/tools/goctl/api/dartgen/util.go b/tools/goctl/api/dartgen/util.go index 961a5f43..5e5fe7e3 100644 --- a/tools/goctl/api/dartgen/util.go +++ b/tools/goctl/api/dartgen/util.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/util" ) func lowCamelCase(s string) string { diff --git a/tools/goctl/api/docgen/doc.go b/tools/goctl/api/docgen/doc.go index a479f27c..7b876e89 100644 --- a/tools/goctl/api/docgen/doc.go +++ b/tools/goctl/api/docgen/doc.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/api/gogen" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/api/gogen" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/util" ) const ( diff --git a/tools/goctl/api/docgen/gen.go b/tools/goctl/api/docgen/gen.go index 47976b80..62cd37fa 100644 --- a/tools/goctl/api/docgen/gen.go +++ b/tools/goctl/api/docgen/gen.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/format/format.go b/tools/goctl/api/format/format.go index e9fb9dde..8f2fd9bc 100644 --- a/tools/goctl/api/format/format.go +++ b/tools/goctl/api/format/format.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/core/errorx" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/gogen/gen.go b/tools/goctl/api/gogen/gen.go index 99569193..7e73f0b0 100644 --- a/tools/goctl/api/gogen/gen.go +++ b/tools/goctl/api/gogen/gen.go @@ -12,13 +12,13 @@ import ( "time" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/core/logx" - apiformat "github.com/tal-tech/go-zero/tools/goctl/api/format" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + apiformat "github.com/zeromicro/go-zero/tools/goctl/api/format" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/gogen/gen_test.go b/tools/goctl/api/gogen/gen_test.go index eeab8730..4b1fbbbd 100644 --- a/tools/goctl/api/gogen/gen_test.go +++ b/tools/goctl/api/gogen/gen_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" ) const testApiTemplate = ` diff --git a/tools/goctl/api/gogen/genconfig.go b/tools/goctl/api/gogen/genconfig.go index 1be07dcc..4b11949e 100644 --- a/tools/goctl/api/gogen/genconfig.go +++ b/tools/goctl/api/gogen/genconfig.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/genetc.go b/tools/goctl/api/gogen/genetc.go index f8e83154..c43f7879 100644 --- a/tools/goctl/api/gogen/genetc.go +++ b/tools/goctl/api/gogen/genetc.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" ) const ( diff --git a/tools/goctl/api/gogen/genhandlers.go b/tools/goctl/api/gogen/genhandlers.go index 5cab27f4..c82532e7 100644 --- a/tools/goctl/api/gogen/genhandlers.go +++ b/tools/goctl/api/gogen/genhandlers.go @@ -5,13 +5,13 @@ import ( "path" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/genlogic.go b/tools/goctl/api/gogen/genlogic.go index baa62f17..6b0d342c 100644 --- a/tools/goctl/api/gogen/genlogic.go +++ b/tools/goctl/api/gogen/genlogic.go @@ -6,12 +6,12 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const logicTemplate = `package {{.pkgName}} diff --git a/tools/goctl/api/gogen/genmain.go b/tools/goctl/api/gogen/genmain.go index 460eae97..3a3269d0 100644 --- a/tools/goctl/api/gogen/genmain.go +++ b/tools/goctl/api/gogen/genmain.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const mainTemplate = `package main diff --git a/tools/goctl/api/gogen/genmiddleware.go b/tools/goctl/api/gogen/genmiddleware.go index f6bc06d4..c283c008 100644 --- a/tools/goctl/api/gogen/genmiddleware.go +++ b/tools/goctl/api/gogen/genmiddleware.go @@ -3,9 +3,9 @@ package gogen import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" ) var middlewareImplementCode = ` diff --git a/tools/goctl/api/gogen/genroutes.go b/tools/goctl/api/gogen/genroutes.go index ef12fd8b..24161360 100644 --- a/tools/goctl/api/gogen/genroutes.go +++ b/tools/goctl/api/gogen/genroutes.go @@ -8,12 +8,12 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/gensvc.go b/tools/goctl/api/gogen/gensvc.go index a6764c8b..573b8466 100644 --- a/tools/goctl/api/gogen/gensvc.go +++ b/tools/goctl/api/gogen/gensvc.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/gentypes.go b/tools/goctl/api/gogen/gentypes.go index 5bea40dd..6dfe9932 100644 --- a/tools/goctl/api/gogen/gentypes.go +++ b/tools/goctl/api/gogen/gentypes.go @@ -7,11 +7,11 @@ import ( "path" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" ) const ( diff --git a/tools/goctl/api/gogen/template.go b/tools/goctl/api/gogen/template.go index 7f80c15d..21addc6f 100644 --- a/tools/goctl/api/gogen/template.go +++ b/tools/goctl/api/gogen/template.go @@ -3,7 +3,7 @@ package gogen import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/gogen/template_test.go b/tools/goctl/api/gogen/template_test.go index 0370c6ce..9d757bfc 100644 --- a/tools/goctl/api/gogen/template_test.go +++ b/tools/goctl/api/gogen/template_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestGenTemplates(t *testing.T) { diff --git a/tools/goctl/api/gogen/util.go b/tools/goctl/api/gogen/util.go index cd2f7cce..cb4ac877 100644 --- a/tools/goctl/api/gogen/util.go +++ b/tools/goctl/api/gogen/util.go @@ -9,11 +9,11 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util/ctx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util/ctx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) type fileGenConfig struct { diff --git a/tools/goctl/api/javagen/gen.go b/tools/goctl/api/javagen/gen.go index eddd92e6..8698012b 100644 --- a/tools/goctl/api/javagen/gen.go +++ b/tools/goctl/api/javagen/gen.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/javagen/gencomponents.go b/tools/goctl/api/javagen/gencomponents.go index a2632da4..f87136ea 100644 --- a/tools/goctl/api/javagen/gencomponents.go +++ b/tools/goctl/api/javagen/gencomponents.go @@ -10,11 +10,11 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const ( diff --git a/tools/goctl/api/javagen/genpacket.go b/tools/goctl/api/javagen/genpacket.go index f6b378b5..7485a348 100644 --- a/tools/goctl/api/javagen/genpacket.go +++ b/tools/goctl/api/javagen/genpacket.go @@ -6,10 +6,10 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util" ) const packetTemplate = `package com.xhb.logic.http.packet.{{.packet}}; diff --git a/tools/goctl/api/javagen/util.go b/tools/goctl/api/javagen/util.go index 2b427b50..c490b441 100644 --- a/tools/goctl/api/javagen/util.go +++ b/tools/goctl/api/javagen/util.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func writeProperty(writer io.Writer, member spec.Member, indent int) error { diff --git a/tools/goctl/api/ktgen/cmd.go b/tools/goctl/api/ktgen/cmd.go index 39e20fcf..04bd214b 100644 --- a/tools/goctl/api/ktgen/cmd.go +++ b/tools/goctl/api/ktgen/cmd.go @@ -3,7 +3,7 @@ package ktgen import ( "errors" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/ktgen/funcs.go b/tools/goctl/api/ktgen/funcs.go index 7ea43d1c..b8085b7b 100644 --- a/tools/goctl/api/ktgen/funcs.go +++ b/tools/goctl/api/ktgen/funcs.go @@ -7,7 +7,7 @@ import ( "text/template" "github.com/iancoleman/strcase" - "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/api/util" ) var funcsMap = template.FuncMap{ diff --git a/tools/goctl/api/ktgen/gen.go b/tools/goctl/api/ktgen/gen.go index 1cbfb2eb..40703749 100644 --- a/tools/goctl/api/ktgen/gen.go +++ b/tools/goctl/api/ktgen/gen.go @@ -7,7 +7,7 @@ import ( "text/template" "github.com/iancoleman/strcase" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" ) const ( diff --git a/tools/goctl/api/new/newservice.go b/tools/goctl/api/new/newservice.go index 89118ac4..0b161864 100644 --- a/tools/goctl/api/new/newservice.go +++ b/tools/goctl/api/new/newservice.go @@ -7,10 +7,10 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/api/gogen" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/gogen" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/new/template.go b/tools/goctl/api/new/template.go index 8c465431..0e8f6dd1 100644 --- a/tools/goctl/api/new/template.go +++ b/tools/goctl/api/new/template.go @@ -3,7 +3,7 @@ package new import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/parser/g4/ast/api.go b/tools/goctl/api/parser/g4/ast/api.go index 7b2ab929..d657b9f4 100644 --- a/tools/goctl/api/parser/g4/ast/api.go +++ b/tools/goctl/api/parser/g4/ast/api.go @@ -5,7 +5,7 @@ import ( "path" "sort" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) const prefixKey = "prefix" diff --git a/tools/goctl/api/parser/g4/ast/apiparser.go b/tools/goctl/api/parser/g4/ast/apiparser.go index 6f57646b..b77474f0 100644 --- a/tools/goctl/api/parser/g4/ast/apiparser.go +++ b/tools/goctl/api/parser/g4/ast/apiparser.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/util/console" "github.com/zeromicro/antlr" ) diff --git a/tools/goctl/api/parser/g4/ast/ast.go b/tools/goctl/api/parser/g4/ast/ast.go index 2f708801..22c825ac 100644 --- a/tools/goctl/api/parser/g4/ast/ast.go +++ b/tools/goctl/api/parser/g4/ast/ast.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/util/console" "github.com/zeromicro/antlr" ) diff --git a/tools/goctl/api/parser/g4/ast/import.go b/tools/goctl/api/parser/g4/ast/import.go index d32c046d..d10c0c2e 100644 --- a/tools/goctl/api/parser/g4/ast/import.go +++ b/tools/goctl/api/parser/g4/ast/import.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) // ImportExpr defines import syntax for api diff --git a/tools/goctl/api/parser/g4/ast/info.go b/tools/goctl/api/parser/g4/ast/info.go index 359a650b..0b56d940 100644 --- a/tools/goctl/api/parser/g4/ast/info.go +++ b/tools/goctl/api/parser/g4/ast/info.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) // InfoExpr defines info syntax for api diff --git a/tools/goctl/api/parser/g4/ast/kv.go b/tools/goctl/api/parser/g4/ast/kv.go index 951dee60..9bf6976b 100644 --- a/tools/goctl/api/parser/g4/ast/kv.go +++ b/tools/goctl/api/parser/g4/ast/kv.go @@ -3,7 +3,7 @@ package ast import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) // KvExpr describes key-value for api diff --git a/tools/goctl/api/parser/g4/ast/service.go b/tools/goctl/api/parser/g4/ast/service.go index 4c39509f..debef376 100644 --- a/tools/goctl/api/parser/g4/ast/service.go +++ b/tools/goctl/api/parser/g4/ast/service.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) // Service describes service for api syntax diff --git a/tools/goctl/api/parser/g4/ast/syntax.go b/tools/goctl/api/parser/g4/ast/syntax.go index 6eb38b34..0ca360f6 100644 --- a/tools/goctl/api/parser/g4/ast/syntax.go +++ b/tools/goctl/api/parser/g4/ast/syntax.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) // SyntaxExpr describes syntax for api diff --git a/tools/goctl/api/parser/g4/ast/type.go b/tools/goctl/api/parser/g4/ast/type.go index 89055f1f..0e55eaeb 100644 --- a/tools/goctl/api/parser/g4/ast/type.go +++ b/tools/goctl/api/parser/g4/ast/type.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) type ( diff --git a/tools/goctl/api/parser/g4/test/apiparser_test.go b/tools/goctl/api/parser/g4/test/apiparser_test.go index 92fac555..764ef1fd 100644 --- a/tools/goctl/api/parser/g4/test/apiparser_test.go +++ b/tools/goctl/api/parser/g4/test/apiparser_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) var ( diff --git a/tools/goctl/api/parser/g4/test/ast_test.go b/tools/goctl/api/parser/g4/test/ast_test.go index 1884b92f..a6a26418 100644 --- a/tools/goctl/api/parser/g4/test/ast_test.go +++ b/tools/goctl/api/parser/g4/test/ast_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) var parser = ast.NewParser(ast.WithParserPrefix("test.api"), ast.WithParserDebug()) diff --git a/tools/goctl/api/parser/g4/test/import_test.go b/tools/goctl/api/parser/g4/test/import_test.go index e136d7b5..422ae0c6 100644 --- a/tools/goctl/api/parser/g4/test/import_test.go +++ b/tools/goctl/api/parser/g4/test/import_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) var importAccept = func(p *api.ApiParserParser, visitor *ast.ApiVisitor) interface{} { diff --git a/tools/goctl/api/parser/g4/test/info_test.go b/tools/goctl/api/parser/g4/test/info_test.go index 7794cf0b..2ce1f91c 100644 --- a/tools/goctl/api/parser/g4/test/info_test.go +++ b/tools/goctl/api/parser/g4/test/info_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) var infoAccept = func(p *api.ApiParserParser, visitor *ast.ApiVisitor) interface{} { diff --git a/tools/goctl/api/parser/g4/test/service_test.go b/tools/goctl/api/parser/g4/test/service_test.go index 6be8b274..6a09624a 100644 --- a/tools/goctl/api/parser/g4/test/service_test.go +++ b/tools/goctl/api/parser/g4/test/service_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) func TestBody(t *testing.T) { diff --git a/tools/goctl/api/parser/g4/test/syntax_test.go b/tools/goctl/api/parser/g4/test/syntax_test.go index 67349e83..31af5536 100644 --- a/tools/goctl/api/parser/g4/test/syntax_test.go +++ b/tools/goctl/api/parser/g4/test/syntax_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) var syntaxAccept = func(p *api.ApiParserParser, visitor *ast.ApiVisitor) interface{} { diff --git a/tools/goctl/api/parser/g4/test/type_test.go b/tools/goctl/api/parser/g4/test/type_test.go index 4e0cca5b..5a8d0c3e 100644 --- a/tools/goctl/api/parser/g4/test/type_test.go +++ b/tools/goctl/api/parser/g4/test/type_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" ) var fieldAccept = func(p *api.ApiParserParser, visitor *ast.ApiVisitor) interface{} { diff --git a/tools/goctl/api/parser/parser.go b/tools/goctl/api/parser/parser.go index 3d40b3e5..8469605b 100644 --- a/tools/goctl/api/parser/parser.go +++ b/tools/goctl/api/parser/parser.go @@ -5,9 +5,9 @@ import ( "path/filepath" "unicode" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/ast" - "github.com/tal-tech/go-zero/tools/goctl/api/parser/g4/gen/api" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/ast" + "github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" ) type parser struct { diff --git a/tools/goctl/api/parser/parser_test.go b/tools/goctl/api/parser/parser_test.go index 95c4dbb9..16b84c70 100644 --- a/tools/goctl/api/parser/parser_test.go +++ b/tools/goctl/api/parser/parser_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" ) var testApi = "// syntax doc\nsyntax = \"v1\" // syntax comment\n\n// type doc\ntype Request {\n\tName string `path:\"name,options=you|me\"`\n}\n\ntype Response {\n\tMessage string `json:\"message\"`\n}\n\n// service doc\nservice greet-api {\n\t// handler doc\n\t@handler GreetHandler // handler comment\n\tget /from/:name(Request) returns (Response);\n}" diff --git a/tools/goctl/api/spec/fn.go b/tools/goctl/api/spec/fn.go index 54b648c1..6ca97d99 100644 --- a/tools/goctl/api/spec/fn.go +++ b/tools/goctl/api/spec/fn.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/tsgen/gen.go b/tools/goctl/api/tsgen/gen.go index 5a361fda..6e007648 100644 --- a/tools/goctl/api/tsgen/gen.go +++ b/tools/goctl/api/tsgen/gen.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/tsgen/gencomponents.go b/tools/goctl/api/tsgen/gencomponents.go index 4ac8e87c..ce08280d 100644 --- a/tools/goctl/api/tsgen/gencomponents.go +++ b/tools/goctl/api/tsgen/gencomponents.go @@ -5,9 +5,9 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const ( diff --git a/tools/goctl/api/tsgen/genpacket.go b/tools/goctl/api/tsgen/genpacket.go index 37cb2846..f8d66d05 100644 --- a/tools/goctl/api/tsgen/genpacket.go +++ b/tools/goctl/api/tsgen/genpacket.go @@ -6,10 +6,10 @@ import ( "strings" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const ( diff --git a/tools/goctl/api/tsgen/util.go b/tools/goctl/api/tsgen/util.go index f9f9634b..5c608b51 100644 --- a/tools/goctl/api/tsgen/util.go +++ b/tools/goctl/api/tsgen/util.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" - "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util" + "github.com/zeromicro/go-zero/tools/goctl/util" ) func writeProperty(writer io.Writer, member spec.Member, indent int) error { diff --git a/tools/goctl/api/util/util.go b/tools/goctl/api/util/util.go index 8afa2e1c..6b86f372 100644 --- a/tools/goctl/api/util/util.go +++ b/tools/goctl/api/util/util.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) // MaybeCreateFile creates file if not exists diff --git a/tools/goctl/api/validate/validate.go b/tools/goctl/api/validate/validate.go index c40f3a5c..97b8d56e 100644 --- a/tools/goctl/api/validate/validate.go +++ b/tools/goctl/api/validate/validate.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/bug/bug.go b/tools/goctl/bug/bug.go index 07d4a0eb..33a6a874 100644 --- a/tools/goctl/bug/bug.go +++ b/tools/goctl/bug/bug.go @@ -6,7 +6,7 @@ import ( "os/exec" "runtime" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" "github.com/urfave/cli" ) diff --git a/tools/goctl/bug/env.go b/tools/goctl/bug/env.go index 4c78196f..bbbc2399 100644 --- a/tools/goctl/bug/env.go +++ b/tools/goctl/bug/env.go @@ -6,7 +6,7 @@ import ( "runtime" "strings" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" ) type env map[string]string diff --git a/tools/goctl/docker/docker.go b/tools/goctl/docker/docker.go index 38f9a427..9b9c772d 100644 --- a/tools/goctl/docker/docker.go +++ b/tools/goctl/docker/docker.go @@ -10,8 +10,8 @@ import ( "time" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/docker/template.go b/tools/goctl/docker/template.go index 51c62306..ba0e94d4 100644 --- a/tools/goctl/docker/template.go +++ b/tools/goctl/docker/template.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/go.mod b/tools/goctl/go.mod index c3302f6f..57138fe1 100644 --- a/tools/goctl/go.mod +++ b/tools/goctl/go.mod @@ -1,4 +1,4 @@ -module github.com/tal-tech/go-zero/tools/goctl +module github.com/zeromicro/go-zero/tools/goctl go 1.17 @@ -10,27 +10,27 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/stretchr/testify v1.7.0 - github.com/tal-tech/go-zero v1.2.5 github.com/urfave/cli v1.22.5 github.com/zeromicro/antlr v0.0.1 github.com/zeromicro/ddl-parser v0.0.0-20210712021150-63520aca7348 + github.com/zeromicro/go-zero v1.3.0-beta ) require ( github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect - github.com/alicebob/miniredis/v2 v2.16.0 // indirect + github.com/alicebob/miniredis/v2 v2.17.0 // indirect github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521184019-c5ad59b459ec // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-redis/redis v6.15.9+incompatible // indirect - github.com/lib/pq v1.10.3 // indirect + github.com/lib/pq v1.10.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.0.1 // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect - go.opentelemetry.io/otel v1.1.0 // indirect - go.opentelemetry.io/otel/trace v1.1.0 // indirect + go.opentelemetry.io/otel v1.3.0 // indirect + go.opentelemetry.io/otel/trace v1.3.0 // indirect go.uber.org/automaxprocs v1.4.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/tools/goctl/go.sum b/tools/goctl/go.sum index 48557118..0b815042 100644 --- a/tools/goctl/go.sum +++ b/tools/goctl/go.sum @@ -39,9 +39,7 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -50,8 +48,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/miniredis/v2 v2.16.0 h1:ALkyFg7bSTEd1Mkrb4ppq4fnwjklA59dVtIehXCUZkU= -github.com/alicebob/miniredis/v2 v2.16.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I= +github.com/alicebob/miniredis/v2 v2.17.0 h1:EwLdrIS50uczw71Jc7iVSxZluTKj5nfSP8n7ARRnJy0= +github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521184019-c5ad59b459ec h1:EEyRvzmpEUZ+I8WmD5cw/vY8EqhambkOqy5iFr0908A= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521184019-c5ad59b459ec/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= @@ -87,7 +85,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= @@ -104,7 +101,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -127,6 +124,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -144,7 +148,7 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -170,7 +174,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -199,8 +202,6 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= @@ -249,18 +250,16 @@ 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/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg= -github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -279,29 +278,25 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= +github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= 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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -320,8 +315,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= @@ -338,7 +333,6 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -349,8 +343,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tal-tech/go-zero v1.2.5 h1:DpqTM/OTCThRtJoQPlp6b4/YnbCVkZ3gDT7+nFGUo3k= -github.com/tal-tech/go-zero v1.2.5/go.mod h1:OM2UangPHFMJ+5boRUaeQ/z6xpVvqprZda/JUWG1D7Y= github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= @@ -366,6 +358,8 @@ github.com/zeromicro/antlr v0.0.1 h1:CQpIn/dc0pUjgGQ81y98s/NGOm2Hfru2NNio2I9mQgk github.com/zeromicro/antlr v0.0.1/go.mod h1:nfpjEwFR6Q4xGDJMcZnCL9tEfQRgszMwu3rDz2Z+p5M= github.com/zeromicro/ddl-parser v0.0.0-20210712021150-63520aca7348 h1:OhxL9tn28gDeJVzreIUiE5oVxZCjL3tBJ0XBNw8p5R8= github.com/zeromicro/ddl-parser v0.0.0-20210712021150-63520aca7348/go.mod h1:ISU/8NuPyEpl9pa17Py9TBPetMjtsiHrb9f5XGiYbo8= +github.com/zeromicro/go-zero v1.3.0-beta h1:jNwtjGzAV6PSklpXbLCmQph7BzfH7abcUIOG9odWMsM= +github.com/zeromicro/go-zero v1.3.0-beta/go.mod h1:Hy4o1VFAt32lXaQMbaBhoFeZjA/rJqJ4PTGNdGsURcc= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= @@ -373,18 +367,19 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.1.0 h1:8p0uMLcyyIx0KHNTgO8o3CW8A1aA+dJZJW6PvnMz0Wc= -go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= -go.opentelemetry.io/otel/exporters/jaeger v1.1.0/go.mod h1:D/GIBwAdrFTTqCy1iITpC9nh5rgJpIbFVgkhlz2vCXk= -go.opentelemetry.io/otel/exporters/zipkin v1.1.0/go.mod h1:LZwDnf1mVGTPMq9hdRUHfFBH30SuQvZ1BJaVywpg0VI= -go.opentelemetry.io/otel/sdk v1.1.0 h1:j/1PngUJIDOddkCILQYTevrTIbWd494djgGkSsMit+U= -go.opentelemetry.io/otel/sdk v1.1.0/go.mod h1:3aQvM6uLm6C4wJpHtT8Od3vNzeZ34Pqc6bps8MywWzo= -go.opentelemetry.io/otel/trace v1.1.0 h1:N25T9qCL0+7IpOT8RrRy0WYlL7y6U0WiUJzXcVdXY/o= -go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= +go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y= +go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= +go.opentelemetry.io/otel/exporters/jaeger v1.3.0/go.mod h1:KoYHi1BtkUPncGSRtCe/eh1ijsnePhSkxwzz07vU0Fc= +go.opentelemetry.io/otel/exporters/zipkin v1.3.0/go.mod h1:LxGGfHIYbvsFnrJtBcazb0yG24xHdDGrT/H6RB9r3+8= +go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI= +go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= +go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY= +go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -460,8 +455,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b h1:eB48h3HiRycXNy8E0Gf5e0hv7YT6Kt14L/D73G1fuwo= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -482,7 +477,6 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -522,8 +516,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211106132015-ebca88c72f68 h1:Ywe/f3fNleF8I6F6qv3MeFoSZ6CTf2zBMMa/7qVML8M= -golang.org/x/sys v0.0.0-20211106132015-ebca88c72f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -538,7 +532,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -575,6 +569,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -615,7 +610,7 @@ google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220112215332-a9c7c0acf9f2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -624,13 +619,12 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -681,6 +675,7 @@ k8s.io/client-go v0.20.12/go.mod h1:NBJj6Evp73Xy/4v/O/RDRaH0+3JoxNfjRxkyRgrdbsA= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/tools/goctl/goctl.go b/tools/goctl/goctl.go index 23d25917..6a5ea653 100644 --- a/tools/goctl/goctl.go +++ b/tools/goctl/goctl.go @@ -6,30 +6,30 @@ import ( "runtime" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/core/load" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/api/apigen" - "github.com/tal-tech/go-zero/tools/goctl/api/dartgen" - "github.com/tal-tech/go-zero/tools/goctl/api/docgen" - "github.com/tal-tech/go-zero/tools/goctl/api/format" - "github.com/tal-tech/go-zero/tools/goctl/api/gogen" - "github.com/tal-tech/go-zero/tools/goctl/api/javagen" - "github.com/tal-tech/go-zero/tools/goctl/api/ktgen" - "github.com/tal-tech/go-zero/tools/goctl/api/new" - "github.com/tal-tech/go-zero/tools/goctl/api/tsgen" - "github.com/tal-tech/go-zero/tools/goctl/api/validate" - "github.com/tal-tech/go-zero/tools/goctl/bug" - "github.com/tal-tech/go-zero/tools/goctl/docker" - "github.com/tal-tech/go-zero/tools/goctl/internal/errorx" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" - "github.com/tal-tech/go-zero/tools/goctl/kube" - "github.com/tal-tech/go-zero/tools/goctl/migrate" - "github.com/tal-tech/go-zero/tools/goctl/model/mongo" - model "github.com/tal-tech/go-zero/tools/goctl/model/sql/command" - "github.com/tal-tech/go-zero/tools/goctl/plugin" - rpc "github.com/tal-tech/go-zero/tools/goctl/rpc/cli" - "github.com/tal-tech/go-zero/tools/goctl/tpl" - "github.com/tal-tech/go-zero/tools/goctl/upgrade" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/api/apigen" + "github.com/zeromicro/go-zero/tools/goctl/api/dartgen" + "github.com/zeromicro/go-zero/tools/goctl/api/docgen" + "github.com/zeromicro/go-zero/tools/goctl/api/format" + "github.com/zeromicro/go-zero/tools/goctl/api/gogen" + "github.com/zeromicro/go-zero/tools/goctl/api/javagen" + "github.com/zeromicro/go-zero/tools/goctl/api/ktgen" + "github.com/zeromicro/go-zero/tools/goctl/api/new" + "github.com/zeromicro/go-zero/tools/goctl/api/tsgen" + "github.com/zeromicro/go-zero/tools/goctl/api/validate" + "github.com/zeromicro/go-zero/tools/goctl/bug" + "github.com/zeromicro/go-zero/tools/goctl/docker" + "github.com/zeromicro/go-zero/tools/goctl/internal/errorx" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/kube" + "github.com/zeromicro/go-zero/tools/goctl/migrate" + "github.com/zeromicro/go-zero/tools/goctl/model/mongo" + model "github.com/zeromicro/go-zero/tools/goctl/model/sql/command" + "github.com/zeromicro/go-zero/tools/goctl/plugin" + rpc "github.com/zeromicro/go-zero/tools/goctl/rpc/cli" + "github.com/zeromicro/go-zero/tools/goctl/tpl" + "github.com/zeromicro/go-zero/tools/goctl/upgrade" "github.com/urfave/cli" ) @@ -494,7 +494,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.StringFlag{ Name: "home", diff --git a/tools/goctl/internal/errorx/errorx.go b/tools/goctl/internal/errorx/errorx.go index 4d0e8707..c513b814 100644 --- a/tools/goctl/internal/errorx/errorx.go +++ b/tools/goctl/internal/errorx/errorx.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" ) var errorFormat = `goctl: generation error: %+v diff --git a/tools/goctl/kube/kube.go b/tools/goctl/kube/kube.go index 9626b8cc..97bc7f4f 100644 --- a/tools/goctl/kube/kube.go +++ b/tools/goctl/kube/kube.go @@ -6,8 +6,8 @@ import ( "text/template" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/migrate/migrate.go b/tools/goctl/migrate/migrate.go index 9894a312..edbb7d76 100644 --- a/tools/goctl/migrate/migrate.go +++ b/tools/goctl/migrate/migrate.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/ctx" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/ctx" "github.com/urfave/cli" ) diff --git a/tools/goctl/migrate/mod.go b/tools/goctl/migrate/mod.go index 2102179d..d1086281 100644 --- a/tools/goctl/migrate/mod.go +++ b/tools/goctl/migrate/mod.go @@ -6,13 +6,13 @@ import ( "os" "time" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/ctx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/ctx" ) -const deprecatedGoZeroMod = "github.com/tal-tech/go-zero" +const deprecatedGoZeroMod = "github.com/zeromicro/go-zero" const goZeroMod = "github.com/zeromicro/go-zero" var errInvalidGoMod = errors.New("it's only working for go module") diff --git a/tools/goctl/migrate/proxy.go b/tools/goctl/migrate/proxy.go index 68bffe7d..b5218940 100644 --- a/tools/goctl/migrate/proxy.go +++ b/tools/goctl/migrate/proxy.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" ) var defaultProxy = "https://goproxy.cn" diff --git a/tools/goctl/migrate/version.go b/tools/goctl/migrate/version.go index 8033a7d2..de6b8fb0 100644 --- a/tools/goctl/migrate/version.go +++ b/tools/goctl/migrate/version.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/console" ) var client = http.Client{ diff --git a/tools/goctl/model/mongo/generate/generate.go b/tools/goctl/model/mongo/generate/generate.go index 9dc7209e..6bc8c005 100644 --- a/tools/goctl/model/mongo/generate/generate.go +++ b/tools/goctl/model/mongo/generate/generate.go @@ -4,11 +4,11 @@ import ( "errors" "path/filepath" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/mongo/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/mongo/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) // Context defines the model generation data what they needs diff --git a/tools/goctl/model/mongo/generate/generate_test.go b/tools/goctl/model/mongo/generate/generate_test.go index 23eb8c01..c214ac74 100644 --- a/tools/goctl/model/mongo/generate/generate_test.go +++ b/tools/goctl/model/mongo/generate/generate_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) var testTypes = ` diff --git a/tools/goctl/model/mongo/generate/template.go b/tools/goctl/model/mongo/generate/template.go index 1194f528..89c525ef 100644 --- a/tools/goctl/model/mongo/generate/template.go +++ b/tools/goctl/model/mongo/generate/template.go @@ -3,8 +3,8 @@ package generate import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/model/mongo/template" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/mongo/template" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/mongo/mongo.go b/tools/goctl/model/mongo/mongo.go index dcfb7f64..3a408e57 100644 --- a/tools/goctl/model/mongo/mongo.go +++ b/tools/goctl/model/mongo/mongo.go @@ -5,10 +5,10 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/mongo/generate" - file "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/mongo/generate" + file "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/sql/README.MD b/tools/goctl/model/sql/README.MD index 944caaf5..574f7dc6 100644 --- a/tools/goctl/model/sql/README.MD +++ b/tools/goctl/model/sql/README.MD @@ -36,11 +36,11 @@ goctl model 为go-zero下的工具模块中的组件之一，目前支持识别m "strings" "time" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/sqlc" - "github.com/tal-tech/go-zero/core/stores/sqlx" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/builderx" ) var ( @@ -261,7 +261,7 @@ OPTIONS: OPTIONS: --src value, -s value the path or path globbing patterns of the ddl --dir value, -d value the target dir - --style value the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md] + --style value the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md] --cache, -c generate code with cache [optional] --idea for idea plugin [optional] --database, -db the name of database [optional] @@ -287,7 +287,7 @@ OPTIONS: --table value, -t value the table or table globbing patterns in the database --cache, -c generate code with cache [optional] --dir value, -d value the target dir - --style value the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md] + --style value the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md] --idea for idea plugin [optional] diff --git a/tools/goctl/model/sql/builderx/builder.go b/tools/goctl/model/sql/builderx/builder.go index a258997e..5d5902f4 100644 --- a/tools/goctl/model/sql/builderx/builder.go +++ b/tools/goctl/model/sql/builderx/builder.go @@ -1,7 +1,7 @@ package builderx import ( - "github.com/tal-tech/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/builder" ) // Deprecated: Use github.com/zeromicro/go-zero/core/stores/builder.RawFieldNames instead. diff --git a/tools/goctl/model/sql/command/command.go b/tools/goctl/model/sql/command/command.go index b6af5945..59753ee6 100644 --- a/tools/goctl/model/sql/command/command.go +++ b/tools/goctl/model/sql/command/command.go @@ -6,16 +6,16 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/postgres" - "github.com/tal-tech/go-zero/core/stores/sqlx" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/gen" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/model" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" - file "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/postgres" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/gen" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/model" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/util" + file "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/sql/command/command_test.go b/tools/goctl/model/sql/command/command_test.go index 201f3c42..5d59655e 100644 --- a/tools/goctl/model/sql/command/command_test.go +++ b/tools/goctl/model/sql/command/command_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/gen" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/gen" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) var ( diff --git a/tools/goctl/model/sql/gen/delete.go b/tools/goctl/model/sql/gen/delete.go index 9f401fb4..559741ea 100644 --- a/tools/goctl/model/sql/gen/delete.go +++ b/tools/goctl/model/sql/gen/delete.go @@ -3,11 +3,11 @@ package gen import ( "strings" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func genDelete(table Table, withCache, postgreSql bool) (string, string, error) { diff --git a/tools/goctl/model/sql/gen/field.go b/tools/goctl/model/sql/gen/field.go index b4397dbe..86301688 100644 --- a/tools/goctl/model/sql/gen/field.go +++ b/tools/goctl/model/sql/gen/field.go @@ -3,10 +3,10 @@ package gen import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/parser" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/parser" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func genFields(table Table, fields []*parser.Field) (string, error) { diff --git a/tools/goctl/model/sql/gen/findone.go b/tools/goctl/model/sql/gen/findone.go index a4a0d0cd..814a8f7f 100644 --- a/tools/goctl/model/sql/gen/findone.go +++ b/tools/goctl/model/sql/gen/findone.go @@ -1,10 +1,10 @@ package gen import ( - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func genFindOne(table Table, withCache, postgreSql bool) (string, string, error) { diff --git a/tools/goctl/model/sql/gen/findonebyfield.go b/tools/goctl/model/sql/gen/findonebyfield.go index 029eb498..1d21d741 100644 --- a/tools/goctl/model/sql/gen/findonebyfield.go +++ b/tools/goctl/model/sql/gen/findonebyfield.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) type findOneCode struct { diff --git a/tools/goctl/model/sql/gen/gen.go b/tools/goctl/model/sql/gen/gen.go index 940d48e4..6730142d 100644 --- a/tools/goctl/model/sql/gen/gen.go +++ b/tools/goctl/model/sql/gen/gen.go @@ -8,16 +8,16 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/model" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/parser" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - modelutil "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/model" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/parser" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + modelutil "github.com/zeromicro/go-zero/tools/goctl/model/sql/util" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const ( diff --git a/tools/goctl/model/sql/gen/gen_test.go b/tools/goctl/model/sql/gen/gen_test.go index dbe2069c..f31593b2 100644 --- a/tools/goctl/model/sql/gen/gen_test.go +++ b/tools/goctl/model/sql/gen/gen_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/builderx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) var source = "CREATE TABLE `test_user` (\n `id` bigint NOT NULL AUTO_INCREMENT,\n `mobile` varchar(255) COLLATE utf8mb4_bin NOT NULL,\n `class` bigint NOT NULL,\n `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,\n `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,\n `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n PRIMARY KEY (`id`),\n UNIQUE KEY `mobile_unique` (`mobile`),\n UNIQUE KEY `class_name_unique` (`class`,`name`),\n KEY `create_index` (`create_time`),\n KEY `name_index` (`name`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;" diff --git a/tools/goctl/model/sql/gen/imports.go b/tools/goctl/model/sql/gen/imports.go index a458147a..7fe98768 100644 --- a/tools/goctl/model/sql/gen/imports.go +++ b/tools/goctl/model/sql/gen/imports.go @@ -1,9 +1,9 @@ package gen import ( - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func genImports(withCache, timeImport bool, table Table) (string, error) { diff --git a/tools/goctl/model/sql/gen/insert.go b/tools/goctl/model/sql/gen/insert.go index a8ecee43..46c28748 100644 --- a/tools/goctl/model/sql/gen/insert.go +++ b/tools/goctl/model/sql/gen/insert.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func genInsert(table Table, withCache, postgreSql bool) (string, string, error) { diff --git a/tools/goctl/model/sql/gen/keys.go b/tools/goctl/model/sql/gen/keys.go index db4003e0..17c71e16 100644 --- a/tools/goctl/model/sql/gen/keys.go +++ b/tools/goctl/model/sql/gen/keys.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) // Key describes cache key diff --git a/tools/goctl/model/sql/gen/keys_test.go b/tools/goctl/model/sql/gen/keys_test.go index f3fb8e09..c54cc4fe 100644 --- a/tools/goctl/model/sql/gen/keys_test.go +++ b/tools/goctl/model/sql/gen/keys_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func TestGenCacheKeys(t *testing.T) { diff --git a/tools/goctl/model/sql/gen/new.go b/tools/goctl/model/sql/gen/new.go index fb58812f..4e46a937 100644 --- a/tools/goctl/model/sql/gen/new.go +++ b/tools/goctl/model/sql/gen/new.go @@ -3,9 +3,9 @@ package gen import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func genNew(table Table, withCache, postgreSql bool) (string, error) { diff --git a/tools/goctl/model/sql/gen/tag.go b/tools/goctl/model/sql/gen/tag.go index 247b140b..f6b3dc4e 100644 --- a/tools/goctl/model/sql/gen/tag.go +++ b/tools/goctl/model/sql/gen/tag.go @@ -1,9 +1,9 @@ package gen import ( - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func genTag(table Table, in string) (string, error) { diff --git a/tools/goctl/model/sql/gen/template.go b/tools/goctl/model/sql/gen/template.go index c04eae50..6287e421 100644 --- a/tools/goctl/model/sql/gen/template.go +++ b/tools/goctl/model/sql/gen/template.go @@ -3,8 +3,8 @@ package gen import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/sql/gen/template_test.go b/tools/goctl/model/sql/gen/template_test.go index 987ff8ea..bcf9602e 100644 --- a/tools/goctl/model/sql/gen/template_test.go +++ b/tools/goctl/model/sql/gen/template_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestGenTemplates(t *testing.T) { diff --git a/tools/goctl/model/sql/gen/types.go b/tools/goctl/model/sql/gen/types.go index c9f5363e..a76afabc 100644 --- a/tools/goctl/model/sql/gen/types.go +++ b/tools/goctl/model/sql/gen/types.go @@ -1,9 +1,9 @@ package gen import ( - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func genTypes(table Table, methods string, withCache bool) (string, error) { diff --git a/tools/goctl/model/sql/gen/update.go b/tools/goctl/model/sql/gen/update.go index 041c41c1..5dab0706 100644 --- a/tools/goctl/model/sql/gen/update.go +++ b/tools/goctl/model/sql/gen/update.go @@ -3,11 +3,11 @@ package gen import ( "strings" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func genUpdate(table Table, withCache, postgreSql bool) (string, string, error) { diff --git a/tools/goctl/model/sql/gen/vars.go b/tools/goctl/model/sql/gen/vars.go index 8688da22..49534095 100644 --- a/tools/goctl/model/sql/gen/vars.go +++ b/tools/goctl/model/sql/gen/vars.go @@ -3,10 +3,10 @@ package gen import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/template" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) func genVars(table Table, withCache, postgreSql bool) (string, error) { diff --git a/tools/goctl/model/sql/model/informationschemamodel.go b/tools/goctl/model/sql/model/informationschemamodel.go index 5d53422b..6480951a 100644 --- a/tools/goctl/model/sql/model/informationschemamodel.go +++ b/tools/goctl/model/sql/model/informationschemamodel.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" - "github.com/tal-tech/go-zero/core/stores/sqlx" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" - su "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/util" + su "github.com/zeromicro/go-zero/tools/goctl/util" ) const indexPri = "PRIMARY" diff --git a/tools/goctl/model/sql/model/postgresqlmodel.go b/tools/goctl/model/sql/model/postgresqlmodel.go index 1ea1ecaa..ad20ee49 100644 --- a/tools/goctl/model/sql/model/postgresqlmodel.go +++ b/tools/goctl/model/sql/model/postgresqlmodel.go @@ -4,7 +4,7 @@ import ( "database/sql" "strings" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) var p2m = map[string]string{ diff --git a/tools/goctl/model/sql/parser/parser.go b/tools/goctl/model/sql/parser/parser.go index 6f27daf4..11c4c9a4 100644 --- a/tools/goctl/model/sql/parser/parser.go +++ b/tools/goctl/model/sql/parser/parser.go @@ -6,13 +6,13 @@ import ( "sort" "strings" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/converter" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/model" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" - su "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/converter" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/model" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/util" + su "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" "github.com/zeromicro/ddl-parser/parser" ) diff --git a/tools/goctl/model/sql/parser/parser_test.go b/tools/goctl/model/sql/parser/parser_test.go index a1c9574a..a1809093 100644 --- a/tools/goctl/model/sql/parser/parser_test.go +++ b/tools/goctl/model/sql/parser/parser_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/model" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/model" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestParsePlainText(t *testing.T) { diff --git a/tools/goctl/model/sql/test/model/model_test.go b/tools/goctl/model/sql/test/model/model_test.go index 6b51de5e..08bf121c 100644 --- a/tools/goctl/model/sql/test/model/model_test.go +++ b/tools/goctl/model/sql/test/model/model_test.go @@ -9,10 +9,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/redis" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" - mocksql "github.com/tal-tech/go-zero/tools/goctl/model/sql/test" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" + mocksql "github.com/zeromicro/go-zero/tools/goctl/model/sql/test" ) func TestStudentModel(t *testing.T) { diff --git a/tools/goctl/model/sql/test/model/studentmodel.go b/tools/goctl/model/sql/test/model/studentmodel.go index cba62675..9a79105c 100755 --- a/tools/goctl/model/sql/test/model/studentmodel.go +++ b/tools/goctl/model/sql/test/model/studentmodel.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/sqlc" - "github.com/tal-tech/go-zero/core/stores/sqlx" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/builderx" ) var ( diff --git a/tools/goctl/model/sql/test/model/usermodel.go b/tools/goctl/model/sql/test/model/usermodel.go index 6735274c..7076b1e2 100755 --- a/tools/goctl/model/sql/test/model/usermodel.go +++ b/tools/goctl/model/sql/test/model/usermodel.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/stores/sqlc" - "github.com/tal-tech/go-zero/core/stores/sqlx" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/model/sql/builderx" ) var ( diff --git a/tools/goctl/model/sql/test/model/vars.go b/tools/goctl/model/sql/test/model/vars.go index b1a15608..e4f809c5 100644 --- a/tools/goctl/model/sql/test/model/vars.go +++ b/tools/goctl/model/sql/test/model/vars.go @@ -1,6 +1,6 @@ package model -import "github.com/tal-tech/go-zero/core/stores/sqlx" +import "github.com/zeromicro/go-zero/core/stores/sqlx" // ErrNotFound types an alias for sqlx.ErrNotFound var ErrNotFound = sqlx.ErrNotFound diff --git a/tools/goctl/model/sql/test/orm.go b/tools/goctl/model/sql/test/orm.go index b4d09bfc..f7ba1775 100644 --- a/tools/goctl/model/sql/test/orm.go +++ b/tools/goctl/model/sql/test/orm.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/mapping" ) const tagName = "db" diff --git a/tools/goctl/model/sql/test/sqlconn.go b/tools/goctl/model/sql/test/sqlconn.go index 77a4d94b..2a1a55cb 100644 --- a/tools/goctl/model/sql/test/sqlconn.go +++ b/tools/goctl/model/sql/test/sqlconn.go @@ -5,7 +5,7 @@ package mocksql import ( "database/sql" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ( diff --git a/tools/goctl/model/sql/test/stmt.go b/tools/goctl/model/sql/test/stmt.go index 47c81486..72e3b584 100644 --- a/tools/goctl/model/sql/test/stmt.go +++ b/tools/goctl/model/sql/test/stmt.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/timex" ) const slowThreshold = time.Millisecond * 500 diff --git a/tools/goctl/model/sql/test/utils.go b/tools/goctl/model/sql/test/utils.go index 46af015b..2491af51 100644 --- a/tools/goctl/model/sql/test/utils.go +++ b/tools/goctl/model/sql/test/utils.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mapping" ) // ErrNotFound is the alias of sql.ErrNoRows diff --git a/tools/goctl/plugin/demo/goctlplugin.go b/tools/goctl/plugin/demo/goctlplugin.go index 387f9842..3c415706 100644 --- a/tools/goctl/plugin/demo/goctlplugin.go +++ b/tools/goctl/plugin/demo/goctlplugin.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/plugin" + "github.com/zeromicro/go-zero/tools/goctl/plugin" ) func main() { diff --git a/tools/goctl/plugin/plugin.go b/tools/goctl/plugin/plugin.go index d681e060..c9cb97f0 100644 --- a/tools/goctl/plugin/plugin.go +++ b/tools/goctl/plugin/plugin.go @@ -13,10 +13,10 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/api/parser" - "github.com/tal-tech/go-zero/tools/goctl/api/spec" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/api/parser" + "github.com/zeromicro/go-zero/tools/goctl/api/spec" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/rpc/cli/cli.go b/tools/goctl/rpc/cli/cli.go index 35449f40..e02f6345 100644 --- a/tools/goctl/rpc/cli/cli.go +++ b/tools/goctl/rpc/cli/cli.go @@ -6,11 +6,11 @@ import ( "path/filepath" "runtime" - "github.com/tal-tech/go-zero/tools/goctl/rpc/generator" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/env" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/generator" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/env" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/rpc/cli/zrpc.go b/tools/goctl/rpc/cli/zrpc.go index 23ec7f87..b1935c9d 100644 --- a/tools/goctl/rpc/cli/zrpc.go +++ b/tools/goctl/rpc/cli/zrpc.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/emicklei/proto" - "github.com/tal-tech/go-zero/tools/goctl/rpc/generator" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/generator" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/rpc/cli/zrpc_test.go b/tools/goctl/rpc/cli/zrpc_test.go index ac56a85b..e809f841 100644 --- a/tools/goctl/rpc/cli/zrpc_test.go +++ b/tools/goctl/rpc/cli/zrpc_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/console" ) type test struct { diff --git a/tools/goctl/rpc/execx/execx.go b/tools/goctl/rpc/execx/execx.go index 1a1073d7..5b5e10bb 100644 --- a/tools/goctl/rpc/execx/execx.go +++ b/tools/goctl/rpc/execx/execx.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) // Run provides the execution of shell scripts in golang, diff --git a/tools/goctl/rpc/generator/defaultgenerator.go b/tools/goctl/rpc/generator/defaultgenerator.go index 61725161..c9979369 100644 --- a/tools/goctl/rpc/generator/defaultgenerator.go +++ b/tools/goctl/rpc/generator/defaultgenerator.go @@ -3,7 +3,7 @@ package generator import ( "os/exec" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/console" ) // DefaultGenerator defines the environment needs of rpc service generation diff --git a/tools/goctl/rpc/generator/gen.go b/tools/goctl/rpc/generator/gen.go index 4fad5071..acb05967 100644 --- a/tools/goctl/rpc/generator/gen.go +++ b/tools/goctl/rpc/generator/gen.go @@ -3,11 +3,11 @@ package generator import ( "path/filepath" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/console" - "github.com/tal-tech/go-zero/tools/goctl/util/ctx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/ctx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) // RPCGenerator defines a generator and configure diff --git a/tools/goctl/rpc/generator/gen_test.go b/tools/goctl/rpc/generator/gen_test.go index d4afb286..d849ba46 100644 --- a/tools/goctl/rpc/generator/gen_test.go +++ b/tools/goctl/rpc/generator/gen_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) var cfg = &conf.Config{ diff --git a/tools/goctl/rpc/generator/gencall.go b/tools/goctl/rpc/generator/gencall.go index 60e4cf05..04544cc0 100644 --- a/tools/goctl/rpc/generator/gencall.go +++ b/tools/goctl/rpc/generator/gencall.go @@ -7,13 +7,13 @@ import ( "strings" "github.com/emicklei/proto" - "github.com/tal-tech/go-zero/core/collection" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const ( diff --git a/tools/goctl/rpc/generator/genconfig.go b/tools/goctl/rpc/generator/genconfig.go index 3d54da0b..61250035 100644 --- a/tools/goctl/rpc/generator/genconfig.go +++ b/tools/goctl/rpc/generator/genconfig.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const configTemplate = `package config @@ -23,7 +23,7 @@ type Config struct { // GenConfig generates the configuration structure definition file of the rpc service, // which contains the zrpc.RpcServerConf configuration item by default. // You can specify the naming style of the target file name through config.Config. For details, -// see https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/config.go +// see https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/config.go func (g *DefaultGenerator) GenConfig(ctx DirContext, _ parser.Proto, cfg *conf.Config) error { dir := ctx.GetConfig() configFilename, err := format.FileNamingFormat(cfg.NamingFormat, "config") diff --git a/tools/goctl/rpc/generator/generator.go b/tools/goctl/rpc/generator/generator.go index 89291967..3c4aa0de 100644 --- a/tools/goctl/rpc/generator/generator.go +++ b/tools/goctl/rpc/generator/generator.go @@ -1,8 +1,8 @@ package generator import ( - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" ) // Generator defines a generator interface to describe how to generate rpc service diff --git a/tools/goctl/rpc/generator/genetc.go b/tools/goctl/rpc/generator/genetc.go index 51f9e401..efa99f49 100644 --- a/tools/goctl/rpc/generator/genetc.go +++ b/tools/goctl/rpc/generator/genetc.go @@ -5,12 +5,12 @@ import ( "path/filepath" "strings" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const etcTemplate = `Name: {{.serviceName}}.rpc diff --git a/tools/goctl/rpc/generator/genlogic.go b/tools/goctl/rpc/generator/genlogic.go index 29c710b5..135ca522 100644 --- a/tools/goctl/rpc/generator/genlogic.go +++ b/tools/goctl/rpc/generator/genlogic.go @@ -5,13 +5,13 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/core/collection" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const ( diff --git a/tools/goctl/rpc/generator/genmain.go b/tools/goctl/rpc/generator/genmain.go index 4983a8cf..eafbe515 100644 --- a/tools/goctl/rpc/generator/genmain.go +++ b/tools/goctl/rpc/generator/genmain.go @@ -5,12 +5,12 @@ import ( "path/filepath" "strings" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const mainTemplate = `package main diff --git a/tools/goctl/rpc/generator/genpb.go b/tools/goctl/rpc/generator/genpb.go index 8294dd81..7c58ef11 100644 --- a/tools/goctl/rpc/generator/genpb.go +++ b/tools/goctl/rpc/generator/genpb.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/core/collection" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/core/collection" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" ) const googleProtocGenGoErr = `--go_out: protoc-gen-go: plugins are not supported; use 'protoc --go-grpc_out=...' to generate gRPC` diff --git a/tools/goctl/rpc/generator/genserver.go b/tools/goctl/rpc/generator/genserver.go index c579b603..b5dafda9 100644 --- a/tools/goctl/rpc/generator/genserver.go +++ b/tools/goctl/rpc/generator/genserver.go @@ -5,13 +5,13 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/core/collection" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/core/collection" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const ( diff --git a/tools/goctl/rpc/generator/gensvc.go b/tools/goctl/rpc/generator/gensvc.go index b4368f99..cd128cc6 100644 --- a/tools/goctl/rpc/generator/gensvc.go +++ b/tools/goctl/rpc/generator/gensvc.go @@ -4,11 +4,11 @@ import ( "fmt" "path/filepath" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/format" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/format" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const svcTemplate = `package svc diff --git a/tools/goctl/rpc/generator/mkdir.go b/tools/goctl/rpc/generator/mkdir.go index fce2656b..12ffbfbc 100644 --- a/tools/goctl/rpc/generator/mkdir.go +++ b/tools/goctl/rpc/generator/mkdir.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - conf "github.com/tal-tech/go-zero/tools/goctl/config" - "github.com/tal-tech/go-zero/tools/goctl/rpc/parser" - "github.com/tal-tech/go-zero/tools/goctl/util/ctx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + conf "github.com/zeromicro/go-zero/tools/goctl/config" + "github.com/zeromicro/go-zero/tools/goctl/rpc/parser" + "github.com/zeromicro/go-zero/tools/goctl/util/ctx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const ( diff --git a/tools/goctl/rpc/generator/prototmpl.go b/tools/goctl/rpc/generator/prototmpl.go index cf7cc04b..526058f8 100644 --- a/tools/goctl/rpc/generator/prototmpl.go +++ b/tools/goctl/rpc/generator/prototmpl.go @@ -4,9 +4,9 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/util" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) const rpcTemplateText = `syntax = "proto3"; diff --git a/tools/goctl/rpc/generator/prototmpl_test.go b/tools/goctl/rpc/generator/prototmpl_test.go index f3d04fbf..30ce7388 100644 --- a/tools/goctl/rpc/generator/prototmpl_test.go +++ b/tools/goctl/rpc/generator/prototmpl_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestProtoTmpl(t *testing.T) { diff --git a/tools/goctl/rpc/generator/template.go b/tools/goctl/rpc/generator/template.go index da482875..86497786 100644 --- a/tools/goctl/rpc/generator/template.go +++ b/tools/goctl/rpc/generator/template.go @@ -3,7 +3,7 @@ package generator import ( "fmt" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/rpc/generator/template_test.go b/tools/goctl/rpc/generator/template_test.go index 951cb625..75a74a72 100644 --- a/tools/goctl/rpc/generator/template_test.go +++ b/tools/goctl/rpc/generator/template_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestGenTemplates(t *testing.T) { diff --git a/tools/goctl/tpl/templates.go b/tools/goctl/tpl/templates.go index 463fbc9c..3ffde0c5 100644 --- a/tools/goctl/tpl/templates.go +++ b/tools/goctl/tpl/templates.go @@ -5,16 +5,16 @@ import ( "path/filepath" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/core/errorx" - "github.com/tal-tech/go-zero/tools/goctl/api/apigen" - "github.com/tal-tech/go-zero/tools/goctl/api/gogen" - apinew "github.com/tal-tech/go-zero/tools/goctl/api/new" - "github.com/tal-tech/go-zero/tools/goctl/docker" - "github.com/tal-tech/go-zero/tools/goctl/kube" - mongogen "github.com/tal-tech/go-zero/tools/goctl/model/mongo/generate" - modelgen "github.com/tal-tech/go-zero/tools/goctl/model/sql/gen" - rpcgen "github.com/tal-tech/go-zero/tools/goctl/rpc/generator" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/tools/goctl/api/apigen" + "github.com/zeromicro/go-zero/tools/goctl/api/gogen" + apinew "github.com/zeromicro/go-zero/tools/goctl/api/new" + "github.com/zeromicro/go-zero/tools/goctl/docker" + "github.com/zeromicro/go-zero/tools/goctl/kube" + mongogen "github.com/zeromicro/go-zero/tools/goctl/model/mongo/generate" + modelgen "github.com/zeromicro/go-zero/tools/goctl/model/sql/gen" + rpcgen "github.com/zeromicro/go-zero/tools/goctl/rpc/generator" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/urfave/cli" ) diff --git a/tools/goctl/update/config/config.go b/tools/goctl/update/config/config.go index dc3cb19c..0bd39c5b 100644 --- a/tools/goctl/update/config/config.go +++ b/tools/goctl/update/config/config.go @@ -1,6 +1,6 @@ package config -import "github.com/tal-tech/go-zero/core/logx" +import "github.com/zeromicro/go-zero/core/logx" // Config defines a service configure for goctl update type Config struct { diff --git a/tools/goctl/update/update.go b/tools/goctl/update/update.go index 4063aa30..a7126abd 100644 --- a/tools/goctl/update/update.go +++ b/tools/goctl/update/update.go @@ -6,11 +6,11 @@ import ( "net/http" "path" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/core/hash" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/tools/goctl/update/config" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/tools/goctl/update/config" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const ( diff --git a/tools/goctl/upgrade/upgrade.go b/tools/goctl/upgrade/upgrade.go index 008da383..e2c91ce1 100644 --- a/tools/goctl/upgrade/upgrade.go +++ b/tools/goctl/upgrade/upgrade.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" "github.com/urfave/cli" ) diff --git a/tools/goctl/util/console/console.go b/tools/goctl/util/console/console.go index dacb8e02..110ad28f 100644 --- a/tools/goctl/util/console/console.go +++ b/tools/goctl/util/console/console.go @@ -6,7 +6,7 @@ import ( "runtime" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) type ( diff --git a/tools/goctl/util/ctx/context.go b/tools/goctl/util/ctx/context.go index b2df6a48..25f8d5a8 100644 --- a/tools/goctl/util/ctx/context.go +++ b/tools/goctl/util/ctx/context.go @@ -4,7 +4,7 @@ import ( "errors" "path/filepath" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" ) var errModuleCheck = errors.New("the work directory must be found in the go mod or the $GOPATH") diff --git a/tools/goctl/util/ctx/gomod.go b/tools/goctl/util/ctx/gomod.go index 5e0cebc8..a81f7347 100644 --- a/tools/goctl/util/ctx/gomod.go +++ b/tools/goctl/util/ctx/gomod.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/tal-tech/go-zero/core/jsonx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/jsonx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) // Module contains the relative data of go module, diff --git a/tools/goctl/util/ctx/gomod_test.go b/tools/goctl/util/ctx/gomod_test.go index 97818a75..6a433352 100644 --- a/tools/goctl/util/ctx/gomod_test.go +++ b/tools/goctl/util/ctx/gomod_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestProjectFromGoMod(t *testing.T) { diff --git a/tools/goctl/util/ctx/gopath.go b/tools/goctl/util/ctx/gopath.go index 8d0ad267..761874bc 100644 --- a/tools/goctl/util/ctx/gopath.go +++ b/tools/goctl/util/ctx/gopath.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) // projectFromGoPath is used to find the main module and project file path diff --git a/tools/goctl/util/ctx/gopath_test.go b/tools/goctl/util/ctx/gopath_test.go index 54f938bc..e4c093fd 100644 --- a/tools/goctl/util/ctx/gopath_test.go +++ b/tools/goctl/util/ctx/gopath_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestProjectFromGoPath(t *testing.T) { diff --git a/tools/goctl/util/ctx/modcheck.go b/tools/goctl/util/ctx/modcheck.go index 0db491e4..9f74c04f 100644 --- a/tools/goctl/util/ctx/modcheck.go +++ b/tools/goctl/util/ctx/modcheck.go @@ -4,8 +4,8 @@ import ( "errors" "os" - "github.com/tal-tech/go-zero/core/jsonx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/core/jsonx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" ) // IsGoMod is used to determine whether workDir is a go module project through command `go list -json -m` diff --git a/tools/goctl/util/ctx/modcheck_test.go b/tools/goctl/util/ctx/modcheck_test.go index be5ec1c1..1aea01fa 100644 --- a/tools/goctl/util/ctx/modcheck_test.go +++ b/tools/goctl/util/ctx/modcheck_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/tools/goctl/rpc/execx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/tools/goctl/rpc/execx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func TestIsGoMod(t *testing.T) { diff --git a/tools/goctl/util/env/env.go b/tools/goctl/util/env/env.go index 9e9e0a77..8938dc34 100644 --- a/tools/goctl/util/env/env.go +++ b/tools/goctl/util/env/env.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/util/env/env_test.go b/tools/goctl/util/env/env_test.go index d634498f..93f18c1e 100644 --- a/tools/goctl/util/env/env_test.go +++ b/tools/goctl/util/env/env_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) func TestLookUpGo(t *testing.T) { diff --git a/tools/goctl/util/git.go b/tools/goctl/util/git.go index 627a6ebf..0db1f5e6 100644 --- a/tools/goctl/util/git.go +++ b/tools/goctl/util/git.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/tal-tech/go-zero/tools/goctl/util/env" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/util/env" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) func CloneIntoGitHome(url string) (dir string, err error) { diff --git a/tools/goctl/util/name/naming.go b/tools/goctl/util/name/naming.go index 61baf5c3..bc4cb8ae 100644 --- a/tools/goctl/util/name/naming.go +++ b/tools/goctl/util/name/naming.go @@ -5,7 +5,7 @@ package name import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/util/stringx" + "github.com/zeromicro/go-zero/tools/goctl/util/stringx" ) // NamingStyle the type of string diff --git a/tools/goctl/util/pathx/file.go b/tools/goctl/util/pathx/file.go index 28e93558..26e02d88 100644 --- a/tools/goctl/util/pathx/file.go +++ b/tools/goctl/util/pathx/file.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" ) // NL defines a new line diff --git a/tools/goctl/util/pathx/file_test.go b/tools/goctl/util/pathx/file_test.go index 7d87a291..7aa81642 100644 --- a/tools/goctl/util/pathx/file_test.go +++ b/tools/goctl/util/pathx/file_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/tools/goctl/internal/version" + "github.com/zeromicro/go-zero/tools/goctl/internal/version" ) func TestGetTemplateDir(t *testing.T) { diff --git a/tools/goctl/util/pathx/path.go b/tools/goctl/util/pathx/path.go index 80f8f3c7..06a1638d 100644 --- a/tools/goctl/util/pathx/path.go +++ b/tools/goctl/util/pathx/path.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/tal-tech/go-zero/tools/goctl/vars" + "github.com/zeromicro/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/util/string.go b/tools/goctl/util/string.go index 8422e4e4..f013624d 100644 --- a/tools/goctl/util/string.go +++ b/tools/goctl/util/string.go @@ -3,7 +3,7 @@ package util import ( "strings" - "github.com/tal-tech/go-zero/tools/goctl/util/console" + "github.com/zeromicro/go-zero/tools/goctl/util/console" ) var goKeyword = map[string]string{ diff --git a/tools/goctl/util/templatex.go b/tools/goctl/util/templatex.go index f1d4acea..f30c54d9 100644 --- a/tools/goctl/util/templatex.go +++ b/tools/goctl/util/templatex.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "text/template" - "github.com/tal-tech/go-zero/tools/goctl/internal/errorx" - "github.com/tal-tech/go-zero/tools/goctl/util/pathx" + "github.com/zeromicro/go-zero/tools/goctl/internal/errorx" + "github.com/zeromicro/go-zero/tools/goctl/util/pathx" ) const regularPerm = 0o666