4.0.0

README.md

@@ -22,6 +22,54 @@ SOP封装了开放平台大部分功能包括：签名验证、统一异常处
 
 以上情况都可以考虑使用SOP
 
+```java
+// 加一个注解即可
+@Open("story.get")
+@RequestMapping("/get")
+public StoryResult get() {
+    StoryResult result = new StoryResult();
+    result.setId(1L);
+    result.setName("海底小纵队(原生)");
+    return result;
+}
+```
+
+调用：
+
+```java
+// 公共请求参数
+Map<String, String> params = new HashMap<String, String>();
+params.put("app_id", appId);
+params.put("method", "story.get");
+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.0");
+
+// 业务参数
+Map<String, String> bizContent = new HashMap<>();
+bizContent.put("id", "1");
+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("URL参数：" + buildUrlQuery(params));
+
+System.out.println("----------- 返回结果 -----------");
+String responseData = get(url, params);// 发送请求
+System.out.println(responseData);
+```
+
 ## 架构图
 
 ![架构图](https://images.gitee.com/uploads/images/2019/1227/145216_c9b45109_332975.png "sop3.png")
@@ -81,7 +129,7 @@ SOP封装了开放平台大部分功能包括：签名验证、统一异常处
 
 ## 分支说明
 
-- master：发版分支（当前为3.0版本，2.x版本见`2.x`分支）
+- master：发版分支（当前为4.0版本）
 - develop：日常开发分支
 - eureka：使用eureka注册中心
 

sop-admin/sop-admin-server/pom.xml

@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-bridge-nacos</artifactId>
-			<version>3.2.0-SNAPSHOT</version>
+			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- easyopen starter -->

sop-auth/pom.xml

@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>3.2.0-SNAPSHOT</version>
+			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- sop相关配置 end-->
 

sop-common/pom.xml

@@ -12,7 +12,6 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sop-common</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

sop-common/sop-bridge-eureka/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <artifactId>sop-bridge-eureka</artifactId>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

sop-common/sop-bridge-nacos/pom.xml

@@ -8,8 +8,9 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <artifactId>sop-bridge-nacos</artifactId>
 
@@ -17,7 +18,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

sop-common/sop-gateway-common/pom.xml

@@ -11,7 +11,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sop-gateway-common</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

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

@@ -12,7 +12,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sop-service-common</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

sop-example/sop-springmvc/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
         <!-- nacos  -->
         <dependency>

sop-example/sop-story/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

sop-gateway/pom.xml

@@ -24,7 +24,7 @@
             <groupId>com.gitee.sop</groupId>
              <artifactId>sop-bridge-nacos</artifactId>
 <!--             <artifactId>sop-bridge-eureka</artifactId>-->
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java

@@ -36,8 +36,6 @@ public class AlipayClientPostTest extends TestBase {
     @Test
     public void testGet() throws Exception {
 
-        // 接口实现见：com.gitee.sop.storyweb.controller.AlipayController.getStory
-
         // 公共请求参数
         Map<String, String> params = new HashMap<String, String>();
         params.put("app_id", appId);

sop-website/pom.xml

@@ -25,7 +25,7 @@
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-bridge-nacos</artifactId>
             <!--<artifactId>sop-bridge-eureka</artifactId>-->
-            <version>3.2.0-SNAPSHOT</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>