Merge branch 'fix/wind_20220328'

services/base_from_ths.go

@@ -21,6 +21,11 @@ type EdbDataFromThs struct {
 }
 
 func GetEdbDataFromThs(edbCode, startDate, endDate string) (item *EdbDataFromThs, err error) {
+	return getEdbDataFromThs(edbCode, startDate, endDate, 0)
+}
+
+// getEdbDataFromThs 获取同花顺接口数据
+func getEdbDataFromThs(edbCode, startDate, endDate string, num int) (item *EdbDataFromThs, err error) {
 	thsUrl := utils.Hz_Ths_Data_Url + `edbInfo/ths?EdbCode=%s&StartDate=%s&EndDate=%s`
 	thsUrl = fmt.Sprintf(thsUrl, edbCode, startDate, endDate)
 	utils.FileLog.Info("thsUrl:" + thsUrl)
@@ -37,6 +42,13 @@ func GetEdbDataFromThs(edbCode, startDate, endDate string) (item *EdbDataFromThs
 		return
 	}
 	if item.Errorcode != 0 {
+
+		//session has expired,please re-login after using the system
+		//如果是同花顺登录session失效了，那么就重新请求获取数据
+		if item.Errorcode == -1020 && num == 0 {
+			return getEdbDataFromThs(edbCode, startDate, endDate, 1)
+		}
+
 		err = errors.New(string(body))
 		return
 	}