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

Revert "公众号授权处理"

Browse Source 
This reverts commit 43d87784776fc8d9d43b214dad910e14aa64282c.
This commit is contained in:
taozi
2022-05-29 17:03:19 +08:00
parent 43d8778477
commit d4846ad8ed
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,16 +217,13 @@ public class AuthService {
WxOAuth2UserInfo wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null); WxOAuth2UserInfo wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
String openid = wxMpUser.getOpenid(); String openid = wxMpUser.getOpenid();
WxMaService wxMaService = WxMaConfiguration.getWxMaService();
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
.getNewPhoneNoInfo(code);
//如果开启了UnionId //如果开启了UnionId
if (StrUtil.isNotBlank(wxMpUser.getUnionId())) { if (StrUtil.isNotBlank(wxMpUser.getUnionId())) {
openid = wxMpUser.getUnionId(); openid = wxMpUser.getUnionId();
} }
YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery() YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery()
.eq(YxUser::getPhone, phoneNoInfo.getPhoneNumber()), false); .eq(YxUser::getUsername, openid), false);
//long uid = 0; //long uid = 0;
YxUser returnUser = null; YxUser returnUser = null;
@ -237,8 +234,7 @@ public class AuthService {
//用户保存 //用户保存
String ip = IpUtil.getRequestIp(); String ip = IpUtil.getRequestIp();
YxUser user = YxUser.builder() YxUser user = YxUser.builder()
.username(phoneNoInfo.getPhoneNumber()) .username(openid)
.phone(phoneNoInfo.getPhoneNumber())
.nickname(nickname) .nickname(nickname)
.avatar(wxMpUser.getHeadImgUrl()) .avatar(wxMpUser.getHeadImgUrl())
.addIp(ip) .addIp(ip)
@ -249,8 +245,8 @@ public class AuthService {
//构建微信用户 //构建微信用户
WechatUserDto wechatUserDTO = WechatUserDto.builder() WechatUserDto wechatUserDTO = WechatUserDto.builder()
.nickname(nickname) .nickname(nickname)
.openid(openid) .openid(wxMpUser.getOpenid())
.unionId(openid) .unionId(wxMpUser.getUnionId())
.language("") .language("")
.headimgurl(wxMpUser.getHeadImgUrl()) .headimgurl(wxMpUser.getHeadImgUrl())
.subscribe(false) .subscribe(false)

2
yshop-common/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>yshop-common</artifactId> <artifactId>yshop-common</artifactId>
<name>公共模块</name> <name>公共模块</name>
<properties> <properties>
<weixin-java.version>4.3.0</weixin-java.version> <weixin-java.version>4.2.0</weixin-java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>