Merge pull request '🎨 优化好友列表同步处理逻辑' (#55) from hotfix into main

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/55

app/friend.go

@@ -182,3 +182,26 @@ func ChangeSkipGroupRankStatus(ctx *gin.Context) {
 
 	ctx.String(http.StatusOK, "操作成功")
 }
+
+// ChangeEnableNewsStatus
+// @description: 修改是否开启新闻
+// @param ctx
+func ChangeEnableNewsStatus(ctx *gin.Context) {
+	var p changeStatusParam
+	if err := ctx.ShouldBindJSON(&p); err != nil {
+		ctx.String(http.StatusBadRequest, "参数错误")
+		return
+	}
+	log.Printf("待修改的Id：%s", p.WxId)
+
+	err := client.MySQL.Model(&entity.Friend{}).
+		Where("wxid = ?", p.WxId).
+		Update("`enable_news`", gorm.Expr(" !`enable_news`")).Error
+	if err != nil {
+		log.Printf("修改早报启用状态失败：%s", err)
+		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
+		return
+	}
+
+	ctx.String(http.StatusOK, "操作成功")
+}

config.yaml

@@ -1,3 +1,22 @@
+system:
+  # 添加新好友或群之后通知给指定的人
+  newFriendNotify:
+    enable: true
+    toUser:
+      - "wxid_xxx"
+  # 默认AI等配置
+  defaultRule:
+    # 默认是否开启AI
+    ai: true
+    # 默认是否开启水群排行榜
+    chatRank: true
+    # 默认是否开启聊天记录总结
+    summary: true
+    # 默认是否开启新成员加群欢迎
+    welcome: true
+    # 每日早报
+    news: true
+
 # 微信HOOK配置
 wechat:
   # 微信HOOK接口地址
@@ -23,12 +42,15 @@ mysql:
   schema: public # postgres 专用
 
 task:
-  enable: false
+  enable: true
+  news:
+    enable: true
+    cron: '14 11 * * *' # 每天0:30
   syncFriends:
     enable: false
     cron: '*/5 * * * *' # 五分钟一次
   groupSummary:
-    enable: true
+    enable: false
     cron: '30 0 * * *' # 每天0:30
   waterGroup:
     enable: false

config/config.go

@@ -6,6 +6,7 @@ var Conf conf
 // Config
 // @description: 配置
 type conf struct {
+	System   system                  `json:"system" yaml:"system"`     // 系统配置
 	Task     task                    `json:"task" yaml:"task"`         // 定时任务配置
 	MySQL    mysql                   `json:"mysql" yaml:"mysql"`       // MySQL 配置
 	Wechat   wechat                  `json:"wechat" yaml:"wechat"`     // 微信助手

config/system.go

@@ -0,0 +1,22 @@
+package config
+
+// 系统配置
+type system struct {
+	NewFriendNotify newFriendNotify `json:"newFriendNotify" yaml:"newFriendNotify"` // 新好友通知
+	DefaultRule     defaultRule     `json:"defaultRule" yaml:"defaultRule"`         // 默认规则
+}
+
+// 添加新好友或群之后通知给指定的人
+type newFriendNotify struct {
+	Enable bool     `json:"enable" yaml:"enable"` // 是否启用
+	ToUser []string `json:"toUser" yaml:"toUser"` // 通知给谁
+}
+
+// 默认规则
+type defaultRule struct {
+	Ai       bool `json:"ai" yaml:"ai"`             // 是否启用AI
+	ChatRank bool `json:"chatRank" yaml:"chatRank"` // 是否启用聊天排行榜
+	Summary  bool `json:"summary" yaml:"summary"`   // 是否启用聊天总结
+	Welcome  bool `json:"welcome" yaml:"welcome"`   // 是否启用欢迎新成员
+	News     bool `json:"news" yaml:"news"`         // 是否启用每日早报
+}

config/task.go

@@ -4,6 +4,7 @@ package config
 // @description: 定时任务
 type task struct {
 	Enable       bool        `json:"enable" yaml:"enable"`             // 是否启用
+	News         syncFriends `json:"news" yaml:"news"`                 // 每日早报
 	SyncFriends  syncFriends `json:"syncFriends" yaml:"syncFriends"`   // 同步好友
 	WaterGroup   waterGroup  `json:"waterGroup" yaml:"waterGroup"`     // 水群排行榜
 	GroupSummary syncFriends `json:"groupSummary" yaml:"groupSummary"` // 群聊总结

entity/friend.go

@@ -19,6 +19,8 @@ type Friend struct {
 	EnableChatRank bool      `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
 	EnableWelcome  bool      `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
 	EnableSummary  bool      `json:"enableSummary" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用总结
+	EnableNews     bool      `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"`     // 是否启用新闻
+	ClearMember    int       `json:"clearMember"`                                              // 清理成员配置（多少天未活跃的）
 	IsOk           bool      `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
 }
 

model/news.go

@@ -0,0 +1,18 @@
+package model
+
+// MorningPost
+// @description: 每日早报返回结构体
+type MorningPost struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data struct {
+		Date      string   `json:"date"`       // 新闻日期
+		News      []string `json:"news"`       // 新闻标题文字版
+		WeiYu     string   `json:"weiyu"`      // 微语，就是一句屁话
+		Image     string   `json:"image"`      // 早报完整图片
+		HeadImage string   `json:"head_image"` // 早报头部图片
+	} `json:"data"`
+	Time  int    `json:"time"`
+	Usage int    `json:"usage"`
+	LogId string `json:"log_id"`
+}

plugin/plugins/ai.go

@@ -54,7 +54,7 @@ func AI(m *plugin.MessageContext) {
 
 	// 组装消息体
 	messages := make([]openai.ChatCompletionMessage, 0)
-	if config.Conf.Ai.Personality != "" {
+	if prompt != "" {
 		// 填充人设
 		messages = append(messages, openai.ChatCompletionMessage{
 			Role:    openai.ChatMessageRoleSystem,

plugin/plugins/command/kfc.go

@@ -4,6 +4,7 @@ import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/utils"
 	"log"
+	"net/http"
 )
 
 // KfcCrazyThursdayCmd
@@ -33,8 +34,9 @@ func kfcApi1() string {
 	res := resty.New()
 	resp, err := res.R().
 		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
-	if err != nil {
+	if err != nil || resp.StatusCode() != http.StatusOK {
-		log.Panicf("KFC接口1文案获取失败: %s", err.Error())
+		log.Printf("KFC接口1文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口1文案获取结果: %s", resp.String())
 	return resp.String()
@@ -58,8 +60,9 @@ func kfcApi2() string {
 	resp, err := res.R().
 		SetResult(&resData).
 		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
-	if err != nil {
+	if err != nil || resp.StatusCode() != http.StatusOK {
-		log.Panicf("KFC接口2文案获取失败: %s", err.Error())
+		log.Printf("KFC接口2文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口2文案获取结果: %s", resp.String())
 	if resData.Data.Msg != "" {
@@ -84,8 +87,9 @@ func kfcApi3() string {
 	resp, err := res.R().
 		SetResult(&resData).
 		Post("https://api.pearktrue.cn/api/kfc")
-	if err != nil {
+	if err != nil || resp.StatusCode() != http.StatusOK {
-		log.Panicf("KFC接口3文案获取失败: %s", err.Error())
+		log.Printf("KFC接口3文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口3文案获取结果: %s", resp.String())
 	if resData.Text != "" {

router/router.go

@@ -26,6 +26,7 @@ func Init(g *gin.Engine) {
 	api.POST("/ai/model", app.ChangeUseAiModel)                   // 修改使用的AI模型
 	api.PUT("/welcome/status", app.ChangeEnableWelcomeStatus)     // 修改是否开启迎新状态
 	api.PUT("/command/status", app.ChangeEnableCommandStatus)     // 修改是否开启指令状态
+	api.PUT("/news/status", app.ChangeEnableNewsStatus)           // 修改是否开启早报状态
 	api.PUT("/grouprank/status", app.ChangeEnableGroupRankStatus) // 修改是否开启水群排行榜状态
 	api.PUT("/grouprank/skip", app.ChangeSkipGroupRankStatus)     // 修改是否跳过水群排行榜状态
 	api.GET("/group/users", app.GetGroupUsers)                    // 获取群成员列表

service/friend.go

@@ -49,7 +49,10 @@ func GetAllEnableAI() (records []entity.Friend, err error) {
 // @return records
 // @return err
 func GetAllEnableChatRank() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("enable_chat_rank = ?", 1).Where("wxid LIKE '%@chatroom'").Find(&records).Error
+	err = client.MySQL.Where("enable_chat_rank = ?", 1).
+		Where("is_ok IS TRUE").
+		Where("wxid LIKE '%@chatroom'").
+		Find(&records).Error
 	return
 }
 
@@ -58,7 +61,28 @@ func GetAllEnableChatRank() (records []entity.Friend, err error) {
 // @return records
 // @return err
 func GetAllEnableSummary() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("enable_summary = ?", 1).Where("wxid LIKE '%@chatroom'").Find(&records).Error
+	err = client.MySQL.Where("enable_summary = ?", 1).
+		Where("is_ok IS TRUE").
+		Where("wxid LIKE '%@chatroom'").
+		Find(&records).Error
+	return
+}
+
+// GetAllEnableNews
+// @description: 取出所有启用了新闻的好友或群组
+// @return records
+// @return err
+func GetAllEnableNews() (records []entity.Friend, err error) {
+	err = client.MySQL.Where("enable_news = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
+	return
+}
+
+// GetAllEnableClearGroup
+// @description: 获取所有需要清理成员的群组
+// @return records
+// @return err
+func GetAllEnableClearGroup() (records []entity.Friend, err error) {
+	err = client.MySQL.Where("clear_member > 0").Where("is_ok IS TRUE").Find(&records).Error
 	return
 }
 

service/message.go

@@ -73,6 +73,8 @@ func GetTextMessagesById(id string) (records []vo.TextMessageItem, err error) {
 		Where("tm.`from_user` = ?", id).
 		Where(`(tm.type = 1 OR ( tm.type = 49 AND EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) IN (?) ))`, appMsgList).
 		Where("DATE ( tm.create_at ) = DATE ( CURDATE() - INTERVAL 1 DAY )").
+		Where("tm.content NOT LIKE '#昨日水群排行榜%'").
+		Where("tm.content NOT LIKE '#昨日消息总结%'").
 		Order("tm.create_at ASC")
 
 	err = tx.Find(&records).Error

tasks/cleargroupuser/cleargroupuser.go

@@ -0,0 +1,68 @@
+package cleargroupuser
+
+import (
+	"fmt"
+	"go-wechat/client"
+	"go-wechat/entity"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"log"
+	"strings"
+)
+
+// ClearGroupUser
+// @description: 清理群成员
+func ClearGroupUser() {
+	groups, err := service.GetAllEnableClearGroup()
+	if err != nil {
+		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
+		return
+	}
+
+	for _, group := range groups {
+		// 获取需要清理的群成员Id
+		members := getNeedDeleteMembers(group.Wxid, group.ClearMember)
+		memberCount := len(members)
+		log.Printf("群[%s(%s)]需要清理的成员数量: %d", group.Nickname, group.Wxid, memberCount)
+		if memberCount < 1 {
+			continue
+		}
+		var memberMap = make(map[string]string)
+		var deleteIds = make([]string, 0)
+		for _, member := range members {
+			deleteIds = append(deleteIds, member.Wxid)
+			// 昵称为空，取id后4位
+			if member.Nickname == "" {
+				member.Nickname = "无名氏_" + member.Wxid[len(member.Wxid)-4:]
+			}
+			memberMap[member.Nickname] = member.LastActive.Format("2006-01-02 15:04:05")
+		}
+		// 调用接口
+		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0)
+		// 发送通知到群里
+		ms := make([]string, 0)
+		for k, v := range memberMap {
+			ms = append(ms, fmt.Sprintf("昵称：%s\n最后活跃时间：%s", k, v))
+		}
+		msg := fmt.Sprintf("#清理群成员\n\n很遗憾地通知各位，就在刚刚，有%d名群友引活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n活跃信息: \n%s",
+			memberCount, strings.Join(ms, "\n"))
+		utils.SendMessage(group.Wxid, "", msg, 0)
+	}
+}
+
+// getNeedDeleteMembers
+// @description: 获取需要删除的群成员
+// @param groupId 群Id
+// @param days 需要清理的未活跃的天数
+// @return members
+func getNeedDeleteMembers(groupId string, days int) (members []entity.GroupUser) {
+	err := client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", groupId).
+		Where("is_member IS TRUE").
+		Where("DATEDIFF( NOW(), last_active ) >= ?", days).
+		Order("last_active DESC").
+		Find(&members).Error
+	if err != nil {
+		log.Printf("获取需要清理的群成员失败, 错误信息: %v", err)
+	}
+	return
+}

tasks/friends/friends.go

@@ -41,6 +41,9 @@ func Sync() {
 
 	nowIds := []string{}
 
+	// 新增的成员，用于通知给指定的人
+	var newItmes = make(map[string]string)
+
 	for _, friend := range base.Data {
 		if strings.Contains(friend.Wxid, "gh_") || strings.Contains(friend.Wxid, "@openim") {
 			continue
@@ -61,18 +64,25 @@ func Sync() {
 		if count == 0 {
 			// 新增
 			err = tx.Create(&entity.Friend{
-				CustomAccount: friend.CustomAccount,
+				CustomAccount:  friend.CustomAccount,
-				Nickname:      friend.Nickname,
+				Nickname:       friend.Nickname,
-				Pinyin:        friend.Pinyin,
+				Pinyin:         friend.Pinyin,
-				PinyinAll:     friend.PinyinAll,
+				PinyinAll:      friend.PinyinAll,
-				Wxid:          friend.Wxid,
+				Wxid:           friend.Wxid,
-				IsOk:          true,
+				IsOk:           true,
-				LastActive:    time.Now().Local(),
+				EnableAi:       config.Conf.System.DefaultRule.Ai,
+				EnableChatRank: config.Conf.System.DefaultRule.ChatRank,
+				EnableSummary:  config.Conf.System.DefaultRule.Summary,
+				EnableWelcome:  config.Conf.System.DefaultRule.Welcome,
+				EnableNews:     config.Conf.System.DefaultRule.News,
+				ClearMember:    0,
+				LastActive:     time.Now().Local(),
 			}).Error
 			if err != nil {
 				log.Printf("新增好友失败: %s", err.Error())
 				continue
 			}
+			newItmes[friend.Wxid] = friend.Nickname
 			if conf, ok := config.Conf.Resource["introduce"]; ok {
 				// 发送一条新消息
 				switch conf.Type {
@@ -93,6 +103,7 @@ func Sync() {
 				"custom_account": friend.CustomAccount,
 				"pinyin":         friend.Pinyin,
 				"pinyin_all":     friend.PinyinAll,
+				"is_ok":          true,
 			}
 			err = tx.Model(&entity.Friend{}).Where("wxid = ?", friend.Wxid).Updates(pm).Error
 			if err != nil {
@@ -107,6 +118,21 @@ func Sync() {
 		}
 	}
 
+	// 通知有新成员
+	if len(newItmes) > 0 && config.Conf.System.NewFriendNotify.Enable {
+		// 组装成一句话
+		msg := []string{"#新好友通知\n"}
+		for wxId, nickname := range newItmes {
+			msg = append(msg, "微信Id: "+wxId+"\n昵称: "+nickname)
+		}
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				utils.SendMessage(user, "", strings.Join(msg, "\n-------\n"), 0)
+			}
+		}
+	}
+
 	// 清理不在列表中的好友
 	err = tx.Model(&entity.Friend{}).Where("wxid NOT IN (?)", nowIds).Update("is_ok", false).Error
 

tasks/news/news.go

@@ -0,0 +1,36 @@
+package news
+
+import (
+	"fmt"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"log"
+	"strings"
+	"time"
+)
+
+// DailyNews
+// @description: 每日新闻
+func DailyNews() {
+	groups, err := service.GetAllEnableNews()
+	if err != nil {
+		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
+		return
+	}
+
+	news := utils.NewsUtil().MorningPost()
+	if len(news) == 0 {
+		log.Println("每日早报获取失败")
+		return
+	}
+
+	newsStr := fmt.Sprintf("#每日早报\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n"))
+
+	// 循环发送新闻
+	for _, group := range groups {
+		// 发送消息
+		utils.SendMessage(group.Wxid, "", newsStr, 0)
+		// 休眠一秒，防止频繁发送
+		time.Sleep(time.Second)
+	}
+}

tasks/summary/summary.go

@@ -42,11 +42,12 @@ func AiSummary() {
 注意，他们可能是多个话题，请仔细甄别。
 每一行代表一个人的发言，每一行的的格式为： {"{nickname}": "{content}"}--end--
 
+群名称: %s
 聊天记录如下:
 %s
 `
 
-		msg := fmt.Sprintf(msgTmp, strings.Join(content, "\n"))
+		msg := fmt.Sprintf(msgTmp, group.Nickname, strings.Join(content, "\n"))
 
 		// AI总结
 		messages := []openai.ChatCompletionMessage{

tasks/tasks.go

@@ -3,7 +3,9 @@ package tasks
 import (
 	"github.com/go-co-op/gocron"
 	"go-wechat/config"
+	"go-wechat/tasks/cleargroupuser"
 	"go-wechat/tasks/friends"
+	"go-wechat/tasks/news"
 	"go-wechat/tasks/summary"
 	"go-wechat/tasks/watergroup"
 	"log"
@@ -42,7 +44,6 @@ func InitTasks() {
 	if config.Conf.Task.GroupSummary.Enable {
 		log.Printf("群聊总结任务已启用，执行表达式: %s", config.Conf.Task.GroupSummary.Cron)
 		_, _ = s.Cron(config.Conf.Task.GroupSummary.Cron).Do(summary.AiSummary)
-
 	}
 
 	// 更新好友列表
@@ -51,6 +52,14 @@ func InitTasks() {
 		_, _ = s.Cron(config.Conf.Task.SyncFriends.Cron).Do(friends.Sync)
 	}
 
+	// 每日早报
+	if config.Conf.Task.News.Enable {
+		_, _ = s.Cron(config.Conf.Task.News.Cron).Do(news.DailyNews)
+	}
+
+	// 每天0点检查一次处理清理群成员
+	_, _ = s.Cron("0 0 * * *").Do(cleargroupuser.ClearGroupUser)
+
 	// 开启定时任务
 	s.StartAsync()
 	log.Println("定时任务初始化成功")

tasks/watergroup/utils.go

@@ -32,7 +32,7 @@ func getRankData(groupId, date string) (rank []rankUser, err error) {
 	case "week":
 		tx.Where("YEARWEEK(date_format(tm.create_at, '%Y-%m-%d')) = YEARWEEK(now()) - 1")
 	case "month":
-		tx.Where("PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(create_at, '%Y%m')) = 1")
+		tx.Where("PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(tm.create_at, '%Y%m')) = 1")
 	case "year":
 		tx.Where("YEAR(tm.create_at) = YEAR(NOW()) - 1")
 	}

utils/news.go

@@ -0,0 +1,46 @@
+package utils
+
+import (
+	"github.com/go-resty/resty/v2"
+	"go-wechat/model"
+	"log"
+)
+
+// News
+// @description: 新闻
+type News interface {
+	MorningPost() []string // 早报
+}
+
+type news struct{}
+
+// NewsUtil
+// @description: 新闻工具
+// @param account
+// @param password
+// @return LeiGod
+func NewsUtil() News {
+	return &news{}
+}
+
+// MorningPost
+// @description: 早报
+// @receiver news
+// @return records
+func (news) MorningPost() (records []string) {
+	var newsResp model.MorningPost
+
+	res := resty.New()
+	resp, err := res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetQueryParam("token", "cFoMZNNBxT4jQovS").
+		SetResult(&newsResp).
+		Post("https://v2.alapi.cn/api/zaobao")
+	if err != nil {
+		log.Panicf("每日早报获取失败: %s", err.Error())
+	}
+	log.Printf("每日早报获取结果: %s", unicodeToText(resp.String()))
+
+	records = newsResp.Data.News
+	return
+}

utils/send.go

@@ -121,3 +121,34 @@ func SendEmotion(toId, emotionHash string, retryCount int) {
 	}
 	log.Printf("发送表情包消息结果: %s", resp.String())
 }
+
+// DeleteGroupMember
+// @description: 删除群成员
+// @param chatRoomId 群Id
+// @param memberIds 成员id,用','分隔
+func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
+	if retryCount > 5 {
+		log.Printf("重试五次失败，停止发送")
+		return
+	}
+
+	// 组装参数
+	param := map[string]any{
+		"chatRoomId": chatRoomId, // 群Id
+		"memberIds":  memberIds,  // 成员id
+	}
+	pbs, _ := json.Marshal(param)
+
+	res := resty.New()
+	resp, err := res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetBody(string(pbs)).
+		Post(config.Conf.Wechat.GetURL("/api/delMemberFromChatRoom"))
+	if err != nil {
+		log.Printf("删除群成员失败: %s", err.Error())
+		// 休眠五秒后重新发送
+		time.Sleep(5 * time.Second)
+		SendImage(chatRoomId, memberIds, retryCount+1)
+	}
+	log.Printf("删除群成员结果: %s", resp.String())
+}

views/components.html

@@ -165,6 +165,33 @@
 </button>
 {{end}}
 
+<!-- 早报 -->
+{{define "news"}}
+<button type="button"
+        class="{{ if eq .EnableNews true }}bg-green-600{{ else }}bg-gray-200{{ end }} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-green-600 focus:ring-offset-2"
+        role="switch" aria-checked="false" onclick="changeUserNewsStatus({{.Wxid}})">
+  <span
+    class="{{ if eq .EnableNews true }}translate-x-5{{ else }}translate-x-0{{ end }} pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out">
+    <span
+      class="{{ if eq .EnableNews true }}opacity-0 duration-100 ease-out{{ else }}opacity-100 duration-200 ease-in{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+      aria-hidden="true">
+      <svg class="h-3 w-3 text-gray-400" fill="none" viewBox="0 0 12 12">
+        <path d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+              stroke-linejoin="round"/>
+      </svg>
+    </span>
+    <span
+      class="{{ if eq .EnableNews true }}opacity-100 duration-200 ease-in{{ else }}opacity-0 duration-100 ease-out{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
+      aria-hidden="true">
+      <svg class="h-3 w-3 text-green-600" fill="currentColor" viewBox="0 0 12 12">
+        <path
+          d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"/>
+      </svg>
+    </span>
+  </span>
+</button>
+{{end}}
+
 
 <!-- 是否tag -->
 {{define "flagTag"}}

views/friend.html

@@ -78,6 +78,13 @@
               </div>
               {{ end }}
 
+              <div class="flex justify-between gap-x-4 py-3">
+                <dt class="text-gray-500">早报</dt>
+                <dd class="flex items-start gap-x-2">
+                  {{ template "news" . }}
+                </dd>
+              </div>
+
               <div class="flex justify-between gap-x-4 py-3">
                 <dt class="text-gray-500">指令</dt>
                 <dd class="flex items-start gap-x-2">

views/group.html

@@ -33,19 +33,25 @@
               是否在通讯录
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-              是否启用AI
+              AI
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-              是否启用水群排行榜
+              排行榜
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-              是否启用聊天记录总结
+              总结
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-              是否启用迎新
+              迎新
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-              是否启用指令
+              早报
+            </th>
+            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+              指令
+            </th>
+            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+              末位淘汰(天)
             </th>
             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
               操作
@@ -98,9 +104,15 @@
             <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
               {{ template "welcome" . }}
             </td>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+              {{ template "news" . }}
+            </td>
             <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
               {{ template "command" . }}
             </td>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+              {{ .ClearMember }}
+            </td>
             <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
               <button class="btn btn-link" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">成员</button>
             </td>

views/static/js/index.js

@@ -80,6 +80,25 @@ function changeWelcomeEnableStatus(wxId) {
     })
 }
 
+// 修改用户新闻开启状态
+function changeUserNewsStatus(wxId) {
+  axios({
+    method: 'put',
+    url: '/api/news/status',
+    data: {
+      wxId: wxId
+    }
+  }).then(function (response) {
+    console.log(`返回结果: ${JSON.stringify(response)}`);
+    alert(`${response.data}`)
+  }).catch(function (error) {
+    console.log(`错误信息: ${error}`);
+    alert("修改失败")
+  }).finally(function () {
+    window.location.reload();
+  })
+}
+
 // 修改指令权限启用状态
 function changeCommandEnableStatus(wxId) {
     axios({

vo/friend.go

@@ -19,6 +19,8 @@ type FriendItem struct {
 	EnableWelcome  bool           // 是否使用迎新
 	EnableCommand  bool           // 是否启用指令
 	EnableSummary  bool           // 是否启用总结
+	EnableNews     bool           // 是否启用新闻
+	ClearMember    int            // 清理成员配置（多少天未活跃的）
 	IsOk           bool           // 是否还在通讯库(群聊是要还在群里也算)
 }