From 06d58f202fa613808c67fe294b5b16c838fb587c Mon Sep 17 00:00:00 2001 From: EightMonth Date: Tue, 30 Apr 2024 14:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/security/app/AppGrantAuthenticationProvider.java | 2 ++ .../security/password/PasswordGrantAuthenticationProvider.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/app/AppGrantAuthenticationProvider.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/app/AppGrantAuthenticationProvider.java index 4f0505715..282720106 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/app/AppGrantAuthenticationProvider.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/app/AppGrantAuthenticationProvider.java @@ -118,10 +118,12 @@ public class AppGrantAuthenticationProvider implements AuthenticationProvider { // 通过用户名获取用户信息 LoginUser loginUser = commonAPI.getUserByName(username); + //update-begin---author:eightmonth ---date:2024-04-30 for：【6168】master分支切sas分支登录发生错误----------- if (Objects.isNull(loginUser) || !StringUtils.hasText(loginUser.getSalt())) { redisUtil.del(CacheConstant.SYS_USERS_CACHE+"::"+username); loginUser = commonAPI.getUserByName(username); } + //update-end---author:eightmonth ---date::2024-04-30 for：【6168】master分支切sas分支登录发生错误-------------- // 检查用户可行性 checkUserIsEffective(loginUser); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/password/PasswordGrantAuthenticationProvider.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/password/PasswordGrantAuthenticationProvider.java index 7daddb57d..f49ab5dcd 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/password/PasswordGrantAuthenticationProvider.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/password/PasswordGrantAuthenticationProvider.java @@ -119,10 +119,12 @@ public class PasswordGrantAuthenticationProvider implements AuthenticationProvid // 通过用户名获取用户信息 LoginUser loginUser = commonAPI.getUserByName(username); + //update-begin---author:eightmonth ---date:2024-04-30 for：【6168】master分支切sas分支登录发生错误----------- if (Objects.isNull(loginUser) || !StringUtils.hasText(loginUser.getSalt())) { redisUtil.del(CacheConstant.SYS_USERS_CACHE+"::"+username); loginUser = commonAPI.getUserByName(username); } + //update-end---author:eightmonth ---date::2024-04-30 for：【6168】master分支切sas分支登录发生错误-------------- // 检查用户可行性 checkUserIsEffective(loginUser);