Merge branch 'huangzqa-fix-20210823' into 'release/v1.0.3'

Huangzqa fix 20210823

See merge request dcuc-tjdsj/approve-gateway!34

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 SecurityAccessUserCacheResolver cacheResolver;
+    private SecurityUserCacheResolver cacheResolver;
 
     @Autowired
     private ServerProperties serverProperties;
@@ -76,11 +76,11 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
         String userToken = request.getHeader(secAccessProp.getUserTokenHeaderName());
         String appToken = request.getHeader(Constants.APP_TOKEN);
 
-        log.info("userToken:{},appToken:{}", userToken, appToken);
+        log.debug("userToken:{},appToken:{}", userToken, appToken);
 
         if (cacheResolver != null) {
             //从缓存中取
-            SecurityUser securityUserCache = (SecurityUser) cacheResolver.getIfPresent(cacheResolver.cacheKey(userToken));
+            SecurityUser securityUserCache = cacheResolver.getIfPresent(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(cacheResolver.cacheKey(userToken), securityUser);
+            cacheResolver.put(userToken, securityUser);
         }
 
         log.info("return idcard:{}, securityUser :{}", sfzh, JsonUtils.toJSONString(securityUser));

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

@@ -1,6 +1,5 @@
 package com.dragonsoft.dcuc.approvegateway.filter;
 
-import com.alibaba.fastjson.JSONObject;
 import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.ip.IpUtils;
@@ -17,7 +16,7 @@ import java.util.Map;
 
 /**
  * <p>
- * 获取请求者真实IP
+ * 设置用户信息，获取请求者真实IP
  * </p>
  *
  * @author huangzqa
@@ -49,7 +48,6 @@ public class UserInfoForwardForFilter extends ZuulFilter {
         Map<String, String> zuulRequestHeaders = currentContext.getZuulRequestHeaders();
         zuulRequestHeaders.put("HTTP_X_FORWARDED_FOR", realIpAdrress);
         BaseSecurityUser currentUser = UserContextUtils.getCurrentUser();
-        log.info("====登录用户信息：{}====", JSONObject.toJSONString(currentUser));
         if (currentUser != null) {
             String jwtToken = JwtTokenUtils.getAlgorithmGen(JwtTokenUtils.AlgorithmType.HS256).sign(currentUser);
             currentContext.addZuulRequestHeader(JwtTokenUtils.AUTHORIZATION_HEADER, JwtTokenUtils.TOKEN_PREFIX + jwtToken);