From d3eed98b30a285753041affaa6ab7530268a6d11 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 08:59:50 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0reids=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCApi/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 86fe0557f..64811f65d 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -27,7 +27,7 @@ spring: # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 From 7fbb8c5921b3a5cfa6c1c9aa2699f363c93d265c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 10:58:33 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCApi/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 64811f65d..2d3946c73 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -92,7 +92,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 From eb1baa79aba3fc640563ffbba5636af5d032703a Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 12:59:41 +0800 Subject: [PATCH 03/10] add debug info --- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 1 + .../java/com/iformall/controller/WxUserGrantController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 8005c6bd0..8657cce81 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -64,6 +64,7 @@ public class RedisCacheAspect { if (StringUtils.isBlank(token)) { token = request.getParameter("token"); } + log.info("token>>>>>>>>>>>>>>>"+token); String tenantId; WxCUser wxCUser = null ; if(StringUtils.isNotBlank(token)) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 56abf8d50..172b55598 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -136,7 +136,7 @@ public class WxUserGrantController extends BaseController { @PostMapping("/login") @ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") public ResultData userLogin(@RequestBody Map map) { - logger.debug(map.toString()); + logger.info("dologin >>>>>>>>>>>>>>>>>"+map.toString()); Map resultMap = new HashMap(); From b760c15fbd316ded132f334ba9aa3d0969f3c3af Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 15:01:50 +0800 Subject: [PATCH 04/10] add debug info --- .../com/iformall/interceptor/AuthorizationInterceptor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index c8c12f652..451e9328b 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -29,6 +29,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + + System.out.println(" requesturi......"+request.getRequestURL()); + AuthIgnore annotation; if(handler instanceof HandlerMethod) { annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class); From c7dfc2352fb1d0472757ad199c8e97fa1a8f36d0 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 15:22:36 +0800 Subject: [PATCH 05/10] update config --- mallinkCApi/src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 2d3946c73..7768c4231 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -87,10 +87,10 @@ aws: wechat: open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: ENC(hnH31XdNzArfMfikKgBFpqQuJUl6rVOPFFcAVyb595o=) + componentSecret: ENC(t/GUVX5L+U7LCwSvZ5WmxAnmTMrc/Uy1nljsrokuzzsBL2j6BEVnrS/n7DCdGc/G) + componentToken: ENC(gUF1m0YgCCI2IY54fX6sGLZVlCswA8tG) + componentAesKey: ENC(TYHcrIkICtfrCfGq4HW6s1b/pHf7OD2uyPN11SzJNB0acqJ/4JVX1nuljo/cAtgMG4O05TImLQc=) redis: host: 101.201.103.81 port: 6379 From 672b0567ffb57b7d4a26d05dfc0a2ae980d37609 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 15:34:27 +0800 Subject: [PATCH 06/10] update config --- mallinkCApi/src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 7768c4231..d291e2ec2 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -87,10 +87,10 @@ aws: wechat: open: - componentAppId: ENC(hnH31XdNzArfMfikKgBFpqQuJUl6rVOPFFcAVyb595o=) - componentSecret: ENC(t/GUVX5L+U7LCwSvZ5WmxAnmTMrc/Uy1nljsrokuzzsBL2j6BEVnrS/n7DCdGc/G) - componentToken: ENC(gUF1m0YgCCI2IY54fX6sGLZVlCswA8tG) - componentAesKey: ENC(TYHcrIkICtfrCfGq4HW6s1b/pHf7OD2uyPN11SzJNB0acqJ/4JVX1nuljo/cAtgMG4O05TImLQc=) + componentAppId: ENC(bts25jzVmmlvXuL1FVSSQb/cFqWO3sYo3XtvWBwcS2I=) + componentSecret: ENC(qLCLKZNF0SfKaaaLOPrkpMWjtYzOLVGWGivLREZv4c5xKoarxlCp/gLB2aGe5rXf) + componentToken: ENC(5VGkIhKKfEzCrxGE0psZubq4BGOGUb6f) + componentAesKey: ENC(mb+qHoLE6EDHn6210WsPrBDMRdpby7XkWC2012vTQqmIXUY8CIaDAeOOrUO/Mz+RsyjvPokf4Oo=) redis: host: 101.201.103.81 port: 6379 From 45ea7c88737fa149d3a9d16812b25b6f8778b17b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 16:44:35 +0800 Subject: [PATCH 07/10] update config --- mallinkCApi/src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index d291e2ec2..65c7ec2ed 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -87,10 +87,10 @@ aws: wechat: open: - componentAppId: ENC(bts25jzVmmlvXuL1FVSSQb/cFqWO3sYo3XtvWBwcS2I=) - componentSecret: ENC(qLCLKZNF0SfKaaaLOPrkpMWjtYzOLVGWGivLREZv4c5xKoarxlCp/gLB2aGe5rXf) - componentToken: ENC(5VGkIhKKfEzCrxGE0psZubq4BGOGUb6f) - componentAesKey: ENC(mb+qHoLE6EDHn6210WsPrBDMRdpby7XkWC2012vTQqmIXUY8CIaDAeOOrUO/Mz+RsyjvPokf4Oo=) + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: host: 101.201.103.81 port: 6379 From 3f36428d9232a23beb7cbf321ba50ad53fa5d11f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 21:28:27 +0800 Subject: [PATCH 08/10] add debug log --- .../java/com/iformall/controller/WxUserGrantController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 172b55598..2ef2c0e8a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -199,6 +199,11 @@ public class WxUserGrantController extends BaseController { try { WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code); + logger.info("sessionResult: " + session); + if (null != session) { + logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); + } + //获取会话密钥(session_key) session_key = session.getSessionKey(); openId = session.getOpenid(); From c718f91a37eeb5144c4afe0b76de24c6423dd090 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 21:51:17 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCApi/src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 65c7ec2ed..fb0940a95 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -87,10 +87,10 @@ aws: wechat: open: - componentAppId: wxdfc8fb4e62d6b52b - componentSecret: 98daa62b316dd6feabaad708327ce233 - componentToken: formall2018 - componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN + componentAppId: "wxdfc8fb4e62d6b52b" + componentSecret: "98daa62b316dd6feabaad708327ce233" + componentToken: "formall2018" + componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: host: 101.201.103.81 port: 6379 From 85cd8bbbd91fba842b7b6c61f92a9e6a526c8d3d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 6 Jun 2020 22:18:36 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0B=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkBApi/src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 2258dd0b9..d4fba090c 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -91,12 +91,12 @@ jasypt: wechat: open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" + componentAppId: "wxdfc8fb4e62d6b52b" + componentSecret: "98daa62b316dd6feabaad708327ce233" componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600