更改task

services/activity.go

@@ -14,7 +14,7 @@ import (
 )
 
 //修改活动状态
-func UpdateActivitySattus() (err error) {
+func UpdateActivitySattus(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())
@@ -28,7 +28,7 @@ func UpdateActivitySattus() (err error) {
 }
 
 //推送会议开始消息提醒60分钟前
-func SendActivityBeginMsg() (err error) {
+func SendActivityBeginMsg(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("发送失败，Err:", err.Error())
@@ -80,7 +80,7 @@ func SendActivityBeginMsg() (err error) {
 }
 
 //推送会议开始消息提醒15分钟前
-func SendActivityBeginMsgMeeting() (err error) {
+func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("发送失败，Err:", err.Error())

services/industrial_management.go

@@ -1,13 +1,14 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"strings"
 )
 
 //修改标签状态
-func UpdateIndustrialManagementLabel() (err error) {
+func UpdateIndustrialManagementLabel(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("修改失败，Err:", err.Error())

services/tactics.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
 	"hongze/hongze_cygx/models"
@@ -284,7 +285,7 @@ func BodyAnalysis(body string) (expertNumStr, expertContentStr, interviewDateStr
 }
 
 //同步策略,报告文章
-func SyncTacticsListAddreport() (err error) {
+func SyncTacticsListAddreport(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())
@@ -716,7 +717,7 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 	return
 }
 
-func GetSummarytoEs() (err error) {
+func GetSummarytoEs(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())

services/task.go

@@ -3,7 +3,7 @@ package services
 import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	"github.com/beego/beego/v2/adapter/toolbox"
+	//"github.com/beego/beego/v2/adapter/toolbox"
 	"github.com/beego/beego/v2/task"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
@@ -21,43 +21,37 @@ func Task() {
 		//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
 		//toolbox.AddTask("syncTacticsList", syncTacticsList)
 		//toolbox.StartTask()
-		syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
-		toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
+		syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
+		task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
 
 		//同步纪要库中的Es
 		//syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 */30 * * * *", SyncTacticsListToEs)
 		//toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
-		getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-		toolbox.AddTask("getSummarytoEs", getSummarytoEs)
+		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+		task.AddTask("getSummarytoEs", getSummarytoEs)
 
 		//toolbox.StartTask()
 	}
 
 	//UpdateActivitySattus()
 	//修改任务状态
-	//updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	//toolbox.AddTask("updateActivitySattus", updateActivitySattus)
-	////更新深 和新的标签
-	//updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	//toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	////更新报告的搜索栏内容
-	////UpdateIndustrialManagementSubjectNnames()
-	////会议提醒模板消息推送
-	//sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	//toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	//sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	//toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-	//
-	////预约外呼名单，会前1小时自动发送邮件给专家组
-	//sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */1 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	SendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0/3 * * * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	task.AddTask("SendEmailFileToExpert", SendEmailFileToExpert)
-	//SendEmailFileToExpert()
-
+	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	task.AddTask("updateActivitySattus", updateActivitySattus)
+	//更新深 和新的标签
+	updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	//更新报告的搜索栏内容
+	//UpdateIndustrialManagementSubjectNnames()
+	//会议提醒模板消息推送
+	sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//预约外呼名单，会前1小时自动发送邮件给专家组
+	sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
+	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+	//UpdateActivitySattus()
 	task.StartTask()
-	defer task.StopTask()
-
-	//toolbox.StartTask()
 	fmt.Println("end")
 }