From fbc074605ce99b15119c237a1344a0b10b6011d5 Mon Sep 17 00:00:00 2001 From: SliverHorn Date: Fri, 20 Nov 2020 23:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BB=84=E9=89=B4=E6=9D=83?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/initialize/router.go | 43 +++++++++++-------- server/router/exa_simple_uploader.go | 5 +-- server/router/exp_customer.go | 6 +-- server/router/exp_file_upload_and_download.go | 1 - server/router/sys_api.go | 3 +- server/router/sys_authority.go | 6 +-- server/router/sys_auto_code.go | 5 +-- server/router/sys_casbin.go | 6 +-- server/router/sys_dictionary.go | 6 +-- server/router/sys_dictionary_detail.go | 6 +-- server/router/sys_email.go | 3 +- server/router/sys_jwt.go | 3 +- server/router/sys_menu.go | 3 +- server/router/sys_operation_record.go | 5 +-- server/router/sys_system.go | 3 +- server/router/sys_user.go | 6 +-- server/router/sys_workflow.go | 3 +- 17 files changed, 39 insertions(+), 74 deletions(-) diff --git a/server/initialize/router.go b/server/initialize/router.go index 8f08f0d4..59e246de 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -24,25 +24,30 @@ func Routers() *gin.Engine { Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) global.GVA_LOG.Info("register swagger handler") // 方便统一添加路由组前缀 多服务器上线使用 - ApiGroup := Router.Group("") - router.InitUserRouter(ApiGroup) // 注册用户路由 - router.InitBaseRouter(ApiGroup) // 注册基础功能路由 不做鉴权 - router.InitMenuRouter(ApiGroup) // 注册menu路由 - router.InitAuthorityRouter(ApiGroup) // 注册角色路由 - router.InitApiRouter(ApiGroup) // 注册功能api路由 - router.InitFileUploadAndDownloadRouter(ApiGroup) // 文件上传下载功能路由 - router.InitSimpleUploaderRouter(ApiGroup) // 断点续传（插件版） - router.InitWorkflowRouter(ApiGroup) // 工作流相关路由 - router.InitCasbinRouter(ApiGroup) // 权限相关路由 - router.InitJwtRouter(ApiGroup) // jwt相关路由 - router.InitSystemRouter(ApiGroup) // system相关路由 - router.InitCustomerRouter(ApiGroup) // 客户路由 - router.InitAutoCodeRouter(ApiGroup) // 创建自动化代码 - router.InitSysDictionaryDetailRouter(ApiGroup) // 字典详情管理 - router.InitSysDictionaryRouter(ApiGroup) // 字典管理 - router.InitSysOperationRecordRouter(ApiGroup) // 操作记录 - router.InitEmailRouter(ApiGroup) // 邮件相关路由 - + PublicGroup := Router.Group("") + { + router.InitBaseRouter(PublicGroup) // 注册基础功能路由 不做鉴权 + } + PrivateGroup := Router.Group("") + PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()).Use(middleware.OperationRecord()) + { + router.InitApiRouter(PrivateGroup) // 注册功能api路由 + router.InitJwtRouter(PrivateGroup) // jwt相关路由 + router.InitUserRouter(PrivateGroup) // 注册用户路由 + router.InitMenuRouter(PrivateGroup) // 注册menu路由 + router.InitEmailRouter(PrivateGroup) // 邮件相关路由 + router.InitSystemRouter(PrivateGroup) // system相关路由 + router.InitCasbinRouter(PrivateGroup) // 权限相关路由 + router.InitWorkflowRouter(PrivateGroup) // 工作流相关路由 + router.InitCustomerRouter(PrivateGroup) // 客户路由 + router.InitAutoCodeRouter(PrivateGroup) // 创建自动化代码 + router.InitAuthorityRouter(PrivateGroup) // 注册角色路由 + router.InitSimpleUploaderRouter(PrivateGroup) // 断点续传（插件版） + router.InitSysDictionaryRouter(PrivateGroup) // 字典管理 + router.InitSysOperationRecordRouter(PrivateGroup) // 操作记录 + router.InitSysDictionaryDetailRouter(PrivateGroup) // 字典详情管理 + router.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由 + } global.GVA_LOG.Info("router register success") return Router } diff --git a/server/router/exa_simple_uploader.go b/server/router/exa_simple_uploader.go index 7197d638..b1dbd379 100644 --- a/server/router/exa_simple_uploader.go +++ b/server/router/exa_simple_uploader.go @@ -2,14 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSimpleUploaderRouter(Router *gin.RouterGroup) { - ApiRouter := Router.Group("simpleUploader"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()) + ApiRouter := Router.Group("simpleUploader") { ApiRouter.POST("upload", v1.SimpleUploaderUpload) // 上传功能 ApiRouter.GET("checkFileMd5", v1.CheckFileMd5) // 文件完整度验证 diff --git a/server/router/exp_customer.go b/server/router/exp_customer.go index d099248c..8195d092 100644 --- a/server/router/exp_customer.go +++ b/server/router/exp_customer.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitCustomerRouter(Router *gin.RouterGroup) { - ApiRouter := Router.Group("customer"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + ApiRouter := Router.Group("customer") { ApiRouter.POST("customer", v1.CreateExaCustomer) // 创建客户 ApiRouter.PUT("customer", v1.UpdateExaCustomer) // 更新客户 diff --git a/server/router/exp_file_upload_and_download.go b/server/router/exp_file_upload_and_download.go index b0ad0328..de141d8c 100644 --- a/server/router/exp_file_upload_and_download.go +++ b/server/router/exp_file_upload_and_download.go @@ -7,7 +7,6 @@ import ( func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) { FileUploadAndDownloadGroup := Router.Group("fileUploadAndDownload") - // .Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { FileUploadAndDownloadGroup.POST("/upload", v1.UploadFile) // 上传文件 FileUploadAndDownloadGroup.POST("/getFileList", v1.GetFileList) // 获取上传文件列表 diff --git a/server/router/sys_api.go b/server/router/sys_api.go index b5d29988..ffc6b7e6 100644 --- a/server/router/sys_api.go +++ b/server/router/sys_api.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitApiRouter(Router *gin.RouterGroup) { - ApiRouter := Router.Group("api").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + ApiRouter := Router.Group("api") { ApiRouter.POST("createApi", v1.CreateApi) // 创建Api ApiRouter.POST("deleteApi", v1.DeleteApi) // 删除Api diff --git a/server/router/sys_authority.go b/server/router/sys_authority.go index 6ecfca4c..313981eb 100644 --- a/server/router/sys_authority.go +++ b/server/router/sys_authority.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitAuthorityRouter(Router *gin.RouterGroup) { - AuthorityRouter := Router.Group("authority"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + AuthorityRouter := Router.Group("authority") { AuthorityRouter.POST("createAuthority", v1.CreateAuthority) // 创建角色 AuthorityRouter.POST("deleteAuthority", v1.DeleteAuthority) // 删除角色 diff --git a/server/router/sys_auto_code.go b/server/router/sys_auto_code.go index 762a1b9d..77526d73 100644 --- a/server/router/sys_auto_code.go +++ b/server/router/sys_auto_code.go @@ -2,14 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitAutoCodeRouter(Router *gin.RouterGroup) { - AutoCodeRouter := Router.Group("autoCode"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()) + AutoCodeRouter := Router.Group("autoCode") { AutoCodeRouter.POST("createTemp", v1.CreateTemp) // 创建自动化代码 AutoCodeRouter.GET("getTables", v1.GetTables) // 获取对应数据库的表 diff --git a/server/router/sys_casbin.go b/server/router/sys_casbin.go index c0f5d2e3..f69c575b 100644 --- a/server/router/sys_casbin.go +++ b/server/router/sys_casbin.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitCasbinRouter(Router *gin.RouterGroup) { - CasbinRouter := Router.Group("casbin"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + CasbinRouter := Router.Group("casbin") { CasbinRouter.POST("updateCasbin", v1.UpdateCasbin) CasbinRouter.POST("getPolicyPathByAuthorityId", v1.GetPolicyPathByAuthorityId) diff --git a/server/router/sys_dictionary.go b/server/router/sys_dictionary.go index 45994759..261de762 100644 --- a/server/router/sys_dictionary.go +++ b/server/router/sys_dictionary.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSysDictionaryRouter(Router *gin.RouterGroup) { - SysDictionaryRouter := Router.Group("sysDictionary"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + SysDictionaryRouter := Router.Group("sysDictionary") { SysDictionaryRouter.POST("createSysDictionary", v1.CreateSysDictionary) // 新建SysDictionary SysDictionaryRouter.DELETE("deleteSysDictionary", v1.DeleteSysDictionary) // 删除SysDictionary diff --git a/server/router/sys_dictionary_detail.go b/server/router/sys_dictionary_detail.go index 1f17fd3b..b83d80a7 100644 --- a/server/router/sys_dictionary_detail.go +++ b/server/router/sys_dictionary_detail.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSysDictionaryDetailRouter(Router *gin.RouterGroup) { - SysDictionaryDetailRouter := Router.Group("sysDictionaryDetail"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + SysDictionaryDetailRouter := Router.Group("sysDictionaryDetail") { SysDictionaryDetailRouter.POST("createSysDictionaryDetail", v1.CreateSysDictionaryDetail) // 新建SysDictionaryDetail SysDictionaryDetailRouter.DELETE("deleteSysDictionaryDetail", v1.DeleteSysDictionaryDetail) // 删除SysDictionaryDetail diff --git a/server/router/sys_email.go b/server/router/sys_email.go index 6d201cf0..8b0acc21 100644 --- a/server/router/sys_email.go +++ b/server/router/sys_email.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitEmailRouter(Router *gin.RouterGroup) { - UserRouter := Router.Group("email").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + UserRouter := Router.Group("email") { UserRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件 } diff --git a/server/router/sys_jwt.go b/server/router/sys_jwt.go index 0241fc3c..1d69c524 100644 --- a/server/router/sys_jwt.go +++ b/server/router/sys_jwt.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitJwtRouter(Router *gin.RouterGroup) { - ApiRouter := Router.Group("jwt").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + ApiRouter := Router.Group("jwt") { ApiRouter.POST("jsonInBlacklist", v1.JsonInBlacklist) // jwt加入黑名单 } diff --git a/server/router/sys_menu.go b/server/router/sys_menu.go index 48609046..0bef2eda 100644 --- a/server/router/sys_menu.go +++ b/server/router/sys_menu.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) { - MenuRouter := Router.Group("menu").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + MenuRouter := Router.Group("menu") { MenuRouter.POST("getMenu", v1.GetMenu) // 获取菜单树 MenuRouter.POST("getMenuList", v1.GetMenuList) // 分页获取基础menu列表 diff --git a/server/router/sys_operation_record.go b/server/router/sys_operation_record.go index 59ffff59..07b175a6 100644 --- a/server/router/sys_operation_record.go +++ b/server/router/sys_operation_record.go @@ -2,14 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSysOperationRecordRouter(Router *gin.RouterGroup) { - SysOperationRecordRouter := Router.Group("sysOperationRecord"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()) + SysOperationRecordRouter := Router.Group("sysOperationRecord") { SysOperationRecordRouter.POST("createSysOperationRecord", v1.CreateSysOperationRecord) // 新建SysOperationRecord SysOperationRecordRouter.DELETE("deleteSysOperationRecord", v1.DeleteSysOperationRecord) // 删除SysOperationRecord diff --git a/server/router/sys_system.go b/server/router/sys_system.go index 2c80e90a..215af699 100644 --- a/server/router/sys_system.go +++ b/server/router/sys_system.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitSystemRouter(Router *gin.RouterGroup) { - SystemRouter := Router.Group("system").Use(middleware.JWTAuth(), middleware.CasbinHandler()) + SystemRouter := Router.Group("system") { SystemRouter.POST("getSystemConfig", v1.GetSystemConfig) // 获取配置文件内容 SystemRouter.POST("setSystemConfig", v1.SetSystemConfig) // 设置配置文件内容 diff --git a/server/router/sys_user.go b/server/router/sys_user.go index 12d49a30..88c258dc 100644 --- a/server/router/sys_user.go +++ b/server/router/sys_user.go @@ -2,15 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitUserRouter(Router *gin.RouterGroup) { - UserRouter := Router.Group("user"). - Use(middleware.JWTAuth()). - Use(middleware.CasbinHandler()). - Use(middleware.OperationRecord()) + UserRouter := Router.Group("user") { UserRouter.POST("register", v1.Register) UserRouter.POST("changePassword", v1.ChangePassword) // 修改密码 diff --git a/server/router/sys_workflow.go b/server/router/sys_workflow.go index 771bfa8c..cad92d57 100644 --- a/server/router/sys_workflow.go +++ b/server/router/sys_workflow.go @@ -2,12 +2,11 @@ package router import ( "gin-vue-admin/api/v1" - "gin-vue-admin/middleware" "github.com/gin-gonic/gin" ) func InitWorkflowRouter(Router *gin.RouterGroup) { - WorkflowRouter := Router.Group("workflow").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + WorkflowRouter := Router.Group("workflow") { WorkflowRouter.POST("createWorkFlow", v1.CreateWorkFlow) // 创建工作流 } -- GitLab