diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index ff05f7e3..b74deaf0 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -30,7 +30,7 @@ com.gitee.sop sop-registry-api - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index b504064c..b9474842 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT pom diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 69d81f49..4944f39f 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -5,11 +5,11 @@ com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT ../pom.xml sop-gateway-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT jar sop-gateway-common diff --git a/sop-common/sop-registry-api/pom.xml b/sop-common/sop-registry-api/pom.xml index f3bfcbe7..f2aa4b67 100644 --- a/sop-common/sop-registry-api/pom.xml +++ b/sop-common/sop-registry-api/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-registry-api - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT UTF-8 diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 2be58d1f..a0b12082 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -6,11 +6,11 @@ com.gitee.sop sop-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT ../pom.xml sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT jar sop-service-common diff --git a/sop-example/sop-auth/pom.xml b/sop-example/sop-auth/pom.xml index c16a2a0d..581fb460 100644 --- a/sop-example/sop-auth/pom.xml +++ b/sop-example/sop-auth/pom.xml @@ -26,7 +26,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml index 04be1bc8..c1610423 100644 --- a/sop-example/sop-book/sop-book-web/pom.xml +++ b/sop-example/sop-book/sop-book-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml index d7422ed6..ce2fe39c 100644 --- a/sop-example/sop-easyopen/pom.xml +++ b/sop-example/sop-easyopen/pom.xml @@ -29,7 +29,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index 4652ae4f..84f68b37 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -20,7 +20,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml index 254cbf45..c80b2131 100644 --- a/sop-example/sop-story/sop-story-web/pom.xml +++ b/sop-example/sop-story/sop-story-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java index c22509cb..a04a59df 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java @@ -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); diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java index 0bc5e45a..8bed5cf8 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/PostJsonController.java @@ -37,5 +37,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 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; + } + } diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index 43c550e8..617820af 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -23,7 +23,7 @@ com.gitee.sop sop-gateway-common - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java index aed2ee6a..68aaf5d9 100644 --- a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java +++ b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java @@ -118,7 +118,7 @@ public class OpenHttp { * @return * @throws IOException */ - public String request(String url, Map form, Map header, String method) throws IOException { + public String request(String url, Map form, Map header, HTTPMethod method) throws IOException { Request.Builder requestBuilder = buildRequestBuilder(url, form, method); // 添加header addHeader(requestBuilder, header); @@ -134,21 +134,21 @@ public class OpenHttp { } } - public static Request.Builder buildRequestBuilder(String url, Map form, String method) { + public static Request.Builder buildRequestBuilder(String url, Map form, HTTPMethod method) { switch (method) { - case "get": + case GET: return new Request.Builder() .url(buildHttpUrl(url, form)) .get(); - case "head": + case HEAD: return new Request.Builder() .url(buildHttpUrl(url, form)) .head(); - case "put": + case PUT: return new Request.Builder() .url(url) .put(buildFormBody(form)); - case "delete": + case DELETE: return new Request.Builder() .url(url) .delete(buildFormBody(form)); @@ -241,5 +241,22 @@ public class OpenHttp { this.httpClient = httpClient; } + public enum HTTPMethod { + GET, + POST, + PUT, + HEAD, + DELETE; + private HTTPMethod() { + } + + public String value() { + return this.name(); + } + + public static HTTPMethod fromValue(String v) { + return valueOf(v.toUpperCase()); + } + } } diff --git a/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java b/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java index 989382df..2409977d 100644 --- a/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java +++ b/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java @@ -111,7 +111,7 @@ public class HttpTool { * @throws IOException */ public String request(String url, Map form, Map header, HTTPMethod method) throws IOException { - Request.Builder requestBuilder = buildRequestBuilder(url, form, method.value()); + Request.Builder requestBuilder = buildRequestBuilder(url, form, method); // 添加header addHeader(requestBuilder, header); @@ -153,21 +153,21 @@ public class HttpTool { } } - public static Request.Builder buildRequestBuilder(String url, Map form, String method) { + public static Request.Builder buildRequestBuilder(String url, Map form, HTTPMethod method) { switch (method) { - case "get": + case GET: return new Request.Builder() .url(buildHttpUrl(url, form)) .get(); - case "head": + case HEAD: return new Request.Builder() .url(buildHttpUrl(url, form)) .head(); - case "put": + case PUT: return new Request.Builder() .url(url) .put(buildFormBody(form)); - case "delete": + case DELETE: return new Request.Builder() .url(url) .delete(buildFormBody(form)); diff --git a/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java b/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java index 640fb5e7..223734ff 100644 --- a/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java +++ b/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java @@ -231,4 +231,35 @@ public class AlipayClientPostTest extends TestBase { System.out.println(responseData); } + @Test + public void testGetStory2() throws AlipayApiException { + // 公共请求参数 + Map params = new HashMap(); + params.put("app_id", appId); + params.put("method", "getStory2"); + params.put("version", "1.0"); + params.put("format", "json"); + params.put("charset", "utf-8"); + params.put("sign_type", "RSA2"); + params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + // 业务参数 + Map bizContent = new HashMap<>(); + + params.put("biz_content", JSON.toJSONString(bizContent)); + + System.out.println("----------- 请求信息 -----------"); + System.out.println("请求参数：" + buildParamQuery(params)); + System.out.println("商户秘钥：" + privateKey); + String content = AlipaySignature.getSignContent(params); + System.out.println("待签名内容：" + content); + String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8"); + System.out.println("签名(sign)：" + sign); + + params.put("sign", sign); + + System.out.println("----------- 返回结果 -----------"); + String responseData = get(url, params);// 发送请求 + System.out.println(responseData); + } + } diff --git a/sop-test/src/test/java/com/gitee/sop/test/PostJsonTest.java b/sop-test/src/test/java/com/gitee/sop/test/PostJsonTest.java index 308ef486..b40f1a67 100644 --- a/sop-test/src/test/java/com/gitee/sop/test/PostJsonTest.java +++ b/sop-test/src/test/java/com/gitee/sop/test/PostJsonTest.java @@ -49,7 +49,41 @@ public class PostJsonTest extends TestBase { params.put("sign", sign); System.out.println("----------- 返回结果 -----------"); - String responseData = get(url, params);// 发送请求 + String responseData = postJson(url, params);// 发送请求 + System.out.println(responseData); + } + + @Test + public void testPostJson2() throws Exception { + + // 公共请求参数 + Map params = new HashMap(); + params.put("app_id", appId); + params.put("method", "demo.post.json"); + params.put("format", "json"); + params.put("charset", "utf-8"); + params.put("sign_type", "RSA2"); + params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + params.put("version", "1.2"); + + // 业务参数 + Map bizContent = new HashMap<>(); + bizContent.put("name", "葫芦娃"); + + params.put("biz_content", JSON.toJSONString(bizContent)); + + System.out.println("----------- 请求信息 -----------"); + System.out.println("请求参数：" + buildParamQuery(params)); + System.out.println("商户秘钥：" + privateKey); + String content = AlipaySignature.getSignContent(params); + System.out.println("待签名内容：" + content); + String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8"); + System.out.println("签名(sign)：" + sign); + + params.put("sign", sign); + + System.out.println("----------- 返回结果 -----------"); + String responseData = postJson(url, params);// 发送请求 System.out.println(responseData); } diff --git a/sop-website/website-server/pom.xml b/sop-website/website-server/pom.xml index c9e62cf7..72a66b50 100644 --- a/sop-website/website-server/pom.xml +++ b/sop-website/website-server/pom.xml @@ -25,7 +25,7 @@ com.gitee.sop sop-registry-api - 1.13.4-SNAPSHOT + 1.13.5-SNAPSHOT diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java b/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java index 8e0cce0e..ee280d4f 100644 --- a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java +++ b/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java @@ -111,7 +111,7 @@ public class HttpTool { * @throws IOException */ public String request(String url, Map form, Map header, HTTPMethod method) throws IOException { - Request.Builder requestBuilder = buildRequestBuilder(url, form, method.value()); + Request.Builder requestBuilder = buildRequestBuilder(url, form, method); // 添加header addHeader(requestBuilder, header); @@ -153,21 +153,21 @@ public class HttpTool { } } - public static Request.Builder buildRequestBuilder(String url, Map form, String method) { + public static Request.Builder buildRequestBuilder(String url, Map form, HTTPMethod method) { switch (method) { - case "get": + case GET: return new Request.Builder() .url(buildHttpUrl(url, form)) .get(); - case "head": + case HEAD: return new Request.Builder() .url(buildHttpUrl(url, form)) .head(); - case "put": + case PUT: return new Request.Builder() .url(url) .put(buildFormBody(form)); - case "delete": + case DELETE: return new Request.Builder() .url(url) .delete(buildFormBody(form)); @@ -262,6 +262,9 @@ public class HttpTool { HEAD, DELETE; + private HTTPMethod() { + } + public String value() { return this.name(); }