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

Merge branch 'hotfix'

Browse Source
1.x
tanghc 5 years ago
parent 64d79ba3eb 774515ccc1
commit 4269b04f12
13 changed files with 19 additions and 18 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. 2
      sop-admin/sop-admin-server/pom.xml
  2. 2
      sop-common/pom.xml
  3. 4
      sop-common/sop-gateway-common/pom.xml
  4. 2
      sop-common/sop-registry-api/pom.xml
  5. 4
      sop-common/sop-service-common/pom.xml
  6. 9
      sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ServiceZookeeperApiMetaManager.java
  7. 2
      sop-example/sop-auth/pom.xml
  8. 2
      sop-example/sop-book/sop-book-web/pom.xml
  9. 2
      sop-example/sop-easyopen/pom.xml
  10. 2
      sop-example/sop-springmvc/pom.xml
  11. 2
      sop-example/sop-story/sop-story-web/pom.xml
  12. 2
      sop-gateway/pom.xml
  13. 2
      sop-website/website-server/pom.xml

2
sop-admin/sop-admin-server/pom.xml
Unescape View File

@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-registry-api</artifactId> <artifactId>sop-registry-api</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<!-- easyopen starter --> <!-- easyopen starter -->

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>1.13.6-SNAPSHOT</version> <version>1.13.7-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>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>sop-gateway-common</name> <name>sop-gateway-common</name>

2
sop-common/sop-registry-api/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-registry-api</artifactId> <artifactId>sop-registry-api</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>sop-service-common</name> <name>sop-service-common</name>

9
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/manager/ServiceZookeeperApiMetaManager.java
Unescape View File

@ -37,6 +37,8 @@ public class ServiceZookeeperApiMetaManager implements ApiMetaManager {
private static final String PATH_SPLIT = "/"; private static final String PATH_SPLIT = "/";
private static final String DEFAULT_CONTEXT_PATH = "/";
private Environment environment; private Environment environment;
private ZookeeperTool zookeeperTool; private ZookeeperTool zookeeperTool;
@ -146,14 +148,13 @@ public class ServiceZookeeperApiMetaManager implements ApiMetaManager {
} }
protected String buildServletPath(ServiceApiInfo serviceApiInfo, ServiceApiInfo.ApiMeta apiMeta) { protected String buildServletPath(ServiceApiInfo serviceApiInfo, ServiceApiInfo.ApiMeta apiMeta) {
String contextPath = environment.getProperty("server.servlet.context-path", DEFAULT_CONTEXT_PATH);
String servletPath = apiMeta.getPath(); String servletPath = apiMeta.getPath();
if (servletPath == null) { if (servletPath == null) {
servletPath = ""; servletPath = "";
} }
if (!servletPath.startsWith(PATH_SPLIT)) { StringUtils.trimLeadingCharacter(servletPath, '/');
servletPath = PATH_SPLIT + servletPath; return contextPath + servletPath;
}
return servletPath;
} }
/** /**

2
sop-example/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>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>

2
sop-example/sop-book/sop-book-web/pom.xml
Unescape View File

@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-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>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>

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>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<!-- eureka 服务发现 --> <!-- eureka 服务发现 -->
<dependency> <dependency>

2
sop-example/sop-story/sop-story-web/pom.xml
Unescape View File

@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>

2
sop-gateway/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ --> <!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ -->

2
sop-website/website-server/pom.xml
Unescape View File

@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-registry-api</artifactId> <artifactId>sop-registry-api</artifactId>
<version>1.13.6-SNAPSHOT</version> <version>1.13.7-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

Write Preview
Loading…
Cancel
Save