Merge pull request #6201 from EightMonth/springboot3_sas

增加bug修复注释
jeecgboot · Apr 30, 2024 · 48555b5 · 48555b5
2 parents 628870a + 06d58f2
commit 48555b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...base-core/src/main/java/org/jeecg/config/security/app/AppGrantAuthenticationProvider.java b/...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/...src/main/java/org/jeecg/config/security/password/PasswordGrantAuthenticationProvider.java b/...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);