网关二合一

This commit is contained in:
tanghc
2020-01-10 20:38:38 +08:00
parent 8530867653
commit e995a2a64f
15 changed files with 25 additions and 20 deletions

View File

@@ -80,7 +80,6 @@ SOP封装了开放平台大部分功能包括签名验证、统一异常处
## 分支说明 ## 分支说明
- master发版分支 - master发版分支
- spring-cloud-gatewaySpring Cloud Gateway作为网关不推荐
- develop日常开发分支 - develop日常开发分支
- eureka使用eureka注册中心 - eureka使用eureka注册中心
- 1.x老的1.x版本代码 - 1.x老的1.x版本代码

View File

@@ -1,5 +1,11 @@
# changelog # changelog
## 2.6.0
- 重构spring cloud gateway网关
- zuul和gateway网关二合一
- 代码优化
## 2.5.10 ## 2.5.10
- 优化签名认证,优化校验日志打印 - 优化签名认证,优化校验日志打印

View File

@@ -9,7 +9,7 @@
<!--<artifactId>sop-bridge-zuul</artifactId>--> <!--<artifactId>sop-bridge-zuul</artifactId>-->
<!-- 使用spring cloud gateway作为网关 --> <!-- 使用spring cloud gateway作为网关 -->
<artifactId>sop-bridge-gateway</artifactId> <artifactId>sop-bridge-gateway</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>对应版本</version>
</dependency> </dependency>
``` ```

View File

@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- sop相关配置 end--> <!-- sop相关配置 end-->

View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-common</artifactId> <artifactId>sop-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>

View File

@@ -5,10 +5,10 @@
<parent> <parent>
<artifactId>sop-common</artifactId> <artifactId>sop-common</artifactId>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<artifactId>sop-bridge-gateway</artifactId> <artifactId>sop-bridge-gateway</artifactId>
@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -5,10 +5,10 @@
<parent> <parent>
<artifactId>sop-common</artifactId> <artifactId>sop-common</artifactId>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<artifactId>sop-bridge-zuul</artifactId> <artifactId>sop-bridge-zuul</artifactId>
@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-common</artifactId> <artifactId>sop-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>sop-gateway-common</name> <name>sop-gateway-common</name>

View File

@@ -6,11 +6,11 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-common</artifactId> <artifactId>sop-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>sop-service-common</name> <name>sop-service-common</name>

View File

@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>

View File

@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- 使用nacos注册中心 <!-- 使用nacos注册中心

View File

@@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- nacos --> <!-- nacos -->
<dependency> <dependency>

View File

@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>

View File

@@ -32,7 +32,7 @@
<!--<artifactId>sop-bridge-zuul</artifactId>--> <!--<artifactId>sop-bridge-zuul</artifactId>-->
<!-- 使用spring cloud gateway作为网关 --> <!-- 使用spring cloud gateway作为网关 -->
<artifactId>sop-bridge-gateway</artifactId> <artifactId>sop-bridge-gateway</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>2.5.10-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>