fix bug

services/data/edb_info.go

@@ -19,6 +19,7 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromThs Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromThs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -70,7 +71,6 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 		//	return errors.New("ModifyEdbDataInfoDate:" + err.Error())
 		//}
 	}
-	wg.Done()
 	return err
 }
 
@@ -81,6 +81,7 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromWind Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromWind ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -123,7 +124,6 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 			}
 		}
 	}
-	wg.Done()
 	return err
 }
 
@@ -134,6 +134,7 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromPb Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromPb ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -186,7 +187,6 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 		//	return errors.New("ModifyEdbDataInfoDate:" + err.Error())
 		//}
 	}
-	wg.Done()
 	return err
 }
 
@@ -395,7 +395,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
 		} else {
-			msg := "刷新失败,无效的指标渠道:source:"+strconv.Itoa(source)+" EdbCode:"+v.EdbCode
+			msg := "刷新失败,无效的指标渠道:source:" + strconv.Itoa(source) + " EdbCode:" + v.EdbCode
 			err = errors.New(msg)
 			return err
 		}
@@ -421,6 +421,7 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromManual Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromManual ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -463,7 +464,6 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 			}
 		}
 	}
-	wg.Done()
 	return err
 }
 
@@ -474,6 +474,7 @@ func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromLz Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromLz ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -517,7 +518,6 @@ func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
 			}
 		}
 	}
-	wg.Done()
 	return err
 }
 
@@ -528,6 +528,7 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromYs Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromYs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -571,11 +572,9 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 			}
 		}
 	}
-	wg.Done()
 	return err
 }
 
-
 //刷新钢联数据
 func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 	defer func() {
@@ -583,6 +582,7 @@ func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 			fmt.Println("RefreshDataFromGl Err:" + err.Error())
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromYs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -626,6 +626,5 @@ func RefreshDataFromGl(wg *sync.WaitGroup) (err error) {
 			}
 		}
 	}
-	wg.Done()
 	return err
-}
+}

services/task.go

@@ -3,12 +3,13 @@ package services
 import (
 	"context"
 	"fmt"
-	"github.com/beego/beego/v2/task"
 	"hongze/hongze_task/services/company_contract"
 	"hongze/hongze_task/services/data"
 	"hongze/hongze_task/utils"
 	"sync"
 	"time"
+
+	"github.com/beego/beego/v2/task"
 )
 
 func Task() {
@@ -171,8 +172,10 @@ func RefreshData(cont context.Context) (err error) {
 	go data.RefreshDataFromYs(&wg)
 	//钢联
 	go data.RefreshDataFromGl(&wg)
+
 	wg.Wait()
 	data.RefreshDataFromCalculateAll()
+
 	time.Sleep(2 * time.Second)
 	data.RefreshNotice()
 	return