Merge branch 'feature/eta1.6.2_trade_analysis_top' into debug

# Conflicts:
#	services/user_login.go

services/data/trade_analysis/trade_analysis.go

@@ -17,6 +17,7 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 		"shanghai":  "上期所",
 		"cffex":     "中金所",
 		"ine":       "上期能源",
+		"guangzhou": "广期所",
 	}
 	exchangesSortMap := map[string]int{
 		"zhengzhou": 1,
@@ -24,6 +25,7 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 		"shanghai":  3,
 		"cffex":     4,
 		"ine":       5,
+		"guangzhou": 6,
 	}
 	//查询所有交易所下的分类
 	classifyExchangeList, tmpErr := trade_analysis.GetAllBaseFromTradeClassify()

services/user_login.go

@@ -286,7 +286,8 @@ func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, er
 // @return tokenResp GetCrmTokenData
 // @return err error
 func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp GetCrmTokenData, err error, errMsg string) {
-	if utils.EtaBridgeLoginUrl == "" {
+	if utils.EtaBridgeUrl == `` || utils.EtaBridgeLoginUrl == "" {
+
 		errMsg = `未配置第三方登录的桥接服务地址`
 		err = errors.New(errMsg)
 		return
@@ -299,7 +300,7 @@ func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp Get
 
 	body := io.NopCloser(strings.NewReader(string(data)))
 	client := &http.Client{}
-	req, e := http.NewRequest("POST", utils.EtaBridgeLoginUrl, body)
+	req, e := http.NewRequest("POST", utils.EtaBridgeUrl+utils.EtaBridgeLoginUrl, body)
 	if e != nil {
 		err = fmt.Errorf("http create request err: %s", e.Error())
 		return
@@ -358,7 +359,7 @@ func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp Get
 // @return data GetCrmTokenData
 // @return err error
 func ThirdLogout(accessToken string) (err error) {
-	if utils.EtaBridgeLogoutUrl == "" {
+	if utils.EtaBridgeUrl == "" || utils.EtaBridgeLogoutUrl == "" {
 		// 未配置第三方登出的桥接服务地址
 		return
 	}
@@ -373,7 +374,7 @@ func ThirdLogout(accessToken string) (err error) {
 
 	body := io.NopCloser(strings.NewReader(string(data)))
 	client := &http.Client{}
-	req, e := http.NewRequest("POST", utils.EtaBridgeLogoutUrl, body)
+	req, e := http.NewRequest("POST", utils.EtaBridgeUrl+utils.EtaBridgeLogoutUrl, body)
 	if e != nil {
 		err = fmt.Errorf("http create request err: %s", e.Error())
 		return