diff --git a/app/api-template/api/hello/hello.go b/app/api-template/api/hello/hello.go index 60b4429..cd2f8b3 100644 --- a/app/api-template/api/hello/hello.go +++ b/app/api-template/api/hello/hello.go @@ -6,12 +6,10 @@ package hello import ( "context" - - "github.com/gogf/template-mono/app/api-template/api/hello/v1" + + "${MODULE_NAME}/app/api-template/api/hello/v1" ) type IHelloV1 interface { Hello(ctx context.Context, req *v1.HelloReq) (res *v1.HelloRes, err error) } - - diff --git a/app/api-template/internal/cmd/cmd.go b/app/api-template/internal/cmd/cmd.go index b8589cb..5db5b1a 100644 --- a/app/api-template/internal/cmd/cmd.go +++ b/app/api-template/internal/cmd/cmd.go @@ -7,7 +7,7 @@ import ( "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/os/gcmd" - "github.com/gogf/template-mono/app/api-template/internal/controller/hello" + "${MODULE_NAME}/app/api-template/internal/controller/hello" ) var ( diff --git a/app/api-template/internal/controller/hello/hello_new.go b/app/api-template/internal/controller/hello/hello_new.go index 40e2e70..fa9ebea 100644 --- a/app/api-template/internal/controller/hello/hello_new.go +++ b/app/api-template/internal/controller/hello/hello_new.go @@ -5,7 +5,7 @@ package hello import ( - "github.com/gogf/template-mono/app/api-template/api/hello" + "${MODULE_NAME}/app/api-template/api/hello" ) type ControllerV1 struct{} @@ -13,4 +13,3 @@ type ControllerV1 struct{} func NewV1() hello.IHelloV1 { return &ControllerV1{} } - diff --git a/app/api-template/internal/controller/hello/hello_v1_hello.go b/app/api-template/internal/controller/hello/hello_v1_hello.go index dcef7f3..cb71863 100644 --- a/app/api-template/internal/controller/hello/hello_v1_hello.go +++ b/app/api-template/internal/controller/hello/hello_v1_hello.go @@ -4,7 +4,7 @@ import ( "context" "github.com/gogf/gf/v2/frame/g" - "github.com/gogf/template-mono/app/api-template/api/hello/v1" + "${MODULE_NAME}/app/api-template/api/hello/v1" ) func (c *ControllerV1) Hello(ctx context.Context, req *v1.HelloReq) (res *v1.HelloRes, err error) { diff --git a/app/api-template/main.go b/app/api-template/main.go index 32c2ea4..2911dca 100644 --- a/app/api-template/main.go +++ b/app/api-template/main.go @@ -1,11 +1,11 @@ package main import ( - _ "github.com/gogf/template-mono/app/api-template/internal/packed" + _ "${MODULE_NAME}/app/api-template/internal/packed" "github.com/gogf/gf/v2/os/gctx" - "github.com/gogf/template-mono/app/api-template/internal/cmd" + "${MODULE_NAME}/app/api-template/internal/cmd" ) func main() { diff --git a/app/api-template/manifest/docker/docker.sh b/app/api-template/manifest/docker/docker.sh old mode 100755 new mode 100644 diff --git a/app/job-template/main.go b/app/job-template/main.go index d692080..3529bce 100644 --- a/app/job-template/main.go +++ b/app/job-template/main.go @@ -1,11 +1,11 @@ package main import ( - _ "github.com/gogf/template-mono/app/job-template/internal/packed" + _ "${MODULE_NAME}/app/job-template/internal/packed" "github.com/gogf/gf/v2/os/gctx" - "github.com/gogf/template-mono/app/job-template/internal/cmd" + "${MODULE_NAME}/app/job-template/internal/cmd" ) func main() { diff --git a/app/job-template/manifest/docker/docker.sh b/app/job-template/manifest/docker/docker.sh old mode 100755 new mode 100644 diff --git a/app/svc-template/api/echo/echo.go b/app/svc-template/api/echo/echo.go index a8ceeb0..ab37456 100644 --- a/app/svc-template/api/echo/echo.go +++ b/app/svc-template/api/echo/echo.go @@ -6,12 +6,10 @@ package echo import ( "context" - - "github.com/gogf/template-mono/app/svc-template/api/echo/v1" + + "${MODULE_NAME}/app/svc-template/api/echo/v1" ) type IEchoV1 interface { Say(ctx context.Context, req *v1.SayReq) (res *v1.SayRes, err error) } - - diff --git a/app/svc-template/internal/cmd/cmd.go b/app/svc-template/internal/cmd/cmd.go index f11309f..21736bc 100644 --- a/app/svc-template/internal/cmd/cmd.go +++ b/app/svc-template/internal/cmd/cmd.go @@ -7,7 +7,7 @@ import ( "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/os/gcmd" - "github.com/gogf/template-mono/app/svc-template/internal/controller/echo" + "${MODULE_NAME}/app/svc-template/internal/controller/echo" ) var ( diff --git a/app/svc-template/internal/controller/echo/echo_new.go b/app/svc-template/internal/controller/echo/echo_new.go index 209801d..0465a6f 100644 --- a/app/svc-template/internal/controller/echo/echo_new.go +++ b/app/svc-template/internal/controller/echo/echo_new.go @@ -5,7 +5,7 @@ package echo import ( - "github.com/gogf/template-mono/app/svc-template/api/echo" + "${MODULE_NAME}/app/svc-template/api/echo" ) type ControllerV1 struct{} @@ -13,4 +13,3 @@ type ControllerV1 struct{} func NewV1() echo.IEchoV1 { return &ControllerV1{} } - diff --git a/app/svc-template/internal/controller/echo/echo_v1_say.go b/app/svc-template/internal/controller/echo/echo_v1_say.go index 80c61b8..2a41308 100644 --- a/app/svc-template/internal/controller/echo/echo_v1_say.go +++ b/app/svc-template/internal/controller/echo/echo_v1_say.go @@ -3,7 +3,7 @@ package echo import ( "context" - "github.com/gogf/template-mono/app/svc-template/api/echo/v1" + "${MODULE_NAME}/app/svc-template/api/echo/v1" ) func (c *ControllerV1) Say(ctx context.Context, req *v1.SayReq) (res *v1.SayRes, err error) { diff --git a/app/svc-template/main.go b/app/svc-template/main.go index 089a22c..72f37b3 100644 --- a/app/svc-template/main.go +++ b/app/svc-template/main.go @@ -1,11 +1,11 @@ package main import ( - _ "github.com/gogf/template-mono/app/svc-template/internal/packed" + _ "${MODULE_NAME}/app/svc-template/internal/packed" "github.com/gogf/gf/v2/os/gctx" - "github.com/gogf/template-mono/app/svc-template/internal/cmd" + "${MODULE_NAME}/app/svc-template/internal/cmd" ) func main() { diff --git a/app/svc-template/manifest/docker/docker.sh b/app/svc-template/manifest/docker/docker.sh old mode 100755 new mode 100644 diff --git a/go.mod b/go.mod index 7d921c6..80330c0 100644 --- a/go.mod +++ b/go.mod @@ -1,29 +1,5 @@ -module github.com/gogf/template-mono +module ${MODULE_NAME} -go 1.18 +go ${GO_VERSION} -require github.com/gogf/gf/v2 v2.5.2 - -require ( - github.com/BurntSushi/toml v1.2.0 // indirect - github.com/clbanning/mxj/v2 v2.7.0 // indirect - github.com/fatih/color v1.15.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/gorilla/websocket v1.5.0 // indirect - github.com/grokify/html-strip-tags-go v0.0.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/rivo/uniseg v0.4.4 // indirect - go.opentelemetry.io/otel v1.14.0 // indirect - go.opentelemetry.io/otel/sdk v1.14.0 // indirect - go.opentelemetry.io/otel/trace v1.14.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) +require github.com/gogf/gf/v2 ${GF_VERSION} diff --git a/go.sum b/go.sum deleted file mode 100644 index 2003de5..0000000 --- a/go.sum +++ /dev/null @@ -1,57 +0,0 @@ -github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= -github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= -github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -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/gogf/gf/v2 v2.5.2 h1:fACJE7DJH6iTGHGhgiNY1uuZIZtr2IqQkJ52E+wBnt8= -github.com/gogf/gf/v2 v2.5.2/go.mod h1:7yf5qp0BznfsYx7Sw49m3mQvBsHpwAjJk3Q9ZnKoUEc= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0= -github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= -github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= -github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= -go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= -go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=