Merge branch 'master' into registry-nacos

This commit is contained in:
tanghc
2019-07-26 12:23:33 +08:00
19 changed files with 126 additions and 47 deletions

View File

@@ -26,7 +26,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.13.2-SNAPSHOT</version>
<version>1.13.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

View File

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

View File

@@ -29,7 +29,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.13.2-SNAPSHOT</version>
<version>1.13.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

View File

@@ -20,7 +20,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.13.2-SNAPSHOT</version>
<version>1.13.3-SNAPSHOT</version>
</dependency>
<!-- eureka 服务发现 -->
<dependency>

View File

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

View File

@@ -64,6 +64,13 @@ public class AlipayController {
return story;
}
// 忽略验证
@ApiMapping(value = "story.get", version = "2.1", ignoreValidate = true)
public Story getStory21(Story story) {
story.setName(story.getName() + ", story.get2.1, ignoreValidate = true");
return story;
}
// http://localhost:2222/getStory2
// 遗留接口具备开放平台能力
@ApiAbility

View File

@@ -45,7 +45,7 @@ public class TraditionalWebappController {
}
// http://localhost:8081/rest/food/getFoodByObj?id=2
@ApiMapping(value = "ggetFoodByObj", method = RequestMethod.GET)
@ApiMapping(value = "getFoodByObj", method = RequestMethod.GET)
public Food getFoodByObj(Food food) {
return food;
}