revert: 回滚判

src/main/java/com/dragonsoft/dcuc/approvegateway/filter/SecurityAccessTokenResolver.java

@@ -13,8 +13,8 @@ import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.commons.util.UrlMatcher;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
-import com.dragonsoft.duceap.security.jwt.SecurityUserCacheResolver;
 import com.dragonsoft.duceap.security.jwt.securityaccess.SecurityAccessTokenProperties;
+import com.dragonsoft.duceap.security.jwt.securityaccess.SecurityAccessUserCacheResolver;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
     private SecurityAccessTokenProperties secAccessProp;
 
     @Autowired(required = false)
-    private SecurityUserCacheResolver cacheResolver;
+    private SecurityAccessUserCacheResolver cacheResolver;
 
     @Autowired
     private ServerProperties serverProperties;
@@ -80,7 +80,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
 
         if (cacheResolver != null) {
             //从缓存中取
-            SecurityUser securityUserCache = cacheResolver.getIfPresent(userToken);
+            SecurityUser securityUserCache = (SecurityUser) cacheResolver.getIfPresent(cacheResolver.cacheKey(userToken));
 
             if (securityUserCache != null) {
                 log.info("Cache securityUserCache:{}", JsonUtils.toJSONString(securityUserCache));
@@ -111,7 +111,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
 
         //放入缓存
         if (cacheResolver != null) {
-            cacheResolver.put(userToken, securityUser);
+            cacheResolver.put(cacheResolver.cacheKey(userToken), securityUser);
         }
 
         log.info("return idcard:{}, securityUser :{}", sfzh, JsonUtils.toJSONString(securityUser));