Merge branch 'master' into eureka

4 years ago · 8ff1b13570
parent 8ecc64de22 31202908a4
commit 8ff1b13570
23 changed files with 57 additions and 24 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,9 @@
 # changelog

+## 4.3.4
+
+- 修复Request参数在第一位导致绑定失败问题
+
 ## 4.3.3

 - 修复获取eureka地址问题
--- 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.3.3-SNAPSHOT</version>
+	<version>4.3.4-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.3.3-SNAPSHOT</version>
+	<version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sop-admin-server</artifactId>
-	<version>4.3.3-SNAPSHOT</version>
+	<version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sdk-java</artifactId>
-			<version>4.3.3-SNAPSHOT</version>
+			<version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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
@ -6,13 +6,13 @@
    <parent>
        <groupId>com.gitee.sop</groupId>
        <artifactId>sop-common</artifactId>
-        <version>4.3.3-SNAPSHOT</version>
+        <version>4.3.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>sop-service-common</artifactId>
-    <version>4.3.3-SNAPSHOT</version>
+    <version>4.3.4-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
--- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java
+++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java
@ -209,7 +209,11 @@ public class ApiArgumentResolver implements SopHandlerMethodArgumentResolver {
     */
    protected Object getParamObject(MethodParameter methodParameter, NativeWebRequest nativeWebRequest) {
        HttpServletRequest request = (HttpServletRequest) nativeWebRequest.getNativeRequest();
-        OpenContextImpl openContext = initOpenContextImpl(nativeWebRequest);
+        ServiceContext currentContext = ServiceContext.getCurrentContext();
+        OpenContextImpl openContext = (OpenContextImpl)currentContext.getOpenContext();
+        if (openContext == null) {
+            openContext = initOpenContextImpl(nativeWebRequest);
+        }
        Map<String, Object> requestParams = openContext.getParameterMap();
        Object bizObj = requestParams.get(ParamNames.BIZ_CONTENT_NAME);
        String bizContent = bizObj == null ? null : bizObj.toString();
--- 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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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
@ -9,6 +9,7 @@ import com.gitee.sop.servercommon.bean.ServiceContext;
 import com.gitee.sop.servercommon.exception.ServiceException;
 import com.gitee.sop.storyweb.controller.param.ArrayElementParam;
 import com.gitee.sop.storyweb.controller.param.CategoryParam;
+import com.gitee.sop.storyweb.controller.param.GoodsParam;
 import com.gitee.sop.storyweb.controller.param.LargeTextParam;
 import com.gitee.sop.storyweb.controller.param.MemberInfoGetParam;
 import com.gitee.sop.storyweb.controller.param.StoryParam;
@ -132,6 +133,12 @@ public class Example1001_BaseController {
        return result;
    }

+    @Open("story.system.param.get4")
+    @RequestMapping("/get/system/param/v4")
+    public Object addGoods3(HttpServletRequest request, StoryParam param) {
+        return param;
+    }
+
    // 参数绑定，少量参数可以这样写，参数多了建议放进类里面
    @Open(value = "story.oneparam")
    @GetMapping("/oneParam/v1")
--- 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.3.3-SNAPSHOT</version>
+        <version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-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.3.3-SNAPSHOT</version>
+		<version>4.3.4-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sdk-java</artifactId>
-	<version>4.3.3-SNAPSHOT</version>
+	<version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>

--- a/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java
+++ b/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java
@ -404,6 +404,24 @@ public class AllInOneTest extends TestBase {
        client.execute(requestBuilder);
    }

+    public void testParamBind() {
+        Client.RequestBuilder requestBuilder = new Client.RequestBuilder()
+                .method("story.system.param.get4")
+                .version("1.0")
+                .bizContent(new BizContent().add("id", "1").add("name", "葫芦娃"))
+                .postJson(true)
+                .httpMethod(HttpTool.HTTPMethod.POST)
+                .callback((requestInfo, responseData) -> {
+                    System.out.println(responseData);
+                    String node = requestInfo.getDataNode();
+                    JSONObject jsonObject = JSON.parseObject(responseData).getJSONObject(node);
+                    Assert.assertEquals(1L, jsonObject.getLongValue("id"));
+                    Assert.assertEquals("葫芦娃", jsonObject.getString("name"));
+                });
+
+        client.execute(requestBuilder);
+    }
+
    static class BizContent extends HashMap<String, Object> {
        public BizContent add(String key, Object value) {
            this.put(key, value);
--- 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.3.3-SNAPSHOT</version>
+		<version>4.3.4-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.3.3-SNAPSHOT</version>
+        <version>4.3.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
    </parent>