Revert "公众号授权处理"

This reverts commit 43d87784776fc8d9d43b214dad910e14aa64282c.

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.<YxUser>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)

yshop-common/pom.xml

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