代码优化

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java

@@ -93,7 +93,7 @@ public class FebsUtil {
      */
     public static boolean isAjaxRequest(HttpServletRequest request) {
         return (request.getHeader("X-Requested-With") != null
-                && "XMLHttpRequest" .equals(request.getHeader("X-Requested-With")));
+                && "XMLHttpRequest".equals(request.getHeader("X-Requested-With")));
     }
 
     /**
@@ -215,7 +215,7 @@ public class FebsUtil {
         if (ip == null || ip.length() == 0 || UNKNOW.equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
         }
-        return "0:0:0:0:0:0:0:1" .equals(ip) ? "127.0.0.1" : ip;
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
     }
 
     /**
@@ -250,7 +250,7 @@ public class FebsUtil {
         if (ip == null || ip.length() == 0 || UNKNOW.equalsIgnoreCase(ip)) {
             ip = Objects.requireNonNull(request.getRemoteAddress()).getAddress().getHostAddress();
         }
-        return "0:0:0:0:0:0:0:1" .equals(ip) ? "127.0.0.1" : ip;
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
     }
 
     /**
@@ -313,7 +313,7 @@ public class FebsUtil {
      */
     public static String getCurrentTokenValue() {
         OAuth2AuthenticationDetails details = (OAuth2AuthenticationDetails) getOauth2Authentication().getDetails();
-        return details.getTokenValue();
+        return details == null ? null : details.getTokenValue();
     }
 
     public static void printSystemUpBanner(Environment environment) {

febs-common/febs-common-security-starter/src/main/java/cc/mrbird/febs/common/security/starter/configure/FebsCloudSecurityAutoconfigure.java

@@ -6,6 +6,7 @@ import cc.mrbird.febs.common.security.starter.handler.FebsAccessDeniedHandler;
 import cc.mrbird.febs.common.security.starter.handler.FebsAuthExceptionEntryPoint;
 import cc.mrbird.febs.common.security.starter.properties.FebsCloudSecurityProperties;
 import feign.RequestInterceptor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -53,7 +54,9 @@ public class FebsCloudSecurityAutoconfigure {
             String gatewayToken = new String(Base64Utils.encode(FebsConstant.GATEWAY_TOKEN_VALUE.getBytes()));
             requestTemplate.header(FebsConstant.GATEWAY_TOKEN_HEADER, gatewayToken);
             String authorizationToken = FebsUtil.getCurrentTokenValue();
-            requestTemplate.header(HttpHeaders.AUTHORIZATION, FebsConstant.OAUTH2_TOKEN_TYPE + authorizationToken);
+            if (StringUtils.isNotBlank(authorizationToken)) {
+                requestTemplate.header(HttpHeaders.AUTHORIZATION, FebsConstant.OAUTH2_TOKEN_TYPE + authorizationToken);
+            }
         };
     }
 }