Merge branch 'master' into develop

# Conflicts:
#	changelog.md
#	sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamNames.java
#	sop-common/sop-registry-api/src/main/java/com/gitee/sop/registryapi/bean/HttpTool.java
#	sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingRequestCondition.java
#	sop-test/src/main/java/com/gitee/sop/test/HttpTool.java
#	sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java
This commit is contained in:
tanghc
2019-08-05 18:36:16 +08:00
26 changed files with 151 additions and 56 deletions

View File

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