From ea578cf32a5cd9e7a1704df2938c4071e7309055 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 18:11:43 +0800
Subject: [PATCH] 处理冲突
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 7dd4af6..2324bcf 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -155,9 +155,6 @@
if (R.FAIL == userInfo.getCode()) {
throw new ServiceException(userInfo.getMsg());
}
- if (!passwordService.matches(userInfo.getData().getSysUser(), password)) {
- throw new ServiceException("旧密码错误，请重新输入！");
- }
remoteUserService.changePassword(username, SecurityUtils.encryptPassword(password),
SecurityConstants.INNER);
}
--
Gitblit v1.7.1