mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix val 为null 的时候导致错误的bug 

debug
This commit is contained in:
damonyuan 2024-11-12 21:44:23 +08:00
parent 8d7830b86f
commit acb9d04fc5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java
View File

@ -1,5 +1,7 @@
package com.mdd.front; package com.mdd.front;
import com.mdd.common.util.StringUtils;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@ -25,6 +27,9 @@ public class LikeFrontThreadLocal {
map = new ConcurrentSkipListMap<>(); map = new ConcurrentSkipListMap<>();
} }
} }
if (StringUtils.isNull(val)) {
return;
}
map.put(key, val); map.put(key, val);
MY_LOCAL.set(map); MY_LOCAL.set(map);
} }

9
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@ -193,10 +193,15 @@ public class LoginServiceImpl implements ILoginService {
@Override @Override
public LoginTokenVo officeLogin(String code, Integer terminal) { public LoginTokenVo officeLogin(String code, Integer terminal) {
try { try {
WxMpService wxMpService = WxMnpDriver.openSetting(); WxMpService wxMpService = WxMnpDriver.oa();
WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code); WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
String uniId = wxOAuth2AccessToken.getUnionId(); String uniId = wxOAuth2AccessToken.getUnionId();
String openId = wxOAuth2AccessToken.getOpenId(); String openId = wxOAuth2AccessToken.getOpenId();
System.out.println("uniId:" + uniId);
System.out.println("openId:" + openId);
String unionId = uniId == null ? "0" : uniId; String unionId = uniId == null ? "0" : uniId;
String avatar = ""; String avatar = "";
@ -226,7 +231,7 @@ public class LoginServiceImpl implements ILoginService {
*/ */
@Override @Override
public String oaCodeUrl(String url) { public String oaCodeUrl(String url) {
WxMpService wxMpService = WxMnpDriver.openSetting(); WxMpService wxMpService = WxMnpDriver.oa();
WxMpOAuth2ServiceImpl wxMpOAuth2Service = new WxMpOAuth2ServiceImpl(wxMpService); WxMpOAuth2ServiceImpl wxMpOAuth2Service = new WxMpOAuth2ServiceImpl(wxMpService);
String state = ToolUtils.makeMd5(ToolUtils.makeToken()); String state = ToolUtils.makeMd5(ToolUtils.makeToken());
return wxMpOAuth2Service.buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, state); return wxMpOAuth2Service.buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, state);