APP 修改登录

ruoyi-app/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -8,6 +8,7 @@ import com.ruoyi.app.annotation.PassToken;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.base.AppTokenService;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppLoginVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.util.AliSMSUtil;
 import com.ruoyi.common.constant.Constants;
@@ -47,28 +48,24 @@ public class AppLoginController {
      */
     @PassToken
     @ApiOperation(value = "APP登录", notes = "APP登录")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mobile", value = "手机号",paramType="string"),
-            @ApiImplicitParam(name = "captcha", value = "验证码",paramType="string")
-    })
-    @GetMapping("/login")
-    public AjaxResult login(String mobile, String captcha){
-        if (StringUtils.isBlank(mobile)) {
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody AppLoginVo loginVo){
+        if (StringUtils.isBlank(loginVo.getMobile())) {
             return AjaxResult.error("手机号不能为空");
         }
-        if (StringUtils.isBlank(captcha)){
+        if (StringUtils.isBlank(loginVo.getCaptcha())){
             return AjaxResult.error("验证码不能为空");
         }
         TbAppUser appUser = userService.getOne(new QueryWrapper<TbAppUser>()
-                .eq("mobile",mobile)
+                .eq("mobile",loginVo.getMobile())
         );
         boolean ck;
         Date date = new Date();
         // 为空则新增
         if (appUser == null) {
             appUser = new TbAppUser();
-            appUser.setMobile(mobile);
-            appUser.setNickName(mobile);
+            appUser.setMobile(loginVo.getMobile());
+            appUser.setNickName(loginVo.getMobile());
             appUser.setQrcode(DateUtils.getCurrentTimeRandom());
             appUser.setCreateTime(date);
             ck = userService.save(appUser);
@@ -79,13 +76,13 @@ public class AppLoginController {
         }
 
         //手机短信验证
-        boolean ckCaptcha = AliSMSUtil.getInstance().validateSmsCode(mobile, captcha);
+        boolean ckCaptcha = AliSMSUtil.getInstance().validateSmsCode(loginVo.getMobile(), loginVo.getCaptcha());
         if (!ckCaptcha) {
             return AjaxResult.error("验证码错误");
         }
 
         //每次登录前，先删除缓存，保证登录唯一性
-        appTokenService.delLoginUser(mobile);
+        appTokenService.delLoginUser(loginVo.getMobile());
         JSONObject jsonObject = new JSONObject();
         AppLoginUser loginUser =  new AppLoginUser();
         loginUser.setUser(appUser);

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbAppUser.java

@@ -79,6 +79,7 @@ public class TbAppUser implements Serializable {
 
     private String pyCode;
     private String pyFirst;
+    private String clientId;
 
     /** 创建者 */
     private Long createBy;

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppLoginVo.java

@@ -0,0 +1,21 @@
+package com.ruoyi.app.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "登录用户")
+public class AppLoginVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value="手机号")
+    String mobile;
+    @ApiModelProperty(value="验证码")
+    String captcha;
+    @ApiModelProperty(value="个推客户端id")
+    String clientId;
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -94,6 +94,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
     public TbMemberMiddle zeroParent(Long familyId){
         return memberMiddleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getFamilyId,familyId)
+                .eq(TbMemberMiddle::getStatus,"2")
                 .eq(TbMemberMiddle::getParentId, 0).last("limit 1")
         );
     }