Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide

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,16 +71,22 @@ 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);
+				logger.info("params token：" + token);
+			}
 			if (StringUtils.isBlank(token)) {
 				return chain.filter(exchange);
 			}
-			}
 			TokenDto user = this.getLoginUserInfo(token);
 			//当前登录用户userId，添加到header中
 			if (user != null) {