4.4.1

4 years ago · 06f400fb81
parent 0e20e75752
commit 06f400fb81
22 changed files with 28 additions and 24 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,9 @@
 # changelog

+## 4.4.1
+
+- 修复单值参数绑定问题
+
 ## 4.4.0

 **【重要】：升级前请阅读 [升级到4.4.0注意事项](./升级到4.4.0注意事项.md)**
--- a/doc/pom.xml
+++ b/doc/pom.xml
@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>doc</artifactId>
-	<version>4.4.0-SNAPSHOT</version>
+	<version>4.4.1-SNAPSHOT</version>

 	<properties>
 		<!-- Generic properties -->
--- a/pom.xml
+++ b/pom.xml
@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-parent</artifactId>
-	<version>4.4.0-SNAPSHOT</version>
+	<version>4.4.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>一个开放平台解决方案项目，基于Spring Cloud实现，目标是能够让用户快速得搭建起自己的开放平台</description>

--- a/sop-admin/pom.xml
+++ b/sop-admin/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

--- a/sop-admin/sop-admin-server/pom.xml
+++ b/sop-admin/sop-admin-server/pom.xml
@ -5,13 +5,13 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sop-admin-server</artifactId>
-	<version>4.4.0-SNAPSHOT</version>
+	<version>4.4.1-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<properties>
--- a/sop-auth/pom.xml
+++ b/sop-auth/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sdk-java</artifactId>
-			<version>4.4.0-SNAPSHOT</version>
+			<version>4.4.1-SNAPSHOT</version>
 		</dependency>
 		<!-- http请求 -->
 		<dependency>
--- a/sop-common/pom.xml
+++ b/sop-common/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

--- a/sop-common/sop-bridge-eureka/pom.xml
+++ b/sop-common/sop-bridge-eureka/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-common</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/sop-common/sop-bridge-nacos/pom.xml
+++ b/sop-common/sop-bridge-nacos/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-common</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/sop-common/sop-gateway-common/pom.xml
+++ b/sop-common/sop-gateway-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-common</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-common/sop-service-common/pom.xml
+++ b/sop-common/sop-service-common/pom.xml
@ -5,7 +5,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gitee.sop</groupId>
    <artifactId>sop-service-common</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.4.1-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
--- 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);
--- a/sop-example/pom.xml
+++ b/sop-example/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-example/sop-springmvc/pom.xml
+++ b/sop-example/sop-springmvc/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-example/sop-story/pom.xml
+++ b/sop-example/sop-story/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- 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;
--- a/sop-gateway/pom.xml
+++ b/sop-gateway/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-sdk/pom.xml
+++ b/sop-sdk/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

--- a/sop-sdk/sdk-java/pom.xml
+++ b/sop-sdk/sdk-java/pom.xml
@ -4,13 +4,13 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sdk-java</artifactId>
-	<version>4.4.0-SNAPSHOT</version>
+	<version>4.4.1-SNAPSHOT</version>

 	<properties>
 		<!-- Generic properties -->
--- a/sop-test/pom.xml
+++ b/sop-test/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-website/pom.xml
+++ b/sop-website/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gitee.sop</groupId>
 		<artifactId>sop-parent</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
+		<version>4.4.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

--- a/sop-website/sop-website-server/pom.xml
+++ b/sop-website/sop-website-server/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-website</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>4.4.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>