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)