refactor:路由中间件调整

yahahaff · Jul 30, 2024 · cf7c35f · cf7c35f
1 parent 14daa04
commit cf7c35f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/internal/routes/http/http.go b/internal/routes/http/http.go
@@ -8,7 +8,7 @@ import (
 
 func RouterGroup(router *gin.Engine) {
 	httpRequest := router.Group("/api")
-	httpRequest.Use(middlewares.AuthJWT(), middlewares.PermissionCheck())
+	httpRequest.Use(middlewares.AuthJWT(), middlewares.PermissionCheck(), middlewares.RecordOperation())
 	EtcdRouter(httpRequest)
 	cloudflare.DnsRouter(httpRequest)
 	cloudflare.ZonesRouter(httpRequest)

diff --git a/internal/routes/router.go b/internal/routes/router.go
@@ -2,14 +2,13 @@ package routes
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/yahahaff/rapide/internal/middlewares"
+	//"github.com/yahahaff/rapide/internal/middlewares"
 	"github.com/yahahaff/rapide/internal/routes/http"
 	"github.com/yahahaff/rapide/internal/routes/sys"
 )
 
 // RegisterAPIRoutes 注册分支路由
 func RegisterAPIRoutes(Router *gin.Engine) {
-	Router.Use(middlewares.RecordOperation())
 	sys.RouterGroup(Router)
 	http.RouterGroup(Router)
 

diff --git a/internal/routes/sys/casbin.go b/internal/routes/sys/casbin.go
@@ -3,11 +3,9 @@ package sys
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/yahahaff/rapide/internal/controllers/api/sys"
-	"github.com/yahahaff/rapide/internal/middlewares"
 )
 
 func CasbinRouter(Router *gin.RouterGroup) {
-	Router.Use(middlewares.AuthJWT(), middlewares.PermissionCheck())
 	{
 		//RBAC
 		{

diff --git a/internal/routes/sys/menu.go b/internal/routes/sys/menu.go
@@ -3,12 +3,10 @@ package sys
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/yahahaff/rapide/internal/controllers/api/sys"
-	"github.com/yahahaff/rapide/internal/middlewares"
 )
 
 func MenuRouter(Router *gin.RouterGroup) {
 	menuGroup := Router.Group("/menu")
-	menuGroup.Use(middlewares.AuthJWT(), middlewares.PermissionCheck())
 
 	//菜单路由
 	{

diff --git a/internal/routes/sys/operationLog.go b/internal/routes/sys/operationLog.go
@@ -3,11 +3,9 @@ package sys
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/yahahaff/rapide/internal/controllers/api/sys"
-	"github.com/yahahaff/rapide/internal/middlewares"
 )
 
 func OperationLogRouter(Router *gin.RouterGroup) {
-	Router.Use(middlewares.AuthJWT(), middlewares.PermissionCheck())
 
 	{
 		// OperationLog路由组

diff --git a/internal/routes/sys/sys.go b/internal/routes/sys/sys.go
@@ -1,18 +1,27 @@
 package sys
 
-import "github.com/gin-gonic/gin"
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/yahahaff/rapide/internal/middlewares"
+)
 
 func RouterGroup(router *gin.Engine) {
+	// 内部公开路由
 	internal := router.Group("")
 	InternalRouter(internal)
 
+	// 认证公开路由
 	auth := router.Group("/api/auth")
 	AuthRouter(auth)
 
+	// 验证码公开路由
 	captcha := router.Group("/api/captcha")
 	CaptchaRouter(captcha)
 
+	// sys相关需要jwt认证路由
 	sys := router.Group("/api/sys")
+	//JWT认证 接口权限校验 && 日志记录
+	sys.Use(middlewares.AuthJWT(), middlewares.PermissionCheck(), middlewares.RecordOperation())
 	AuthenticatorRouter(sys)
 	CasbinRouter(sys)
 	UserRouter(sys)

diff --git a/internal/routes/sys/user.go b/internal/routes/sys/user.go
@@ -8,8 +8,7 @@ import (
 
 func UserRouter(Router *gin.RouterGroup) {
 
-	usersGroup := Router.Group("/user")    //需要认证分组
-	usersPubGroup := Router.Group("/user") //不需要JWT认证分组
+	usersGroup := Router.Group("/user")
 
 	//用户中心
 	{
@@ -23,15 +22,12 @@ func UserRouter(Router *gin.RouterGroup) {
 		usersGroup.GET("/getUserInfo", uc.CurrentUser)
 		// 获取所有用户
 		usersGroup.GET("/getUserList", uc.GetUserList)
-
 		usersGroup.PUT("/updateProfile", uc.UpdateProfile)
 		usersGroup.PUT("/updatePhone", uc.UpdatePhone)
 		usersGroup.PUT("/updateEmail", uc.UpdateEmail)
 		usersGroup.PUT("/updatePassword", uc.UpdatePassword)
 		usersGroup.PUT("/updateAvatar", uc.UpdateAvatar)
-
-		// 不需认证的接口  使用 usersPubGroup
-		usersPubGroup.POST("/password-reset/using-email", uc.ResetByEmail) // 重置密码
+		usersGroup.POST("/password-reset/using-email", uc.ResetByEmail) // 重置密码
 
 	}