定时任务修改

clueSync/db.json

@@ -1,10 +1,12 @@
 {
-  "cornexp1": "0 */30 * * * ?",
-  "cornexp2": "0 */5 9,10,11,12,13,14,15,16,17 * * ?",
+  "cornexp1": 30,
+  "cornexp2": 1,
+  "cornexp2End": "18:00",
+  "cornexp2Strat": "09:00",
   "cornexp3": "0 30 8 * * ?",
   "cornexp4": "0 0 0 */1 * ? ",
-  "cornexp5": "0 */5 * * * ?",
-  "cornexp6": "0 */10 * * * ?",
+  "cornexp5": 5,
+  "cornexp6": 10,
   "cornexp7": "0 */10 * * * ?",
   "redisServer": "bidx=192.168.3.206:1712,newother=192.168.3.149:1712",
   "tiDb": {

clueSync/main.go

@@ -5,33 +5,33 @@ import (
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
 	"bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"flag"
 	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/util/gconv"
 	"github.com/robfig/cron"
 	"log"
 	"time"
-
-	"app.yhyue.com/moapp/jybase/redis"
 )
 
 var (
-	cfg          = new(Config)
-	db           = new(DB)
-	Mysql        *mysql.Mysql
-	TiDb         *mysql.Mysql
-	TiDbData     *mysql.Mysql
-	TiDbPower    *mysql.Mysql
-	WorkOrder    *mysql.Mysql
-	ThirdParty   *mysql.Mysql
-	Jyactivities *mysql.Mysql
-	Base         *mysql.Mysql
-	Es           elastic.Es
-	Mgo          *mongodb.MongodbSim
-	MgoLog       *mongodb.MongodbSim
-	MgoQyxy      *mongodb.MongodbSim
-	mode         = flag.Int("m", 1, "")
+	cfg                = new(Config)
+	db                 = new(DB)
+	Mysql              *mysql.Mysql
+	TiDb               *mysql.Mysql
+	TiDbData           *mysql.Mysql
+	TiDbPower          *mysql.Mysql
+	WorkOrder          *mysql.Mysql
+	ThirdParty         *mysql.Mysql
+	Jyactivities       *mysql.Mysql
+	Base               *mysql.Mysql
+	Es                 elastic.Es
+	Mgo                *mongodb.MongodbSim
+	MgoLog             *mongodb.MongodbSim
+	MgoQyxy            *mongodb.MongodbSim
+	mode               = flag.Int("m", 1, "")
+	startTime, endTime = "00:00", "23:59"
 )
 
 func main() {
@@ -121,14 +121,14 @@ func main() {
 	InitProduct(db.ProductArr)
 	if *mode == 1 {
 		//30分钟一次
-		for {
+		go p.VarTimeTask.RunInTimeSection("30分钟定时任务", startTime, endTime, db.CornExp1, func(dayFirst bool) {
 			orders()      //未支付订单
 			messageSync() //聊天记录进线索
 			userbase()    //新绑定手机号进线索
 			time.Sleep(gconv.Duration(db.CornExp1) * time.Minute)
-		}
+		})
 		//5分钟一次
-		p.VarTimeTask.RunInTimeSection("5分钟定时任务", db.CornExp2Start, db.CornExp2End, db.CornExp2, func(dayFirst bool) {
+		go p.VarTimeTask.RunInTimeSection("5分钟定时任务", db.CornExp2Start, db.CornExp2End, db.CornExp2, func(dayFirst bool) {
 			users()          //新注册用户进线索
 			saleLeads()      //留资进线索
 			eventReg()       //渠道
@@ -151,22 +151,23 @@ func main() {
 		d.Start()
 		// 5分钟一次
 		go ordersClue() //后台订单进线索
-		for {
-			everythingSync() //渠道
-			ordersClue()     //后台订单进线索
-			kcSync()         //移交客成
-			kcAuto()         //客成自动加入任务车
-			tagAddSync()     //用户标签增量
-			autoExitSea()    //自动退海
-			Thaw()           //自动解冻处理
-			time.Sleep(gconv.Duration(db.CornExp5) * time.Minute)
-		}
+		go p.VarTimeTask.RunInTimeSection("5分钟定时任务", startTime, endTime, db.CornExp5, func(dayFirst bool) {
+			everythingSync()   //渠道
+			ordersClue()       //后台订单进线索
+			kcSync()           //移交客成
+			kcAuto()           //客成自动加入任务车
+			tagAddSync()       //用户标签增量
+			autoExitSea()      //自动退海
+			Thaw()             //自动解冻处理
+			subscribeAddSync() //订阅增量
+			rderAcceptance()   //工单生成
+		})
 		//5分钟一次
-		for {
+		go p.VarTimeTask.RunInTimeSection("5分钟定时任务", startTime, endTime, db.CornExp6, func(dayFirst bool) {
 			subscribeAddSync() //订阅增量
 			rderAcceptance()   //工单生成
 			time.Sleep(gconv.Duration(db.CornExp6) * time.Minute)
-		}
+		})
 		//自动进入任务车 1天一次
 		g := cron.New()
 		g.AddFunc(db.CornExp7, func() {