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