From e3ec61f6197dc3bc5052dc5510f0f4f4cdbfe05d Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Fri, 20 Mar 2020 10:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A6=E6=88=AAtoken=E8=8E=B7=E5=8F=96token?=
 =?UTF-8?q?=E6=88=96=E8=80=85Authorization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/CpAuthGatewayFilterFactory.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index dd74348b92..02705c0e89 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -61,7 +61,6 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 	public GatewayFilter apply(CpAuthConfig config) {
 		return (exchange, chain) -> {
 			if (!config.isEnabled()) {
-				logger.info("===========");
 				return chain.filter(exchange);
 			}
 
@@ -72,15 +71,21 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 			if (!pathMatcher(requestUri)) {
 				return chain.filter(exchange);
 			}
+			logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri + "]CpAuthGatewayFilterFactory拦截成功");
 			HttpHeaders headers = request.getHeaders();
 			String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
-			logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri + "]CpAuthGatewayFilterFactory拦截成功token:"+token);
+			if (StringUtils.isBlank(token)) {
+				token = headers.getFirst(Constant.TOKEN_HEADER);
+				logger.info("token=" + token);
+			} else {
+				logger.info("authorization=" + token);
+			}
 			if (StringUtils.isBlank(token)) {
 				token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
-				logger.info("params token："+token);
-				if (StringUtils.isBlank(token)) {
-					return chain.filter(exchange);
-				}
+				logger.info("params token：" + token);
+			}
+			if (StringUtils.isBlank(token)) {
+				return chain.filter(exchange);
 			}
 			TokenDto user = this.getLoginUserInfo(token);
 			//当前登录用户userId，添加到header中