Merge branch 'master' of github.com:laigeoffer/pmhub

laigeoffer · Jul 7, 2024 · d8ec04e · d8ec04e
2 parents da10e9e + bacca42
commit d8ec04e
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/...urity/src/main/java/com/laigeoffer/pmhub/base/security/feign/FeignRequestInterceptor.java b/...urity/src/main/java/com/laigeoffer/pmhub/base/security/feign/FeignRequestInterceptor.java
@@ -21,28 +21,26 @@ public class FeignRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         HttpServletRequest httpServletRequest = ServletUtils.getRequest();
-        if (StringUtils.isNotNull(httpServletRequest)) {
-            Map<String, String> headers = ServletUtils.getHeaders(httpServletRequest);
-            // 传递用户信息请求头，防止丢失
-            String userId = headers.get(SecurityConstants.DETAILS_USER_ID);
-            if (StringUtils.isNotEmpty(userId)) {
-                requestTemplate.header(SecurityConstants.DETAILS_USER_ID, userId);
-            }
-            String userKey = headers.get(SecurityConstants.USER_KEY);
-            if (StringUtils.isNotEmpty(userKey)) {
-                requestTemplate.header(SecurityConstants.USER_KEY, userKey);
-            }
-            String userName = headers.get(SecurityConstants.DETAILS_USERNAME);
-            if (StringUtils.isNotEmpty(userName)) {
-                requestTemplate.header(SecurityConstants.DETAILS_USERNAME, userName);
-            }
-            String authentication = headers.get(SecurityConstants.AUTHORIZATION_HEADER);
-            if (StringUtils.isNotEmpty(authentication)) {
-                requestTemplate.header(SecurityConstants.AUTHORIZATION_HEADER, authentication);
-            }
-
-            // 配置客户端IP
-            requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr());
+        Map<String, String> headers = ServletUtils.getHeaders(httpServletRequest);
+        // 传递用户信息请求头，防止丢失
+        String userId = headers.get(SecurityConstants.DETAILS_USER_ID);
+        if (StringUtils.isNotEmpty(userId)) {
+            requestTemplate.header(SecurityConstants.DETAILS_USER_ID, userId);
+        }
+        String userKey = headers.get(SecurityConstants.USER_KEY);
+        if (StringUtils.isNotEmpty(userKey)) {
+            requestTemplate.header(SecurityConstants.USER_KEY, userKey);
+        }
+        String userName = headers.get(SecurityConstants.DETAILS_USERNAME);
+        if (StringUtils.isNotEmpty(userName)) {
+            requestTemplate.header(SecurityConstants.DETAILS_USERNAME, userName);
         }
+        String authentication = headers.get(SecurityConstants.AUTHORIZATION_HEADER);
+        if (StringUtils.isNotEmpty(authentication)) {
+            requestTemplate.header(SecurityConstants.AUTHORIZATION_HEADER, authentication);
+        }
+
+        // 配置客户端IP
+        requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr());
     }
 }