diff --git a/app/admin/apis/syscontent/syscontent.go b/app/admin/apis/sys_content/sys_content.go similarity index 99% rename from app/admin/apis/syscontent/syscontent.go rename to app/admin/apis/sys_content/sys_content.go index ceb851c3..cf5d2ac1 100644 --- a/app/admin/apis/syscontent/syscontent.go +++ b/app/admin/apis/sys_content/sys_content.go @@ -1,4 +1,4 @@ -package syscontent +package sys_content import ( "github.com/gin-gonic/gin" diff --git a/app/admin/apis/sysjob/sysjob.go b/app/admin/apis/sys_job/sys_job.go similarity index 98% rename from app/admin/apis/sysjob/sysjob.go rename to app/admin/apis/sys_job/sys_job.go index c0067b49..4f2b1a77 100644 --- a/app/admin/apis/sysjob/sysjob.go +++ b/app/admin/apis/sys_job/sys_job.go @@ -1,4 +1,4 @@ -package sysjob +package sys_job import ( "github.com/gin-gonic/gin" diff --git a/app/admin/router/router.go b/app/admin/router/router.go index a69b59d5..83f9210a 100644 --- a/app/admin/router/router.go +++ b/app/admin/router/router.go @@ -48,7 +48,4 @@ func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddle for _, f := range routerCheckRole { f(v1, authMiddleware) } - - // {{认证路由自动补充在此处请勿删除}} - } diff --git a/app/admin/router/syscontent.go b/app/admin/router/sys_content.go similarity index 65% rename from app/admin/router/syscontent.go rename to app/admin/router/sys_content.go index 12220e1e..ffc03d6a 100644 --- a/app/admin/router/syscontent.go +++ b/app/admin/router/sys_content.go @@ -2,7 +2,7 @@ package router import ( "github.com/gin-gonic/gin" - "go-admin/app/admin/apis/syscontent" + "go-admin/app/admin/apis/sys_content" "go-admin/app/admin/middleware" jwt "go-admin/pkg/jwtauth" ) @@ -17,15 +17,15 @@ func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMid r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - r.GET("/:id", syscontent.GetSysContent) - r.POST("", syscontent.InsertSysContent) - r.PUT("", syscontent.UpdateSysContent) - r.DELETE("/:id", syscontent.DeleteSysContent) + r.GET("/:id", sys_content.GetSysContent) + r.POST("", sys_content.InsertSysContent) + r.PUT("", sys_content.UpdateSysContent) + r.DELETE("/:id", sys_content.DeleteSysContent) } l := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - l.GET("/syscontentList", syscontent.GetSysContentList) + l.GET("/syscontentList", sys_content.GetSysContentList) } } diff --git a/app/admin/router/sysjob.go b/app/admin/router/sys_job.go similarity index 94% rename from app/admin/router/sysjob.go rename to app/admin/router/sys_job.go index 85270907..27fcef05 100644 --- a/app/admin/router/sysjob.go +++ b/app/admin/router/sys_job.go @@ -2,7 +2,7 @@ package router import ( "github.com/gin-gonic/gin" - "go-admin/app/admin/apis/sysjob" + "go-admin/app/admin/apis/sys_job" "go-admin/app/admin/middleware" "go-admin/app/admin/models" "go-admin/app/admin/service/dto" @@ -31,7 +31,7 @@ func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew r.PUT("", actions.PermissionAction(), actions.UpdateAction(new(dto.SysJobControl))) r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysJobById))) } - sysJob := &sysjob.SysJob{} + sysJob := &sys_job.SysJob{} v1.GET("/job/remove/:id", sysJob.RemoveJobForService) v1.GET("/job/start/:id", sysJob.StartJobForService) diff --git a/app/admin/router/sysrouter.go b/app/admin/router/sysrouter.go index b3d55e04..8f7e7806 100644 --- a/app/admin/router/sysrouter.go +++ b/app/admin/router/sysrouter.go @@ -103,24 +103,17 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle registerPageRouter(v1, authMiddleware) registerBaseRouter(v1, authMiddleware) - //registerDeptRouter(v1, authMiddleware) registerDictRouter(v1, authMiddleware) registerSysUserRouter(v1, authMiddleware) - //registerRoleRouter(v1, authMiddleware) registerUserCenterRouter(v1, authMiddleware) - //registerPostRouter(v1, authMiddleware) - //registerMenuRouter(v1, authMiddleware) } func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { v1auth.GET("/getinfo", system.GetInfo) - - //v1auth.PUT("/roledatascope", system.UpdateRoleDataScope) v1auth.GET("/roleMenuTreeselect/:roleId", system.GetMenuTreeRoleselect) v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect) - v1auth.POST("/logout", handler.LogOut) v1auth.GET("/menuids", system.GetMenuIDS) } @@ -129,13 +122,7 @@ func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - //v1auth.GET("/deptList", system.GetDeptList) - //v1auth.GET("/deptTree", system.GetDeptTree) v1auth.GET("/sysUserList", system.GetSysUserList) - //v1auth.GET("/rolelist", system.GetRoleList) - //v1auth.GET("/configList", system.GetConfigList) - //v1auth.GET("/postlist", system.GetPostList) - //v1auth.GET("/menulist", system.GetMenuList) } } @@ -158,26 +145,6 @@ func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar } } -//func registerMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// 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) -// } -//} - -//func registerRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { -// role := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) -// { -// role.GET("/:roleId", system.GetRole) -// role.POST("", system.InsertRole) -// role.PUT("", system.UpdateRole) -// role.DELETE("/:roleId", system.DeleteRole) -// } -//} - func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) {