Merge remote-tracking branch 'origin/satoken' into satoken

疯狂的狮子li

2021-10-12 1f1d4e2defd90f16a4229b9bf98114f42c91405d

Merge remote-tracking branch 'origin/satoken' into satoken

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -64,9 +64,7 @@
            log.info("登录用户：{} 已被停用.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
        }
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        String encodePassword = passwordEncoder.encode(password);
        if (SecurityUtils.matchesPassword(user.getPassword(), encodePassword)) {
        if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
            asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
            throw new UserPasswordNotMatchException();
        }