Browse Source

token和Authorization的兼容

jichaobo 2 years ago
parent
commit
ca1fc267f3

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

@@ -134,9 +134,17 @@ public class AuthFilter implements GlobalFilter, Ordered
        {
            token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);
        }
+       token = getFireToken(request,token);
        return token;
     }
 
+    private String getFireToken(ServerHttpRequest request,String token){
+        if (StringUtils.isNotBlank(token)){
+            token = request.getHeaders().getFirst("token");
+        }
+        return token;
+    }
+
     @Override
     public int getOrder()
     {

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

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * 权限获取工具类
- * 
+ *
  * @author ruoyi
  */
 public class SecurityUtils
@@ -72,9 +72,17 @@ public class SecurityUtils
     {
         // 从header获取token标识
         String token = request.getHeader(TokenConstants.AUTHENTICATION);
+        token = getTokenOne(request,token);
         return replaceTokenPrefix(token);
     }
 
+    public static String getTokenOne(HttpServletRequest request,String token){
+        if (StringUtils.isNotBlank(token)){
+            token = request.getHeader("token");
+        }
+        return token;
+    }
+
     /**
      * 裁剪token前缀
      */
@@ -90,7 +98,7 @@ public class SecurityUtils
 
     /**
      * 是否为管理员
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */