修复：多次重连后消息订阅失败 bug

git-svn-id: svn://47.119.165.148/zhub@72 e63fbceb-bcc3-4977-ac22-735b83d8d0f4

cli/client.go

@@ -23,6 +23,7 @@ type Client struct {
 
 	subFun   map[string]func(v string) // subscribe topic and callback function
 	timerFun map[string]func()         // subscribe timer amd callback function
+	dalyFun  map[string]func()
 
 	chSend       chan []string // chan of send message
 	chReceive    chan []string // chan of receive message
@@ -45,6 +46,7 @@ func Create(addr string, groupid string) (*Client, error) {
 
 		subFun:       make(map[string]func(v string)),
 		timerFun:     make(map[string]func()),
+		dalyFun:      make(map[string]func()),
 		chSend:       make(chan []string, 100),
 		chReceive:    make(chan []string, 100),
 		timerReceive: make(chan []string, 100),
@@ -139,8 +141,9 @@ func (c *Client) Publish(topic string, message string) error {
 	return nil
 }
 
-func (c *Client) Daly(topic string, message string, daly int) error {
-	c.send("daly", topic, message, strconv.Itoa(daly))
+func (c *Client) Daly(topic string, daly int, fun func()) error {
+	c.send("daly", topic, strconv.Itoa(daly))
+	c.dalyFun[topic] = fun
 	return nil
 }
 
@@ -167,6 +170,10 @@ func (c *Client) Cmd(cmd string) {
 	c.send("cmd", cmd)
 }
 
+func (c *Client) Close() {
+	c.conn.Close()
+}
+
 /*
 // subscribe topic
 ---
@@ -264,6 +271,11 @@ 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])
+				continue
+			}
 
 			continue
 		case "+": // +pong, +xxx