From d3d88ea024e0ecd04ec62b2a77a7291c8ac01aea Mon Sep 17 00:00:00 2001
From: "237401117@qq.com" <237401117@qq.com>
Date: Tue, 19 Oct 2021 20:45:36 +0800
Subject: [PATCH] add postgresql driver

---
 app/system/service/sys_job.go         | 38 ++++++++++++++-------------
 app/system/service/tools_gen_table.go |  4 +--
 config/config.toml                    |  6 ++---
 task/bind_function.go                 |  1 +
 task/demo.go                          |  8 +++---
 5 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/app/system/service/sys_job.go b/app/system/service/sys_job.go
index ab31ed7..64eab6d 100644
--- a/app/system/service/sys_job.go
+++ b/app/system/service/sys_job.go
@@ -101,27 +101,29 @@ func (s *sysJob) JobStart(job *model.SysJob) error {
 	}
 	//传参
 	paramArr := strings.Split(job.JobParams, "|")
+	g.Log().Infof(job.JobParams)
 	TimeTaskList.EditParams(f.FuncName, paramArr)
-	rs := gcron.Search(job.InvokeTarget)
-	if rs == nil {
-		if job.MisfirePolicy == 1 {
-			t, err := gcron.AddSingleton(job.CronExpression, f.Run, job.InvokeTarget)
-			if err != nil {
-				return err
-			}
-			if t == nil {
-				return gerror.New("启动任务失败")
-			}
-		} else {
-			t, err := gcron.AddOnce(job.CronExpression, f.Run, job.InvokeTarget)
-			if err != nil {
-				return err
-			}
-			if t == nil {
-				return gerror.New("启动任务失败")
-			}
+	//rs := gcron.Search(job.InvokeTarget)
+	//if rs == nil {
+	if job.MisfirePolicy == 1 {
+		t, err := gcron.Add(job.CronExpression, f.Run, job.InvokeTarget)
+		//t, err := gcron.AddSingleton(job.CronExpression, f.Run, job.InvokeTarget)
+		if err != nil {
+			return err
+		}
+		if t == nil {
+			return gerror.New("启动任务失败")
+		}
+	} else {
+		t, err := gcron.AddOnce(job.CronExpression, f.Run, job.InvokeTarget)
+		if err != nil {
+			return err
+		}
+		if t == nil {
+			return gerror.New("启动任务失败")
 		}
 	}
+	//}
 	gcron.Start(job.InvokeTarget)
 	if job.MisfirePolicy == 1 {
 		job.Status = 0
diff --git a/app/system/service/tools_gen_table.go b/app/system/service/tools_gen_table.go
index 501cd51..d514a8f 100644
--- a/app/system/service/tools_gen_table.go
+++ b/app/system/service/tools_gen_table.go
@@ -76,8 +76,8 @@ func (s *toolsGenTable) SelectListByPage(param *dao.ToolsGenTableSearchReq) (tot
 // SelectDbTableList 查询据库表
 func (s *toolsGenTable) SelectDbTableList(param *dao.ToolsGenTableSearchReq) (total int, list []*model.ToolsGenTable, err error) {
 	db := g.DB()
-	if s.getDbDriver() != "mysql" {
-		err = gerror.New("代码生成暂时只支持mysql数据库")
+	if s.getDbDriver() != "postgres" {
+		err = gerror.New("代码生成暂时只支持postgres数据库")
 		return
 	}
 	sql := " from information_schema.tables where table_schema = (select database())" +
diff --git a/config/config.toml b/config/config.toml
index cfa4075..c166e3a 100644
--- a/config/config.toml
+++ b/config/config.toml
@@ -31,7 +31,7 @@
 # Database.
 [database]
     #link  = "mysql:root:root@tcp(localhost:3306)/gfast-v2-os"
-    link  = "pgsql:user=postgres password=123456 host=127.0.0.1 port=5432 dbname=db5 sslmode=disable"
+    link  = "pgsql:user=gleke password=gleke host=127.0.0.1 port=5432 dbname=dbsync sslmode=disable"
     charset   = "utf8mb4" #数据库编码
     debug = true
     dryRun = false #空跑type: pgsql
@@ -48,13 +48,13 @@
 
 # Redis数据库配置
 [redis]
-    open = true #是否开启 redis 缓存 若不开启使用gchache缓存方式
+    open = false #是否开启 redis 缓存 若不开启使用gchache缓存方式
     default = "127.0.0.1:6379,9?idleTimeout=20&maxActive=100"
 
 #jwt配置
 [gToken]
     [gToken.system]
-        CacheMode = 2
+        CacheMode = 1
         CacheKey = "GToken:"
         Timeout = 10800000 #3个小时
         MaxRefresh = 0
diff --git a/task/bind_function.go b/task/bind_function.go
index ab9ec8d..b8de78d 100644
--- a/task/bind_function.go
+++ b/task/bind_function.go
@@ -33,6 +33,7 @@ func init() {
 		g.Log().Error(err)
 	}
 	for _, job := range jobs {
+		g.Log().Infof(job.JobParams)
 		service.SysJob.JobStart(job)
 	}
 }
diff --git a/task/demo.go b/task/demo.go
index 76197e9..4f9f2da 100644
--- a/task/demo.go
+++ b/task/demo.go
@@ -13,7 +13,7 @@ import (
 )
 
 func Test1() {
-	fmt.Println("无参测试")
+	//fmt.Println("Test1()无参测试")
 }
 
 func Test2() {
@@ -22,8 +22,8 @@ func Test2() {
 	if t == nil {
 		return
 	}
-	for _, v := range t.Param {
-		fmt.Printf("参数:%s;  ", v)
-	}
+	//for _, v := range t.Param {
+	//	fmt.Printf("Test2()参数:%s;  ", v)
+	//}
 	fmt.Println()
 }