配合移动端登录接口添加返回是否更改密码字段，更改密码接口添加返回用户信息

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@@ -85,4 +85,7 @@ public class SysUserVo implements Vo {
     private List<OrgList> orgList = new ArrayList<>();
     private String defaultOrgPath;
     private String defaultOrgPathName;
+
+    @ApiModelProperty("是否需要更换密码")
+    private Boolean needResetPsd;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java

@@ -44,7 +44,7 @@ public interface AppSysUserFeign {
     @ApiOperation(value = "手机更改密码")
     @ResponseBody
     @PostMapping("/updatePassword")
-    public ResultBean updatePassword(@RequestParam(value = "userSid", required = true) String userSid,
+    public ResultBean<SysUserVo> updatePassword(@RequestParam(value = "userSid", required = true) String userSid,
                                      @RequestParam(value = "appId", required = true) String appId,
                                      @RequestParam(value = "oldPassword", required = true) String oldPassword,
                                      @RequestParam(value = "newPassword", required = true) String newPassword,

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -234,20 +234,37 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         return baseMapper.updatePassword(sid, password);
     }
 
-    public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) {
+    public ResultBean<SysUserVo> updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) {
+        ResultBean<SysUserVo> rb = ResultBean.fireFail();
         String oldPasswordMd5 = Encodes.md5(oldPassword);
         if (!oldPasswordMd5.equals(user.getPassword())) {
-            return ResultBean.fireFail().setMsg("原始密码输入错误");
+            return rb.setMsg("原始密码输入错误");
         }
         if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) {
-            return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合");
+            return rb.setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合");
         }
         int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword));
+        SysUserVo sysUserVo = selectUserOne(user);
+        if (sysUserVo == null) {
+            sysUserVo = new SysUserVo();
+        } else {
+            //查询是否需要更换密码
+            boolean isTrue = false;
+            String mobile = user.getMobile();
+            if (StringUtils.isNotBlank(mobile)) {
+                String password = mobile.substring(5, 11);
+                String md5 = Encodes.md5(password);
+                if (user.getPassword().equals(md5)) {
+                    isTrue = true;
+                }
+            }
+            sysUserVo.setNeedResetPsd(isTrue);
+        }
         if (i == 1) {
             redisUtil.remove(token);
-            return ResultBean.fireSuccess().setMsg("修改成功");
+            return rb.success().setData(sysUserVo);
         } else {
-            return ResultBean.fireSuccess().setMsg("修改失败");
+            return rb.setMsg("修改失败");
         }
     }
 
@@ -338,7 +355,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
                     SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid());
-                    if(sysOrganizationOne != null){
+                    if (sysOrganizationOne != null) {
                         String psid = sysOrganizationOne.getPsid();
                         String name = sysOrganizationService.fetchBySid(psid).getName();
                         userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
@@ -407,6 +424,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             sysUserVo.setToken(newToken);
             // 更新用户中的token
             updateToken(user.getSid(), newToken);
+            //查询是否需要更换密码
+            boolean isTrue = false;
+            String mobile = user.getMobile();
+            if (StringUtils.isNotBlank(mobile)) {
+                String password = mobile.substring(5, 11);
+                String md5 = Encodes.md5(password);
+                if (user.getPassword().equals(md5)) {
+                    isTrue = true;
+                }
+            }
+            sysUserVo.setNeedResetPsd(isTrue);
             return sysUserVo;
         }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -278,14 +278,15 @@ public class AppSysUserRest implements AppSysUserFeign {
     }
 
     @Override
-    public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
+    public ResultBean<SysUserVo> updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
+        ResultBean<SysUserVo> rb = ResultBean.fireFail();
         String token = httpServletRequest.getHeader("token");
         SysUser user = sysUserService.fetchBySid(userSid);
         if (user == null) {
-            return ResultBean.fireFail().setMsg("抱歉，用户不存在");
+            return rb.setMsg("抱歉，用户不存在");
         }
         if (!appId.equals(user.getAppId())) {
-            return new ResultBean().fail().setMsg("当前设备与账号不匹配，请解绑后再试");
+            return rb.setMsg("当前设备与账号不匹配，请解绑后再试");
         }
         return sysUserService.updatePasswordApp(user, oldPassword, newPassword, token);
     }