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

clueSync/everything.go

@@ -716,7 +716,7 @@ func AdvisoryCommittee() {
 			row.AddCell().SetString(gconv.Time(gconv.Int64(v["createtime"])).Format(date.Date_Full_Layout))
 			//增加客户需求
 		}
-		email := db.MarketSaleMail
+		email := db.AdvisoryCommitteeMail
 		dir := "./xlsx/zx/" + fileName + ".xlsx"
 		err := xf.Save(dir)
 		if err != nil {
@@ -728,15 +728,18 @@ func AdvisoryCommittee() {
 				User:     "public03@topnet.net.cn",
 				Pwd:      "ue9Rg9Sf4CVtdm5a",
 			}
-			status := mail.GSendMail_q("剑鱼标讯", email, "", "", fileName, detailName, dir, fileName+".xlsx", gmail)
-			if status {
-				log.Println("send mail success", fileName, email)
+			for _, v := range email {
+				status := mail.GSendMail_q("剑鱼标讯", v, "", "", fileName, detailName, dir, fileName+".xlsx", gmail)
+				if status {
+					log.Println("send mail success", fileName, v)
+				}
 			}
+
 		}
 
 	}
 	common.WriteSysConfig(&cfg)
-	log.Println("大客户线索定时任务结束")
+	log.Println("咨询部线索定时任务结束")
 }
 
 // 市场部线索

clueSync/main.go

@@ -6,10 +6,8 @@ import (
 	"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/robfig/cron"
 	"log"
 )
 
@@ -122,12 +120,12 @@ func main() {
 	}
 	BiService.Init()
 	DataAnalysisService = &mysql.Mysql{
-		Address:      db.BiService.Host + ":" + fmt.Sprint(db.BiService.Port),
-		UserName:     db.BiService.User,
-		PassWord:     db.BiService.Password,
-		DBName:       db.BiService.Database,
-		MaxOpenConns: db.BiService.PollSize,
-		MaxIdleConns: db.BiService.MaxIdle,
+		Address:      db.DataAnalysis.Host + ":" + fmt.Sprint(db.DataAnalysis.Port),
+		UserName:     db.DataAnalysis.User,
+		PassWord:     db.DataAnalysis.Password,
+		DBName:       db.DataAnalysis.Database,
+		MaxOpenConns: db.DataAnalysis.PollSize,
+		MaxIdleConns: db.DataAnalysis.MaxIdle,
 	}
 	DataAnalysisService.Init()
 	Es = elastic.NewEs(db.Es.Version, db.Es.Address, db.Es.DbSize, db.Es.UserName, db.Es.Password)