diff --git a/LOG.md b/LOG.md index f0d2c279..c2ca0a6b 100644 --- a/LOG.md +++ b/LOG.md @@ -1,3 +1,6 @@ +### 1.0.30 +* 修复 消息过期判断 + ### 1.0.29 * 添加 消息过期支持 * sokcet.d 升为 2.3.6 diff --git a/folkmq-broker/pom.xml b/folkmq-broker/pom.xml index c11aabdf..df157d77 100644 --- a/folkmq-broker/pom.xml +++ b/folkmq-broker/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-lang-js/src/FolkMQ.ts b/folkmq-lang-js/src/FolkMQ.ts index b478b779..bf001702 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.0.29"; + return "1.0.30"; } /** diff --git a/folkmq-parent/pom.xml b/folkmq-parent/pom.xml index 3fa0a64d..2f2745f2 100644 --- a/folkmq-parent/pom.xml +++ b/folkmq-parent/pom.xml @@ -6,7 +6,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 pom ${project.artifactId} @@ -18,7 +18,7 @@ UTF-8 1.8 - 1.0.29 + 1.0.30 2.3.6 3.2.88 2.6.5 diff --git a/folkmq-pro/pom.xml b/folkmq-pro/pom.xml index af2aeac6..8fc56930 100644 --- a/folkmq-pro/pom.xml +++ b/folkmq-pro/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-server/pom.xml b/folkmq-server/pom.xml index adab4aec..b1816489 100644 --- a/folkmq-server/pom.xml +++ b/folkmq-server/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-test/pom.xml b/folkmq-test/pom.xml index 3708a32e..f1ff997d 100644 --- a/folkmq-test/pom.xml +++ b/folkmq-test/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-test/src/test/java/features/cases/TestCase08_expiration.java b/folkmq-test/src/test/java/features/cases/TestCase08_expiration.java index f9a96d8e..3b8ec620 100644 --- a/folkmq-test/src/test/java/features/cases/TestCase08_expiration.java +++ b/folkmq-test/src/test/java/features/cases/TestCase08_expiration.java @@ -37,7 +37,11 @@ public void start() throws Exception { assert server.getServerInternal().getQueueMap().get("demo#a").messageTotal() == 1L; - Thread.sleep(10000); + Thread.sleep(3000); + + assert server.getServerInternal().getQueueMap().get("demo#a").messageTotal() == 1L; + + Thread.sleep(3000); assert server.getServerInternal().getQueueMap().get("demo#a").messageTotal() == 0L; } diff --git a/folkmq-transport-java-tcp/pom.xml b/folkmq-transport-java-tcp/pom.xml index b056196d..239c4f87 100644 --- a/folkmq-transport-java-tcp/pom.xml +++ b/folkmq-transport-java-tcp/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-java-websocket/pom.xml b/folkmq-transport-java-websocket/pom.xml index 174c6cec..f522d5f9 100644 --- a/folkmq-transport-java-websocket/pom.xml +++ b/folkmq-transport-java-websocket/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-netty/pom.xml b/folkmq-transport-netty/pom.xml index 6ce72b1b..485095ad 100644 --- a/folkmq-transport-netty/pom.xml +++ b/folkmq-transport-netty/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq-transport-smartsocket/pom.xml b/folkmq-transport-smartsocket/pom.xml index 6fddf1c2..37972c19 100644 --- a/folkmq-transport-smartsocket/pom.xml +++ b/folkmq-transport-smartsocket/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../folkmq-parent/pom.xml diff --git a/folkmq/pom.xml b/folkmq/pom.xml index 373bef7f..a1e69788 100644 --- a/folkmq/pom.xml +++ b/folkmq/pom.xml @@ -7,7 +7,7 @@ org.noear folkmq-parent - 1.0.29 + 1.0.30 ../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 11df18a7..32a68109 100644 --- a/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java +++ b/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java @@ -14,7 +14,7 @@ public class FolkMQ { * 获取版本 */ public static String version() { - return "1.0.29"; + return "1.0.30"; } /**