1、调整手机号验证码登录问题的处理

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -582,6 +582,25 @@ public class AppLoginController extends AppBaseController{
         if (ObjectUtil.isNotEmpty(isWechatInstalled)&&isWechatInstalled && isInit()){
             return generateTokenAndReturn(info);
         }
+        // 与 /login 一致：无 unionId 时返回 isNew，前端强制绑定微信
+        if (info.getUnionId()==null){
+            if (info.getPhone().length()<=11){
+                FsUser fsUser = new FsUser();
+                fsUser.setUserId(info.getUserId());
+                fsUser.setPhone(encryptPhone(phone));
+                String jpushId = map.get("jpushId");
+                if(StringUtils.isNotEmpty(jpushId)){
+                    fsUser.setJpushId(jpushId);
+                }
+                if(info.getAppCreateTime()== null){
+                    fsUser.setAppCreateTime(new Date());
+                }
+                fsUser.setUpdateTime(new Date());
+                userService.updateFsUser(fsUser);
+                logger.info("zyp \n【手机加密】：{}",encryptPhone(phone));
+            }
+            return R.ok(generateTokenAndReturn(info)).put("isNew",true).put("phone",encryptPhone(phone));
+        }
         FsUser userMap = new FsUser();
         userMap.setUserId(info.getUserId());
         String jpushId = map.get("jpushId");
@@ -591,9 +610,6 @@ public class AppLoginController extends AppBaseController{
         if(info.getAppCreateTime()== null){
             userMap.setAppCreateTime(new Date());
         }
-        if(info.getUnionId()==null && info.getPhone().length()<=11){
-            userMap.setPhone(encryptPhone(phone));
-        }
         userMap.setUpdateTime(new Date());
         userService.updateFsUser(userMap);
 
@@ -1014,7 +1030,7 @@ public class AppLoginController extends AppBaseController{
         return generateTokenAndReturn(user);
     }
 
-    @PostMapping("/loginByUserId")
+   /* @PostMapping("/loginByUserId")
     public R loginByUserId(@RequestBody FsUserLoginByWeChatParam param){
         FsUser user = userService.selectFsUserByUserId(param.getUserId());
         if (user == null){
@@ -1024,7 +1040,7 @@ public class AppLoginController extends AppBaseController{
             updateExistingUserJpushId(user, param.getJpushId());
         }
         return generateTokenAndReturn(user);
-    }
+    }*/
 
     private FsUser createNewUser(FsUserLoginParam param) {
         FsUser newUser = new FsUser();
@@ -1056,19 +1072,19 @@ public class AppLoginController extends AppBaseController{
         return user;
     }
 
-    @PostMapping("/loginTest")
-    public R loginTest(@RequestBody String userId) {
-        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
-        if (user!=null){
-            String token = jwtUtils.generateToken(user.getUserId());
-            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
-            Map<String, Object> map = new HashMap<>();
-            map.put("token", token);
-            map.put("user", user);
-            return R.ok(map);
-        }
-        return R.error("用户不存在！");
-    }
+//    @PostMapping("/loginTest")
+//    public R loginTest(@RequestBody String userId) {
+//        FsUser user = userMapper.selectFsUserByUserId(Long.parseLong(userId));
+//        if (user!=null){
+//            String token = jwtUtils.generateToken(user.getUserId());
+//            redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("token", token);
+//            map.put("user", user);
+//            return R.ok(map);
+//        }
+//        return R.error("用户不存在！");
+//    }
 
     /**
      * 退出清除jpushId