Merge branch 'mazq-0823-fix' into 'release/v2.4.0'

fix(报错修改): 报错修改

See merge request dcuc-tjdsj/auth-back!88

src/main/java/com/dragoninfo/dcuc/authweb/interceptor/SecurityAccessTokenResolver.java

@@ -11,8 +11,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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
@@ -32,7 +32,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
     private SecurityAccessTokenProperties secAccessProp;
 
     @Autowired(required = false)
-    private SecurityUserCacheResolver cacheResolver;
+    private SecurityAccessUserCacheResolver cacheResolver;
 
     @Autowired
     private IBimBusinessFacade bimBusinessFacade;
@@ -74,7 +74,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
 
         if (cacheResolver != null) {
             //从缓存中取
-            SecurityUser securityUserCache = (SecurityUser) cacheResolver.getIfPresent(userToken);
+            SecurityUser securityUserCache = (SecurityUser) cacheResolver.getIfPresent(cacheResolver.cacheKey(userToken));
 
             if (securityUserCache != null) {
                 log.info("Cache securityUserCache:{}", JsonUtils.toJSONString(securityUserCache));
@@ -104,7 +104,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));