From 6f8ad4efe4ccdff03f2c659d806be11ff1144327 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Sun, 9 Aug 2020 02:44:42 +0800
Subject: [PATCH] feat : added auto task

---
 router/router.go    |  3 +--
 router/sysjob.go    | 22 ----------------------
 router/sysrouter.go | 21 ++++++++++++++++++++-
 3 files changed, 21 insertions(+), 25 deletions(-)
 delete mode 100644 router/sysjob.go

diff --git a/router/router.go b/router/router.go
index 7ec8acfb..9366ed48 100644
--- a/router/router.go
+++ b/router/router.go
@@ -25,8 +25,7 @@ func examplesNoCheckRoleRouter(r *gin.Engine) {
 	// 空接口防止v1定义无使用报错
 	v1.GET("/nilcheckrole", nil)
 
-	// {{无需认证路由自动补充在此处请勿删除}} 
- registerSysJobRouter(v1) 
+	// {{无需认证路由自动补充在此处请勿删除}}
 }
 
 // 需要认证的路由示例
diff --git a/router/sysjob.go b/router/sysjob.go
deleted file mode 100644
index ff4ec8a2..00000000
--- a/router/sysjob.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	"go-admin/apis/sysjob"
-)
-
-// 无需认证的路由代码
-func registerSysJobRouter(v1 *gin.RouterGroup) {
-
-	r := v1.Group("/sysjob")
-	{
-		r.GET("", sysjob.GetSysJobList)
-		r.GET("/:jobId", sysjob.GetSysJob)
-		r.POST("", sysjob.InsertSysJob)
-		r.PUT("", sysjob.UpdateSysJob)
-		r.DELETE("/:jobId", sysjob.DeleteSysJob)
-	}
-
-	v1.GET("/job/remove/:jobId",sysjob.RemoveJob)
-	v1.GET("/job/start/:jobId",sysjob.StartJob)
-}
diff --git a/router/sysrouter.go b/router/sysrouter.go
index 56f6fd9e..89e5e0ad 100644
--- a/router/sysrouter.go
+++ b/router/sysrouter.go
@@ -7,6 +7,7 @@ import (
 	log2 "go-admin/apis/log"
 	"go-admin/apis/monitor"
 	"go-admin/apis/public"
+	"go-admin/apis/sysjob"
 	"go-admin/apis/system"
 	"go-admin/apis/system/dict"
 	. "go-admin/apis/tools"
@@ -75,6 +76,8 @@ func sysNoCheckRoleRouter(r *gin.RouterGroup) {
 	registerPublicRouter(v1)
 
 	registerSysSettingRouter(v1)
+
+	registerSysJobRouter(v1)
 }
 
 func registerDBRouter(api *gin.RouterGroup) {
@@ -99,6 +102,22 @@ func registerSysTableRouter(v1 *gin.RouterGroup) {
 	}
 }
 
+func registerSysJobRouter(v1 *gin.RouterGroup) {
+
+	r := v1.Group("/sysjob")
+	{
+		r.GET("", sysjob.GetSysJobList)
+		r.GET("/:jobId", sysjob.GetSysJob)
+		r.POST("", sysjob.InsertSysJob)
+		r.PUT("", sysjob.UpdateSysJob)
+		r.DELETE("/:jobId", sysjob.DeleteSysJob)
+	}
+
+	v1.GET("/job/remove/:jobId",sysjob.RemoveJob)
+	v1.GET("/job/start/:jobId",sysjob.StartJob)
+}
+
+
 func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	r.POST("/login", authMiddleware.LoginHandler)
 	// Refresh time can be longer than token timeout
@@ -260,7 +279,7 @@ func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 func registerSysSettingRouter(v1 *gin.RouterGroup) {
 	setting := v1.Group("/setting")
 	{
-		setting.GET("", system.QuerySetting)
+		setting.GET("", system.GetSetting)
 		setting.POST("", system.CreateSetting)
 		setting.GET("/serverInfo",monitor.ServerInfo)
 	}