fix🐛 :格式化内容和job的文件名
This commit is contained in:
1 parent
017d669a04
commit
e9617ec677
6 files changed
+10
-46
No files matched your search
@@ -1,4 +1,4 @@
|
|||||||
package syscontent
|
package sys_content
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package sysjob
|
package sys_job
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -48,7 +48,4 @@ func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddle
|
|||||||
for _, f := range routerCheckRole {
|
for _, f := range routerCheckRole {
|
||||||
f(v1, authMiddleware)
|
f(v1, authMiddleware)
|
||||||
}
|
}
|
||||||
|
|
||||||
// {{认证路由自动补充在此处请勿删除}}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"go-admin/app/admin/apis/syscontent"
|
"go-admin/app/admin/apis/sys_content"
|
||||||
"go-admin/app/admin/middleware"
|
"go-admin/app/admin/middleware"
|
||||||
jwt "go-admin/pkg/jwtauth"
|
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 := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
||||||
{
|
{
|
||||||
r.GET("/:id", syscontent.GetSysContent)
|
r.GET("/:id", sys_content.GetSysContent)
|
||||||
r.POST("", syscontent.InsertSysContent)
|
r.POST("", sys_content.InsertSysContent)
|
||||||
r.PUT("", syscontent.UpdateSysContent)
|
r.PUT("", sys_content.UpdateSysContent)
|
||||||
r.DELETE("/:id", syscontent.DeleteSysContent)
|
r.DELETE("/:id", sys_content.DeleteSysContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
l := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
l := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
||||||
{
|
{
|
||||||
l.GET("/syscontentList", syscontent.GetSysContentList)
|
l.GET("/syscontentList", sys_content.GetSysContentList)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"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/middleware"
|
||||||
"go-admin/app/admin/models"
|
"go-admin/app/admin/models"
|
||||||
"go-admin/app/admin/service/dto"
|
"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.PUT("", actions.PermissionAction(), actions.UpdateAction(new(dto.SysJobControl)))
|
||||||
r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysJobById)))
|
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/remove/:id", sysJob.RemoveJobForService)
|
||||||
v1.GET("/job/start/:id", sysJob.StartJobForService)
|
v1.GET("/job/start/:id", sysJob.StartJobForService)
|
||||||
@@ -103,24 +103,17 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
|
|||||||
|
|
||||||
registerPageRouter(v1, authMiddleware)
|
registerPageRouter(v1, authMiddleware)
|
||||||
registerBaseRouter(v1, authMiddleware)
|
registerBaseRouter(v1, authMiddleware)
|
||||||
//registerDeptRouter(v1, authMiddleware)
|
|
||||||
registerDictRouter(v1, authMiddleware)
|
registerDictRouter(v1, authMiddleware)
|
||||||
registerSysUserRouter(v1, authMiddleware)
|
registerSysUserRouter(v1, authMiddleware)
|
||||||
//registerRoleRouter(v1, authMiddleware)
|
|
||||||
registerUserCenterRouter(v1, authMiddleware)
|
registerUserCenterRouter(v1, authMiddleware)
|
||||||
//registerPostRouter(v1, authMiddleware)
|
|
||||||
//registerMenuRouter(v1, authMiddleware)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||||
v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
||||||
{
|
{
|
||||||
v1auth.GET("/getinfo", system.GetInfo)
|
v1auth.GET("/getinfo", system.GetInfo)
|
||||||
|
|
||||||
//v1auth.PUT("/roledatascope", system.UpdateRoleDataScope)
|
|
||||||
v1auth.GET("/roleMenuTreeselect/:roleId", system.GetMenuTreeRoleselect)
|
v1auth.GET("/roleMenuTreeselect/:roleId", system.GetMenuTreeRoleselect)
|
||||||
v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect)
|
v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect)
|
||||||
|
|
||||||
v1auth.POST("/logout", handler.LogOut)
|
v1auth.POST("/logout", handler.LogOut)
|
||||||
v1auth.GET("/menuids", system.GetMenuIDS)
|
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) {
|
func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||||
v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
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("/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) {
|
func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||||
sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user