From 8fd6eea28ef4e227b8eac5747826084309cd0b73 Mon Sep 17 00:00:00 2001
From: lxy <237809796@qq.com>
Date: Mon, 1 Feb 2021 11:37:51 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Adelay=20=E4=BB=A3?=
 =?UTF-8?q?=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://47.119.165.148/zhub@96 e63fbceb-bcc3-4977-ac22-735b83d8d0f4
---
 cli/client.go        | 10 +++++-----
 cli_test.go          |  2 +-
 zsub/msg-consumer.go | 10 +++++-----
 zsub/zsub.go         |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cli/client.go b/cli/client.go
index af9757d..21e0a5f 100644
--- a/cli/client.go
+++ b/cli/client.go
@@ -149,8 +149,8 @@ func (c *Client) Broadcast(topic string, message string) error {
 	return c.send("broadcast", topic, message)
 }
 
-func (c *Client) Daly(topic string, message string, daly int) error {
-	return c.send("daly", topic, message, strconv.Itoa(daly))
+func (c *Client) Delay(topic string, message string, delay int) error {
+	return c.send("delay", topic, message, strconv.Itoa(delay))
 }
 
 /*func (c *Client) Timer(topic string, expr string, fun func()) {
@@ -264,9 +264,9 @@ func (c *Client) receive() {
 				c.timerReceive <- vs
 				continue
 			}
-			/*if len(vs) == 2 && strings.EqualFold(vs[0], "daly") {
-				c.dalyFun[vs[1]]()
-				delete(c.dalyFun, vs[1])
+			/*if len(vs) == 2 && strings.EqualFold(vs[0], "delay") {
+				c.delayFun[vs[1]]()
+				delete(c.delayFun, vs[1])
 				continue
 			}*/
 
diff --git a/cli_test.go b/cli_test.go
index f2da3e7..d33a179 100644
--- a/cli_test.go
+++ b/cli_test.go
@@ -36,7 +36,7 @@ func TestCli(t *testing.T) {
 	client.Subscribe("a", func(v string) {
 		log.Println("收到主题 a 消息 " + v)
 	})
-	client.Daly("a", "x", 3000)
+	client.Delay("a", "x", 3000)
 
 	time.Sleep(time.Hour * 3)
 }
diff --git a/zsub/msg-consumer.go b/zsub/msg-consumer.go
index fa9e4e2..e82384e 100644
--- a/zsub/msg-consumer.go
+++ b/zsub/msg-consumer.go
@@ -38,7 +38,7 @@ func msgAccept(v Message) {
 				return false
 			}
 
-			arr := []string{"subscribe", "unsubscribe", "daly", "groupid"}
+			arr := []string{"subscribe", "unsubscribe", "delay", "groupid"}
 			if startWithAny(rcmd[0], arr...) {
 				rcmd = strings.Split(rcmd[0], " ")
 			} else {
@@ -69,8 +69,8 @@ func msgAccept(v Message) {
 		}
 	case "broadcast":
 		zsub.broadcast(rcmd[1], rcmd[2])
-	case "daly":
-		zsub.daly(rcmd, c)
+	case "delay":
+		zsub.delay(rcmd, c)
 	case "timer":
 		zsub.timer(rcmd, c)
 	case "cmd":
@@ -87,8 +87,8 @@ func msgAccept(v Message) {
 	}
 }
 
-// daly topic value 100 -> publish topic value
-func (s *ZSub) daly(rcmd []string, c *ZConn) {
+// delay topic value 100 -> publish topic value
+func (s *ZSub) delay(rcmd []string, c *ZConn) {
 	s.Lock()
 	defer s.Unlock()
 	if len(rcmd) != 4 {
diff --git a/zsub/zsub.go b/zsub/zsub.go
index adf4033..c34833c 100644
--- a/zsub/zsub.go
+++ b/zsub/zsub.go
@@ -149,7 +149,7 @@ func (s *ZSub) close(c *ZConn) {
 		s.unsubscribe(c, topic)
 	}
 
-	// daly
+	// delay
 
 	// timer conn close
 	s.Lock()