From 3b901de0678fada1cbd39c435eddeae481bd751c Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 31 Oct 2023 19:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/admin/SystemUserAuthController.java | 4 ++-- .../basicdata/service/impl/EngineeringServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java index ab556ea..d23f054 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java @@ -86,7 +86,7 @@ public class SystemUserAuthController { .eq(SystemUser::getAccount, Aes.decrypt(systemUser.getAccount())) .eq(SystemUser::getShowPassword, Aes.decrypt(systemUser.getShowPassword()))); SystemUserAuthDto userInfo = new SystemUserAuthDto(); - checkLogin(user, userInfo, result, systemUser.getAccount()); + checkLogin(user, userInfo, result, Aes.decrypt(systemUser.getAccount())); if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) { String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24 * 1000L); userInfo.setToken(token); @@ -207,7 +207,7 @@ public class SystemUserAuthController { userInfo.setProjectDateAuth(government.getProjectDateAuth()); } //登录名密码输入正确，清楚登陆失败记录 - jwtTokenProvider.clearLock(user.getAccount()); + jwtTokenProvider.clearLock(account); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index c57da60..5248315 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -126,11 +126,11 @@ public class EngineeringServiceImpl extends ServiceImpl