From 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 7d42138..b90186a 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
@@ -197,7 +197,7 @@
if (r.getData() == null) {
throw new ServiceException("账号不存在");
}
- if (!SecurityUtils.matchesPassword(r.getData().getPassword(), password)) {
+ if (!SecurityUtils.matchesPassword(password, r.getData().getPassword())) {
throw new ServiceException("密码错误");
}
return r.getData();
@@ -265,7 +265,7 @@
if (Objects.isNull(sysUser)){
throw new ServiceException("用户不存在");
}
- if (!SecurityUtils.matchesPassword(SecurityUtils.encryptPassword(dto.getOldPassword()), sysUser.getPassword())){
+ if (!SecurityUtils.matchesPassword(dto.getOldPassword(), sysUser.getPassword())){
throw new ServiceException("原密码错误");
}
sysUser.setPassword(SecurityUtils.encryptPassword(dto.getNewPassword()));
--
Gitblit v1.7.1