From 9e6d3fad5dbd43d2a3341547e138004e71b89a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <lxh@cxh.cn>
Date: Fri, 30 Aug 2024 10:07:03 +0800
Subject: [PATCH] :bug: Fix a bug.

---
 config.yaml                     |  4 ++--
 model/dto/message.go            | 17 ++++++++++++++++-
 plugin/plugins/systemmessgae.go |  5 ++++-
 service/friendsync.go           |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/config.yaml b/config.yaml
index 9e941a6..bba6411 100644
--- a/config.yaml
+++ b/config.yaml
@@ -31,7 +31,7 @@ system:
 # 微信HOOK配置
 wechat:
   # 微信HOOK接口地址
-  host: 10.0.0.79:19088
+  host: 10.0.0.79:19098
   # 微信容器映射出来的vnc页面地址，没有就不填
   #  vncUrl: http://192.168.1.175:19087/vnc_lite.html
   # 是否在启动的时候自动设置hook服务的回调
@@ -81,7 +81,7 @@ mq:
   enable: false
   # RabbitMQ配置
   rabbitmq:
-    host: 10.0.0.247
+    host: 10.0.0.31
     port: 5672
     user: wechat
     password: wechat123
diff --git a/model/dto/message.go b/model/dto/message.go
index 487c535..3261d55 100644
--- a/model/dto/message.go
+++ b/model/dto/message.go
@@ -250,7 +250,11 @@ func (m Message) IsJoinToGroup() (flag bool) {
 	if m.Type != types.MsgTypeSys {
 		return
 	}
-	return strings.Contains(m.Content, "\"邀请你加入了群聊，群聊参与人还有：")
+	flag = strings.Contains(m.Content, "\"邀请你加入了群聊，群聊参与人还有：")
+	if flag {
+		return
+	}
+	return strings.Contains(m.Content, "\"邀请你和\"") && strings.Contains(m.Content, "\"加入了群聊")
 }
 
 // IsRemoveFromChatroom
@@ -263,3 +267,14 @@ func (m Message) IsRemoveFromChatroom() (flag bool) {
 	}
 	return strings.HasPrefix(m.Content, "你被\"") && strings.HasSuffix(m.Content, "\"移出群聊")
 }
+
+// IsChangeGroupName
+// @description: 是否是修改群名称消息
+// @receiver m
+// @return flag
+func (m Message) IsChangeGroupName() (flag bool) {
+	if m.Type != types.MsgTypeSys {
+		return
+	}
+	return strings.HasPrefix(m.Content, "\"修改群名为“")
+}
diff --git a/plugin/plugins/systemmessgae.go b/plugin/plugins/systemmessgae.go
index 0b669d8..a06832d 100644
--- a/plugin/plugins/systemmessgae.go
+++ b/plugin/plugins/systemmessgae.go
@@ -4,6 +4,7 @@ import (
 	"go-wechat/plugin"
 	"go-wechat/service"
 	"go-wechat/utils"
+	"time"
 )
 
 // ReplyNewFriend
@@ -14,10 +15,12 @@ func ReplyNewFriend(m *plugin.MessageContext) {
 		_ = utils.SendMessage(m.FromUser, m.GroupUser, "AI正在初始化，请稍等几分钟，初始化完成之后我将主动告知您。", 0)
 	}
 	if m.IsOldFriendBack() {
-		_ = utils.SendMessage(m.FromUser, m.GroupUser, "嘿，我的朋友，你为何要离我而去？又为何去而复返？", 0)
+		_ = utils.SendMessage(m.FromUser, "", "嘿，我的朋友，你为何要离我而去？又为何去而复返？", 0)
 	}
 
 	go func() {
+		// 等待5秒
+		time.Sleep(5 * time.Second)
 		// 刷新好友列表
 		service.SyncFriend()
 		// 如果是加入群，刷新群成员列表
diff --git a/service/friendsync.go b/service/friendsync.go
index 70131e4..8d2f701 100644
--- a/service/friendsync.go
+++ b/service/friendsync.go
@@ -237,7 +237,7 @@ func SyncGroupMembers(wxId string) {
 				// 新增的
 				// 新增
 				err = client.MySQL.Create(&entity.GroupUser{
-					GroupId:    wxid,
+					GroupId:    wxId,
 					Account:    cp.Account,
 					HeadImage:  cp.HeadImage,
 					Nickname:   cp.Nickname,