diff --git a/LOG.md b/LOG.md index ff645c91..9888aaee 100644 --- 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 index 145ea931..6476dc36 100644 --- a/folkmq-broker/pom.xml +++ b/folkmq-broker/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-broker/src/main/resources/static/favicon.ico b/folkmq-broker/src/main/resources/static/favicon.ico new file mode 100644 index 00000000..16e7fd5d Binary files /dev/null and b/folkmq-broker/src/main/resources/static/favicon.ico differ diff --git a/folkmq-lang-js/src/FolkMQ.ts b/folkmq-lang-js/src/FolkMQ.ts index 63bd54c1..aa5016e2 100644 --- 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 index 31e8f6c6..82c2530d 100644 --- a/folkmq-parent/pom.xml +++ b/folkmq-parent/pom.xml @@ -6,7 +6,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 pom ${project.artifactId} @@ -18,7 +18,7 @@ UTF-8 1.8 - 1.2.1 + 1.2.2 2.4.3 3.2.88 2.7.1 diff --git a/folkmq-pro/pom.xml b/folkmq-pro/pom.xml index ed96daa5..fea5c55e 100644 --- a/folkmq-pro/pom.xml +++ b/folkmq-pro/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-server/pom.xml b/folkmq-server/pom.xml index 046573a5..c2bf2a9a 100644 --- a/folkmq-server/pom.xml +++ b/folkmq-server/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-server/src/main/resources/static/favicon.ico b/folkmq-server/src/main/resources/static/favicon.ico new file mode 100644 index 00000000..16e7fd5d Binary files /dev/null and b/folkmq-server/src/main/resources/static/favicon.ico differ diff --git a/folkmq-test/pom.xml b/folkmq-test/pom.xml index 631c3c1f..0669d27b 100644 --- a/folkmq-test/pom.xml +++ b/folkmq-test/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-test/src/test/java/benchmark/RpcTest.java b/folkmq-test/src/test/java/benchmark/RpcTest.java index c820c2ee..f0bb2cc7 100644 --- 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 index 3a07b60c..79c7b1ed 100644 --- a/folkmq-transport-java-tcp/pom.xml +++ b/folkmq-transport-java-tcp/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-java-websocket/pom.xml b/folkmq-transport-java-websocket/pom.xml index a49cf15b..52e41ca1 100644 --- a/folkmq-transport-java-websocket/pom.xml +++ b/folkmq-transport-java-websocket/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-netty/pom.xml b/folkmq-transport-netty/pom.xml index 802d7c0a..49c9a33e 100644 --- a/folkmq-transport-netty/pom.xml +++ b/folkmq-transport-netty/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-smartsocket/pom.xml b/folkmq-transport-smartsocket/pom.xml index 5dbd269b..a1ffd8e1 100644 --- a/folkmq-transport-smartsocket/pom.xml +++ b/folkmq-transport-smartsocket/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq/pom.xml b/folkmq/pom.xml index dffc98cb..447800f6 100644 --- a/folkmq/pom.xml +++ b/folkmq/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.2.1 + 1.2.2 ../folkmq-parent/pom.xml diff --git a/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java b/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java index fec47ab1..1bf5eb2c 100644 --- 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"; } /**