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 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 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);