fix:新增提示

services/user_login.go

@@ -205,7 +205,7 @@ func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, er
 		return
 	}
 
-	data, err = ThirdCodeLoginFromMiddleServer(req)
+	data, err, errMsg = ThirdCodeLoginFromMiddleServer(req)
 
 	// 普通的第三方
 
@@ -219,9 +219,10 @@ func ThirdLogin(req map[string]interface{}) (data GetCrmTokenData, err error, er
 // @param param map[string]interface{}
 // @return tokenResp GetCrmTokenData
 // @return err error
-func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp GetCrmTokenData, err error) {
+func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp GetCrmTokenData, err error, errMsg string) {
 	if utils.EtaBridgeLoginUrl == "" {
-		err = errors.New("未配置第三方登录的桥接服务地址")
+		errMsg = `未配置第三方登录的桥接服务地址`
+		err = errors.New(errMsg)
 		return
 	}
 	data, e := json.Marshal(param)
@@ -240,7 +241,9 @@ func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp Get
 
 	contentType := "application/json;charset=utf-8"
 	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
+
+	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
+	req.Header.Set("Authorization", checkToken)
 	resp, e := client.Do(req)
 	if e != nil {
 		err = fmt.Errorf("http client do err: %s", e.Error())
@@ -262,19 +265,22 @@ func ThirdCodeLoginFromMiddleServer(param map[string]interface{}) (tokenResp Get
 	if utils.RunMode == "release" {
 		str := string(b)
 		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.DesKey)
+		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
 	}
 
 	result := new(GetCrmTokenDataResp)
 	if e = json.Unmarshal(b, &result); e != nil {
 		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		utils.FileLog.Info("第三方登录（向桥接服务换取token）:\n" + string(b))
 		return
 	}
 	if result.Code != 200 {
+		errMsg = result.Msg
 		err = fmt.Errorf("result: %s", string(b))
 		return
 	}
 	tokenResp = result.Data
+
 	return
 }
 
@@ -309,7 +315,8 @@ func ThirdLogout(accessToken string) (err error) {
 
 	contentType := "application/json;charset=utf-8"
 	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Authorization", utils.CrmEtaAuthorization)
+	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
+	req.Header.Set("Authorization", checkToken)
 	resp, e := client.Do(req)
 	if e != nil {
 		err = fmt.Errorf("http client do err: %s", e.Error())
@@ -331,7 +338,7 @@ func ThirdLogout(accessToken string) (err error) {
 	if utils.RunMode == "release" {
 		str := string(b)
 		str = strings.Trim(str, `"`)
-		b = utils.DesBase64Decrypt([]byte(str), utils.DesKey)
+		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
 	}
 
 	result := new(GetCrmTokenDataResp)