Merge branch 'fix_20210930162706'

services/data/data_ths.go

@@ -24,7 +24,7 @@ type EdbDataFromThs struct {
 }
 
 func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err error) {
-	thsUrl := utils.Hz_Data_Url + `edbInfo/ths?EdbCode=%s&StartDate=%s&EndDate=%s`
+	thsUrl := utils.Hz_Server_Data_Url + `edbInfo/ths?EdbCode=%s&StartDate=%s&EndDate=%s`
 	thsUrl = fmt.Sprintf(thsUrl, edbCode, startDate, endDate)
 	utils.FileLog.Info("thsUrl:" + thsUrl)
 	body, err := http.Get(thsUrl)
@@ -91,4 +91,4 @@ func SyncEdbDataByThs(edbInfoId int64, edbCode, startDate, endDate string) (err
 		}
 	}
 	return
-}
+}

utils/config.go

@@ -78,6 +78,8 @@ ZwIDAQAB
 		//同花顺正式地址
 		THS_SendUrl = `https://board.10jqka.com.cn/gateway/ps/syncNews`
 		THS_SyncWxGroupUrl = `https://board.10jqka.com.cn/gateway/ps/syncWechatGroupInfo`
+		//同花顺，万得接口服务地址（阿里云windows服务器地址；内网地址）
+		Hz_Server_Data_Url = "http://172.19.173.231:7000/"
 	} else {
 		CompanyId = 16
 		RealName = "超级管理员"
@@ -89,6 +91,8 @@ ZwIDAQAB
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`
 		THS_SyncWxGroupUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncWechatGroupInfo`
+		//同花顺，万得接口服务地址（阿里云windows服务器地址；外网地址）
+		Hz_Server_Data_Url = "http://139.196.136.213:7000/"
 	}
 }
 

utils/constants.go

@@ -91,3 +91,7 @@ const (
 const (
 	DATA_REFRESH = 7 //7个单位，日/周/月/季度/年
 )
+
+var (
+	Hz_Server_Data_Url string //同花顺，万得接口服务地址（阿里云windows服务器地址）
+)