last fix

services/commodity_coal_inland.go

@@ -21,29 +21,28 @@ func FileCoalInland() () {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalInland ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-	//path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存%s.xlsx"
-	//for i := 0;i < 7;i++{
-	//	npath := fmt.Sprintf(path,time.Now().AddDate(0,0,-i).Format(utils.FormatDateUnSpace))
-	//	fmt.Println(npath)
-	//	exist,err := PathExists(npath)
-	//	if err != nil {
-	//		fmt.Println(err)
-	//		return
-	//	}
-	//	if exist{
-	//		path = npath
-	//		break
-	//	}
-	//}
-	//exist,err := PathExists(path)
-	//if err != nil {
-	//	fmt.Println(err)
-	//	return
-	//}
-	//if !exist{
-	//	path = "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-	//}
+	path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存%s.xlsx"
+	for i := 0;i < 7;i++{
+		npath := fmt.Sprintf(path,time.Now().AddDate(0,0,-i).Format(utils.FormatDateUnSpace))
+		fmt.Println(npath)
+		exist,err := PathExists(npath)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		if exist{
+			path = npath
+			break
+		}
+	}
+	exist,err := PathExists(path)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	if !exist{
+		path = "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
+	}
 
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {

services/task.go

@@ -3,21 +3,22 @@ package services
 import (
 	"context"
 	"fmt"
+	"github.com/beego/beego/v2/task"
 )
 
 func Task() {
 	fmt.Println("start crawler")
-	//refreshData := task.NewTask("refreshData", "0 0,30 16-20 * * *", RefreshData)
-	//refreshEic := task.NewTask("refreshData", "0 0 1,6 * * *", RefreshEic)
-	//refreshCoal := task.NewTask("refreshData", "0 0 18-23 * * *", RefreshCoal)
-	//task.AddTask("数据爬取", refreshData)
-	//task.AddTask("欧洲天然气爬取", refreshEic)
-	//task.AddTask("中国煤炭网爬取", refreshCoal)
-	//task.StartTask()
+	refreshData := task.NewTask("refreshData", "0 0,30 16-20 * * *", RefreshData)
+	refreshEic := task.NewTask("refreshData", "0 0 1,6 * * *", RefreshEic)
+	refreshCoal := task.NewTask("refreshData", "0 0 18-23 * * *", RefreshCoal)
+	task.AddTask("数据爬取", refreshData)
+	task.AddTask("欧洲天然气爬取", refreshEic)
+	task.AddTask("中国煤炭网爬取", refreshCoal)
+	task.StartTask()
 	//FileCoalJsm()
 	//FileCoalFirm()
 	//FileCoalCoastal()
-	FileCoalInland()
+	//FileCoalInland()
 	fmt.Println("end crawler")
 }