Răsfoiți Sursa

同花顺终端方式刷新

xyxie 1 zi în urmă
părinte
comite
519608473d
2 a modificat fișierele cu 9 adăugiri și 7 ștergeri
  1. 4 4
      services/base_from_ths.go
  2. 5 3
      services/base_from_ths_ds.go

+ 4 - 4
services/base_from_ths.go

@@ -53,12 +53,12 @@ func GetEdbDataFromThs(edbCode, startDate, endDate, edbTerminalCode string) (ite
 		item, apiErrMsg, err = getEdbDataFromThsHttp(edbCode, startDate, endDate, terminal.Value, token)
 		return
 	}
-	item, err = getEdbDataFromThsApp(edbCode, startDate, endDate, 0, terminal.ServerUrl)
+	item, apiErrMsg, err = getEdbDataFromThsApp(edbCode, startDate, endDate, 0, terminal.ServerUrl)
 	return
 }
 
 // getEdbDataFromThs 获取同花顺接口数据
-func getEdbDataFromThsApp(edbCode, startDate, endDate string, num int, serverUrl string) (item models.EdbDataFromThs, err error) {
+func getEdbDataFromThsApp(edbCode, startDate, endDate string, num int, serverUrl string) (item models.EdbDataFromThs, apiErrMsg string, err error) {
 	if serverUrl == `` {
 		err = errors.New("同花顺接口未配置")
 		return
@@ -84,7 +84,7 @@ func getEdbDataFromThsApp(edbCode, startDate, endDate string, num int, serverUrl
 		return
 	}
 	if tmpItems.Errorcode != 0 {
-
+		apiErrMsg = fmt.Sprintf("%d:%s", tmpItems.Errorcode, tmpItems.Errmsg)
 		//session has expired,please re-login after using the system
 		//如果是同花顺登录session失效了,那么就重新请求获取数据
 		if tmpItems.Errorcode == -1020 && num == 0 {
@@ -141,7 +141,7 @@ func getEdbDataFromThsApp(edbCode, startDate, endDate string, num int, serverUrl
 		Perf:      tmpItems.Perf,
 		Tables:    tablesList,
 	}
-	return item, nil
+	return item, apiErrMsg, err
 }
 
 // FutureGoodDataFromThsInterface 同花顺商品数据类型转为interface

+ 5 - 3
services/base_from_ths_ds.go

@@ -42,7 +42,7 @@ func GetEdbDataFromThsDs(stockCode, edbCode, startDate, endDate, edbTerminalCode
 		return
 	}
 
-	item, err = getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate, 0, terminal.ServerUrl, extraPars)
+	item, apiErrMsg, err = getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate, 0, terminal.ServerUrl, extraPars)
 	return
 }
 
@@ -100,7 +100,7 @@ type Type struct {
 //}
 
 // getEdbDataFromThsDs 获取同花顺接口数据
-func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num int, serverUrl, extraPars string) (item models.EdbDataFromThs, err error) {
+func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num int, serverUrl, extraPars string) (item models.EdbDataFromThs, apiErrMsg string, err error) {
 	if serverUrl == `` {
 		err = errors.New("同花顺接口未配置")
 		return
@@ -142,6 +142,7 @@ func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num i
 
 			errCode = int64(response.ErrorCode)
 			if response.ErrorCode != 0 {
+				apiErrMsg = fmt.Sprintf("%d:%s", response.ErrorCode, response.ErrMsg)
 				//session has expired,please re-login after using the system
 				//如果是同花顺登录session失效了,那么就重新请求获取数据
 				if response.ErrorCode == -1020 && num == 0 {
@@ -191,6 +192,7 @@ func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num i
 
 		errCode = int64(response.ErrorCode)
 		if response.ErrorCode != 0 {
+			apiErrMsg = fmt.Sprintf("%d:%s", response.ErrorCode, response.ErrMsg)
 			//session has expired,please re-login after using the system
 			//如果是同花顺登录session失效了,那么就重新请求获取数据
 			if response.ErrorCode == -1020 && num == 0 {
@@ -282,5 +284,5 @@ func getEdbDataFromThsDsApp(stockCode, edbCode, startDate, endDate string, num i
 	//	Perf:      tmpItems.Perf,
 	//	Tables:    tablesList,
 	//}
-	return item, nil
+	return item, apiErrMsg, err
 }