diff --git a/app/admin/router/sys_role.go b/app/admin/router/sys_role.go index 5ba9ec5f..9ae2cedf 100644 --- a/app/admin/router/sys_role.go +++ b/app/admin/router/sys_role.go @@ -3,8 +3,9 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/app/admin/apis" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +15,7 @@ func init() { // 需认证的路由代码 func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := apis.SysRole{} - r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysRoleList) r.GET("/:id", api.GetSysRole) diff --git a/app/admin/router/sys_router.go b/app/admin/router/sys_router.go index ab6793c0..bbae9d8f 100644 --- a/app/admin/router/sys_router.go +++ b/app/admin/router/sys_router.go @@ -10,7 +10,6 @@ import ( ginSwagger "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" - "go-admin/app/admin/apis/tools" "go-admin/common/middleware" "go-admin/common/middleware/handler" _ "go-admin/docs" @@ -23,8 +22,6 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou sysStaticFileRouter(g) // swagger；注意：生产环境可以注释掉 sysSwaggerRouter(g) - // 无需认证 - sysNoCheckRoleRouter(g) // 需要认证 sysCheckRoleRouterInit(g, authMiddleware) return g @@ -53,52 +50,6 @@ func sysSwaggerRouter(r *gin.RouterGroup) { r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) } -func sysNoCheckRoleRouter(r *gin.RouterGroup) { - v1 := r.Group("/api/v1") - - //m := apis2.Monitor{} - //v1.GET("/monitor/server", m.ServerInfo) - sys := apis.System{} - v1.GET("/getCaptcha", sys.GenerateCaptchaHandler) - gen := tools.Gen{} - v1.GET("/gen/preview/:tableId", gen.Preview) - v1.GET("/gen/toproject/:tableId", gen.GenCode) - v1.GET("/gen/apitofile/:tableId", gen.GenApiToFile) - - v1.GET("/gen/todb/:tableId", gen.GenMenuAndApi) - sysTable := tools.SysTable{} - v1.GET("/gen/tabletree", sysTable.GetSysTablesTree) - - registerDBRouter(v1) - registerSysTableRouter(v1) - //registerPublicRouter(v1) -} - -func registerDBRouter(api *gin.RouterGroup) { - db := api.Group("/db") - { - gen := tools.Gen{} - db.GET("/tables/page", gen.GetDBTableList) - db.GET("/columns/page", gen.GetDBColumnList) - } -} - -func registerSysTableRouter(v1 *gin.RouterGroup) { - systables := v1.Group("/sys/tables") - { - sysTable := tools.SysTable{} - systables.GET("/page", sysTable.GetSysTableList) - tablesinfo := systables.Group("/info") - { - tablesinfo.POST("", sysTable.InsertSysTable) - tablesinfo.PUT("", sysTable.UpdateSysTable) - tablesinfo.DELETE("/:tableId", sysTable.DeleteSysTables) - tablesinfo.GET("/:tableId", sysTable.GetSysTables) - tablesinfo.GET("", sysTable.GetSysTablesInfo) - } - } -} - func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient) r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient) @@ -109,9 +60,7 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle v1.GET("/refresh_token", authMiddleware.RefreshHandler) //registerPageRouter(v1, authMiddleware) registerBaseRouter(v1, authMiddleware) - registerDictRouter(v1, authMiddleware) - //registerSysUserRouter(v1, authMiddleware) - //registerUserCenterRouter(v1, authMiddleware) + //registerDictRouter(v1, authMiddleware) } func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { @@ -119,96 +68,9 @@ func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar api2 := apis.SysDept{} v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - //v1auth.GET("/getinfo", system.GetInfo) v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect) v1.GET("/menuTreeselect", api.GetMenuTreeSelect) v1auth.GET("/roleDeptTreeselect/:roleId", api2.GetDeptTreeRoleSelect) - //GetDeptTreeRoleselect) v1auth.POST("/logout", handler.LogOut) } } - -//func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// v1auth.GET("/sysUserList", system.GetSysUserList) -// } -//} - -//func registerUserCenterRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// user.GET("/profile", system.GetSysUserProfile) -// user.POST("/avatar", system.InsetSysUserAvatar) -// user.PUT("/pwd", system.SysUserUpdatePwd) -// } -//} - -//func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// post := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// post.GET("/:postId", system.GetPost) -// post.POST("", system.InsertPost) -// post.PUT("", system.UpdatePost) -// post.DELETE("/:postId", system.DeletePost) -// } -//} - -//func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// sysuser.GET("/:userId", system.GetSysUser) -// sysuser.GET("/", system.GetSysUserInit) -// sysuser.POST("", system.InsertSysUser) -// sysuser.PUT("", system.UpdateSysUser) -// sysuser.DELETE("/:userId", system.DeleteSysUser) -// } -//} - -func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - dictApi := apis.SysDictType{} - dataApi := apis.SysDictData{} - dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - { - - dicts.GET("/data", dataApi.GetSysDictDataList) - dicts.GET("/data/:dictCode", dataApi.GetSysDictData) - dicts.POST("/data", dataApi.InsertSysDictData) - dicts.PUT("/data/:dictCode", dataApi.UpdateSysDictData) - dicts.DELETE("/data", dataApi.DeleteSysDictData) - - dicts.GET("/type-option-select", dictApi.GetSysDictTypeAll) - dicts.GET("/type", dictApi.GetSysDictTypeList) - dicts.GET("/type/:id", dictApi.GetSysDictType) - dicts.POST("/type", dictApi.InsertSysDictType) - dicts.PUT("/type/:id", dictApi.UpdateSysDictType) - dicts.DELETE("/type", dictApi.DeleteSysDictType) - } - v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).GET("/data-all", dataApi.GetSysDictDataAll) -} - -//func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// dept := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// dept.GET("/:deptId", system.GetDept) -// dept.POST("", system.InsertDept) -// dept.PUT("", system.UpdateDept) -// dept.DELETE("/:id", system.DeleteDept) -// } -//} -//func registerSysSettingRouter(v1 *gin.RouterGroup) { -// -// //m := apis2.Monitor{} -// setting := v1.Group("/setting") -// { -// setting.GET("/serverInfo", m.ServerInfo) -// } -//} - -//func registerPublicRouter(v1 *gin.RouterGroup) { -// p := v1.Group("/public") -// { -// file := apis2.File{} -// p.POST("/uploadFile", file.UploadFile) -// } -//}