From d393e0d7fee2bf6fd92d66b0dc3bece0d0a9314e Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 14 Jun 2022 15:49:02 +0800 Subject: [PATCH 1/3] =?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(); } From 652b3fc499e0729439b4cd6941c117b9e54317f5 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Tue, 14 Jun 2022 18:22:14 +0800 Subject: [PATCH 2/3] =?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 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); From d6a0d897de25fe7cb25afe17cd8181a10a94114d Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 14 Jun 2022 19:53:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E7=BB=A7=E6=89=BFwelink=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/login/rest/LoginRestController.java | 1 + .../src/main/java/com/adc/da/login/util/WeLinkUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 2 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 4b5cdd2e..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 @@ -130,6 +130,7 @@ public class LoginRestController { 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 3aefd713..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 @@ -20,9 +20,9 @@ public class WeLinkUtil { // 测试环境地址 - private final String access_url = "https://iftappdev.foton.com.cn/devservertest/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/"; + private final String access_url = "https://iftappwelink.foton.com.cn/devserver/welink/"; public String getIftappCodeByWelinkCode(WeLinkVO linkVO){ try{