1.2.2

noear · Feb 27, 2024 · 0e556e3 · 0e556e3
1 parent 1106af0
commit 0e556e3
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 18 deletions.
diff --git a/LOG.md b/LOG.md
@@ -1,3 +1,11 @@
+### 1.2.2
+* 调整 response 拆分为：transactionCheckback 和 listen
+* 调整 request 改为 send
+* 添加 transactionCheckback 用于响应服务端的事务回查
+* 添加 listen 和 send 配套接口
+* 添加 后台图标
+* 完善 许可证本地处理机制
+
 ### 1.2.1
 * 添加 协议版本的握手传递
 * 添加 消息事务支持（即二段式提交），支持反向事务确认

diff --git a/folkmq-broker/pom.xml b/folkmq-broker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-broker/src/main/resources/static/favicon.ico b/folkmq-broker/src/main/resources/static/favicon.ico
diff --git a/folkmq-lang-js/src/FolkMQ.ts b/folkmq-lang-js/src/FolkMQ.ts
@@ -6,7 +6,7 @@ export class FolkMQ {
      * 获取版本
      */
     static version(): string {
-        return "1.2.1";
+        return "1.2.2";
     }
 
     /**

diff --git a/folkmq-parent/pom.xml b/folkmq-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>folkmq-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <folkmq.version>1.2.1</folkmq.version>
+        <folkmq.version>1.2.2</folkmq.version>
         <socketd.version>2.4.3</socketd.version>
         <snack3.version>3.2.88</snack3.version>
         <solon.version>2.7.1</solon.version>

diff --git a/folkmq-pro/pom.xml b/folkmq-pro/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-server/pom.xml b/folkmq-server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-server/src/main/resources/static/favicon.ico b/folkmq-server/src/main/resources/static/favicon.ico
diff --git a/folkmq-test/pom.xml b/folkmq-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-test/src/test/java/benchmark/RpcTest.java b/folkmq-test/src/test/java/benchmark/RpcTest.java
@@ -26,17 +26,16 @@ public static void main(String[] args) throws Exception {
                 .nameAs("demo-app1")
                 .connect();
 
-        MqClient client2 = FolkMQ.createClient("folkmq://127.0.0.1:18602?ak=folkmq&sk=YapLHTx19RlsEE16")
-                .nameAs("demo-app2")
-                .connect();
-
         client1.listen(m->{
-            if("tag".equals(m.getTag())) {
+            if("test".equals(m.getTag())) {
                 m.acknowledge(true);
                 countDownLatch.countDown();
             }
         });
 
+        MqClient client2 = FolkMQ.createClient("folkmq://127.0.0.1:18602?ak=folkmq&sk=YapLHTx19RlsEE16")
+                .nameAs("demo-app2")
+                .connect();
 
         //发布测试
         long start_time = System.currentTimeMillis();

diff --git a/folkmq-transport-java-tcp/pom.xml b/folkmq-transport-java-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-transport-java-websocket/pom.xml b/folkmq-transport-java-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-transport-netty/pom.xml b/folkmq-transport-netty/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-transport-smartsocket/pom.xml b/folkmq-transport-smartsocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq/pom.xml b/folkmq/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java b/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java
@@ -28,7 +28,7 @@ public static String versionCodeAsString() {
      * 获取版本名称
      */
     public static String versionName() {
-        return "1.2.1";
+        return "1.2.2";
     }
 
     /**