Browse Source

token和Authorization的兼容

jichaobo 2 years ago
parent
commit
ca5ff231e2

+ 5 - 0
base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java

@@ -12,6 +12,11 @@ public class TokenConstants
      */
     public static final String AUTHENTICATION = "Authorization";
 
+    /**
+     * 令牌自定义标识
+     */
+    public static final String TOKEN = "token";
+
     /**
      * 令牌前缀
      */

+ 2 - 2
base-components/gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java

@@ -139,8 +139,8 @@ public class AuthFilter implements GlobalFilter, Ordered
     }
 
     private String getFireToken(ServerHttpRequest request,String token){
-        if (StringUtils.isNotBlank(token)){
-            token = request.getHeaders().getFirst("token");
+        if (StringUtils.isBlank(token)){
+            token = request.getHeaders().getFirst(TokenConstants.TOKEN);
         }
         return token;
     }

+ 5 - 0
usky-common/usky-common-core/src/main/java/com/usky/common/core/constants/TokenConstants.java

@@ -12,6 +12,11 @@ public class TokenConstants
      */
     public static final String AUTHENTICATION = "Authorization";
 
+    /**
+     * 令牌自定义标识
+     */
+    public static final String TOKEN = "token";
+
     /**
      * 令牌前缀
      */

+ 2 - 2
usky-common/usky-common-security/src/main/java/com/usky/common/security/utils/SecurityUtils.java

@@ -77,8 +77,8 @@ public class SecurityUtils
     }
 
     public static String getTokenOne(HttpServletRequest request,String token){
-        if (StringUtils.isNotBlank(token)){
-            token = request.getHeader("token");
+        if (StringUtils.isBlank(token)){
+            token = request.getHeader(TokenConstants.TOKEN);
         }
         return token;
     }