From fd7ac8504500f25d2281d0fa5f635b1997cb4c00 Mon Sep 17 00:00:00 2001
From: lxy <237809796@qq.com>
Date: Thu, 18 May 2023 11:36:17 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81auth,=20bool=3D>string,=20=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=94=A8=E6=88=B7key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://47.119.165.148/zhub@166 e63fbceb-bcc3-4977-ac22-735b83d8d0f4
---
 zsub/msg-consumer.go | 4 ++--
 zsub/zsub.go         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zsub/msg-consumer.go b/zsub/msg-consumer.go
index 7d9e3be..779b372 100644
--- a/zsub/msg-consumer.go
+++ b/zsub/msg-consumer.go
@@ -32,7 +32,7 @@ func msgAccept(v Message) {
 	if LogDebug {
 		log.Printf("[%d] rcmd: %s\n", v.Conn.sn, strings.Join(rcmd, " "))
 	}
-	if !c.auth && !strings.EqualFold("auth", rcmd[0]) && strings.EqualFold(GetStr("service.auth", "0"), "1") {
+	if strings.TrimSpace(c.auth) == "" && !strings.EqualFold("auth", rcmd[0]) && strings.EqualFold(GetStr("service.auth", "0"), "1") {
 		c.send("-Auth: NOAUTH Authentication required:" + rcmd[0])
 		return
 	}
@@ -162,7 +162,7 @@ func msgAccept(v Message) {
 			inx := strings.IndexAny(rcmd[1], "@") //user@pwd
 
 			if strings.EqualFold(GetStr("auth."+rcmd[1][:inx], ""), rcmd[1][inx+1:]) {
-				c.auth = true
+				c.auth = rcmd[1][:inx]
 				c.send("+Auth: ok!")
 			} else {
 				c.send("-Auth: invalid password!")
diff --git a/zsub/zsub.go b/zsub/zsub.go
index 0460a6a..2e7bf9e 100644
--- a/zsub/zsub.go
+++ b/zsub/zsub.go
@@ -87,7 +87,7 @@ type ZConn struct { //ZConn
 	substoped map[string]chan int // 关闭信号量
 	ping      int64               // 最后心跳时间
 	pong      int64               // 最后心跳回复时间
-	auth      bool                // 是否已验证授权
+	auth      string              // 是否已验证授权
 }
 
 type Lock struct {