From e995a2a64fef594e5dc1e98856e4c9fa59689539 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 10 Jan 2020 20:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E5=85=B3=E4=BA=8C=E5=90=88=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - 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 +- 15 files changed, 25 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index ab343d4e..406774fb 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,6 @@ SOP封装了开放平台大部分功能包括：签名验证、统一异常处 ## 分支说明 - master：发版分支 -- spring-cloud-gateway：Spring Cloud Gateway作为网关（不推荐） - develop：日常开发分支 - eureka：使用eureka注册中心 - 1.x：老的1.x版本代码 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..68d59c37 100644 --- a/doc/docs/files/10096_使用SpringCloudGateway.md +++ b/doc/docs/files/10096_使用SpringCloudGateway.md @@ -9,7 +9,7 @@ sop-bridge-gateway - 2.5.10-SNAPSHOT + 对应版本 ``` 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 @@ com.gitee.sop sop-service-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 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 @@ 4.0.0 com.gitee.sop sop-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT pom 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 @@ sop-common com.gitee.sop - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 4.0.0 - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT sop-bridge-gateway @@ -16,7 +16,7 @@ com.gitee.sop sop-gateway-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 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 @@ sop-common com.gitee.sop - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 4.0.0 - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT sop-bridge-zuul @@ -16,7 +16,7 @@ com.gitee.sop sop-gateway-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 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 @@ com.gitee.sop sop-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT ../pom.xml sop-gateway-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT jar sop-gateway-common 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 @@ com.gitee.sop sop-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT ../pom.xml sop-service-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT jar sop-service-common 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 @@ com.gitee.sop sop-service-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT com.gitee.sop 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 @@ com.gitee.sop sop-service-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 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 @@ com.gitee.sop sop-service-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT com.gitee.sop 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 @@ sop-bridge-gateway - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT 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 @@ com.gitee.sop sop-gateway-common - 2.5.10-SNAPSHOT + 2.6.0-SNAPSHOT