feat: refactor http

backend/common/service/http/http.go

@@ -1,16 +1,22 @@
 package http
 
 import (
+	"backend/modules/medias"
 	"backend/modules/middlewares"
 	"backend/modules/users"
 	"backend/providers/app"
 	"backend/providers/http"
+	"backend/providers/jwt"
 	"backend/providers/postgres"
+	"backend/providers/storage"
+	"backend/providers/wechat"
 
 	"git.ipao.vip/rogeecn/atom"
 	"git.ipao.vip/rogeecn/atom/container"
 	"git.ipao.vip/rogeecn/atom/contracts"
-	log "github.com/sirupsen/logrus"
+	"github.com/gofiber/fiber/v3"
+	"github.com/gofiber/fiber/v3/log"
+	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 	"go.uber.org/dig"
 )
@@ -20,12 +26,17 @@ func defaultProviders(providers ...container.ProviderContainer) container.Provid
 		app.DefaultProvider(),
 		http.DefaultProvider(),
 		postgres.DefaultProvider(),
+		jwt.DefaultProvider(),
 	}, providers...)
 }
 
 func Command() atom.Option {
-	providers := defaultProviders().With(
+	providers := defaultProviders(
+		wechat.DefaultProvider(),
+		storage.DefaultProvider(),
+	).With(
 		users.Provide,
+		medias.Provide,
 	)
 
 	return atom.Command(
@@ -49,17 +60,35 @@ type Http struct {
 
 func Serve(cmd *cobra.Command, args []string) error {
 	return container.Container.Invoke(func(http Http) error {
-		for _, route := range http.Routes {
-			if err := route.Register(); err != nil {
-				log.Fatal(err)
-			}
-		}
-
 		mid := http.Middlewares
 		http.Service.Engine.Use(mid.Verify)
 		http.Service.Engine.Use(mid.AuthUserInfo)
 		http.Service.Engine.Use(mid.SilentAuth)
 
+		mounts := map[string][]string{
+			"/t/{tenant}": {"users", "medias"},
+		}
+		for _, route := range http.Routes {
+			r := route.Register()
+			if app, ok := r.(*fiber.App); ok {
+				match := false
+				for prefix, groups := range mounts {
+					log.Infof("mount %s to %s", prefix, route.Name())
+					if lo.Contains(groups, route.Name()) {
+						match = true
+						http.Service.Engine.Use(prefix, app)
+						break
+					}
+				}
+				_ = match
+
+				if !match {
+					log.Infof("mount / to %s", route.Name())
+					http.Service.Engine.Use(app)
+				}
+			}
+		}
+
 		return http.Service.Serve()
 	})
 }

backend/modules/medias/provider.gen.go

@@ -1,7 +1,6 @@
 package medias
 
 import (
-	"backend/providers/http"
 	"backend/providers/storage"
 	"database/sql"
 
@@ -25,11 +24,12 @@ func Provide(opts ...opt.Option) error {
 
 	if err := container.Container.Provide(func(
 		controller *Controller,
-		http *http.Service,
 	) (contracts.HttpRoute, error) {
 		obj := &Router{
 			controller: controller,
-			http:       http,
+		}
+		if err := obj.Prepare(); err != nil {
+			return nil, err
 		}
 		return obj, nil
 	}, atom.GroupRoutes); err != nil {

backend/modules/medias/router.go

@@ -1,8 +1,6 @@
 package medias
 
 import (
-	"backend/providers/http"
-
 	_ "git.ipao.vip/rogeecn/atom"
 	_ "git.ipao.vip/rogeecn/atom/contracts"
 	"github.com/gofiber/fiber/v3"
@@ -11,16 +9,28 @@ import (
 
 // @provider:except	contracts.HttpRoute	 atom.GroupRoutes
 type Router struct {
-	http *http.Service
+	app   *fiber.App   `inject:"false"`
+	group fiber.Router `inject:"false"`
+	log   *log.Entry   `inject:"false"`
 
 	controller *Controller
 }
 
-func (r *Router) Register() error {
+func (r *Router) Name() string {
-	group := r.http.Engine.Group("medias")
+	return "medias"
-	log.Infof("register route group: %s", group.(*fiber.Group).Prefix)
+}
-	group.Get("", r.controller.List)
+
-	group.Get("{id}", r.controller.Show)
+func (r *Router) Prepare() error {
+	r.log = log.WithField("http.group", r.Name())
+	r.app = fiber.New()
+	r.group = r.app.Group(r.Name())
 
 	return nil
 }
+
+func (r *Router) Register() any {
+	r.group.Get("", r.controller.List)
+	r.group.Get("{id}", r.controller.Show)
+
+	return r.app
+}

backend/modules/users/provider.gen.go

@@ -1,7 +1,6 @@
 package users
 
 import (
-	"backend/providers/http"
 	"database/sql"
 
 	"git.ipao.vip/rogeecn/atom"
@@ -24,11 +23,12 @@ func Provide(opts ...opt.Option) error {
 
 	if err := container.Container.Provide(func(
 		controller *Controller,
-		http *http.Service,
 	) (contracts.HttpRoute, error) {
 		obj := &Router{
 			controller: controller,
-			http:       http,
+		}
+		if err := obj.Prepare(); err != nil {
+			return nil, err
 		}
 		return obj, nil
 	}, atom.GroupRoutes); err != nil {

backend/modules/users/router.go

@@ -1,8 +1,6 @@
 package users
 
 import (
-	"backend/providers/http"
-
 	_ "git.ipao.vip/rogeecn/atom"
 	_ "git.ipao.vip/rogeecn/atom/contracts"
 	"github.com/gofiber/fiber/v3"
@@ -11,15 +9,27 @@ import (
 
 // @provider:except	contracts.HttpRoute	 atom.GroupRoutes
 type Router struct {
-	http *http.Service
+	app   *fiber.App   `inject:"false"`
+	group fiber.Router `inject:"false"`
+	log   *log.Entry   `inject:"false"`
 
 	controller *Controller
 }
 
-func (r *Router) Register() error {
+func (r *Router) Prepare() error {
-	group := r.http.Engine.Group("users")
+	r.log = log.WithField("http.group", r.Name())
-	log.Infof("register route group: %s", group.(*fiber.Group).Prefix)
+	r.app = fiber.New()
-	group.Get("", r.controller.List)
+	r.group = r.app.Group(r.Name())
 
 	return nil
 }
+
+func (r *Router) Name() string {
+	return "users"
+}
+
+func (r *Router) Register() any {
+	r.group.Get("", r.controller.List)
+
+	return r.app
+}

backend/providers/http/engine.go

@@ -83,6 +83,9 @@ func Provide(opts ...opt.Option) error {
 			TimeZone:   "Asia/Shanghai",
 		}))
 
-		return &Service{Engine: engine, conf: &config}, nil
+		return &Service{
+			Engine: engine,
+			conf:   &config,
+		}, nil
 	}, o.DiOptions()...)
 }