diff --git a/cmd/gen_route.go b/cmd/gen_route.go index 0f81a4f..664b356 100644 --- a/cmd/gen_route.go +++ b/cmd/gen_route.go @@ -45,7 +45,7 @@ func commandGenRouteE(cmd *cobra.Command, args []string) error { routes := []route.RouteDefinition{} - modulePath := filepath.Join(path, "modules") + modulePath := filepath.Join(path, "app/http") if _, err := os.Stat(modulePath); os.IsNotExist(err) { log.Fatal("modules dir not exist, ", modulePath) } diff --git a/cmd/new_module.go b/cmd/new_module.go index b96e50b..8953028 100644 --- a/cmd/new_module.go +++ b/cmd/new_module.go @@ -35,7 +35,7 @@ func commandNewModuleE(cmd *cobra.Command, args []string) error { modulePath = strings.Join(module, "/modules/") } moduleName := module[len(module)-1] - modulePath = filepath.Join("modules", modulePath) + modulePath = filepath.Join("app/http", modulePath) log.Infof("new module: %s", modulePath) force, _ := cmd.Flags().GetBool("force") diff --git a/templates/module/provider.gen.go.tpl b/templates/module/provider.gen.go.tpl deleted file mode 100755 index bfd91d7..0000000 --- a/templates/module/provider.gen.go.tpl +++ /dev/null @@ -1,9 +0,0 @@ -package {{.ModuleName}} - -import ( - "git.ipao.vip/rogeecn/atom/utils/opt" -) - -func Provide(opts ...opt.Option) error { - return nil -} diff --git a/templates/module/router.go.tpl b/templates/module/router.go.tpl deleted file mode 100755 index cdd0774..0000000 --- a/templates/module/router.go.tpl +++ /dev/null @@ -1,29 +0,0 @@ -package {{.ModuleName}} - -import ( - _ "git.ipao.vip/rogeecn/atom" - _ "git.ipao.vip/rogeecn/atom/contracts" - "github.com/gofiber/fiber/v3" - log "github.com/sirupsen/logrus" -) - -// @provider:except contracts.HttpRoute atom.GroupRoutes -type Router struct { - log *log.Entry `inject:"false"` - - controller *Controller -} - -func (r *Router) Name() string { - return "{{.ModuleName}}" -} - -func (r *Router) Prepare() error { - r.log = log.WithField("http.group", r.Name()) - return nil -} - -func (r *Router) Register(router fiber.Router) { - group := router.Group(r.Name()) - _ = group -}