diff --git a/changelog.md b/changelog.md index 56f43429..2288d657 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # changelog +## 4.4.1 + +- 修复单值参数绑定问题 + ## 4.4.0 **【重要】:升级前请阅读 [升级到4.4.0注意事项](./升级到4.4.0注意事项.md)** diff --git a/doc/pom.xml b/doc/pom.xml index e9a5fcc0..e11f02e8 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.gitee.sop doc - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 807bed5c..f17f2788 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT pom 一个开放平台解决方案项目,基于Spring Cloud实现,目标是能够让用户快速得搭建起自己的开放平台 diff --git a/sop-admin/pom.xml b/sop-admin/pom.xml index 25ec91df..c6cf57fb 100644 --- a/sop-admin/pom.xml +++ b/sop-admin/pom.xml @@ -6,7 +6,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index 701a365d..38dd1cc8 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -5,13 +5,13 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../../pom.xml 4.0.0 sop-admin-server - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT jar diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml index 60d51212..f44d262f 100644 --- a/sop-auth/pom.xml +++ b/sop-auth/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml @@ -38,7 +38,7 @@ com.gitee.sop sdk-java - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 378e02b5..7e0a4700 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -6,7 +6,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-common/sop-bridge-eureka/pom.xml b/sop-common/sop-bridge-eureka/pom.xml index 8b122f5d..068047cb 100644 --- a/sop-common/sop-bridge-eureka/pom.xml +++ b/sop-common/sop-bridge-eureka/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-common - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sop-common/sop-bridge-nacos/pom.xml b/sop-common/sop-bridge-nacos/pom.xml index e394afa0..c4236651 100644 --- a/sop-common/sop-bridge-nacos/pom.xml +++ b/sop-common/sop-bridge-nacos/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-common - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 49acb240..d1c769bf 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-common - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 01d220a0..d0fabe79 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-service-common - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT jar diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/SingleParameterContext.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/SingleParameterContext.java index d2574df6..e6d7aaed 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/SingleParameterContext.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/SingleParameterContext.java @@ -25,8 +25,8 @@ public class SingleParameterContext { public static void add(Parameter parameter, Open open) { String version = open.version(); version = "".equals(version) ? ServiceConfig.getInstance().getDefaultVersion() : version; - String key = open.value() + version; String parameterName = parameter.getName(); + String key = open.value() + version + parameterName; Class wrapClass = singleFieldWrapper.create(parameter, parameterName); SingleParameterContextValue value = new SingleParameterContextValue(); value.setParameterName(parameterName); diff --git a/sop-example/pom.xml b/sop-example/pom.xml index d3cf02b6..7f3d1ab1 100644 --- a/sop-example/pom.xml +++ b/sop-example/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index d045afac..a0185c51 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../../pom.xml diff --git a/sop-example/sop-story/pom.xml b/sop-example/sop-story/pom.xml index d4ce228d..a69c8ea0 100644 --- a/sop-example/sop-story/pom.xml +++ b/sop-example/sop-story/pom.xml @@ -4,7 +4,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../../pom.xml diff --git a/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java index 28839f3e..3b04aa6d 100644 --- a/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java +++ b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java @@ -171,7 +171,7 @@ public class Example1001_BaseController { // 参数绑定 @Open(value = "story.param.bind", mergeResult = false) @RequestMapping("/get/param/v1") - public StoryResult param(@RequestParam("id") Integer id, @RequestParam String name) { + public StoryResult param(String id, String name) { StoryResult result = new StoryResult(); result.setName("参数绑定:id:" + id + ", name:" + name); return result; diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index 205e882a..2767b072 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -4,7 +4,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-sdk/pom.xml b/sop-sdk/pom.xml index ffb39022..b0204794 100644 --- a/sop-sdk/pom.xml +++ b/sop-sdk/pom.xml @@ -6,7 +6,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-sdk/sdk-java/pom.xml b/sop-sdk/sdk-java/pom.xml index 01f148f0..93b58071 100644 --- a/sop-sdk/sdk-java/pom.xml +++ b/sop-sdk/sdk-java/pom.xml @@ -4,13 +4,13 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../../pom.xml 4.0.0 sdk-java - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT diff --git a/sop-test/pom.xml b/sop-test/pom.xml index db45c02e..e9b147bd 100644 --- a/sop-test/pom.xml +++ b/sop-test/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-website/pom.xml b/sop-website/pom.xml index e7d8fc89..4df9b30c 100644 --- a/sop-website/pom.xml +++ b/sop-website/pom.xml @@ -6,7 +6,7 @@ com.gitee.sop sop-parent - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/sop-website/sop-website-server/pom.xml b/sop-website/sop-website-server/pom.xml index 2cc2b1a3..1d4cbae3 100644 --- a/sop-website/sop-website-server/pom.xml +++ b/sop-website/sop-website-server/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-website - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml