From 221082b96770ddca91c527aa0909ed4e08aa6b3d Mon Sep 17 00:00:00 2001 From: John Guo Date: Mon, 24 Jan 2022 14:49:56 +0800 Subject: [PATCH] command -> cmd --- {command => cmd}/gf/LICENSE | 0 {command => cmd}/gf/Makefile | 0 {command => cmd}/gf/README.MD | 0 {command => cmd}/gf/go.mod | 2 +- {command => cmd}/gf/go.sum | 0 {command => cmd}/gf/internal/cmd/cmd.go | 4 ++-- {command => cmd}/gf/internal/cmd/cmd_build.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_docker.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_env.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_gen.go | 0 {command => cmd}/gf/internal/cmd/cmd_gen_dao.go | 6 +++--- {command => cmd}/gf/internal/cmd/cmd_gen_pb.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_gen_pbentity.go | 4 ++-- {command => cmd}/gf/internal/cmd/cmd_init.go | 4 ++-- {command => cmd}/gf/internal/cmd/cmd_install.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_pack.go | 4 ++-- {command => cmd}/gf/internal/cmd/cmd_run.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_tpl.go | 2 +- {command => cmd}/gf/internal/cmd/cmd_version.go | 4 ++-- {command => cmd}/gf/internal/consts/consts.go | 0 .../gf/internal/consts/consts_gen_dao_template_dao.go | 0 .../gf/internal/consts/consts_gen_dao_template_do.go | 0 .../gf/internal/consts/consts_gen_dao_template_entity.go | 0 .../gf/internal/consts/consts_gen_pbentity_template.go | 0 {command => cmd}/gf/internal/packed/packed.go | 0 {command => cmd}/gf/internal/packed/template-mono.go | 0 {command => cmd}/gf/internal/packed/template-single.go | 0 {command => cmd}/gf/internal/service/install.go | 4 ++-- {command => cmd}/gf/internal/utility/allyes/allyes.go | 0 {command => cmd}/gf/internal/utility/mlog/mlog.go | 0 {command => cmd}/gf/internal/utility/utils/utils.go | 0 {command => cmd}/gf/main.go | 8 ++++---- {command => cmd}/gf/test/testdata/tpls/tpl1.yaml | 0 {command => cmd}/gf/test/testdata/tpls/tpl2.sql | 0 {command => cmd}/gf/test/testdata/values.json | 0 35 files changed, 27 insertions(+), 27 deletions(-) rename {command => cmd}/gf/LICENSE (100%) rename {command => cmd}/gf/Makefile (100%) rename {command => cmd}/gf/README.MD (100%) rename {command => cmd}/gf/go.mod (91%) rename {command => cmd}/gf/go.sum (100%) rename {command => cmd}/gf/internal/cmd/cmd.go (92%) rename {command => cmd}/gf/internal/cmd/cmd_build.go (99%) rename {command => cmd}/gf/internal/cmd/cmd_docker.go (98%) rename {command => cmd}/gf/internal/cmd/cmd_env.go (95%) rename {command => cmd}/gf/internal/cmd/cmd_gen.go (100%) rename {command => cmd}/gf/internal/cmd/cmd_gen_dao.go (99%) rename {command => cmd}/gf/internal/cmd/cmd_gen_pb.go (97%) rename {command => cmd}/gf/internal/cmd/cmd_gen_pbentity.go (99%) rename {command => cmd}/gf/internal/cmd/cmd_init.go (95%) rename {command => cmd}/gf/internal/cmd/cmd_install.go (89%) rename {command => cmd}/gf/internal/cmd/cmd_pack.go (95%) rename {command => cmd}/gf/internal/cmd/cmd_run.go (98%) rename {command => cmd}/gf/internal/cmd/cmd_tpl.go (98%) rename {command => cmd}/gf/internal/cmd/cmd_version.go (95%) rename {command => cmd}/gf/internal/consts/consts.go (100%) rename {command => cmd}/gf/internal/consts/consts_gen_dao_template_dao.go (100%) rename {command => cmd}/gf/internal/consts/consts_gen_dao_template_do.go (100%) rename {command => cmd}/gf/internal/consts/consts_gen_dao_template_entity.go (100%) rename {command => cmd}/gf/internal/consts/consts_gen_pbentity_template.go (100%) rename {command => cmd}/gf/internal/packed/packed.go (100%) rename {command => cmd}/gf/internal/packed/template-mono.go (100%) rename {command => cmd}/gf/internal/packed/template-single.go (100%) rename {command => cmd}/gf/internal/service/install.go (98%) rename {command => cmd}/gf/internal/utility/allyes/allyes.go (100%) rename {command => cmd}/gf/internal/utility/mlog/mlog.go (100%) rename {command => cmd}/gf/internal/utility/utils/utils.go (100%) rename {command => cmd}/gf/main.go (84%) rename {command => cmd}/gf/test/testdata/tpls/tpl1.yaml (100%) rename {command => cmd}/gf/test/testdata/tpls/tpl2.sql (100%) rename {command => cmd}/gf/test/testdata/values.json (100%) diff --git a/command/gf/LICENSE b/cmd/gf/LICENSE similarity index 100% rename from command/gf/LICENSE rename to cmd/gf/LICENSE diff --git a/command/gf/Makefile b/cmd/gf/Makefile similarity index 100% rename from command/gf/Makefile rename to cmd/gf/Makefile diff --git a/command/gf/README.MD b/cmd/gf/README.MD similarity index 100% rename from command/gf/README.MD rename to cmd/gf/README.MD diff --git a/command/gf/go.mod b/cmd/gf/go.mod similarity index 91% rename from command/gf/go.mod rename to cmd/gf/go.mod index 82c2d77d8..92bc6a95d 100644 --- a/command/gf/go.mod +++ b/cmd/gf/go.mod @@ -1,4 +1,4 @@ -module github.com/gogf/gf/command/gf/v2 +module github.com/gogf/gf/cmd/gf/v2 go 1.14 diff --git a/command/gf/go.sum b/cmd/gf/go.sum similarity index 100% rename from command/gf/go.sum rename to cmd/gf/go.sum diff --git a/command/gf/internal/cmd/cmd.go b/cmd/gf/internal/cmd/cmd.go similarity index 92% rename from command/gf/internal/cmd/cmd.go rename to cmd/gf/internal/cmd/cmd.go index 1ad823507..844346a10 100644 --- a/command/gf/internal/cmd/cmd.go +++ b/cmd/gf/internal/cmd/cmd.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/gogf/gf/command/gf/v2/internal/service" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/service" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcmd" "github.com/gogf/gf/v2/util/gtag" diff --git a/command/gf/internal/cmd/cmd_build.go b/cmd/gf/internal/cmd/cmd_build.go similarity index 99% rename from command/gf/internal/cmd/cmd_build.go rename to cmd/gf/internal/cmd/cmd_build.go index b0b9031c8..9a42ca5f1 100644 --- a/command/gf/internal/cmd/cmd_build.go +++ b/cmd/gf/internal/cmd/cmd_build.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/encoding/gbase64" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcmd" diff --git a/command/gf/internal/cmd/cmd_docker.go b/cmd/gf/internal/cmd/cmd_docker.go similarity index 98% rename from command/gf/internal/cmd/cmd_docker.go rename to cmd/gf/internal/cmd/cmd_docker.go index 4229d1831..db48fb98d 100644 --- a/command/gf/internal/cmd/cmd_docker.go +++ b/cmd/gf/internal/cmd/cmd_docker.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gfile" "github.com/gogf/gf/v2/os/gproc" diff --git a/command/gf/internal/cmd/cmd_env.go b/cmd/gf/internal/cmd/cmd_env.go similarity index 95% rename from command/gf/internal/cmd/cmd_env.go rename to cmd/gf/internal/cmd/cmd_env.go index 21663e34d..b6538414b 100644 --- a/command/gf/internal/cmd/cmd_env.go +++ b/cmd/gf/internal/cmd/cmd_env.go @@ -4,7 +4,7 @@ import ( "bytes" "context" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gproc" "github.com/gogf/gf/v2/text/gregex" diff --git a/command/gf/internal/cmd/cmd_gen.go b/cmd/gf/internal/cmd/cmd_gen.go similarity index 100% rename from command/gf/internal/cmd/cmd_gen.go rename to cmd/gf/internal/cmd/cmd_gen.go diff --git a/command/gf/internal/cmd/cmd_gen_dao.go b/cmd/gf/internal/cmd/cmd_gen_dao.go similarity index 99% rename from command/gf/internal/cmd/cmd_gen_dao.go rename to cmd/gf/internal/cmd/cmd_gen_dao.go index 098f174de..c674e85ce 100644 --- a/command/gf/internal/cmd/cmd_gen_dao.go +++ b/cmd/gf/internal/cmd/cmd_gen_dao.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/gogf/gf/command/gf/v2/internal/consts" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" - "github.com/gogf/gf/command/gf/v2/internal/utility/utils" + "github.com/gogf/gf/cmd/gf/v2/internal/consts" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/utils" "github.com/gogf/gf/v2/container/garray" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/frame/g" diff --git a/command/gf/internal/cmd/cmd_gen_pb.go b/cmd/gf/internal/cmd/cmd_gen_pb.go similarity index 97% rename from command/gf/internal/cmd/cmd_gen_pb.go rename to cmd/gf/internal/cmd/cmd_gen_pb.go index 3ada72667..e62fdb29f 100644 --- a/command/gf/internal/cmd/cmd_gen_pb.go +++ b/cmd/gf/internal/cmd/cmd_gen_pb.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/genv" diff --git a/command/gf/internal/cmd/cmd_gen_pbentity.go b/cmd/gf/internal/cmd/cmd_gen_pbentity.go similarity index 99% rename from command/gf/internal/cmd/cmd_gen_pbentity.go rename to cmd/gf/internal/cmd/cmd_gen_pbentity.go index d7b4f66cd..10cbfb27d 100644 --- a/command/gf/internal/cmd/cmd_gen_pbentity.go +++ b/cmd/gf/internal/cmd/cmd_gen_pbentity.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/gogf/gf/command/gf/v2/internal/consts" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/consts" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gfile" diff --git a/command/gf/internal/cmd/cmd_init.go b/cmd/gf/internal/cmd/cmd_init.go similarity index 95% rename from command/gf/internal/cmd/cmd_init.go rename to cmd/gf/internal/cmd/cmd_init.go index b1d2c84f5..6f059f982 100644 --- a/command/gf/internal/cmd/cmd_init.go +++ b/cmd/gf/internal/cmd/cmd_init.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/gogf/gf/command/gf/v2/internal/utility/allyes" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcmd" "github.com/gogf/gf/v2/os/gfile" diff --git a/command/gf/internal/cmd/cmd_install.go b/cmd/gf/internal/cmd/cmd_install.go similarity index 89% rename from command/gf/internal/cmd/cmd_install.go rename to cmd/gf/internal/cmd/cmd_install.go index 624b26eae..159294e96 100644 --- a/command/gf/internal/cmd/cmd_install.go +++ b/cmd/gf/internal/cmd/cmd_install.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/gogf/gf/command/gf/v2/internal/service" + "github.com/gogf/gf/cmd/gf/v2/internal/service" "github.com/gogf/gf/v2/frame/g" ) diff --git a/command/gf/internal/cmd/cmd_pack.go b/cmd/gf/internal/cmd/cmd_pack.go similarity index 95% rename from command/gf/internal/cmd/cmd_pack.go rename to cmd/gf/internal/cmd/cmd_pack.go index a9fc28e12..a54905837 100644 --- a/command/gf/internal/cmd/cmd_pack.go +++ b/cmd/gf/internal/cmd/cmd_pack.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/gogf/gf/command/gf/v2/internal/utility/allyes" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcmd" "github.com/gogf/gf/v2/os/gfile" diff --git a/command/gf/internal/cmd/cmd_run.go b/cmd/gf/internal/cmd/cmd_run.go similarity index 98% rename from command/gf/internal/cmd/cmd_run.go rename to cmd/gf/internal/cmd/cmd_run.go index 5826580b7..623fb4787 100644 --- a/command/gf/internal/cmd/cmd_run.go +++ b/cmd/gf/internal/cmd/cmd_run.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/container/gtype" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gfile" diff --git a/command/gf/internal/cmd/cmd_tpl.go b/cmd/gf/internal/cmd/cmd_tpl.go similarity index 98% rename from command/gf/internal/cmd/cmd_tpl.go rename to cmd/gf/internal/cmd/cmd_tpl.go index 51db53ac1..845561333 100644 --- a/command/gf/internal/cmd/cmd_tpl.go +++ b/cmd/gf/internal/cmd/cmd_tpl.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/frame/g" diff --git a/command/gf/internal/cmd/cmd_version.go b/cmd/gf/internal/cmd/cmd_version.go similarity index 95% rename from command/gf/internal/cmd/cmd_version.go rename to cmd/gf/internal/cmd/cmd_version.go index a96998f6c..4f84f5155 100644 --- a/command/gf/internal/cmd/cmd_version.go +++ b/cmd/gf/internal/cmd/cmd_version.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/gogf/gf/command/gf/v2/internal/consts" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/consts" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gbuild" diff --git a/command/gf/internal/consts/consts.go b/cmd/gf/internal/consts/consts.go similarity index 100% rename from command/gf/internal/consts/consts.go rename to cmd/gf/internal/consts/consts.go diff --git a/command/gf/internal/consts/consts_gen_dao_template_dao.go b/cmd/gf/internal/consts/consts_gen_dao_template_dao.go similarity index 100% rename from command/gf/internal/consts/consts_gen_dao_template_dao.go rename to cmd/gf/internal/consts/consts_gen_dao_template_dao.go diff --git a/command/gf/internal/consts/consts_gen_dao_template_do.go b/cmd/gf/internal/consts/consts_gen_dao_template_do.go similarity index 100% rename from command/gf/internal/consts/consts_gen_dao_template_do.go rename to cmd/gf/internal/consts/consts_gen_dao_template_do.go diff --git a/command/gf/internal/consts/consts_gen_dao_template_entity.go b/cmd/gf/internal/consts/consts_gen_dao_template_entity.go similarity index 100% rename from command/gf/internal/consts/consts_gen_dao_template_entity.go rename to cmd/gf/internal/consts/consts_gen_dao_template_entity.go diff --git a/command/gf/internal/consts/consts_gen_pbentity_template.go b/cmd/gf/internal/consts/consts_gen_pbentity_template.go similarity index 100% rename from command/gf/internal/consts/consts_gen_pbentity_template.go rename to cmd/gf/internal/consts/consts_gen_pbentity_template.go diff --git a/command/gf/internal/packed/packed.go b/cmd/gf/internal/packed/packed.go similarity index 100% rename from command/gf/internal/packed/packed.go rename to cmd/gf/internal/packed/packed.go diff --git a/command/gf/internal/packed/template-mono.go b/cmd/gf/internal/packed/template-mono.go similarity index 100% rename from command/gf/internal/packed/template-mono.go rename to cmd/gf/internal/packed/template-mono.go diff --git a/command/gf/internal/packed/template-single.go b/cmd/gf/internal/packed/template-single.go similarity index 100% rename from command/gf/internal/packed/template-single.go rename to cmd/gf/internal/packed/template-single.go diff --git a/command/gf/internal/service/install.go b/cmd/gf/internal/service/install.go similarity index 98% rename from command/gf/internal/service/install.go rename to cmd/gf/internal/service/install.go index 27211cb4d..3448b6ce5 100644 --- a/command/gf/internal/service/install.go +++ b/cmd/gf/internal/service/install.go @@ -5,8 +5,8 @@ import ( "runtime" "strings" - "github.com/gogf/gf/command/gf/v2/internal/utility/allyes" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/container/garray" "github.com/gogf/gf/v2/container/gset" "github.com/gogf/gf/v2/frame/g" diff --git a/command/gf/internal/utility/allyes/allyes.go b/cmd/gf/internal/utility/allyes/allyes.go similarity index 100% rename from command/gf/internal/utility/allyes/allyes.go rename to cmd/gf/internal/utility/allyes/allyes.go diff --git a/command/gf/internal/utility/mlog/mlog.go b/cmd/gf/internal/utility/mlog/mlog.go similarity index 100% rename from command/gf/internal/utility/mlog/mlog.go rename to cmd/gf/internal/utility/mlog/mlog.go diff --git a/command/gf/internal/utility/utils/utils.go b/cmd/gf/internal/utility/utils/utils.go similarity index 100% rename from command/gf/internal/utility/utils/utils.go rename to cmd/gf/internal/utility/utils/utils.go diff --git a/command/gf/main.go b/cmd/gf/main.go similarity index 84% rename from command/gf/main.go rename to cmd/gf/main.go index 907e342d0..be90cfd8b 100644 --- a/command/gf/main.go +++ b/cmd/gf/main.go @@ -1,11 +1,11 @@ package main import ( - _ "github.com/gogf/gf/command/gf/v2/internal/packed" + _ "github.com/gogf/gf/cmd/gf/v2/internal/packed" - "github.com/gogf/gf/command/gf/v2/internal/cmd" - "github.com/gogf/gf/command/gf/v2/internal/utility/allyes" - "github.com/gogf/gf/command/gf/v2/internal/utility/mlog" + "github.com/gogf/gf/cmd/gf/v2/internal/cmd" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes" + "github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog" "github.com/gogf/gf/v2/os/gcmd" "github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gfile" diff --git a/command/gf/test/testdata/tpls/tpl1.yaml b/cmd/gf/test/testdata/tpls/tpl1.yaml similarity index 100% rename from command/gf/test/testdata/tpls/tpl1.yaml rename to cmd/gf/test/testdata/tpls/tpl1.yaml diff --git a/command/gf/test/testdata/tpls/tpl2.sql b/cmd/gf/test/testdata/tpls/tpl2.sql similarity index 100% rename from command/gf/test/testdata/tpls/tpl2.sql rename to cmd/gf/test/testdata/tpls/tpl2.sql diff --git a/command/gf/test/testdata/values.json b/cmd/gf/test/testdata/values.json similarity index 100% rename from command/gf/test/testdata/values.json rename to cmd/gf/test/testdata/values.json