Merge pull request hs-web#183 from JiaRG/upstream-3.0.x

zhou-hao · web-flow · commit 3cfb1d60e053 · 2021-06-18T17:16:14.000+08:00
解决集成Redisson时ValueWrapper变为NullValue导致认证失败的问题 fix hs-web#182
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthenticationManager.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthenticationManager.java
@@ -6,7 +6,6 @@
 import org.hswebframework.web.authorization.AuthenticationInitializeService;
 import org.hswebframework.web.authorization.AuthenticationManager;
 import org.hswebframework.web.authorization.AuthenticationRequest;
-import org.hswebframework.web.authorization.listener.event.AuthorizationFailedEvent;
 import org.hswebframework.web.authorization.simple.PlainTextUsernamePasswordAuthenticationRequest;
 import org.hswebframework.web.commons.entity.DataStatus;
 import org.hswebframework.web.entity.authorization.UserEntity;
@@ -16,7 +15,6 @@
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
 
 import java.util.function.Supplier;
 
@@ -98,7 +96,7 @@ public Authentication getByUserId(String userId) {
         if (null != cacheManager) {
             Cache cache = cacheManager.getCache(USER_AUTH_CACHE_NAME);
             Cache.ValueWrapper wrapper = cache.get(userId);
-            if (wrapper == null) {
+            if (wrapper == null || wrapper.get() == null) {
                 Authentication authentication = supplier.get();
                 cache.put(userId, authentication);
                 return authentication;
