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);