k
/
SOP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

网关二合一

Browse Source
pull/1/MERGE
tanghc 5 years ago
parent 8530867653
commit e995a2a64f
15 changed files with 25 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      README.md
  2. 6
      changelog.md
  3. 2
      doc/docs/files/10096_使用SpringCloudGateway.md
  4. 2
      sop-auth/pom.xml
  5. 2
      sop-common/pom.xml
  6. 6
      sop-common/sop-bridge-gateway/pom.xml
  7. 6
      sop-common/sop-bridge-zuul/pom.xml
  8. 4
      sop-common/sop-gateway-common/pom.xml
  9. 4
      sop-common/sop-service-common/pom.xml
  10. 2
      sop-example/sop-book/sop-book-web/pom.xml
  11. 2
      sop-example/sop-easyopen/pom.xml
  12. 2
      sop-example/sop-springmvc/pom.xml
  13. 2
      sop-example/sop-story/sop-story-web/pom.xml
  14. 2
      sop-gateway/pom.xml
  15. 2
      sop-website/pom.xml

1
README.md
Unescape View File

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

6
changelog.md
Unescape View File

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

2
doc/docs/files/10096_使用SpringCloudGateway.md
Unescape 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>
``` ```

2
sop-auth/pom.xml
Unescape 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-->

2
sop-common/pom.xml
Unescape 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>

6
sop-common/sop-bridge-gateway/pom.xml
Unescape 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>

6
sop-common/sop-bridge-zuul/pom.xml
Unescape 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>

4
sop-common/sop-gateway-common/pom.xml
Unescape 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>

4
sop-common/sop-service-common/pom.xml
Unescape 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>

2
sop-example/sop-book/sop-book-web/pom.xml
Unescape 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>

2
sop-example/sop-easyopen/pom.xml
Unescape 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注册中心

2
sop-example/sop-springmvc/pom.xml
Unescape 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>

2
sop-example/sop-story/sop-story-web/pom.xml
Unescape 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>

2
sop-gateway/pom.xml
Unescape 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>

2
sop-website/pom.xml
Unescape 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>

Write Preview
Loading…
Cancel
Save