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 4f05057156..2827201061 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 Authentication authenticate(Authentication authentication) throws Authent // 通过用户名获取用户信息 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 7daddb57d0..f49ab5dcd2 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 Authentication authenticate(Authentication authentication) throws Authent // 通过用户名获取用户信息 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);