From 652b3fc499e0729439b4cd6941c117b9e54317f5 Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Tue, 14 Jun 2022 18:22:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=B4=E6=97=B6=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=88=B0=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E6=B3=A8=E6=84=8F=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=B0=86=E5=9C=B0=E5=9D=80=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/login/util/WeLinkUtil.java     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/WeLinkUtil.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/WeLinkUtil.java
index a7f48fc5..3aefd713 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/WeLinkUtil.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/WeLinkUtil.java
@@ -18,11 +18,15 @@ public class WeLinkUtil {
     @Autowired
     private OkHttpUtil okHttpUtil;
 
-    private final String access_url = "https://iftappwelink.foton.com.cn/devserver/welink/";
+
+    // 测试环境地址
+    private final String access_url = "https://iftappdev.foton.com.cn/devservertest/welink/";
+    //正式环境地址
+//    private final String access_url = "https://iftappwelink.foton.com.cn/devserver/welink/";
 
     public String getIftappCodeByWelinkCode(WeLinkVO linkVO){
         try{
-            String access_token = "";
+            String authCode = "";
             Map<String,String> param  = new HashMap<>();
             param.put("code",linkVO.getCode());
             param.put("name",linkVO.getName().replace("-"," "));
@@ -32,21 +36,25 @@ public class WeLinkUtil {
             if(StringUtils.isNotBlank(linkVO.getCorpCode())){
                 param.put("corpCode",linkVO.getCorpCode());
             }
+            log.debug("第一个接口请求地址:"+access_url+"getIftappCodeByWelinkCode");
+            log.debug("请求参数为："+ JSONObject.fromObject(param).toString());
             String access_token_str = okHttpUtil.post(access_url+"getIftappCodeByWelinkCode",param,new HashMap<>());
             JSONObject atJsonObj = JSONObject.fromObject(access_token_str);
             log.info("AccessTokenJSON:   "+access_token_str);
             if (atJsonObj.has("data")) {
                 JSONObject obj = JSONObject.fromObject(atJsonObj.getOrDefault("data",""));
 
-                if(obj.has("access_token")){
-                    access_token = obj.getOrDefault("access_token","").toString();
+                if(obj.has("authCode")){
+                    authCode = obj.getOrDefault("authCode","").toString();
                 }
             }
-            if(StringUtils.isBlank(access_token)){
+            if(StringUtils.isBlank(authCode)){
                 return "";
             }
             Map<String,String> param_p  = new HashMap<>();
-            param_p.put("code",access_token);
+            param_p.put("code",authCode);
+            log.debug("第二个接口请求地址："+access_url+"getUserInfoByAuthCode");
+            log.debug("请求参数为："+JSONObject.fromObject(param_p).toString());
             String principal_json = okHttpUtil.get(access_url+"getUserInfoByAuthCode",param_p,new HashMap<>());
             JSONObject pfjsonObj = JSONObject.fromObject(principal_json);
             log.info("getUserInfoByAuthCode        "+principal_json);