Merge branch 'master' into registry-nacos

This commit is contained in:
tanghc
2019-08-13 15:34:19 +08:00
40 changed files with 982 additions and 198 deletions

View File

@@ -26,7 +26,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>1.15.0-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.14.0-SNAPSHOT</version>
<version>1.15.0-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.14.0-SNAPSHOT</version>
<version>1.15.0-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.14.0-SNAPSHOT</version>
<version>1.15.0-SNAPSHOT</version>
</dependency>
<!-- eureka 服务发现 -->
<dependency>

View File

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

View File

@@ -31,7 +31,7 @@ public class OpenServiceConfig extends AlipayServiceConfiguration {
/**
* 开启文档
* 开启文档本地微服务文档地址http://localhost:2222/doc.html
* http://ip:port/v2/api-docs
*/
@Configuration

View File

@@ -1,5 +1,6 @@
package com.gitee.sop.storyweb.controller;
import com.alibaba.fastjson.JSON;
import com.gitee.sop.servercommon.annotation.ApiAbility;
import com.gitee.sop.servercommon.annotation.ApiMapping;
import com.gitee.sop.servercommon.bean.OpenContext;
@@ -147,6 +148,19 @@ public class AlipayController {
return story2;
}
/**
* 验证字符串乱码问题
* @param param
* @return
*/
@ApiMapping(value = "story.string.get", version = "1.0")
public String string(Story param) {
Story story2 = new Story();
story2.setId(1);
story2.setName("海底小纵队");
return JSON.toJSONString(story2);
}
/**
* 参数绑定
* @param story 对应biz_content中的内容并自动JSR-303校验