cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

公众号授权修改

Browse Source
This commit is contained in:
taozi
2022-01-17 22:42:04 +08:00
parent b3138452d9
commit a8bf8085f7
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -213,10 +213,9 @@ public class AuthService {
public YxUser wechatLogin(String code, String spread) { public YxUser wechatLogin(String code, String spread) {
try { try {
WxMpService wxService = WxMpConfiguration.getWxMpService(); WxMpService wxService = WxMpConfiguration.getWxMpService();
WxOAuth2AccessToken wxOAuth2AccessToken = wxService.getOAuth2Service().getAccessToken(code); WxOAuth2AccessToken wxMpOAuth2AccessToken = wxService.getOAuth2Service().getAccessToken(code);
WxOAuth2UserInfo wxOAuth2UserInfo = wxService.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); WxOAuth2UserInfo wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
WxMpUser wxMpUser = wxService.getUserService().userInfo(wxOAuth2UserInfo.getOpenid()); String openid = wxMpUser.getOpenid();
String openid = wxMpUser.getOpenId();
//如果开启了UnionId //如果开启了UnionId
if (StrUtil.isNotBlank(wxMpUser.getUnionId())) { if (StrUtil.isNotBlank(wxMpUser.getUnionId())) {
@ -246,12 +245,12 @@ public class AuthService {
//构建微信用户 //构建微信用户
WechatUserDto wechatUserDTO = WechatUserDto.builder() WechatUserDto wechatUserDTO = WechatUserDto.builder()
.nickname(nickname) .nickname(nickname)
.openid(wxMpUser.getOpenId()) .openid(wxMpUser.getOpenid())
.unionId(wxMpUser.getUnionId()) .unionId(wxMpUser.getUnionId())
.language(wxMpUser.getLanguage()) .language("")
.headimgurl(wxMpUser.getHeadImgUrl()) .headimgurl(wxMpUser.getHeadImgUrl())
.subscribe(wxMpUser.getSubscribe()) .subscribe(false)
.subscribeTime(wxMpUser.getSubscribeTime()) .subscribeTime(0L)
.build(); .build();
user.setWxProfile(wechatUserDTO); user.setWxProfile(wechatUserDTO);
@ -261,9 +260,9 @@ public class AuthService {
} else { } else {
returnUser = yxUser; returnUser = yxUser;
WechatUserDto wechatUser = yxUser.getWxProfile(); WechatUserDto wechatUser = yxUser.getWxProfile();
if ((StrUtil.isBlank(wechatUser.getOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId())) if ((StrUtil.isBlank(wechatUser.getOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenid()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) { || (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) {
wechatUser.setOpenid(wxMpUser.getOpenId()); wechatUser.setOpenid(wxMpUser.getOpenid());
wechatUser.setUnionId(wxMpUser.getUnionId()); wechatUser.setUnionId(wxMpUser.getUnionId());
yxUser.setWxProfile(wechatUser); yxUser.setWxProfile(wechatUser);