From 0e556e328c91f38c6bbf45d3abbb2e39f113b1f6 Mon Sep 17 00:00:00 2001 From: noear Date: Tue, 27 Feb 2024 09:21:20 +0800 Subject: [PATCH] 1.2.2 --- LOG.md | 8 ++++++++ folkmq-broker/pom.xml | 2 +- .../src/main/resources/static/favicon.ico | Bin 0 -> 67646 bytes folkmq-lang-js/src/FolkMQ.ts | 2 +- folkmq-parent/pom.xml | 4 ++-- folkmq-pro/pom.xml | 2 +- folkmq-server/pom.xml | 2 +- .../src/main/resources/static/favicon.ico | Bin 0 -> 67646 bytes folkmq-test/pom.xml | 2 +- .../src/test/java/benchmark/RpcTest.java | 9 ++++----- folkmq-transport-java-tcp/pom.xml | 2 +- folkmq-transport-java-websocket/pom.xml | 2 +- folkmq-transport-netty/pom.xml | 2 +- folkmq-transport-smartsocket/pom.xml | 2 +- folkmq/pom.xml | 2 +- .../src/main/java/org/noear/folkmq/FolkMQ.java | 2 +- 16 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 folkmq-broker/src/main/resources/static/favicon.ico create mode 100644 folkmq-server/src/main/resources/static/favicon.ico 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 0000000000000000000000000000000000000000..16e7fd5de068a6421966380e637a54b5f24ab950 GIT binary patch literal 67646 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.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 0000000000000000000000000000000000000000..16e7fd5de068a6421966380e637a54b5f24ab950 GIT binary patch literal 67646 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 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"; } /**