fiee/fonchain-fiee
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'chat' into dev

Browse Source
This commit is contained in:
徐俊杰 2025-06-19 12:35:11 +08:00
commit ebaeac28fb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/common/jwt/common.go
View File

@ -54,7 +54,7 @@ func ParseToChatUser(c *gin.Context) (chatUserInfo *accountFiee.ChatUserData, co
originId = int64(fieeJwtInfo.ID) originId = int64(fieeJwtInfo.ID)
newChatUser = &accountFiee.ChatUserData{ newChatUser = &accountFiee.ChatUserData{
NickName: fieeJwtInfo.NickName, NickName: fieeJwtInfo.NickName,
Account: fieeJwtInfo.Account, Account: fieeJwtInfo.Phone,
Role: 1, Role: 1,
Origin: config.AppConfig.System.Domain, Origin: config.AppConfig.System.Domain,
OriginId: int64(fieeJwtInfo.ID), OriginId: int64(fieeJwtInfo.ID),

15
pkg/service/asChat/robot/robot.go
View File

@ -165,11 +165,12 @@ func (r *Robot) Run() {
fmt.Printf("robot listen event:%#v\n", event) fmt.Printf("robot listen event:%#v\n", event)
r.mu.Lock() r.mu.Lock()
//加入聊天室规则 //加入聊天室规则
hit := false hasHit := false
for _, rule := range r.joinSessionRules { 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) fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
if hit { if hit {
hasHit = true
if rule.RunTime().IsZero() { if rule.RunTime().IsZero() {
err := rule.Run(r.cache) err := rule.Run(r.cache)
if err != nil { if err != nil {
@ -180,11 +181,12 @@ func (r *Robot) Run() {
} }
} }
} }
if !hit { if !hasHit {
for _, rule := range r.keywordsRules { 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) fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
if hit { if hit {
hasHit = true
fmt.Println("命中规则:", rule.GetTitle()) fmt.Println("命中规则:", rule.GetTitle())
if rule.RunTime().IsZero() { if rule.RunTime().IsZero() {
err := rule.Run(r.cache) err := rule.Run(r.cache)
@ -197,11 +199,12 @@ func (r *Robot) Run() {
} }
} }
} }
if !hit { if !hasHit {
for _, rule := range r.noReplyAfterRules { 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) fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
if hit { if hit {
hasHit = true
fmt.Println("命中规则:", rule.GetTitle()) fmt.Println("命中规则:", rule.GetTitle())
if rule.RunTime().IsZero() { if rule.RunTime().IsZero() {
err := rule.Run(r.cache) err := rule.Run(r.cache)