Merge branch 'dev_v1.5.17_wh' of jianyu/datatools into feature/v1.5.17

clueSync/config.go

@@ -120,6 +120,13 @@ type (
 			MaxIdle     int    `json:"maxidle"`
 			MaxLeftTime int    `json:"maxleft"`
 		} `json:"jyactivities"`
+		DebrisProduct struct {
+			Host     string `json:"host"`
+			Port     int    `json:"port"`
+			Database string `json:"database"`
+			User     string `json:"user"`
+			Password string `json:"password"`
+		} `json:"debrisProduct"`
 		Mysql struct {
 			Host        string `json:"host"`
 			Port        int    `json:"port"`

clueSync/db.json

@@ -79,6 +79,13 @@
     "maxidle": 40,
     "maxleft": 40
   },
+  "debrisProduct": {
+    "host": "192.168.3.14",
+    "port": 4000,
+    "database": "debris_product",
+    "user": "root",
+    "password": "=PDT49#80Z!RVv52_z"
+  },
   "dataAnalysis": {
     "host": "192.168.3.14",
     "port": 4000,

clueSync/jobutil.go

@@ -634,7 +634,7 @@ WHERE
 	INNER JOIN debris_product.miniprogram_user c ON ( a.unionid = c.unionid AND b.CODE = c.miniprogram_code ))
 	ORDER BY time
 	`, selectXcxTimeEnd, selectXcxTimeEnd)
-	xcxData := TiDb.SelectBySql(xcxSql)
+	xcxData := debrisProductMysql.SelectBySql(xcxSql)
 	if xcxData != nil && *xcxData != nil && len(*xcxData) > 0 {
 		for k, v := range *xcxData {
 			//判断用户是否有小程序切使用过剑鱼其他产品

clueSync/main.go

@@ -9,7 +9,6 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 	"flag"
 	"fmt"
-	"github.com/robfig/cron"
 	"log"
 )
 
@@ -23,6 +22,7 @@ var (
 	WorkOrder           *mysql.Mysql
 	ThirdParty          *mysql.Mysql
 	Jyactivities        *mysql.Mysql
+	debrisProductMysql  *mysql.Mysql
 	Base                *mysql.Mysql
 	BiService           *mysql.Mysql
 	DataAnalysisService *mysql.Mysql
@@ -85,6 +85,13 @@ func main() {
 		MaxIdleConns: db.Jyactivities.MaxIdle,
 	}
 	Jyactivities.Init()
+	debrisProductMysql = &mysql.Mysql{
+		Address:  db.DebrisProduct.Host + ":" + fmt.Sprint(db.DebrisProduct.Port),
+		UserName: db.DebrisProduct.User,
+		PassWord: db.DebrisProduct.Password,
+		DBName:   db.DebrisProduct.Database,
+	}
+	debrisProductMysql.Init()
 	WorkOrder = &mysql.Mysql{
 		Address:      db.WorderOrder.Host + ":" + fmt.Sprint(db.WorderOrder.Port),
 		UserName:     db.WorderOrder.User,
@@ -145,7 +152,6 @@ func main() {
 			userbase()    //新绑定手机号进线索
 		})
 		//5分钟一次
-
 		go p.VarTimeTask.RunInTimeSection("5分钟定时任务1", db.CornExp2Start, db.CornExp2End, db.CornExp2, func(dayFirst bool) {
 			users()             //新注册用户进线索
 			saleLeads()         //留资进线索