From 87edf1099cb7e3f946e14b4e2ccad657ab51a0e2 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Fri, 28 Aug 2020 00:52:16 +0800
Subject: [PATCH] feat:update search

---
 apis/sysjob/sysjob.go  | 10 +++++++---
 go.mod                 |  4 ++--
 models/sysjob.go       | 26 --------------------------
 pkg/casbin/mycasbin.go | 28 +++++++++++++++-------------
 router/sysrouter.go    |  4 ++--
 tools/url.go           |  4 ++--
 6 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/apis/sysjob/sysjob.go b/apis/sysjob/sysjob.go
index 317b2f50..b8b2dd48 100644
--- a/apis/sysjob/sysjob.go
+++ b/apis/sysjob/sysjob.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	
+
 	"go-admin/dto"
 	"go-admin/jobs"
 	"go-admin/models"
@@ -76,10 +76,14 @@ func UpdateSysJob(c *gin.Context) {
 
 func DeleteSysJob(c *gin.Context) {
 	var data models.SysJob
+
+	var v tools.GeneralDelDto
+	err := c.BindUri(&v)
+
 	data.UpdateBy = tools.GetUserIdStr(c)
 
-	IDS := tools.IdsStrToIdsIntGroup("jobId", c)
-	_, err := data.BatchDelete(IDS)
+	IDS := tools.IdsStrToIdsIntGroupStr(v.Id)
+	_, err = data.BatchDelete(IDS)
 	tools.HasError(err, msg.DeletedFail, 500)
 	app.OK(c, nil, msg.DeletedSuccess)
 }
diff --git a/go.mod b/go.mod
index 26904228..2ae93459 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/casbin/casbin/v2 v2.11.2
-	github.com/casbin/gorm-adapter/v3 v3.0.2 // indirect
+	github.com/casbin/gorm-adapter/v3 v3.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-ole/go-ole v1.2.4 // indirect
@@ -33,5 +33,5 @@ require (
 	gorm.io/driver/mysql v0.3.2
 	gorm.io/driver/postgres v0.2.9
 	gorm.io/driver/sqlite v1.0.9
-	gorm.io/gorm v0.2.36
+	gorm.io/gorm v0.2.38
 )
diff --git a/models/sysjob.go b/models/sysjob.go
index d9a100f5..98ef72f4 100644
--- a/models/sysjob.go
+++ b/models/sysjob.go
@@ -78,35 +78,9 @@ func (e *SysJob) Get() (SysJob, error) {
 func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}) ([]SysJob, int, error) {
 	var doc []SysJob
 
-	//table := orm.Eloquent.Select("*").Table(e.TableName())
 	table := orm.Eloquent.Table(e.TableName())
-
 	table = tools.SetQuery(table, v)
 
-	//if e.JobId != 0 {
-	//	table = table.Where("job_id = ?", e.JobId)
-	//}
-	//
-	//if e.JobName != "" {
-	//	table = table.Where("job_name like ?", "%"+e.JobName+"%")
-	//}
-	//
-	//if e.JobGroup != "" {
-	//	table = table.Where("job_group = ?", e.JobGroup)
-	//}
-	//
-	//if e.CronExpression != "" {
-	//	table = table.Where("cron_expression = ?", e.CronExpression)
-	//}
-	//
-	//if e.InvokeTarget != "" {
-	//	table = table.Where("invoke_target = ?", e.InvokeTarget)
-	//}
-	//
-	//if e.Status != 0 {
-	//	table = table.Where("status = ?", e.Status)
-	//}
-
 	// 数据权限控制(如果不需要数据权限请将此处去掉)
 	dataPermission := new(DataPermission)
 	dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go
index 512ec5ba..bd5e7d49 100644
--- a/pkg/casbin/mycasbin.go
+++ b/pkg/casbin/mycasbin.go
@@ -4,6 +4,8 @@ import (
 	"log"
 
 	"github.com/casbin/casbin/v2"
+	"github.com/casbin/casbin/v2/model"
+	gormAdapter "github.com/casbin/gorm-adapter/v3"
 	_ "github.com/go-sql-driver/mysql"
 
 	"go-admin/global"
@@ -25,19 +27,19 @@ m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.
 `
 
 func Setup() {
-	//Apter, err := gormAdapter.NewAdapterByDB(global.Eloquent)
-	//if err != nil {
-	//	panic(err)
-	//}
-	//m, err := model.NewModelFromString(text)
-	//if err != nil {
-	//	panic(err)
-	//}
-	//e, err := casbin.NewSyncedEnforcer(m, Apter)
-	//if err != nil {
-	//	panic(err)
-	//}
-	//global.CasbinEnforcer = e
+	Apter, err := gormAdapter.NewAdapterByDB(global.Eloquent)
+	if err != nil {
+		panic(err)
+	}
+	m, err := model.NewModelFromString(text)
+	if err != nil {
+		panic(err)
+	}
+	e, err := casbin.NewSyncedEnforcer(m, Apter)
+	if err != nil {
+		panic(err)
+	}
+	global.CasbinEnforcer = e
 }
 
 func Casbin() (*casbin.SyncedEnforcer, error) {
diff --git a/router/sysrouter.go b/router/sysrouter.go
index 7d2b58e5..e56f19a6 100644
--- a/router/sysrouter.go
+++ b/router/sysrouter.go
@@ -111,10 +111,10 @@ func registerSysJobRouter(v1 *gin.RouterGroup) {
 	r := v1.Group("/sysjob")
 	{
 		r.GET("", sysjob.GetSysJobList)
-		r.GET("/:jobId", sysjob.GetSysJob)
+		r.GET("/:id", sysjob.GetSysJob)
 		r.POST("", sysjob.InsertSysJob)
 		r.PUT("", sysjob.UpdateSysJob)
-		r.DELETE("/:jobId", sysjob.DeleteSysJob)
+		r.DELETE("/:id", sysjob.DeleteSysJob)
 	}
 
 	v1.GET("/job/remove/:jobId", sysjob.RemoveJob)
diff --git a/tools/url.go b/tools/url.go
index 784aaa0f..1c53933a 100644
--- a/tools/url.go
+++ b/tools/url.go
@@ -8,10 +8,10 @@ import (
 
 //获取URL中批量id并解析
 func IdsStrToIdsIntGroup(key string, c *gin.Context) []int {
-	return idsStrToIdsIntGroup(c.Param(key))
+	return IdsStrToIdsIntGroupStr(c.Param(key))
 }
 
-func idsStrToIdsIntGroup(keys string) []int {
+func IdsStrToIdsIntGroupStr(keys string) []int {
 	IDS := make([]int, 0)
 	ids := strings.Split(keys, ",")
 	for i := 0; i < len(ids); i++ {