|
@@ -177,7 +177,6 @@ type FutureGoodDataFromThsInterface struct {
|
|
|
}
|
|
|
|
|
|
func GetFutureGoodDataFromThs(edbCode, startDate, endDate, edbTerminalCode string) (item future_good.FutureGoodDataFromThs, err error) {
|
|
|
- // todo 商品获取终端逻辑修改,默认取第一个终端
|
|
|
terminal, err := GetFirstTerminal(utils.DATA_SOURCE_THS, edbTerminalCode)
|
|
|
if err != nil {
|
|
|
err = fmt.Errorf("获取同花顺接口配置出错 Err: %s", err)
|
|
@@ -193,12 +192,13 @@ func GetFutureGoodDataFromThs(edbCode, startDate, endDate, edbTerminalCode strin
|
|
|
terminalCodeCacheKey := utils.CACHE_EDB_TERMINAL_CODE_URL + edbCode
|
|
|
_ = utils.Rc.Put(terminalCodeCacheKey, terminal.TerminalCode, utils.GetTodayLastSecond())
|
|
|
}
|
|
|
- var token string
|
|
|
- token, err = GetAccessToken(false, terminal.Value)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
+
|
|
|
if utils.ThsDataMethod == "" || utils.ThsDataMethod == "api" { // 生产环境走官方http请求,测试环境走终端
|
|
|
+ var token string
|
|
|
+ token, err = GetAccessToken(false, terminal.Value)
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
return getFutureGoodDataFromThsHttp(edbCode, startDate, endDate, terminal.Value, token)
|
|
|
} else {
|
|
|
return getFutureGoodDataFromThsApp(edbCode, startDate, endDate, 0, terminal.ServerUrl)
|