From ae34ff8f82a205a04701e3b3d3c7cb7d57c79b97 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Mon, 10 May 2021 17:02:26 +0800 Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8=E4=BC=98=E5=8C=96router=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/router/router.go | 5 +---- app/admin/router/sys_category.go | 6 +++--- app/admin/router/sys_config.go | 6 +++--- app/admin/router/sys_content.go | 12 +++--------- app/admin/router/sys_dept.go | 6 +++--- app/admin/router/sys_file_dir.go | 6 +++--- app/admin/router/sys_file_info.go | 6 +++--- app/admin/router/sys_job.go | 6 +++--- app/admin/router/sys_login_log.go | 6 +++--- app/admin/router/sys_menu.go | 13 +++---------- app/admin/router/sys_opera_log.go | 6 +++--- app/admin/router/sys_post.go | 6 +++--- app/admin/router/sys_role.go | 6 +++--- app/admin/router/sys_user.go | 8 ++++---- 14 files changed, 41 insertions(+), 57 deletions(-) diff --git a/app/admin/router/router.go b/app/admin/router/router.go index ed28347..314e18b 100644 --- a/app/admin/router/router.go +++ b/app/admin/router/router.go @@ -33,9 +33,6 @@ func examplesNoCheckRoleRouter(r *gin.Engine) { for _, f := range routerNoCheckRole { f(v1) } - - // {{无需认证路由自动补充在此处请勿删除}} - //registerSysFileInfoRouter(v1) } // 需要认证的路由示例 @@ -48,4 +45,4 @@ func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddle for _, f := range routerCheckRole { f(v1, authMiddleware) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_category.go b/app/admin/router/sys_category.go index df8322a..6565016 100644 --- a/app/admin/router/sys_category.go +++ b/app/admin/router/sys_category.go @@ -2,7 +2,7 @@ package router import ( "github.com/gin-gonic/gin" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/models" @@ -16,7 +16,7 @@ func init() { // 需认证的路由代码 func registerSysCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { model := &models.SysCategory{} r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} { @@ -28,4 +28,4 @@ func registerSysCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysCategoryControl))) r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysCategoryById))) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go index 9b90da7..64dc6bf 100644 --- a/app/admin/router/sys_config.go +++ b/app/admin/router/sys_config.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_config" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_config.SysConfig{} - r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysConfigList) @@ -34,4 +34,4 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd r2.GET("", api.GetSysConfigBySysApp) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_content.go b/app/admin/router/sys_content.go index 133d724..fe13519 100644 --- a/app/admin/router/sys_content.go +++ b/app/admin/router/sys_content.go @@ -6,7 +6,7 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/service/dto" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -16,14 +16,8 @@ func init() { // 需认证的路由代码 func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - //r.GET("", sys_content.GetSysContentList) - //r.GET("/:id", sys_content.GetSysContent) - //r.POST("", sys_content.InsertSysContent) - //r.PUT("", sys_content.UpdateSysContent) - //r.DELETE("/:id", sys_content.DeleteSysContent) - model := &models.SysContent{} r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysContentSearch), func() interface{} { list := make([]models.SysContent, 0) @@ -34,4 +28,4 @@ func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMid r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysContentControl))) r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysContentById))) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_dept.go b/app/admin/router/sys_dept.go index 7ce7edd..a64d846 100644 --- a/app/admin/router/sys_dept.go +++ b/app/admin/router/sys_dept.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_dept" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_dept.SysDept{} - r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysDeptList) r.GET("/:id", api.GetSysDept) @@ -28,4 +28,4 @@ func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r1.GET("/deptTree", api.GetDeptTree) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_file_dir.go b/app/admin/router/sys_file_dir.go index d2d4719..aeef2c7 100644 --- a/app/admin/router/sys_file_dir.go +++ b/app/admin/router/sys_file_dir.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/sys_file" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_file.SysFileDir{} - r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysFileDirList) r.GET("/:id", api.GetSysFileDir) @@ -22,4 +22,4 @@ func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMid r.PUT("/:id", api.UpdateSysFileDir) r.DELETE("/:id", api.DeleteSysFileDir) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_file_info.go b/app/admin/router/sys_file_info.go index 5cd1d45..3c01435 100644 --- a/app/admin/router/sys_file_info.go +++ b/app/admin/router/sys_file_info.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/sys_file" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_file.SysFileInfo{} - r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysFileInfoList) r.GET("/:id", api.GetSysFileInfo) @@ -22,4 +22,4 @@ func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.PUT("/:id", api.UpdateSysFileInfo) r.DELETE("/:id", api.DeleteSysFileInfo) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_job.go b/app/admin/router/sys_job.go index a6985b8..b989804 100644 --- a/app/admin/router/sys_job.go +++ b/app/admin/router/sys_job.go @@ -7,7 +7,7 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/service/dto" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -17,7 +17,7 @@ func init() { // 需认证的路由代码 func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { sysJob := &models.SysJob{} r.GET("", actions.PermissionAction(), actions.IndexAction(sysJob, new(dto.SysJobSearch), func() interface{} { @@ -35,4 +35,4 @@ func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew v1.GET("/job/remove/:id", sysJob.RemoveJobForService) v1.GET("/job/start/:id", sysJob.StartJobForService) -} +} \ No newline at end of file diff --git a/app/admin/router/sys_login_log.go b/app/admin/router/sys_login_log.go index b813357..8eb08e6 100644 --- a/app/admin/router/sys_login_log.go +++ b/app/admin/router/sys_login_log.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_login_log" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_login_log.SysLoginLog{} - r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysLoginLogList) r.GET("/:id", api.GetSysLoginLog) @@ -22,4 +22,4 @@ func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.PUT("/:id", api.UpdateSysLoginLog) r.DELETE("", api.DeleteSysLoginLog) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_menu.go b/app/admin/router/sys_menu.go index 8d7b300..b458e0e 100644 --- a/app/admin/router/sys_menu.go +++ b/app/admin/router/sys_menu.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_menu" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,14 +14,7 @@ func init() { // 需认证的路由代码 func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_menu.SysMenu{} - //menu := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - //{ - // menu.GET("/:id", system.GetMenu) - // menu.POST("", system.InsertMenu) - // menu.PUT("", system.UpdateMenu) - // menu.DELETE("/:id", system.DeleteMenu) - //} - r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysMenuList) r.GET("/:id", api.GetSysMenu) @@ -36,4 +29,4 @@ func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r1.GET("/menuids", api.GetMenuIDS) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_opera_log.go b/app/admin/router/sys_opera_log.go index 37e0db5..4744e67 100644 --- a/app/admin/router/sys_opera_log.go +++ b/app/admin/router/sys_opera_log.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_opera_log" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_opera_log.SysOperaLog{} - r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysOperaLogList) r.GET("/:id", api.GetSysOperaLog) @@ -22,4 +22,4 @@ func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.PUT("/:id", api.UpdateSysOperaLog) r.DELETE("", api.DeleteSysOperaLog) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_post.go b/app/admin/router/sys_post.go index a77f861..242cae6 100644 --- a/app/admin/router/sys_post.go +++ b/app/admin/router/sys_post.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_post" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_post.SysPost{} - r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) + r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.GetSysPostList) r.GET("/:id", api.GetSysPost) @@ -22,4 +22,4 @@ func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew r.PUT("/:id", api.UpdateSysPost) r.DELETE("/:id", api.DeleteSysPost) } -} +} \ No newline at end of file diff --git a/app/admin/router/sys_role.go b/app/admin/router/sys_role.go index 9ad9efa..8a6753b 100644 --- a/app/admin/router/sys_role.go +++ b/app/admin/router/sys_role.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/system/sys_role" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -14,7 +14,7 @@ func init() { // 需认证的路由代码 func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_role.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) @@ -23,4 +23,4 @@ func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r.DELETE("", api.DeleteSysRole) } v1.PUT("/roledatascope", api.UpdateRoleDataScope) -} +} \ No newline at end of file diff --git a/app/admin/router/sys_user.go b/app/admin/router/sys_user.go index 59e4a67..26c210c 100644 --- a/app/admin/router/sys_user.go +++ b/app/admin/router/sys_user.go @@ -5,7 +5,7 @@ import ( jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "go-admin/app/admin/apis/sys_user" "go-admin/common/actions" - middleware2 "go-admin/common/middleware" + "go-admin/common/middleware" ) func init() { @@ -15,7 +15,7 @@ func init() { // 需认证的路由代码 func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { api := sys_user.SysUser{} - r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction()) + r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) { r.GET("", api.GetSysUserList) r.GET("/:id", api.GetSysUser) @@ -24,7 +24,7 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle r.DELETE("", api.DeleteSysUser) } - user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction()) + user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction()) { user.GET("/profile", api.GetSysUserProfile) user.POST("/avatar", api.InsetSysUserAvatar) @@ -34,4 +34,4 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle { v1auth.GET("/getinfo", api.GetInfo) } -} +} \ No newline at end of file