🐛 fix the casbin invalidation bug/adjust routing strategy
This commit is contained in:
12
router/modules/client_router.go
Normal file
12
router/modules/client_router.go
Normal file
@@ -0,0 +1,12 @@
|
||||
package modules
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"schisandra-cloud-album/api"
|
||||
)
|
||||
|
||||
var clientApi = api.Api.ClientApi
|
||||
|
||||
func ClientRouter(router *gin.RouterGroup) {
|
||||
router.GET("/client/generate_client_id", clientApi.GenerateClientId)
|
||||
}
|
@@ -12,7 +12,6 @@ func OauthRouter(router *gin.RouterGroup) {
|
||||
{
|
||||
wechatRouter := group.Group("/wechat")
|
||||
{
|
||||
wechatRouter.GET("/generate_client_id", oauth.GenerateClientId)
|
||||
wechatRouter.GET("/get_temp_qrcode", oauth.GetTempQrCode)
|
||||
//wechatRouter.GET("/callback", oauth.CallbackVerify)
|
||||
wechatRouter.POST("/callback", oauth.CallbackNotify)
|
||||
@@ -34,5 +33,4 @@ func OauthRouter(router *gin.RouterGroup) {
|
||||
}
|
||||
group.GET("/get_device", oauth.GetUserLoginDevice)
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -9,6 +9,8 @@ var permissionApi = api.Api.PermissionApi
|
||||
|
||||
func PermissionRouter(router *gin.RouterGroup) {
|
||||
group := router.Group("/auth/permission")
|
||||
//group.Use(middleware.JWTAuthMiddleware())
|
||||
group.POST("/add", permissionApi.AddPermissions)
|
||||
{
|
||||
group.POST("/add", permissionApi.AddPermissions)
|
||||
group.GET("/get_user_permissions", permissionApi.GetUserPermissions)
|
||||
}
|
||||
}
|
||||
|
@@ -3,14 +3,15 @@ package modules
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"schisandra-cloud-album/api"
|
||||
"schisandra-cloud-album/middleware"
|
||||
)
|
||||
|
||||
var roleApi = api.Api.RoleApi
|
||||
|
||||
func RoleRouter(router *gin.RouterGroup) {
|
||||
group := router.Group("/auth")
|
||||
group.Use(middleware.JWTAuthMiddleware())
|
||||
group.POST("/role/create", roleApi.CreateRole)
|
||||
group.POST("/role/add_role_to_user", roleApi.AddRoleToUser)
|
||||
{
|
||||
group.POST("/role/create", roleApi.CreateRole)
|
||||
group.POST("/role/add_role_to_user", roleApi.AddRoleToUser)
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -8,10 +8,10 @@ import (
|
||||
"schisandra-cloud-album/global"
|
||||
)
|
||||
|
||||
func SwaggerRouter(router *gin.Engine) {
|
||||
func SwaggerRouter(router *gin.RouterGroup) {
|
||||
docs.SwaggerInfo.BasePath = ""
|
||||
docs.SwaggerInfo.Description = global.CONFIG.Swagger.Description
|
||||
router.GET("/api/doc/*any", gin.BasicAuth(gin.Accounts{
|
||||
router.GET("/doc/*any", gin.BasicAuth(gin.Accounts{
|
||||
global.CONFIG.Swagger.User: global.CONFIG.Swagger.Password,
|
||||
}), ginSwagger.WrapHandler(swaggerFiles.Handler, func(config *ginSwagger.Config) {
|
||||
config.Title = global.CONFIG.Swagger.Title
|
||||
|
@@ -3,7 +3,6 @@ package modules
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"schisandra-cloud-album/api"
|
||||
"schisandra-cloud-album/middleware"
|
||||
)
|
||||
|
||||
var userApi = api.Api.UserApi
|
||||
@@ -16,15 +15,18 @@ func UserRouter(router *gin.RouterGroup) {
|
||||
userGroup.POST("/phone_login", userApi.PhoneLogin)
|
||||
userGroup.POST("/reset_password", userApi.ResetPassword)
|
||||
}
|
||||
authGroup := router.Group("auth").Use(middleware.JWTAuthMiddleware()).Use(middleware.CasbinMiddleware())
|
||||
{
|
||||
authGroup.GET("/user/list", userApi.GetUserList)
|
||||
authGroup.GET("/user/query_by_uuid", userApi.QueryUserByUuid)
|
||||
|
||||
}
|
||||
tokenGroup := router.Group("token")
|
||||
{
|
||||
tokenGroup.POST("/refresh", userApi.RefreshHandler)
|
||||
}
|
||||
}
|
||||
|
||||
// UserRouterAuth 用户相关路由 有auth接口组需要token验证
|
||||
func UserRouterAuth(router *gin.RouterGroup) {
|
||||
authGroup := router.Group("auth")
|
||||
{
|
||||
authGroup.GET("/user/list", userApi.GetUserList)
|
||||
authGroup.GET("/user/query_by_uuid", userApi.QueryUserByUuid)
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user