From d393e0d7fee2bf6fd92d66b0dc3bece0d0a9314e Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 14 Jun 2022 15:49:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=85=B7=E4=BD=93=E8=B0=83=E7=94=A8=E9=93=BE?= =?UTF-8?q?=E6=9D=A1=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/login/rest/LoginRestController.java | 3 +++ .../src/main/java/com/adc/da/login/util/WeLinkUtil.java | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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..4b5cdd2e 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,9 @@ 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); + 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..a7f48fc5 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 @@ -34,9 +34,8 @@ public class WeLinkUtil { } 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")){ @@ -50,10 +49,9 @@ public class WeLinkUtil { param_p.put("code",access_token); 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(); }