From 72b5d60bf1d4edcf554cc26bb4b2ff89e590565f Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 13 Dec 2019 16:37:53 +0800 Subject: [PATCH] =?UTF-8?q?initrouter=E5=A2=9E=E5=8A=A0group=E5=A3=B3?= =?UTF-8?q?=E5=AD=90=20=E6=96=B9=E4=BE=BF=E7=BB=9F=E4=B8=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=89=8D=E7=BC=80=20=E5=A4=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E4=BD=BF=E7=94=A8=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=89=8D=E7=BC=80=E8=BF=87=E5=90=8E=20=E8=AF=B7=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E7=90=86api=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/init/initRouter/init_router.go | 17 +++++++++-------- .../router/exp_fileUploadAndDownload.go | 3 +-- QMPlusServer/router/sys_api.go | 15 +++++++-------- QMPlusServer/router/sys_authority.go | 9 ++++----- QMPlusServer/router/sys_base.go | 2 +- QMPlusServer/router/sys_casbin.go | 4 +--- QMPlusServer/router/sys_menu.go | 16 ++++++++-------- QMPlusServer/router/sys_user.go | 2 +- QMPlusServer/router/sys_workflow.go | 3 +-- 9 files changed, 33 insertions(+), 38 deletions(-) diff --git a/QMPlusServer/init/initRouter/init_router.go b/QMPlusServer/init/initRouter/init_router.go index 7c470b5c..b9815eaa 100644 --- a/QMPlusServer/init/initRouter/init_router.go +++ b/QMPlusServer/init/initRouter/init_router.go @@ -15,14 +15,15 @@ func InitRouter() *gin.Engine { //Router.Use(middleware.LoadTls()) // 打开就能玩https了 Router.Use(middleware.Logger()) // 如果不需要日志 请关闭这里 Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) + ApiGroup := Router.Group("") // 方便统一添加路由组前缀 多服务器上线使用 //Router.Use(middleware.Logger()) - router.InitUserRouter(Router) // 注册用户路由 - router.InitBaseRouter(Router) // 注册基础功能路由 不做鉴权 - router.InitMenuRouter(Router) // 注册menu路由 - router.InitAuthorityRouter(Router) // 注册角色路由 - router.InitApiRouter(Router) // 注册功能api路由 - router.InitFileUploadAndDownloadRouter(Router) // 文件上传下载功能路由 - router.InitWorkflowRouter(Router) // 工作流相关路由 - router.InitCasbinRouter(Router) + router.InitUserRouter(ApiGroup) // 注册用户路由 + router.InitBaseRouter(ApiGroup) // 注册基础功能路由 不做鉴权 + router.InitMenuRouter(ApiGroup) // 注册menu路由 + router.InitAuthorityRouter(ApiGroup) // 注册角色路由 + router.InitApiRouter(ApiGroup) // 注册功能api路由 + router.InitFileUploadAndDownloadRouter(ApiGroup) // 文件上传下载功能路由 + router.InitWorkflowRouter(ApiGroup) // 工作流相关路由 + router.InitCasbinRouter(ApiGroup) return Router } diff --git a/QMPlusServer/router/exp_fileUploadAndDownload.go b/QMPlusServer/router/exp_fileUploadAndDownload.go index a29fda38..c2eb9b4a 100644 --- a/QMPlusServer/router/exp_fileUploadAndDownload.go +++ b/QMPlusServer/router/exp_fileUploadAndDownload.go @@ -6,7 +6,7 @@ import ( "main/middleware" ) -func InitFileUploadAndDownloadRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) { FileUploadAndDownloadGroup := Router.Group("fileUploadAndDownload").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) //.Use(middleware.JWTAuth()) { @@ -14,5 +14,4 @@ func InitFileUploadAndDownloadRouter(Router *gin.Engine)(R gin.IRoutes) { FileUploadAndDownloadGroup.POST("/getFileList", api.GetFileList) // 获取上传文件列表 FileUploadAndDownloadGroup.POST("/deleteFile", api.DeleteFile) // 删除指定文件 } - return FileUploadAndDownloadGroup } diff --git a/QMPlusServer/router/sys_api.go b/QMPlusServer/router/sys_api.go index a16ec4e8..625390b3 100644 --- a/QMPlusServer/router/sys_api.go +++ b/QMPlusServer/router/sys_api.go @@ -6,15 +6,14 @@ import ( "main/middleware" ) -func InitApiRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitApiRouter(Router *gin.RouterGroup) { ApiRouter := Router.Group("api").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { - ApiRouter.POST("createApi", api.CreateApi) //创建Api - ApiRouter.POST("deleteApi", api.DeleteApi) //删除Api - ApiRouter.POST("getApiList",api.GetApiList) //获取Api列表 - ApiRouter.POST("getApiById",api.GetApiById) //获取单条Api消息 - ApiRouter.POST("updataApi",api.UpdataApi) //更新api - ApiRouter.POST("getAllApis",api.GetAllApis) // 获取所有api + ApiRouter.POST("createApi", api.CreateApi) //创建Api + ApiRouter.POST("deleteApi", api.DeleteApi) //删除Api + ApiRouter.POST("getApiList", api.GetApiList) //获取Api列表 + ApiRouter.POST("getApiById", api.GetApiById) //获取单条Api消息 + ApiRouter.POST("updataApi", api.UpdataApi) //更新api + ApiRouter.POST("getAllApis", api.GetAllApis) // 获取所有api } - return ApiRouter } diff --git a/QMPlusServer/router/sys_authority.go b/QMPlusServer/router/sys_authority.go index ef5c1e45..1e10a999 100644 --- a/QMPlusServer/router/sys_authority.go +++ b/QMPlusServer/router/sys_authority.go @@ -6,12 +6,11 @@ import ( "main/middleware" ) -func InitAuthorityRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitAuthorityRouter(Router *gin.RouterGroup) { AuthorityRouter := Router.Group("authority").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { - AuthorityRouter.POST("createAuthority", api.CreateAuthority) //创建角色 - AuthorityRouter.POST("deleteAuthority", api.DeleteAuthority) //删除角色 - AuthorityRouter.POST("getAuthorityList",api.GetAuthorityList) //获取角色列表 + AuthorityRouter.POST("createAuthority", api.CreateAuthority) //创建角色 + AuthorityRouter.POST("deleteAuthority", api.DeleteAuthority) //删除角色 + AuthorityRouter.POST("getAuthorityList", api.GetAuthorityList) //获取角色列表 } - return AuthorityRouter } diff --git a/QMPlusServer/router/sys_base.go b/QMPlusServer/router/sys_base.go index a9ddca56..97edf59d 100644 --- a/QMPlusServer/router/sys_base.go +++ b/QMPlusServer/router/sys_base.go @@ -5,7 +5,7 @@ import ( "main/controller/api" ) -func InitBaseRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) { BaseRouter := Router.Group("base") { BaseRouter.POST("regist", api.Regist) diff --git a/QMPlusServer/router/sys_casbin.go b/QMPlusServer/router/sys_casbin.go index fa45bd91..ddb793b3 100644 --- a/QMPlusServer/router/sys_casbin.go +++ b/QMPlusServer/router/sys_casbin.go @@ -6,13 +6,11 @@ import ( "main/middleware" ) -func InitCasbinRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitCasbinRouter(Router *gin.RouterGroup) { BaseRouter := Router.Group("casbin").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { BaseRouter.POST("casbinPUpdata", api.CasbinPUpdata) BaseRouter.POST("getPolicyPathByAuthorityId", api.GetPolicyPathByAuthorityId) - } - return BaseRouter } diff --git a/QMPlusServer/router/sys_menu.go b/QMPlusServer/router/sys_menu.go index e79a8002..e5282c29 100644 --- a/QMPlusServer/router/sys_menu.go +++ b/QMPlusServer/router/sys_menu.go @@ -6,18 +6,18 @@ import ( "main/middleware" ) -func InitMenuRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) { MenuRouter := Router.Group("menu").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { - MenuRouter.POST("getMenu", api.GetMenu) //获取菜单树 - MenuRouter.POST("getMenuList", api.GetMenuList) // 分页获取基础menu列表 - MenuRouter.POST("addBaseMenu", api.AddBaseMenu) // 新增菜单 - MenuRouter.POST("getBaseMenuTree", api.GetBaseMenuTree) // 获取用户动态路由 + MenuRouter.POST("getMenu", api.GetMenu) //获取菜单树 + MenuRouter.POST("getMenuList", api.GetMenuList) // 分页获取基础menu列表 + MenuRouter.POST("addBaseMenu", api.AddBaseMenu) // 新增菜单 + MenuRouter.POST("getBaseMenuTree", api.GetBaseMenuTree) // 获取用户动态路由 MenuRouter.POST("addMenuAuthority", api.AddMenuAuthority) // 增加menu和角色关联关系 MenuRouter.POST("getMenuAuthority", api.GetMenuAuthority) // 获取指定角色menu - MenuRouter.POST("deleteBaseMenu", api.DeleteBaseMenu) // 删除菜单 - MenuRouter.POST("updataBaseMenu", api.UpdataBaseMenu) // 更新菜单 - MenuRouter.POST("getBaseMenuById", api.GetBaseMenuById) //根据id获取菜单 + MenuRouter.POST("deleteBaseMenu", api.DeleteBaseMenu) // 删除菜单 + MenuRouter.POST("updataBaseMenu", api.UpdataBaseMenu) // 更新菜单 + MenuRouter.POST("getBaseMenuById", api.GetBaseMenuById) //根据id获取菜单 } return MenuRouter } diff --git a/QMPlusServer/router/sys_user.go b/QMPlusServer/router/sys_user.go index 4909df1e..d236fec8 100644 --- a/QMPlusServer/router/sys_user.go +++ b/QMPlusServer/router/sys_user.go @@ -6,7 +6,7 @@ import ( "main/middleware" ) -func InitUserRouter(Router *gin.Engine) { +func InitUserRouter(Router *gin.RouterGroup) { UserRouter := Router.Group("user").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { UserRouter.POST("changePassword", api.ChangePassword) // 修改密码 diff --git a/QMPlusServer/router/sys_workflow.go b/QMPlusServer/router/sys_workflow.go index 9d08bf21..286df767 100644 --- a/QMPlusServer/router/sys_workflow.go +++ b/QMPlusServer/router/sys_workflow.go @@ -6,10 +6,9 @@ import ( "main/middleware" ) -func InitWorkflowRouter(Router *gin.Engine)(R gin.IRoutes) { +func InitWorkflowRouter(Router *gin.RouterGroup) { WorkflowRouter := Router.Group("workflow").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { WorkflowRouter.POST("createWorkFlow", api.CreateWorkFlow) // 创建工作流 } - return WorkflowRouter } -- GitLab