diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 677cdbea..e1341e52 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -15,6 +15,7 @@ import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.Encodes; import com.adc.da.util.PasswordUtils; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -127,7 +128,10 @@ public class LoginRestController { @PostMapping(value = "/getTokenToWeLink") @ResponseBody public ResponseMessage getIftappCodeByWelinkCode(HttpServletRequest request, WeLinkVO linkVO) throws UnsupportedEncodingException { + log.info(JSONObject.toJSONString(linkVO)); String account = weLinkUtil.getIftappCodeByWelinkCode(linkVO); +// String account = "zhangyanduan001"; + log.info("userAccount:" +account); if(StringUtils.isBlank(account)){ return Result.error("r0011", "用户不存在"); } 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 70531b31..b76a6ec2 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://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,28 +36,30 @@ 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); - System.out.println("AccessTokenJSON:" + atJsonObj); + log.info("AccessTokenJSON: "+access_token_str); if (atJsonObj.has("data")) { - System.out.println("data:" + atJsonObj.get("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); if (pfjsonObj.has("data")) { - System.out.println("data:" + pfjsonObj.get("data")); JSONObject obj = JSONObject.fromObject(pfjsonObj.getOrDefault("data","")); - if(obj.has("username")){ return obj.getOrDefault("username","").toString(); }