fix

zhanzhiqin

2022-04-22 7c92a9851eb6bf90e3bb9e2a5059b83f12564b85

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java

@@ -246,7 +246,14 @@
    @Log("后台用户修改密码")
    @PutMapping("/updateMyPassword")
    public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
        boolean result = adminService.updateMyPassword(param);
        boolean result;
        if (SecurityUtils.getClientId() == null) {
            result = adminService.updateMyPassword(param);
        } else {
            result = clientService.resetPassword(param);
        }


        if (result) {
            return ResponseUtil.success("修改成功");
        } else {

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -74,15 +74,15 @@
        }
    }

    @PostMapping("/resetClientPassword")
    public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
        boolean b = clientService.resetPassword(resetClientPasswordPrarm);
        if (b) {
            return ResponseUtil.success("修改成功");
        } else {
            return ResponseUtil.fail("修改失败");
        }
    }
//    @PostMapping("/resetClientPassword")
//    public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
//        boolean b = clientService.resetPassword(resetClientPasswordPrarm);
//        if (b) {
//            return ResponseUtil.success("修改成功");
//        } else {
//            return ResponseUtil.fail("修改失败");
//        }
//    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteClient(@PathVariable Long id) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PwdParam.java

@@ -12,12 +12,7 @@
 */
@Data
public class PwdParam {
//    @NotBlank(message = "旧密码不能为空")
//    private String oldPass;
    @NotBlank(message = "新密码不能为空")
    @Size(min = 6,message = "密码最短必须是6位")
    @Size(min = 6, message = "密码最短必须是6位")
    private String newPass;
    @NotBlank(message = "确认密码不能为空")
    @Size(min = 6,message = "密码最短必须是6位")
    private String confirmPass;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java

@@ -117,21 +117,14 @@
     * @return
     */
    public boolean updateMyPassword(PwdParam param) {
        if (!StrUtil.equals(param.getNewPass(), param.getConfirmPass())) {
            throw new BusinessException("两次密码不一致");
        }
        Long userId = SecurityUtils.getUserId();
        Admin admin = getById(userId);
        if (admin == null) {
            throw new BusinessException("用户不存在");
        }
//        if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
//            throw new BusinessException("旧密码不正确");
//        }
        Admin update = new Admin();
        update.setId(userId);
        update.setPassword(passwordEncoder.encode(param.getNewPass()));
        return updateById(update);
        admin.setId(userId);
        admin.setPassword(passwordEncoder.encode(param.getNewPass()));
        return updateById(admin);
    }

    public boolean deleteAdmin(Long adminId) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java

@@ -7,6 +7,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
import com.sandu.ximon.admin.param.UpdateClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -114,23 +115,19 @@
        return updateById(client);
    }

    public boolean resetPassword(ResetClientPasswordPrarm resetClientPasswordPrarm) {
        Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, resetClientPasswordPrarm.getId()));
    public boolean resetPassword(PwdParam param) {

        Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, SecurityUtils.getUserDetails().getUserId()));

        if (client == null) {
            throw new BusinessException("该用户不存在！");
        }

        PasswordEncoder pw = new BCryptPasswordEncoder();
        //判断旧密码与数据库是否一致
        if (pw.matches(resetClientPasswordPrarm.getOldPassword(), client.getPassword())) {
            //加密新密码
            String encode = pw.encode(resetClientPasswordPrarm.getNewPassword());
            client.setPassword(encode);
            return updateById(client);
        } else {
            throw new BusinessException("旧密码不正确，请重新确认密码！");
        }
        //加密新密码
        String encode = pw.encode(param.getNewPass());
        client.setPassword(encode);
        return updateById(client);
    }

    public boolean deleteClient(Long id) {