煤炭时间，文件名称fix

services/commodity_coal_inland.go

@@ -22,47 +22,48 @@ func FileCoalInland() () {
 		}
 	}()
 	//path := "/Users/xi/Desktop/内陆17省动力煤终端用户供耗存%s.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
-		}
-		if i < 3 && !exist{
-			npath := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-			//npath := "/Users/xi/Desktop/内陆17省动力煤终端用户供耗存.xlsx"
-			fmt.Println(npath)
-			exist,err := PathExists(npath)
-			if err != nil {
-				fmt.Println(err)
-				return
-			}
-			if exist{
-				path = npath
-				break
-			}
-		}
-	}
+	//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
+	//	}
+	//	if i < 3 && !exist{
+	//		npath := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
+	//		//npath := "/Users/xi/Desktop/内陆17省动力煤终端用户供耗存.xlsx"
+	//		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省动力煤终端用户供耗存.xlsx"
 	exist,err := PathExists(path)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
-	if !exist{
-		path = "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-	}
-	exist,err = PathExists(path)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
 	var xlFile *xlsx.File
 	if exist {
 		xlFile, err = xlsx.OpenFile(path)

services/task.go

@@ -17,12 +17,12 @@ func Task() {
 	FileCoalCoastal()
 	FileCoalInland()
 	refreshData := task.NewTask("refreshData", "0 0,30 16-23 * * *", RefreshData)
-	refreshEic := task.NewTask("refreshEic", "0 0 2,6 * * *", RefreshEic)
-	refreshCoal := task.NewTask("refreshCoal", "0 0,30 23 * * *", RefreshCoal)
+	refreshEic := task.NewTask("refreshData", "0 0 2,6 * * *", RefreshEic)
+	refreshCoal := task.NewTask("refreshData", "0 0,30 16-23 * * *", RefreshCoal)
 	refreshVisitors := task.NewTask("RefreshChangesVisitorsCovid", "0 30 2-22/10 * * *", RefreshChangesVisitorsCovid)
-	syncEiaSteoData := task.NewTask("syncEiaSteoData", "0 0 22 * * *", SyncEiaSteoData)
-	syncYearComTrade := task.NewTask("syncYearComTrade", "0 0 3 1 1 *", SyncYearComTrade)                // 每年一月一号同步
-	syncYearMonthComTrade := task.NewTask("syncYearMonthComTrade", "0 0 3 1 * *", SyncYearMonthComTrade) // 每月1号同步
+	syncEiaSteoData := task.NewTask("SyncEiaSteoData", "0 0 22 * * *", SyncEiaSteoData)
+	syncYearComTrade := task.NewTask("SyncEiaSteoData", "0 0 3 1 1 *", SyncYearComTrade)           // 每年一月一号同步
+	syncYearMonthComTrade := task.NewTask("SyncEiaSteoData", "0 0 3 1 * *", SyncYearMonthComTrade) // 每月1号同步
 
 	// 统计局-分月季年爬
 	//refreshNationalMonthA := task.NewTask("RefreshNationalMonthDbA", "0 15 2 10 * *", national_data.RefreshNationalMonthDbA)
@@ -35,7 +35,7 @@ func Task() {
 	task.AddTask("欧洲天然气爬取", refreshEic)
 	task.AddTask("中国煤炭网爬取", refreshCoal)
 	task.AddTask("谷歌出行指数爬取", refreshVisitors)
-	task.AddTask("eia steo报告", syncEiaSteoData)   //每天22点爬一次
+	task.AddTask("eia steo报告", syncEiaSteoData) //每天22点爬一次
 	task.AddTask("UN年度数据", syncYearComTrade)      //每年一月一号的3点同步
 	task.AddTask("UN月度数据", syncYearMonthComTrade) //每月1号的3点同步