|
@@ -12,7 +12,6 @@ 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.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;
|
|
@@ -31,9 +30,6 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
|
|
|
@Autowired
|
|
|
private SecurityAccessTokenProperties secAccessProp;
|
|
|
|
|
|
- @Autowired(required = false)
|
|
|
- private SecurityAccessUserCacheResolver cacheResolver;
|
|
|
-
|
|
|
@Autowired
|
|
|
private IBimBusinessFacade bimBusinessFacade;
|
|
|
|
|
@@ -72,25 +68,12 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
|
|
|
|
|
|
log.info("userToken:{},appToken:{}", userToken, appToken);
|
|
|
|
|
|
- if (cacheResolver != null) {
|
|
|
- //从缓存中取
|
|
|
- SecurityUser securityUserCache = (SecurityUser) cacheResolver.getIfPresent(cacheResolver.cacheKey(userToken));
|
|
|
-
|
|
|
- if (securityUserCache != null) {
|
|
|
- log.info("Cache securityUserCache:{}", JsonUtils.toJSONString(securityUserCache));
|
|
|
-
|
|
|
- return securityUserCache;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
if (StrUtil.isBlank(userToken)) {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
BimUserInfoItemRespVO userInfoItemRespVO = bimBusinessFacade.getUserInfoByUserToken(userToken);
|
|
|
String sfzh = userInfoItemRespVO.getSfzh();
|
|
|
-// String sfzh = "000000000000000001";
|
|
|
-
|
|
|
UserInfo userInfo = userFacade.detailBySfzh(sfzh);
|
|
|
log.info("idcard:{}, userInfo :{}", sfzh, JsonUtils.toJSONString(userInfo));
|
|
|
|
|
@@ -103,11 +86,6 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
|
|
|
securityUser.setSecurityOrg(userInfo.getOrgCode());
|
|
|
securityUser.setSecurityOrgName(userInfo.getOrgName());
|
|
|
|
|
|
- //放入缓存
|
|
|
- if (cacheResolver != null) {
|
|
|
- cacheResolver.put(cacheResolver.cacheKey(userToken), securityUser);
|
|
|
- }
|
|
|
-
|
|
|
log.info("return idcard:{}, securityUser :{}", sfzh, JsonUtils.toJSONString(securityUser));
|
|
|
|
|
|
return securityUser;
|