Merge branch 'hotfix/wind_server_url' into debug

controllers/base_from_wind.go

@@ -99,7 +99,7 @@ func (this *WindController) Add() {
 			terminalCode = terminalInfo.TerminalCode
 		}
 
-		if terminalCode == `` {
+		if terminalCode == `` || windUrl == `` {
 			br.Msg = "没有配置wind终端！"
 			br.ErrMsg = "没有配置wind终端"
 			return

controllers/base_from_wind_wsd.go

@@ -79,27 +79,12 @@ func (this *WindWsdController) Add() {
 			terminalCode = terminalInfo.TerminalCode
 		}
 
-		if terminalCode == `` {
+		if terminalCode == `` || windUrl == `` {
 			br.Msg = "没有配置wind终端！"
 			br.ErrMsg = "没有配置wind终端"
 			return
 		}
 
-		if windUrl == `` {
-			windUrl, err = GetServerUrl()
-			if err != nil {
-				br.Msg = "获取可以使用的wind地址失败！"
-				br.ErrMsg = "获取可以使用的wind地址失败，err:" + err.Error()
-				return
-			}
-		}
-
-		if windUrl == `` {
-			br.Msg = "没有配置wind地址！"
-			br.ErrMsg = "没有配置wind地址"
-			return
-		}
-
 		// 设置指标与终端关系的缓存
 		windUrlCacheKey := utils.CACHE_WIND_URL + ":" + req.StockCode + req.EdbCode
 		_ = utils.Rc.SetNX(windUrlCacheKey, windUrl, utils.GetTodayLastSecond())
@@ -195,8 +180,13 @@ func (this *WindWsdController) Refresh() {
 	if strings.Contains(req.EdbCode, ".") {
 		endDate = time.Now().Format(utils.FormatDate)
 	}
-
-	dataItem, errCode, err := services.GetEdbDataFromWindUrlWsd(edbInfo.ServerUrl, edbInfo.StockCode, edbInfo.IndicatorCode, utils.GetEdbRefreshStartDate(req.StartDate), utils.GetEdbRefreshEndDate(endDate))
+	//获取对应的终端信息
+	terminal, err := services.GetTerminal(utils.DATA_SOURCE_WIND, edbInfo.TerminalCode)
+	if err != nil {
+		br.Msg = "终端未配置"
+		return
+	}
+	dataItem, errCode, err := services.GetEdbDataFromWindUrlWsd(terminal.ServerUrl, edbInfo.StockCode, edbInfo.IndicatorCode, utils.GetEdbRefreshStartDate(req.StartDate), utils.GetEdbRefreshEndDate(endDate))
 	if errCode == 421 { //指标超限
 		br.Ret = 421
 		br.Msg = "指标超限！"