diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index 1d57cb60..72f798ff 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -217,16 +217,13 @@ public class AuthService { WxOAuth2UserInfo wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null); String openid = wxMpUser.getOpenid(); - WxMaService wxMaService = WxMaConfiguration.getWxMaService(); - WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService() - .getNewPhoneNoInfo(code); //如果开启了UnionId if (StrUtil.isNotBlank(wxMpUser.getUnionId())) { openid = wxMpUser.getUnionId(); } YxUser yxUser = userService.getOne(Wrappers.lambdaQuery() - .eq(YxUser::getPhone, phoneNoInfo.getPhoneNumber()), false); + .eq(YxUser::getUsername, openid), false); //long uid = 0; YxUser returnUser = null; @@ -237,8 +234,7 @@ public class AuthService { //用户保存 String ip = IpUtil.getRequestIp(); YxUser user = YxUser.builder() - .username(phoneNoInfo.getPhoneNumber()) - .phone(phoneNoInfo.getPhoneNumber()) + .username(openid) .nickname(nickname) .avatar(wxMpUser.getHeadImgUrl()) .addIp(ip) @@ -249,8 +245,8 @@ public class AuthService { //构建微信用户 WechatUserDto wechatUserDTO = WechatUserDto.builder() .nickname(nickname) - .openid(openid) - .unionId(openid) + .openid(wxMpUser.getOpenid()) + .unionId(wxMpUser.getUnionId()) .language("") .headimgurl(wxMpUser.getHeadImgUrl()) .subscribe(false) diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml index 85b675c4..54601282 100644 --- a/yshop-common/pom.xml +++ b/yshop-common/pom.xml @@ -12,7 +12,7 @@ yshop-common 公共模块 - 4.3.0 + 4.2.0