1.0.30

noear · Jan 17, 2024 · 0a6a52e · 0a6a52e
1 parent 1622f62
commit 0a6a52e
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 14 deletions.
diff --git 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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.0.29</version>
+        <version>1.0.30</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

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.0.29";
+        return "1.0.30";
     }
 
     /**

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.0.29</version>
+    <version>1.0.30</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.0.29</folkmq.version>
+        <folkmq.version>1.0.30</folkmq.version>
         <socketd.version>2.3.6</socketd.version>
         <snack3.version>3.2.88</snack3.version>
         <solon.version>2.6.5</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.0.29</version>
+        <version>1.0.30</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.0.29</version>
+        <version>1.0.30</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

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.0.29</version>
+        <version>1.0.30</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git 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
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.0.29</version>
+        <version>1.0.30</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.0.29</version>
+        <version>1.0.30</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.0.29</version>
+        <version>1.0.30</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.0.29</version>
+        <version>1.0.30</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.0.29</version>
+        <version>1.0.30</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
@@ -14,7 +14,7 @@ public class FolkMQ {
      * 获取版本
      */
     public static String version() {
-        return "1.0.29";
+        return "1.0.30";
     }
 
     /**