From 873d86fd6028f3c7742c509d0ec9db0cf2f2cf94 Mon Sep 17 00:00:00 2001
From: lxy <237809796@qq.com>
Date: Tue, 2 Feb 2021 09:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Adalay=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AD=97=E7=AC=A6=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/zdemo/{zdb => zhub}/ZHubClient.java | 36 ++++++++++++++++++++-
 test/com/zdemo/test/AppTest.java            |  7 ++--
 test/com/zdemo/test/MyConsumer.java         |  2 +-
 3 files changed, 40 insertions(+), 5 deletions(-)
 rename src/com/zdemo/{zdb => zhub}/ZHubClient.java (87%)

diff --git a/src/com/zdemo/zdb/ZHubClient.java b/src/com/zdemo/zhub/ZHubClient.java
similarity index 87%
rename from src/com/zdemo/zdb/ZHubClient.java
rename to src/com/zdemo/zhub/ZHubClient.java
index ecada2d..5ef3446 100644
--- a/src/com/zdemo/zdb/ZHubClient.java
+++ b/src/com/zdemo/zhub/ZHubClient.java
@@ -1,4 +1,4 @@
-package com.zdemo.zdb;
+package com.zdemo.zhub;
 
 import com.zdemo.*;
 import org.redkale.convert.json.JsonConvert;
@@ -277,10 +277,44 @@ public abstract class ZHubClient extends AbstractConsumer implements IConsumer,
         send("broadcast", topic, toStr(v));
     }
 
+    // 发送 publish 主题消息，若多次发送的 topic + "-" + value 相同，将会做延时重置
     public <V> void delay(String topic, V v, int delay) {
         send("delay", topic, toStr(v), String.valueOf(delay));
     }
 
+    // 表达式支持：d+[d,H,m,s]
+    public <V> void delay(String topic, V v, String delayExpr) {
+        String endchar = "";
+        int delay;
+        if (delayExpr.matches("^\\d+[d,H,m,s]$")) {
+            endchar = delayExpr.substring(delayExpr.length() - 1);
+            delay = Integer.parseInt(delayExpr.substring(0, delayExpr.length() - 1));
+        } else {
+            if (!delayExpr.matches("^\\d+$")) {
+                throw new IllegalArgumentException(String.format("ScheduledCycle period config error: [%s]", delayExpr));
+            }
+
+            delay = Integer.parseInt(delayExpr);
+            if (delay <= 0L) {
+                throw new IllegalArgumentException(String.format("ScheduledCycle period config error: [%s]", delayExpr));
+            }
+        }
+
+        if ("M".equals(endchar)) {
+            delay *= (1000 * 60 * 60 * 24 * 30);
+        } else if ("d".equals(endchar)) {
+            delay *= (1000 * 60 * 60 * 24);
+        } else if ("H".equals(endchar)) {
+            delay *= (1000 * 60 * 60);
+        } else if ("m".equals(endchar)) {
+            delay *= (1000 * 60);
+        } else if ("s".equals(endchar)) {
+            delay *= 1000;
+        }
+
+        delay(topic, v, delay);
+    }
+
     @Override
     public void subscribe(String topic, Consumer<String> consumer) {
         addEventType(EventType.of(topic, consumer));
diff --git a/test/com/zdemo/test/AppTest.java b/test/com/zdemo/test/AppTest.java
index 412120d..36cb9c8 100644
--- a/test/com/zdemo/test/AppTest.java
+++ b/test/com/zdemo/test/AppTest.java
@@ -25,6 +25,7 @@ public class AppTest {
             MyConsumer consumer = Application.singleton(MyConsumer.class);
 
             consumer.subscribe("a", str -> {
+                System.out.println(System.currentTimeMillis());
                 logger.info("我收到了消息 a 事件：" + str);
             });
 
@@ -40,9 +41,9 @@ public class AppTest {
             consumer.timer("b", () -> {
                 System.out.println(Utility.now() + " ----------------- timer b 执行了");
             });
-            consumer.delay("a", "1", 3000);
-            consumer.delay("a", "1", 5000);
-            logger.info("----");
+            //consumer.delay("a", "1", 200);
+            System.out.println(System.currentTimeMillis());
+            consumer.delay("a", "1", "2000");
 
             Thread.sleep(60_000 * 60);
         } catch (Exception e) {
diff --git a/test/com/zdemo/test/MyConsumer.java b/test/com/zdemo/test/MyConsumer.java
index a6110b0..5e8cf6a 100644
--- a/test/com/zdemo/test/MyConsumer.java
+++ b/test/com/zdemo/test/MyConsumer.java
@@ -1,6 +1,6 @@
 package com.zdemo.test;
 
-import com.zdemo.zdb.ZHubClient;
+import com.zdemo.zhub.ZHubClient;
 
 public class MyConsumer extends ZHubClient {