修改appid和登录逻辑

ruoyi-admin/src/main/resources/application.yml

@@ -150,10 +150,8 @@ policy:
 
 #微信小程序
 wx:
-#  appid: wx99193c507b93d6db
-#  secret: 79bf8648880746c11f9ef9c5c12e030f
-  appid: wx9d1cbc11c8c40ba7
-  secret: 38e87cf6251945446e8ac091a0ba9ab2
+  appid: wx99193c507b93d6db
+  secret: 79bf8648880746c11f9ef9c5c12e030f
 
 #统一门户认证
 oauth:

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -631,7 +631,9 @@ public class SysLoginService
         if (StringUtils.hasText(phoneUser.getOpenid()) && !openid.equals(phoneUser.getOpenid())) {
             System.out.printf("手机号绑定冲突，phone:%s, oldOpenid:%s, newOpenid:%s%n",
                     phoneUser.getPhone(), phoneUser.getOpenid(), openid);
-            return AjaxResult.error("该手机号已绑定其他微信账号");
+            //如果手机号一致openid不一致重新注册小程序账号
+            ajax=handleNewUser(openid,unionid,phoneUser.getPhone(),userType);
+            return ajax;
         }
         //修改用户信息
         updateAppUserCommon(phoneUser, openid, unionid, userType);