Merge branch 'master' into eureka

changelog.md

@@ -1,5 +1,9 @@
 # changelog
 
+## 4.4.1
+
+- 修复单值参数绑定问题
+
 ## 4.4.0
 
 **【重要】：升级前请阅读 [升级到4.4.0注意事项](./升级到4.4.0注意事项.md)**

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 -->

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>
 

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>
 

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>

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>
 
@@ -37,7 +37,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>

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>
 

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>

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>

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>
 

sop-common/sop-service-common/pom.xml

@@ -1,22 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent>
-        <groupId>com.gitee.sop</groupId>
-        <artifactId>sop-common</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
-    </parent>
-
     <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>
         <java.version>1.8</java.version>
+
+        <!-- springboot 版本-->
+        <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
+        <!-- spring cloud 版本 -->
+        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+        <!-- spring cloud alibaba 版本 -->
+        <!-- 具体版本对应关系见：https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E -->
+        <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
+
+        <!-- Logging -->
+        <logback.version>1.2.3</logback.version>
+        <!-- Test -->
+        <junit.version>4.11</junit.version>
+        <fastjson.version>1.2.73</fastjson.version>
+        <commons-io.version>2.5</commons-io.version>
+        <commons-fileupload.version>1.3.3</commons-fileupload.version>
+        <commons-collection.version>3.2.2</commons-collection.version>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-codec.version>1.11</commons-codec.version>
+        <commons-logging.version>1.2</commons-logging.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
+        <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
+        <fastmybatis.version>1.9.1</fastmybatis.version>
+        <guava.version>29.0-jre</guava.version>
+        <swagger.version>1.5.21</swagger.version>
+        <springfox-spring-web.version>2.9.2</springfox-spring-web.version>
+        <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
+        <easyopen.version>1.16.9</easyopen.version>
+        <asm.version>6.2</asm.version>
+        <pagehelper.version>5.2.0</pagehelper.version>
     </properties>
 
     <dependencies>
@@ -108,5 +131,179 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <!-- 加了这个就不需要加版本号了 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.oschina.durcframework</groupId>
+                <artifactId>fastmybatis-spring-boot-starter</artifactId>
+                <version>${fastmybatis.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-spring-web</artifactId>
+                <version>${springfox-spring-web.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${springfox-swagger2.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.oschina.durcframework</groupId>
+                <artifactId>easyopen</artifactId>
+                <version>${easyopen.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>3.14.7</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.oschina.durcframework</groupId>
+                <artifactId>easyopen-spring-boot-starter</artifactId>
+                <version>${easyopen.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>${validation-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>${hibernate-validator.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <!-- commons -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons-collection.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons-fileupload.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper</artifactId>
+                <version>${pagehelper.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.4</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <!-- 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

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);

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>
 

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>
 

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>
 

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;

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>
 

sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/MyRouteInterceptor.java

@@ -5,6 +5,7 @@ import com.gitee.sop.gatewaycommon.interceptor.RouteInterceptorContext;
 import com.gitee.sop.gatewaycommon.param.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 
 import java.net.URI;
@@ -34,6 +35,10 @@ public class MyRouteInterceptor implements RouteInterceptor {
 
     @Override
     public void afterRoute(RouteInterceptorContext context) {
+        String serviceErrorMsg = context.getServiceErrorMsg();
+        if (StringUtils.hasText(serviceErrorMsg)) {
+            log.error("错误信息:{}", serviceErrorMsg);
+        }
     }
 
     @Override

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>
 

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 -->

sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java

@@ -44,6 +44,8 @@ public abstract class BaseRequest<T extends BaseResponse> {
     private String bizContent = EMPTY_JSON;
     private Object bizModel;
 
+    private RequestMethod requestMethod = RequestMethod.POST;
+
     /**
      * 上传文件
      */
@@ -144,13 +146,12 @@ public abstract class BaseRequest<T extends BaseResponse> {
         return responseClass;
     }
 
-    /**
+
-     * 指定HTTP请求method,默认POST
+    public RequestMethod getRequestMethod() {
-     *
+        return requestMethod;
-     * @return
-     */
-    protected RequestMethod getRequestMethod() {
-        return RequestMethod.POST;
     }
 
+    public void setRequestMethod(RequestMethod requestMethod) {
+        this.requestMethod = requestMethod;
+    }
 }

sop-sdk/sdk-java/src/test/java/com/gitee/sop/sdk/SdkTest.java

@@ -3,6 +3,7 @@ package com.gitee.sop.sdk;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gitee.sop.sdk.client.OpenClient;
+import com.gitee.sop.sdk.common.RequestMethod;
 import com.gitee.sop.sdk.common.UploadFile;
 import com.gitee.sop.sdk.model.DemoFileUploadModel;
 import com.gitee.sop.sdk.model.GetStoryModel;
@@ -65,6 +66,7 @@ public class SdkTest extends TestCase {
         Map<String, Object> bizModel = new HashMap<>();
         bizModel.put("name", "白雪公主");
         request.setBizModel(bizModel);
+//        request.setRequestMethod(RequestMethod.GET);
 
         // 发送请求
         CommonResponse response = client.execute(request);

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>
 

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>
 

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>