From 8d7830b86f36b3b421ed7aca80fc3a7bd0a95d5c Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Tue, 12 Nov 2024 21:19:16 +0800 Subject: [PATCH 1/2] debug --- .../mdd/common/plugin/wechat/WxMnpDriver.java | 19 +++++++++++++++++++ .../front/service/impl/LoginServiceImpl.java | 9 ++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxMnpDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxMnpDriver.java index 543eb940..c66ef219 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxMnpDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/wechat/WxMnpDriver.java @@ -77,6 +77,25 @@ public class WxMnpDriver { return wxMpService; } + /** + * 微信开放平台 + * + * @author fzr + * @return WxMpService + */ + public static WxMpService openSetting() { + Map config = ConfigUtils.get("open_platform"); + + WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpDefaultConfigImpl(); + wxMpDefaultConfig.setAppId(config.getOrDefault("app_id", "").trim()); + wxMpDefaultConfig.setSecret(config.getOrDefault("app_secret", "").trim()); + wxMpDefaultConfig.setToken(config.getOrDefault("token", "").trim()); + wxMpDefaultConfig.setAesKey(config.getOrDefault("encoding_aes_key", "").trim()); + wxMpService.setWxMpConfigStorage(wxMpDefaultConfig); + + return wxMpService; + } + /** * 获取授权页ticket * diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index ec03dd6e..08b481c2 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -193,15 +193,10 @@ public class LoginServiceImpl implements ILoginService { @Override public LoginTokenVo officeLogin(String code, Integer terminal) { try { - WxMpService wxMpService = WxMnpDriver.oa(); + WxMpService wxMpService = WxMnpDriver.openSetting(); WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code); String uniId = wxOAuth2AccessToken.getUnionId(); String openId = wxOAuth2AccessToken.getOpenId(); - - System.out.println("uniId:" + uniId); - System.out.println("openId:" + openId); - - String unionId = uniId == null ? "0" : uniId; String avatar = ""; @@ -231,7 +226,7 @@ public class LoginServiceImpl implements ILoginService { */ @Override public String oaCodeUrl(String url) { - WxMpService wxMpService = WxMnpDriver.oa(); + WxMpService wxMpService = WxMnpDriver.openSetting(); WxMpOAuth2ServiceImpl wxMpOAuth2Service = new WxMpOAuth2ServiceImpl(wxMpService); String state = ToolUtils.makeMd5(ToolUtils.makeToken()); return wxMpOAuth2Service.buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, state); From acb9d04fc5d85e9538ff8a6fc77c3b7fd666a5d9 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Tue, 12 Nov 2024 21:44:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20val=20=E4=B8=BAnull=20=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?bug=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/LikeFrontThreadLocal.java | 5 +++++ .../com/mdd/front/service/impl/LoginServiceImpl.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java b/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java index 70c68bfc..428e0d3f 100644 --- a/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java +++ b/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java @@ -1,5 +1,7 @@ package com.mdd.front; +import com.mdd.common.util.StringUtils; + import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -25,6 +27,9 @@ public class LikeFrontThreadLocal { map = new ConcurrentSkipListMap<>(); } } + if (StringUtils.isNull(val)) { + return; + } map.put(key, val); MY_LOCAL.set(map); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index 08b481c2..ec03dd6e 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -193,10 +193,15 @@ public class LoginServiceImpl implements ILoginService { @Override public LoginTokenVo officeLogin(String code, Integer terminal) { try { - WxMpService wxMpService = WxMnpDriver.openSetting(); + WxMpService wxMpService = WxMnpDriver.oa(); WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code); String uniId = wxOAuth2AccessToken.getUnionId(); String openId = wxOAuth2AccessToken.getOpenId(); + + System.out.println("uniId:" + uniId); + System.out.println("openId:" + openId); + + String unionId = uniId == null ? "0" : uniId; String avatar = ""; @@ -226,7 +231,7 @@ public class LoginServiceImpl implements ILoginService { */ @Override public String oaCodeUrl(String url) { - WxMpService wxMpService = WxMnpDriver.openSetting(); + WxMpService wxMpService = WxMnpDriver.oa(); WxMpOAuth2ServiceImpl wxMpOAuth2Service = new WxMpOAuth2ServiceImpl(wxMpService); String state = ToolUtils.makeMd5(ToolUtils.makeToken()); return wxMpOAuth2Service.buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, state);