7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into registry-nacos

Browse Source
This commit is contained in:
tanghc
2019-08-07 10:00:00 +08:00
parent f244575976 64d79ba3eb
commit 734265601c
30 changed files with 205 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sop-example/sop-auth/pom.xml
View File

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

2
sop-example/sop-auth/src/test/java/com/gitee/sop/sopauth/RefreshTokenTest.java
View File

@@ -26,7 +26,7 @@ public class RefreshTokenTest extends TestCase {
OpenAuthTokenAppRequest request = new OpenAuthTokenAppRequest();
OpenAuthTokenAppModel model = new OpenAuthTokenAppModel();
model.setGrant_type("refresh_token");
model.setRefresh_token("856faf8d77d3b985c1073557ce6ea724");
model.setRefresh_token("c9e4003c06fe59066eed73d64ea074ca");
request.setBizModel(model);
OpenAuthTokenAppResponse response = openClient.execute(request);

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

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

2
sop-example/sop-easyopen/pom.xml
View File

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

2
sop-example/sop-springmvc/pom.xml
View File

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

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

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

4
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java
View File

@@ -30,7 +30,7 @@ public class AlipayController {
// http://localhost:2222/story_get
// 原生的接口，可正常调用
@RequestMapping("story_get")
public Story getStory4() {
public Story story_get() {
Story story = new Story();
story.setId(1);
story.setName("海底小纵队(原生)");
@@ -117,7 +117,7 @@ public class AlipayController {
// http://localhost:2222/getStory2?version=2.1
// 遗留接口具备开放平台能力，在原来的基础上加版本号
@ApiAbility(version = "2.1")
@RequestMapping("getStory2")
@GetMapping("getStory2")
public Story getStory2_1() {
Story story = new Story();
story.setId(1);

23
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java
View File

@@ -6,6 +6,7 @@ import com.gitee.sop.servercommon.bean.OpenContext;
import com.gitee.sop.story.api.domain.Story;
import com.gitee.sop.storyweb.controller.param.StoryParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
@@ -23,7 +24,7 @@ public class PostJsonController {
* @return
*/
@ApiMapping("demo.post.json")
public Story postJson(StoryParam param) {
public Story postJson(@RequestBody StoryParam param) {
// 获取开放平台请求参数
OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
List<Object> params = Arrays.asList(
@@ -37,5 +38,25 @@ public class PostJsonController {
return story;
}
/**
* 演示客户端使用json方式请求（application/json）
* @param param
* @return
*/
@ApiMapping(value = "demo.post.json", version = "1.2")
public Story postJson2(StoryParam param) {
// 获取开放平台请求参数
OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
List<Object> params = Arrays.asList(
openContext.getAppId(),
openContext.getMethod(),
openContext.getVersion()
);
Story story = new Story();
story.setId(1);
story.setName("1.2 参数：" + param.getName() + ", openParams:" + StringUtils.join(params));
return story;
}
}