From 293f3e5c090a441639ac7813f170edc352f27732 Mon Sep 17 00:00:00 2001
From: jjxu <428192774@qq.com>
Date: Thu, 19 Jun 2025 12:34:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=9B=9E=E5=A4=8D=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/common/jwt/common.go          |  2 +-
 pkg/service/asChat/robot/robot.go | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/common/jwt/common.go b/pkg/common/jwt/common.go
index 9d57d1d..2db9497 100644
--- a/pkg/common/jwt/common.go
+++ b/pkg/common/jwt/common.go
@@ -54,7 +54,7 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
 		originId = int64(fieeJwtInfo.ID)
 		newChatUser = &accountFiee.ChatUserData{
 			NickName: fieeJwtInfo.NickName,
-			Account:  fieeJwtInfo.Account,
+			Account:  fieeJwtInfo.Phone,
 			Role:     1,
 			Origin:   config.AppConfig.System.Domain,
 			OriginId: int64(fieeJwtInfo.ID),
diff --git a/pkg/service/asChat/robot/robot.go b/pkg/service/asChat/robot/robot.go
index d82988c..d27785b 100644
--- a/pkg/service/asChat/robot/robot.go
+++ b/pkg/service/asChat/robot/robot.go
@@ -165,11 +165,12 @@ func (r *Robot) Run() {
 			fmt.Printf("robot listen event:%#v\n", event)
 			r.mu.Lock()
 			//加入聊天室规则
-			hit := false
+			hasHit := false
 			for _, rule := range r.joinSessionRules {
-				hit = rule.Hit(event, r.Info)
+				hit := rule.Hit(event, r.Info)
 				fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 				if hit {
+					hasHit = true
 					if rule.RunTime().IsZero() {
 						err := rule.Run(r.cache)
 						if err != nil {
@@ -180,11 +181,12 @@ func (r *Robot) Run() {
 					}
 				}
 			}
-			if !hit {
+			if !hasHit {
 				for _, rule := range r.keywordsRules {
-					hit = rule.Hit(event, r.Info)
+					hit := rule.Hit(event, r.Info)
 					fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 					if hit {
+						hasHit = true
 						fmt.Println("命中规则:", rule.GetTitle())
 						if rule.RunTime().IsZero() {
 							err := rule.Run(r.cache)
@@ -197,11 +199,12 @@ func (r *Robot) Run() {
 					}
 				}
 			}
-			if !hit {
+			if !hasHit {
 				for _, rule := range r.noReplyAfterRules {
-					hit = rule.Hit(event, r.Info)
+					hit := rule.Hit(event, r.Info)
 					fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 					if hit {
+						hasHit = true
 						fmt.Println("命中规则:", rule.GetTitle())
 						if rule.RunTime().IsZero() {
 							err := rule.Run(r.cache)