From 8c2ab9376c2447590a241fc6b5f052f3233c1a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <lxh@cxh.cn>
Date: Thu, 16 May 2024 00:12:47 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E4=B8=8D=E6=B4=BB=E8=B7=83=E6=88=90=E5=91=98=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/friend.go                      | 2 +-
 tasks/cleargroupuser/cleargroupuser.go | 6 +++---
 tasks/tasks.go                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/friend.go b/service/friend.go
index 948cbbb..0a40f95 100644
--- a/service/friend.go
+++ b/service/friend.go
@@ -82,7 +82,7 @@ func GetAllEnableNews() (records []entity.Friend, err error) {
 // @return records
 // @return err
 func GetAllEnableClearGroup() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("clear_members != 0").Where("is_ok IS TRUE").Find(&records).Error
+	err = client.MySQL.Where("clear_member > 0").Where("is_ok IS TRUE").Find(&records).Error
 	return
 }
 
diff --git a/tasks/cleargroupuser/cleargroupuser.go b/tasks/cleargroupuser/cleargroupuser.go
index c236b4c..0d92de8 100644
--- a/tasks/cleargroupuser/cleargroupuser.go
+++ b/tasks/cleargroupuser/cleargroupuser.go
@@ -13,7 +13,7 @@ import (
 // ClearGroupUser
 // @description: 清理群成员
 func ClearGroupUser() {
-	groups, err := service.GetAllEnableNews()
+	groups, err := service.GetAllEnableClearGroup()
 	if err != nil {
 		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
 		return
@@ -42,9 +42,9 @@ func ClearGroupUser() {
 		// 发送通知到群里
 		ms := make([]string, 0)
 		for k, v := range memberMap {
-			ms = append(ms, fmt.Sprintf("%s: %s", k, v))
+			ms = append(ms, fmt.Sprintf("昵称：%s\n最后活跃时间：%s", k, v))
 		}
-		msg := fmt.Sprintf("#清理群成员#\n\n很遗憾地通知各位，就在刚刚，有%d名群友引活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n活跃信息: \n%s",
+		msg := fmt.Sprintf("#清理群成员\n\n很遗憾地通知各位，就在刚刚，有%d名群友引活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n活跃信息: \n%s",
 			memberCount, strings.Join(ms, "\n"))
 		utils.SendMessage(group.Wxid, "", msg, 0)
 	}
diff --git a/tasks/tasks.go b/tasks/tasks.go
index 9627c01..46c0efe 100644
--- a/tasks/tasks.go
+++ b/tasks/tasks.go
@@ -58,7 +58,7 @@ func InitTasks() {
 	}
 
 	// 每天0点检查一次处理清理群成员
-	_, _ = s.Cron("0 0 * * *").Do(cleargroupuser.ClearGroupUser)
+	_, _ = s.Cron("12 0 * * *").Do(cleargroupuser.ClearGroupUser)
 
 	// 开启定时任务
 	s.StartAsync()