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

Merge branch 'eureka' into fit-eureka

Browse Source
pull/1/head
tanghc 5 years ago
parent 8f6a76f4e4 1c78bdcc02
commit a101b5e5a8
12 changed files with 14 additions and 13 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. 2
      doc/docs/files/10070_easyopen支持.md
  3. 2
      sop-auth/pom.xml
  4. 2
      sop-common/pom.xml
  5. 4
      sop-common/sop-gateway-common/pom.xml
  6. 4
      sop-common/sop-service-common/pom.xml
  7. 2
      sop-example/sop-book/sop-book-web/pom.xml
  8. 2
      sop-example/sop-easyopen/pom.xml
  9. 2
      sop-example/sop-springmvc/pom.xml
  10. 2
      sop-example/sop-story/sop-story-web/pom.xml
  11. 2
      sop-gateway/pom.xml
  12. 2
      sop-website/pom.xml

1
README.md
Unescape View File

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

2
doc/docs/files/10070_easyopen支持.md
Unescape View File

@ -13,7 +13,7 @@ SOP对easyopen项目提供了很好的支持，如果您的服务端使用了eas
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>2.1.3-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- 使用nacos注册中心 <!-- 使用nacos注册中心

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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>

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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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.1.3-SNAPSHOT</version> <version>2.2.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

@ -29,7 +29,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.1.3-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ --> <!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ -->

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.1.3-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

Write Preview
Loading…
Cancel
Save