From e96653751d24c016a271abc7ce828eb2c67e8c6b Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Fri, 19 Dec 2025 17:50:29 +0800 Subject: [PATCH] fix --- internal/container/container.go | 7 +------ .../http/routes/ui_component_routes.go | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/internal/container/container.go b/internal/container/container.go index 5e3cb62..971bc8e 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -1352,12 +1352,7 @@ func RegisterRoutes( financeRoutes.Register(router) productRoutes.Register(router) productAdminRoutes.Register(router) - - // UI组件路由需要特殊处理,因为它需要管理员中间件 - engine := router.GetEngine() - adminGroup := engine.Group("/api/v1/admin") - adminGroup.Use(adminAuth.Handle()) - uiComponentRoutes.RegisterRoutes(adminGroup, adminAuth) + uiComponentRoutes.Register(router) articleRoutes.Register(router) announcementRoutes.Register(router) diff --git a/internal/infrastructure/http/routes/ui_component_routes.go b/internal/infrastructure/http/routes/ui_component_routes.go index d00241c..8456e0f 100644 --- a/internal/infrastructure/http/routes/ui_component_routes.go +++ b/internal/infrastructure/http/routes/ui_component_routes.go @@ -1,34 +1,42 @@ package routes import ( - "github.com/gin-gonic/gin" "go.uber.org/zap" "tyapi-server/internal/infrastructure/http/handlers" - "tyapi-server/internal/shared/interfaces" + sharedhttp "tyapi-server/internal/shared/http" + "tyapi-server/internal/shared/middleware" ) // UIComponentRoutes UI组件路由 type UIComponentRoutes struct { uiComponentHandler *handlers.UIComponentHandler logger *zap.Logger + auth *middleware.JWTAuthMiddleware + admin *middleware.AdminAuthMiddleware } // NewUIComponentRoutes 创建UI组件路由 func NewUIComponentRoutes( uiComponentHandler *handlers.UIComponentHandler, logger *zap.Logger, + auth *middleware.JWTAuthMiddleware, + admin *middleware.AdminAuthMiddleware, ) *UIComponentRoutes { return &UIComponentRoutes{ uiComponentHandler: uiComponentHandler, logger: logger, + auth: auth, + admin: admin, } } // RegisterRoutes 注册UI组件路由 -func (r *UIComponentRoutes) RegisterRoutes(router *gin.RouterGroup, authMiddleware interfaces.Middleware) { - uiComponentGroup := router.Group("/ui-components") - uiComponentGroup.Use(authMiddleware.Handle()) +func (r *UIComponentRoutes) Register(router *sharedhttp.GinRouter) { + // 管理员路由组 + engine := router.GetEngine() + uiComponentGroup := engine.Group("/api/v1/admin/ui-components") + uiComponentGroup.Use(r.admin.Handle()) // 管理员权限验证 { // UI组件管理 uiComponentGroup.POST("", r.uiComponentHandler.CreateUIComponent) // 创建UI组件