From 59289cb1704a8c2cbb680c11f4e5b8ffe8b45801 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Fri, 10 Jan 2020 20:41:17 +0800
Subject: [PATCH] 2.6.0

---
 changelog.md                                     | 6 ++++++
 doc/docs/files/10096_使用SpringCloudGateway.md | 2 +-
 sop-auth/pom.xml                                 | 2 +-
 sop-common/pom.xml                               | 2 +-
 sop-common/sop-bridge-gateway/pom.xml            | 6 +++---
 sop-common/sop-bridge-zuul/pom.xml               | 6 +++---
 sop-common/sop-gateway-common/pom.xml            | 4 ++--
 sop-common/sop-service-common/pom.xml            | 4 ++--
 sop-example/sop-book/sop-book-web/pom.xml        | 2 +-
 sop-example/sop-easyopen/pom.xml                 | 2 +-
 sop-example/sop-springmvc/pom.xml                | 2 +-
 sop-example/sop-story/sop-story-web/pom.xml      | 2 +-
 sop-gateway/pom.xml                              | 2 +-
 sop-website/pom.xml                              | 2 +-
 14 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/changelog.md b/changelog.md
index d7202a97..249a7b9f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # changelog
 
+## 2.6.0
+
+- 重构spring cloud gateway网关
+- zuul和gateway网关二合一
+- 代码优化
+
 ## 2.5.10
 
 - 优化签名认证，优化校验日志打印
diff --git a/doc/docs/files/10096_使用SpringCloudGateway.md b/doc/docs/files/10096_使用SpringCloudGateway.md
index cdad27e0..870d58a7 100644
--- a/doc/docs/files/10096_使用SpringCloudGateway.md
+++ b/doc/docs/files/10096_使用SpringCloudGateway.md
@@ -9,7 +9,7 @@
      <!--<artifactId>sop-bridge-zuul</artifactId>-->
      <!-- 使用spring cloud gateway作为网关 -->
      <artifactId>sop-bridge-gateway</artifactId>
-    <version>2.5.10-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml
index a17fdc20..06a0fc2c 100644
--- a/sop-auth/pom.xml
+++ b/sop-auth/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>2.5.10-SNAPSHOT</version>
+			<version>2.6.0-SNAPSHOT</version>
 		</dependency>
 		<!-- sop相关配置 end-->
 
diff --git a/sop-common/pom.xml b/sop-common/pom.xml
index 09743364..6a26af74 100644
--- a/sop-common/pom.xml
+++ b/sop-common/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-common</artifactId>
-	<version>2.5.10-SNAPSHOT</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/sop-common/sop-bridge-gateway/pom.xml b/sop-common/sop-bridge-gateway/pom.xml
index 328eaf22..04766774 100644
--- a/sop-common/sop-bridge-gateway/pom.xml
+++ b/sop-common/sop-bridge-gateway/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>2.5.10-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.5.10-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
 
     <artifactId>sop-bridge-gateway</artifactId>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-bridge-zuul/pom.xml b/sop-common/sop-bridge-zuul/pom.xml
index 1fa813b4..2b2f483e 100644
--- a/sop-common/sop-bridge-zuul/pom.xml
+++ b/sop-common/sop-bridge-zuul/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <artifactId>sop-common</artifactId>
         <groupId>com.gitee.sop</groupId>
-        <version>2.5.10-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.5.10-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
 
     <artifactId>sop-bridge-zuul</artifactId>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml
index 1486cd9f..7c3e9b7f 100644
--- a/sop-common/sop-gateway-common/pom.xml
+++ b/sop-common/sop-gateway-common/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>2.5.10-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>2.5.10-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-gateway-common</name>
diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml
index 3abf6f8c..01a6fff7 100644
--- a/sop-common/sop-service-common/pom.xml
+++ b/sop-common/sop-service-common/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>2.5.10-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>2.5.10-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-service-common</name>
diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml
index 68c3dfe5..335b4762 100644
--- a/sop-example/sop-book/sop-book-web/pom.xml
+++ b/sop-example/sop-book/sop-book-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml
index 02829e7f..b998dc17 100644
--- a/sop-example/sop-easyopen/pom.xml
+++ b/sop-example/sop-easyopen/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>2.5.10-SNAPSHOT</version>
+			<version>2.6.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- 使用nacos注册中心
diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml
index 609d12c5..86d22634 100644
--- a/sop-example/sop-springmvc/pom.xml
+++ b/sop-example/sop-springmvc/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
         <!-- nacos  -->
         <dependency>
diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml
index 1df94a82..0943327a 100644
--- a/sop-example/sop-story/sop-story-web/pom.xml
+++ b/sop-example/sop-story/sop-story-web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>
diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml
index 8352f1d3..0778cc65 100644
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@@ -32,7 +32,7 @@
              <!--<artifactId>sop-bridge-zuul</artifactId>-->
              <!-- 使用spring cloud gateway作为网关 -->
              <artifactId>sop-bridge-gateway</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sop-website/pom.xml b/sop-website/pom.xml
index 1e4d8251..2bf3e40f 100644
--- a/sop-website/pom.xml
+++ b/sop-website/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>2.5.10-SNAPSHOT</version>
+            <version>2.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>