From 76f2ef1940791b55510456f26874606369a62f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 25 Oct 2018 16:47:19 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E3=80=82=20F=20SR2=20=E3=80=81Boot=202.0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/gateway/filter/PigxRequestGlobalFilter.java  | 11 ++---------
 pom.xml                                               |  6 +++---
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java
index bb608d7f5..2ef734f35 100644
--- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java
+++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java
@@ -18,7 +18,6 @@
 package com.pig4cloud.pigx.gateway.filter;
 
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
-import com.pig4cloud.pigx.gateway.config.SwaggerProvider;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
@@ -42,7 +41,8 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.a
  * <p>
  * 1. 对请求头中参数进行处理 from 参数进行清洗
  * 2. 重写StripPrefix = 1,支持全局
- * 3. 支持swagger添加X-Forwarded-Prefix header
+ * <p>
+ * 支持swagger添加X-Forwarded-Prefix header  （F SR2 已经支持，不需要自己维护）
  */
 @Component
 public class PigxRequestGlobalFilter implements GlobalFilter, Ordered {
@@ -73,15 +73,8 @@ public class PigxRequestGlobalFilter implements GlobalFilter, Ordered {
 			.build();
 		exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, newRequest.getURI());
 
-		// 3. 支持swagger添加X-Forwarded-Prefix header
-		String path = request.getURI().getPath();
-		if (!StringUtils.endsWithIgnoreCase(path, SwaggerProvider.API_URI)) {
-			return chain.filter(exchange.mutate().request(newRequest).build());
-		}
-		String basePath = path.substring(0, path.lastIndexOf(SwaggerProvider.API_URI));
 		return chain.filter(exchange.mutate()
 			.request(newRequest.mutate()
-				.header(HEADER_NAME, basePath)
 				.build()).build());
 	}
 
diff --git a/pom.xml b/pom.xml
index 3c98aea13..96a4e05c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,13 @@
 
 	<properties>
 		<pigx.version>1.6.4</pigx.version>
-		<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
-		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+		<spring-boot.version>2.0.6.RELEASE</spring-boot.version>
+		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
 		<spring-platform.version>Cairo-SR3</spring-platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<monitor.version>2.0.3</monitor.version>
+		<monitor.version>2.0.4</monitor.version>
 		<hutool.version>4.1.13</hutool.version>
 		<mbp.boot.version>2.3</mbp.boot.version>
 		<kaptcha.version>0.0.9</kaptcha.version>