diff --git a/backend/router/ro_base.go b/backend/router/ro_base.go index f474259f7..1f8678d66 100644 --- a/backend/router/ro_base.go +++ b/backend/router/ro_base.go @@ -8,14 +8,13 @@ import ( type BaseRouter struct{} -func (s *BaseRouter) InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) { +func (s *BaseRouter) InitBaseRouter(Router *gin.RouterGroup) { baseRouter := Router.Group("auth") - withRecordRouter := baseRouter.Use(middleware.OperationRecord()) + withRecordRouter := Router.Group("auth").Use(middleware.OperationRecord()) baseApi := v1.ApiGroupApp.BaseApi { + baseRouter.GET("captcha", baseApi.Captcha) withRecordRouter.POST("login", baseApi.Login) withRecordRouter.POST("logout", baseApi.LogOut) - baseRouter.GET("captcha", baseApi.Captcha) } - return baseRouter } diff --git a/backend/router/ro_terminal.go b/backend/router/ro_terminal.go index caa28f1a4..37a87f712 100644 --- a/backend/router/ro_terminal.go +++ b/backend/router/ro_terminal.go @@ -2,6 +2,7 @@ package router import ( v1 "github.com/1Panel-dev/1Panel/app/api/v1" + "github.com/1Panel-dev/1Panel/middleware" "github.com/gin-gonic/gin" ) @@ -9,7 +10,7 @@ import ( type TerminalRouter struct{} func (s *UserRouter) InitTerminalRouter(Router *gin.RouterGroup) { - terminalRouter := Router.Group("terminals") + terminalRouter := Router.Group("terminals").Use(middleware.JwtAuth()).Use(middleware.SessionAuth()) baseApi := v1.ApiGroupApp.BaseApi { terminalRouter.GET("", baseApi.WsSsh)