Merge branch 'ETA_1.1.3'

# Conflicts:
#	services/meeting_probabilities.go

services/meeting_probabilities.go

@@ -20,7 +20,7 @@ func RefreshMeetingProbabilities(cont context.Context) (err error) {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalJsm ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	templatePath := "/home/code/python/meeting_probabilities/file/%s.xlsx"
+	templatePath := "./static/%s.xlsx"
 	//templatePath := "/Users/xi/Desktop/%s.xlsx"
 	templatePath = fmt.Sprintf(templatePath, time.Now().Format(utils.FormatDate))
 	fmt.Println(templatePath)

services/task.go

@@ -15,8 +15,8 @@ func Task() {
 	fmt.Println("start crawler")
 	//SyncRankingFromShangHai()
 	//SyncRankingFromIne()
-	FileCoalCoastal()
-	FileCoalInland()
+	//FileCoalCoastal()
+	//FileCoalInland()
 	refreshData := task.NewTask("refreshData", "0 0,30 16-18 * * *", RefreshData)
 	refreshEic := task.NewTask("RefreshEic", "0 0 2,6 * * *", RefreshEic)
 	refreshCoal := task.NewTask("RefreshCoal", "0 0,30 16-23 * * *", RefreshCoal)