Merge pull request '🎨 逻辑优化' (#80) from hotfix into main

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

app/friend.go

@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/gin-gonic/gin"
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"gorm.io/gorm"
 	"log"
 	"net/http"
@@ -20,7 +20,7 @@ type changeStatusParam struct {
 // @description: 修改使用的AI模型用的参数集
 type changeUseAiModelParam struct {
 	WxId  string `json:"wxid" binding:"required"` // 群Id或微信Id
-	Model string `json:"model" binding:"required"` // 模型代码
+	Model string `json:"model"`                   // 模型代码
 }
 
 // autoClearMembers
@@ -235,6 +235,29 @@ func ChangeEnableNewsStatus(ctx *gin.Context) {
 	ctx.String(http.StatusOK, "操作成功")
 }
 
+// ChangeEnableHotTopStatus
+// @description: 修改是否开启热搜
+// @param ctx
+func ChangeEnableHotTopStatus(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_hot_top`", gorm.Expr(" !`enable_hot_top`")).Error
+	if err != nil {
+		log.Printf("修改热榜启用状态失败：%s", err)
+		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
+		return
+	}
+
+	ctx.String(http.StatusOK, "操作成功")
+}
+
 // AutoClearMembers
 // @description: 自动清理群成员
 // @param ctx

app/group.go

@@ -25,6 +25,19 @@ func GetGroupUsers(ctx *gin.Context) {
 		ctx.String(http.StatusInternalServerError, "查询失败: %s", err.Error())
 		return
 	}
-	// 暂时先就这样写着，跑通了再改
-	ctx.JSON(http.StatusOK, records)
+
+	result := map[string]any{
+		"records": records,
+	}
+	// 循环数据，统计健在成员
+	var isOkCount int
+	for _, record := range records {
+		if record.IsMember {
+			isOkCount++
+		}
+	}
+	result["isOkCount"] = isOkCount
+
+	// 暂时先就这样写着，跑通了再改
+	ctx.JSON(http.StatusOK, result)
 }

common/current/robot.go

@@ -1,14 +1,14 @@
 package current
 
 import (
-	"go-wechat/model"
-	plugin "go-wechat/plugin"
+	"go-wechat/model/dto"
+	"go-wechat/plugin"
 )
 
 // robotInfo
 // @description: 机器人信息
 type robotInfo struct {
-	info           model.RobotUserInfo
+	info           dto.RobotUserInfo
 	MessageHandler plugin.MessageHandler // 启用的插件
 }
 
@@ -18,14 +18,14 @@ var ri robotInfo
 // SetRobotInfo
 // @description: 设置机器人信息
 // @param info
-func SetRobotInfo(info model.RobotUserInfo) {
+func SetRobotInfo(info dto.RobotUserInfo) {
 	ri.info = info
 }
 
 // GetRobotInfo
 // @description: 获取机器人信息
-// @return model.RobotUserInfo
-func GetRobotInfo() model.RobotUserInfo {
+// @return dto.RobotUserInfo
+func GetRobotInfo() dto.RobotUserInfo {
 	return ri.info
 }
 

config.yaml

@@ -19,11 +19,13 @@ system:
     welcome: true
     # 每日早报
     news: true
+    # 热榜
+    hotTop: true
 
 # 微信HOOK配置
 wechat:
   # 微信HOOK接口地址
-  host: 10.0.0.73:19088
+  host: 10.0.0.79:19088
   # 微信容器映射出来的vnc页面地址，没有就不填
   #  vncUrl: http://192.168.1.175:19087/vnc_lite.html
   # 是否在启动的时候自动设置hook服务的回调
@@ -44,11 +46,15 @@ mysql:
   db: wechat
   schema: public # postgres 专用
 
+# 定时任务
 task:
-  enable: false
-  news:
   enable: true
+  news:
+    enable: false
     cron: '14 11 * * *' # 每天0:30
+  hotTop:
+    enable: true
+    cron: '0 */1 * * *' # 每小时一次
   syncFriends:
     enable: false
     cron: '*/5 * * * *' # 五分钟一次

config/ai.go

@@ -4,7 +4,7 @@ package config
 // @description: AI配置
 type ai struct {
 	Enable       bool      `json:"enable" yaml:"enable"`             // 是否启用AI
-	Model        string    `json:"model" yaml:"model"`               // 模型
+	Model        string    `json:"dto" yaml:"dto"`                   // 模型
 	SummaryModel string    `json:"summaryModel" yaml:"summaryModel"` // 总结模型
 	ApiKey       string    `json:"apiKey" yaml:"apiKey"`             // API Key
 	BaseUrl      string    `json:"baseUrl" yaml:"baseUrl"`           // API地址
@@ -16,5 +16,5 @@ type ai struct {
 // @description: AI模型
 type aiModel struct {
 	Name  string `json:"name" yaml:"name"` // 模型名称
-	Model string `json:"model" yaml:"model"` // 模型代码
+	Model string `json:"dto" yaml:"dto"`   // 模型代码
 }

config/system.go

@@ -20,4 +20,5 @@ type defaultRule struct {
 	Summary  bool `json:"summary" yaml:"summary"`   // 是否启用聊天总结
 	Welcome  bool `json:"welcome" yaml:"welcome"`   // 是否启用欢迎新成员
 	News     bool `json:"news" yaml:"news"`         // 是否启用每日早报
+	HotTop   bool `json:"hotTop" yaml:"hotTop"`     // 是否启用热门话题
 }

config/task.go

@@ -8,6 +8,7 @@ type task struct {
 	SyncFriends  syncFriends `json:"syncFriends" yaml:"syncFriends"`   // 同步好友
 	WaterGroup   waterGroup  `json:"waterGroup" yaml:"waterGroup"`     // 水群排行榜
 	GroupSummary syncFriends `json:"groupSummary" yaml:"groupSummary"` // 群聊总结
+	HotTop       syncFriends `json:"hotTop" yaml:"hotTop"`             // 热搜排行榜
 }
 
 // syncFriends

initialization/plugin.go

@@ -2,10 +2,11 @@ package initialization
 
 import (
 	"go-wechat/common/current"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	plugin "go-wechat/plugin"
 	"go-wechat/plugin/plugins"
 	"go-wechat/service"
+	"go-wechat/types"
 )
 
 // Plugin
@@ -19,25 +20,39 @@ func Plugin() {
 	// 注册插件
 
 	// 保存消息进数据库
-	dispatcher.RegisterHandler(func(*model.Message) bool {
+	dispatcher.RegisterHandler(func(*dto.Message) bool {
 		return true
 	}, plugins.SaveToDb)
 
+	// 通知邀请入群消息到配置用户
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+		flag, _ := m.IsInvitationJoinGroup()
+		return flag
+	}, plugins.NotifyInvitationJoinGroup)
+	// 被移除群聊通知到配置用户
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+		return m.Type == types.MsgTypeSys
+	}, plugins.NotifyRemoveFromChatroom)
+	// 响应好友添加成功消息
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+		return m.Type == types.MsgTypeSys
+	}, plugins.ReplyNewFriend)
+
 	// 私聊指令消息
-	dispatcher.RegisterHandler(func(m *model.Message) bool {
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
 		// 私聊消息 或 群聊艾特机器人并且以/开头的消息
 		isGroupAt := m.IsAt() && !m.IsAtAll()
 		return (m.IsPrivateText() || isGroupAt) && m.CleanContentStartWith("/") && service.CheckIsEnableCommand(m.FromUser)
 	}, plugins.Command)
 
 	// AI消息插件
-	dispatcher.RegisterHandler(func(m *model.Message) bool {
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
 		// 群内@或者私聊文字消息
 		return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText()
 	}, plugins.AI)
 
 	// 欢迎新成员
-	dispatcher.RegisterHandler(func(m *model.Message) bool {
+	dispatcher.RegisterHandler(func(m *dto.Message) bool {
 		return m.IsNewUserJoin()
 	}, plugins.WelcomeNew)
 

initialization/wechat.go

@@ -4,7 +4,7 @@ import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/common/current"
 	"go-wechat/config"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"log"
 )
 
@@ -12,7 +12,7 @@ import (
 // @description: 初始化微信机器人信息
 func InitWechatRobotInfo() {
 	// 获取数据
-	var base model.Response[model.RobotUserInfo]
+	var base dto.Response[dto.RobotUserInfo]
 	_, err := resty.New().R().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
 		SetResult(&base).

model/dto/friend.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 // FriendItem
 // @description: 好友列表数据

model/dto/leigod.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 // LeiGodLoginResp
 // @description: 雷神登录返回

model/dto/message.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 import (
 	"encoding/xml"
@@ -32,6 +32,39 @@ type systemMsgDataXml struct {
 	Type   string `xml:"type,attr"`
 }
 
+// appMsgDataXml
+// @description: 微信app消息的xml结构
+type appMsgDataXml struct {
+	XMLName xml.Name `xml:"msg"`
+	Text    string   `xml:",chardata"`
+	AppMsg  struct {
+		Text      string `xml:",chardata"`
+		Appid     string `xml:"appid,attr"`
+		SdkVer    string `xml:"sdkver,attr"`
+		Title     string `xml:"title"`
+		Des       string `xml:"des"`
+		Action    string `xml:"action"`
+		Type      string `xml:"type"`
+		ShowType  string `xml:"showtype"`
+		Content   string `xml:"content"`
+		URL       string `xml:"url"`
+		ThumbUrl  string `xml:"thumburl"`
+		LowUrl    string `xml:"lowurl"`
+		AppAttach struct {
+			Text     string `xml:",chardata"`
+			TotalLen string `xml:"totallen"`
+			AttachId string `xml:"attachid"`
+			FileExt  string `xml:"fileext"`
+		} `xml:"appattach"`
+		ExtInfo string `xml:"extinfo"`
+	} `xml:"appmsg"`
+	AppInfo struct {
+		Text    string `xml:",chardata"`
+		Version string `xml:"version"`
+		AppName string `xml:"appname"`
+	} `xml:"appinfo"`
+}
+
 // atMsgDataXml
 // @description: 微信@消息的xml结构
 type atMsgDataXml struct {
@@ -163,3 +196,22 @@ func (m Message) CleanContentStartWith(prefix string) bool {
 
 	return strings.HasPrefix(content, prefix)
 }
+
+// IsInvitationJoinGroup
+// @description: 是否是邀请入群消息
+// @receiver m
+// @return bool 是否是邀请入群消息
+// @return string 邀请入群消息内容
+func (m Message) IsInvitationJoinGroup() (flag bool, str string) {
+	if m.Type == types.MsgTypeApp {
+		// 解析xml
+		var md appMsgDataXml
+		if err := xml.Unmarshal([]byte(m.Content), &md); err != nil {
+			return
+		}
+		flag = md.AppMsg.Type == "5" && md.AppMsg.Title == "邀请你加入群聊"
+		str = strings.ReplaceAll(md.AppMsg.Des, "，进入可查看详情。", "")
+		return
+	}
+	return
+}

model/dto/news.go

@@ -0,0 +1,38 @@
+package dto
+
+// 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"`
+}
+
+// HotTop
+// @description: 热搜排行榜返回结构体
+type HotTop struct {
+	Success    bool             `json:"success"`     // 是否成功
+	Name       string           `json:"name"`        // 渠道
+	Subtitle   string           `json:"subtitle"`    // 副标题
+	UpdateTime string           `json:"update_time"` // 更新时间
+	Data       []HotTopDataItem `json:"data"`        // 数据
+}
+
+// HotTopDataItem
+// @description: 热搜排行榜数据项
+type HotTopDataItem struct {
+	Index    int    `json:"index"`    // 排行
+	Title    string `json:"title"`    // 标题
+	Hot      string `json:"hot"`      // 热度
+	Url      string `json:"url"`      // 链接
+	MobilUrl string `json:"mobilUrl"` // 手机端链接
+}

model/dto/response.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 // Response
 // @description: 基础返回结构体

model/dto/userinfo.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 // RobotUserInfo
 // @description: 机器人用户信息

model/entity/aiassistant.go

@@ -14,7 +14,7 @@ type AiAssistant struct {
 	CreatedAt   types.DateTime `json:"createdAt"`
 	Name        string         `json:"name" gorm:"type:varchar(10);not null;comment:'名称'"`
 	Personality string         `json:"personality" gorm:"type:varchar(999);not null;comment:'人设'"`
-	Model       string         `json:"model" gorm:"type:varchar(50);not null;comment:'使用的模型'"`
+	Model       string         `json:"dto" gorm:"type:varchar(50);not null;comment:'使用的模型'"`
 	Enable      bool           `json:"enable" gorm:"type:tinyint(1);not null;default:1;comment:'是否启用'"`
 }
 

model/entity/friend.go

@@ -20,8 +20,10 @@ type Friend struct {
 	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"`     // 是否启用新闻
+	EnableHotTop   bool      `json:"enableHotTop" gorm:"type:tinyint(1) default 0 not null"`   // 是否启用热榜新闻
 	ClearMember    int       `json:"clearMember"`                                              // 清理成员配置（多少天未活跃的）
 	IsOk           bool      `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
+	UsedTokens     int       `json:"usedTokens"`                                               // 已使用的AI Token数量
 }
 
 func (Friend) TableName() string {

model/entity/hottop.go

@@ -0,0 +1,40 @@
+package entity
+
+import (
+	"github.com/google/uuid"
+	"go-wechat/common/types"
+	"gorm.io/gorm"
+	"strings"
+)
+
+// HotTop
+// @description: 热榜数据
+type HotTop struct {
+	Id        string         `json:"id" gorm:"type:varchar(32);primarykey"`
+	CreatedAt types.DateTime `json:"createdAt"`
+	Channel   string         `json:"channel"`   // 渠道
+	Title     string         `json:"title"`     // 标题
+	Hot       string         `json:"hot"`       // 热度
+	Url       string         `json:"url"`       // 链接
+	MobileUrl string         `json:"mobileUrl"` // 手机端链接
+}
+
+// TableName
+// @description: 表名
+// @receiver HotTop
+// @return string
+func (HotTop) TableName() string {
+	return "t_hot_top"
+}
+
+// BeforeCreate
+// @description: 创建数据库对象之前生成UUID
+// @receiver m
+// @param *gorm.DB
+// @return err
+func (m *HotTop) BeforeCreate(*gorm.DB) (err error) {
+	if m.Id == "" {
+		m.Id = strings.ReplaceAll(uuid.New().String(), "-", "")
+	}
+	return
+}

model/news.go

@@ -1,18 +0,0 @@
-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"`
-}

model/vo/friend.go

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

mq/handler.go

@@ -3,7 +3,7 @@ package mq
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"go-wechat/types"
 	"log"
 	"strings"
@@ -13,7 +13,7 @@ import (
 // @description: 解析消息
 // @param msg
 func parse(msg []byte) {
-	var m model.Message
+	var m dto.Message
 	if err := json.Unmarshal(msg, &m); err != nil {
 		log.Printf("消息解析失败： %v", err)
 		log.Printf("消息内容： %d -> %v", len(msg), string(msg))

plugin/plugin.go

@@ -1,21 +1,21 @@
 package plugin
 
 import (
-	"go-wechat/model"
+	"go-wechat/model/dto"
 )
 
 // MessageHandler 消息处理函数
-type MessageHandler func(msg *model.Message)
+type MessageHandler func(msg *dto.Message)
 
 // MessageDispatcher 消息分发处理接口
 // 跟 DispatchMessage 结合封装成 MessageHandler
 type MessageDispatcher interface {
-	Dispatch(msg *model.Message)
+	Dispatch(msg *dto.Message)
 }
 
 // DispatchMessage 跟 MessageDispatcher 结合封装成 MessageHandler
-func DispatchMessage(dispatcher MessageDispatcher) func(msg *model.Message) {
-	return func(msg *model.Message) { dispatcher.Dispatch(msg) }
+func DispatchMessage(dispatcher MessageDispatcher) func(msg *dto.Message) {
+	return func(msg *dto.Message) { dispatcher.Dispatch(msg) }
 }
 
 // MessageDispatcher impl
@@ -30,7 +30,7 @@ type MessageContext struct {
 	index           int
 	abortIndex      int
 	messageHandlers MessageContextHandlerGroup
-	*model.Message
+	*dto.Message
 }
 
 // Next 主动调用下一个消息处理函数(或开始调用)
@@ -65,11 +65,11 @@ func (c *MessageContext) AbortHandler() MessageContextHandler {
 }
 
 // MatchFunc 消息匹配函数,返回为true则表示匹配
-type MatchFunc func(*model.Message) bool
+type MatchFunc func(*dto.Message) bool
 
 // MatchFuncList 将多个MatchFunc封装成一个MatchFunc
 func MatchFuncList(matchFuncs ...MatchFunc) MatchFunc {
-	return func(message *model.Message) bool {
+	return func(message *dto.Message) bool {
 		for _, matchFunc := range matchFuncs {
 			if !matchFunc(message) {
 				return false
@@ -89,7 +89,7 @@ type matchNodes []*matchNode
 // MessageMatchDispatcher impl MessageDispatcher interface
 //
 //	dispatcher := NewMessageMatchDispatcher()
-//	dispatcher.OnText(func(msg *model.Message){
+//	dispatcher.OnText(func(msg *dto.Message){
 //			msg.ReplyText("hello")
 //	})
 //	bot := DefaultBot()
@@ -113,7 +113,7 @@ func (m *MessageMatchDispatcher) SetAsync(async bool) {
 // 遍历 MessageMatchDispatcher 所有的消息处理函数
 // 获取所有匹配上的函数
 // 执行处理的消息处理方法
-func (m *MessageMatchDispatcher) Dispatch(msg *model.Message) {
+func (m *MessageMatchDispatcher) Dispatch(msg *dto.Message) {
 	var group MessageContextHandlerGroup
 	for _, node := range m.matchNodes {
 		if node.matchFunc(msg) {

plugin/plugins/ai.go

@@ -8,7 +8,7 @@ import (
 	"go-wechat/client"
 	"go-wechat/common/current"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/plugin"
 	"go-wechat/service"
 	"go-wechat/types"
@@ -137,11 +137,14 @@ func AI(m *plugin.MessageContext) {
 	}
 
 	// 返回消息为空
-	if resp.Choices[0].Message.Content == "" {
+	if len(resp.Choices) == 0 || resp.Choices[0].Message.Content == "" {
 		utils.SendMessage(m.FromUser, m.GroupUser, "AI似乎抽风了，没有告诉我你需要的回答~", 0)
 		return
 	}
 
+	// 异步更新一下已使用的AI次数
+	go service.UpdateUsedAiTokens(m.FromUser, resp.Usage.TotalTokens)
+
 	// 保存一下AI 返回的消息，消息 Id 使用传入 Id 的负数
 	var replyMessage entity.Message
 	replyMessage.MsgId = -m.MsgId

plugin/plugins/command/ai.go

@@ -3,7 +3,7 @@ package command
 import (
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/utils"
 	"log"
 	"strings"

plugin/plugins/command/leigod.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/entity"
-	"go-wechat/model"
+	"go-wechat/model/dto"
+	"go-wechat/model/entity"
+	"go-wechat/model/vo"
 	"go-wechat/utils"
-	"go-wechat/vo"
 	"gorm.io/gorm"
 	"log"
 	"strings"
@@ -156,7 +156,7 @@ func (l leiGod) info() (replyMsg string) {
 	if err = lgu.Login(); err != nil {
 		return "登录失败: " + err.Error()
 	}
-	var ui model.LeiGodUserInfoResp
+	var ui dto.LeiGodUserInfoResp
 	if ui, err = lgu.Info(); err != nil {
 		return "获取详情失败: " + err.Error()
 	}

plugin/plugins/notify2configuser.go

@@ -0,0 +1,55 @@
+package plugins
+
+import (
+	"fmt"
+	"go-wechat/config"
+	"go-wechat/plugin"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"strings"
+)
+
+// NotifyInvitationJoinGroup
+// @description: 通知邀请入群消息到配置用户
+// @param m
+func NotifyInvitationJoinGroup(m *plugin.MessageContext) {
+	// 先回复一条固定句子
+	utils.SendMessage(m.FromUser, m.GroupUser, "您的邀请消息已收到啦，正在通知我的主人来同意请求。在我加群之后将会进行初始化操作，直到收到我主动发送的消息就是初始化完成咯，在那之前请耐心等待喔~", 0)
+
+	// 如果是邀请进群，推送到配置的用户
+	if flag, dec := m.IsInvitationJoinGroup(); flag {
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				dec = fmt.Sprintf("#邀请入群提醒\n\n%s", dec)
+				utils.SendMessage(user, "", dec, 0)
+			}
+		}
+	}
+}
+
+// NotifyRemoveFromChatroom
+// @description: 被移除群聊通知到配置用户
+// @param m
+func NotifyRemoveFromChatroom(m *plugin.MessageContext) {
+	// 如果是被移出群聊，推送到配置的用户
+	if strings.HasPrefix(m.Content, "你被\"") && strings.HasSuffix(m.Content, "\"移出群聊") {
+		// 调用一下退出群聊接口，防止被移出后还能从好友列表接口拉到相关信息
+		utils.QuitChatroom(m.FromUser, 0)
+
+		// 取出群名称
+		groupInfo, err := service.GetFriendInfoById(m.FromUser)
+		if err != nil {
+			return
+		}
+		// 组装消息
+		msg := fmt.Sprintf("#移除群聊提醒\n\n群Id: %s\n群名称: %s\n事件: %s", m.FromUser, groupInfo.Nickname, m.Content)
+
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				utils.SendMessage(user, "", msg, 0)
+			}
+		}
+	}
+}

plugin/plugins/save2db.go

@@ -1,7 +1,7 @@
 package plugins
 
 import (
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/plugin"
 	"go-wechat/service"
 	"time"

plugin/plugins/systemmessgae.go

@@ -0,0 +1,18 @@
+package plugins
+
+import (
+	"go-wechat/plugin"
+	"go-wechat/utils"
+	"strings"
+)
+
+// ReplyNewFriend
+// @description: 响应好友添加成功消息
+// @param m
+func ReplyNewFriend(m *plugin.MessageContext) {
+	isNewFriend := strings.HasPrefix(m.Content, "你已添加了") && strings.HasSuffix(m.Content, "，现在可以开始聊天了。")
+	isNewChatroom := strings.Contains(m.Content, "\"邀请你加入了群聊，群聊参与人还有：")
+	if isNewFriend || isNewChatroom {
+		utils.SendMessage(m.FromUser, m.GroupUser, "AI正在初始化，请稍等几分钟，初始化完成之后我将主动告知您。", 0)
+	}
+}

plugin/plugins/welconenew.go

@@ -3,7 +3,7 @@ package plugins
 import (
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/plugin"
 	"go-wechat/utils"
 )
@@ -14,7 +14,7 @@ import (
 func WelcomeNew(m *plugin.MessageContext) {
 	// 判断是否开启迎新
 	var count int64
-	client.MySQL.Model(&entity.Friend{}).Where("enable_welcome IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
+	client.MySQL.Model(&entity.Friend{}).Where("enable_welcome IS TRUE").Where("is_ok IS TRUE").Where("is_ok IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
 	if count < 1 {
 		return
 	}

router/router.go

@@ -29,6 +29,7 @@ func Init(g *gin.Engine) {
 	api.PUT("/welcome/status", app.ChangeEnableWelcomeStatus)     // 修改是否开启迎新状态
 	api.PUT("/command/status", app.ChangeEnableCommandStatus)     // 修改是否开启指令状态
 	api.PUT("/news/status", app.ChangeEnableNewsStatus)           // 修改是否开启早报状态
+	api.PUT("/hot-top/status", app.ChangeEnableHotTopStatus)      // 修改是否开启热榜状态
 	api.PUT("/grouprank/status", app.ChangeEnableGroupRankStatus) // 修改是否开启水群排行榜状态
 	api.PUT("/grouprank/skip", app.ChangeSkipGroupRankStatus)     // 修改是否跳过水群排行榜状态
 	api.GET("/group/users", app.GetGroupUsers)                    // 获取群成员列表

service/aiassistant.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 )
 
 // GetAllAiAssistant

service/friend.go

@@ -2,8 +2,9 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/entity"
-	"go-wechat/vo"
+	"go-wechat/model/entity"
+	"go-wechat/model/vo"
+	"gorm.io/gorm"
 	"log"
 	"strings"
 )
@@ -36,11 +37,21 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
 	return
 }
 
+// GetFriendInfoById
+// @description: 通过wxId获取好友信息
+// @param wxId
+// @return ent
+// @return err
+func GetFriendInfoById(wxId string) (ent entity.Friend, err error) {
+	err = client.MySQL.Where("wxid = ?", wxId).First(&ent).Error
+	return
+}
+
 // GetAllEnableAI
 // @description: 取出所有启用了AI的好友或群组
 // @return []entity.Friend
 func GetAllEnableAI() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("enable_ai = ?", 1).Find(&records).Error
+	err = client.MySQL.Where("enable_ai = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
 	return
 }
 
@@ -77,6 +88,15 @@ func GetAllEnableNews() (records []entity.Friend, err error) {
 	return
 }
 
+// GetAllEnableHotTop
+// @description: 获取所有启用了热搜排行榜的好友或群组
+// @return records
+// @return err
+func GetAllEnableHotTop() (records []entity.Friend, err error) {
+	err = client.MySQL.Where("enable_hot_top = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
+	return
+}
+
 // GetAllEnableClearGroup
 // @description: 获取所有需要清理成员的群组
 // @return records
@@ -119,3 +139,16 @@ func updateLastActive(msg entity.Message) {
 		log.Printf("更新群或者好友活跃时间失败, 错误信息: %v", err)
 	}
 }
+
+// UpdateUsedAiTokens
+// @description: 更新已使用的AI次数
+// @param wxId 微信好友或者群聊Id
+// @param tokens 新增的tokens额度
+func UpdateUsedAiTokens(wxId string, tokens int) {
+	err := client.MySQL.Model(&entity.Friend{}).
+		Where("wxid = ?", wxId).
+		Update("`used_tokens`", gorm.Expr(" `used_tokens` + ?", tokens)).Error
+	if err != nil {
+		log.Printf("更新AI使用次数失败, 错误信息: %v", err)
+	}
+}

service/group.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/vo"
+	"go-wechat/model/vo"
 )
 
 // GetGroupUsersByGroupId

service/message.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/entity"
-	"go-wechat/vo"
+	"go-wechat/model/entity"
+	"go-wechat/model/vo"
 	"log"
 	"os"
 	"strconv"

tasks/cleargroupuser/cleargroupuser.go

@@ -3,7 +3,7 @@ package cleargroupuser
 import (
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"

tasks/friends/friends.go

@@ -6,8 +6,8 @@ import (
 	"go-wechat/client"
 	"go-wechat/common/constant"
 	"go-wechat/config"
-	"go-wechat/entity"
-	"go-wechat/model"
+	"go-wechat/model/dto"
+	"go-wechat/model/entity"
 	"go-wechat/utils"
 	"gorm.io/gorm"
 	"log"
@@ -24,7 +24,7 @@ var hc = resty.New()
 // Sync
 // @description: 同步好友列表
 func Sync() {
-	var base model.Response[[]model.FriendItem]
+	var base dto.Response[[]dto.FriendItem]
 
 	resp, err := hc.R().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
@@ -75,6 +75,7 @@ func Sync() {
 				EnableSummary:  config.Conf.System.DefaultRule.Summary,
 				EnableWelcome:  config.Conf.System.DefaultRule.Welcome,
 				EnableNews:     config.Conf.System.DefaultRule.News,
+				EnableHotTop:   config.Conf.System.DefaultRule.HotTop,
 				ClearMember:    0,
 				LastActive:     time.Now().Local(),
 			}).Error
@@ -136,12 +137,6 @@ func Sync() {
 	// 清理不在列表中的好友
 	clearPm := map[string]any{
 		"is_ok": false,
-		"enable_chat_rank": false,
-		"enable_welcome":   false,
-		"enable_summary":   false,
-		"enable_news":      false,
-		"clear_member":     false,
-		"enable_ai":        false,
 	}
 	err = tx.Model(&entity.Friend{}).Where("wxid NOT IN (?)", nowIds).Updates(clearPm).Error
 	if err != nil {
@@ -155,7 +150,7 @@ func Sync() {
 // @description: 同步群成员
 // @param gid
 func syncGroupUsers(tx *gorm.DB, gid string) {
-	var baseResp model.Response[model.GroupUser]
+	var baseResp dto.Response[dto.GroupUser]
 
 	// 组装参数
 	param := map[string]any{
@@ -242,8 +237,8 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
 // @param wxid
 // @return ent
 // @return err
-func getContactProfile(wxid string) (ent model.ContactProfile, err error) {
-	var baseResp model.Response[model.ContactProfile]
+func getContactProfile(wxid string) (ent dto.ContactProfile, err error) {
+	var baseResp dto.Response[dto.ContactProfile]
 
 	// 组装参数
 	param := map[string]any{

tasks/hottop/hottop.go

@@ -0,0 +1,88 @@
+package hottop
+
+import (
+	"fmt"
+	"go-wechat/client"
+	"go-wechat/common/types"
+	"go-wechat/model/entity"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"log"
+	"slices"
+	"strings"
+	"time"
+)
+
+// HotTop
+// @description: 热搜排行榜
+func HotTop() {
+	// 发送到开启了的群
+	groups, err := service.GetAllEnableHotTop()
+	if err != nil {
+		log.Printf("获取启用了热榜的群组失败, 错误信息: %v", err)
+		return
+	}
+	// 获取热榜数据
+	news := getTopData()
+	if len(news) == 0 {
+		return
+	}
+
+	// 组装消息
+	msg := fmt.Sprintf("#热搜排行榜\n \n嘿，朋友，有新的新闻了喔，快来康康吧\n \n%s", strings.Join(news, "\n-------\n"))
+	for _, group := range groups {
+		utils.SendMessage(group.Wxid, "", msg, 0)
+		// 休眠一秒，防止频繁发送
+		time.Sleep(time.Second)
+	}
+}
+
+// getTopData
+// @description: 获取热榜数据
+// @return data
+func getTopData() (data []string) {
+	// 获取热榜数据
+	records := utils.NewsUtil().GetHotTop()
+	if len(records) == 0 {
+		log.Println("获取热榜数据失败")
+		return
+	}
+	var datas = make([]entity.HotTop, 0)
+	for _, item := range records {
+		var d = entity.HotTop{
+			CreatedAt: types.DateTime(time.Now().Local()),
+			Title:     item.Title,
+			Hot:       item.Hot,
+			Url:       item.Url,
+			MobileUrl: item.MobilUrl,
+		}
+		datas = append(datas, d)
+	}
+
+	// 获取缓存数据
+	var oldTitles []string
+	err := client.MySQL.Model(&entity.HotTop{}).Order("created_at DESC").Limit(len(datas)).Pluck("title", &oldTitles).Error
+	if err != nil {
+		log.Println("获取历史热榜数据失败", err)
+		return
+	}
+
+	// 筛选出新数据
+	var newDatas []entity.HotTop
+	for _, d := range datas {
+		if slices.Contains(oldTitles, d.Title) {
+			continue
+		}
+		d.Channel = "百度"
+		newDatas = append(newDatas, d)
+		data = append(data, fmt.Sprintf("标题: %s\n热度: %s\n详情: %s", d.Title, d.Hot, d.Url))
+	}
+	// 保存新数据到数据库
+	if len(newDatas) > 0 {
+		err = client.MySQL.Create(&newDatas).Error
+		if err != nil {
+			log.Println("保存新热榜数据失败", err)
+		}
+	}
+	return
+}

tasks/news/news.go

@@ -24,7 +24,7 @@ func DailyNews() {
 		return
 	}
 
-	newsStr := fmt.Sprintf("#每日早报\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n"))
+	newsStr := fmt.Sprintf("#每日早报\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n \n"))
 
 	// 循环发送新闻
 	for _, group := range groups {

tasks/summary/summary.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/sashabaranov/go-openai"
 	"go-wechat/config"
+	"go-wechat/model/vo"
 	"go-wechat/service"
 	"go-wechat/utils"
-	"go-wechat/vo"
 	"log"
 	"strings"
 )

tasks/tasks.go

@@ -5,6 +5,7 @@ import (
 	"go-wechat/config"
 	"go-wechat/tasks/cleargroupuser"
 	"go-wechat/tasks/friends"
+	"go-wechat/tasks/hottop"
 	"go-wechat/tasks/news"
 	"go-wechat/tasks/summary"
 	"go-wechat/tasks/watergroup"
@@ -57,6 +58,11 @@ func InitTasks() {
 		_, _ = s.Cron(config.Conf.Task.News.Cron).Do(news.DailyNews)
 	}
 
+	// 热榜
+	if config.Conf.Task.HotTop.Enable {
+		_, _ = s.Cron(config.Conf.Task.HotTop.Cron).Do(hottop.HotTop)
+	}
+
 	// 每天0点检查一次处理清理群成员
 	_, _ = s.Cron("0 0 * * *").Do(cleargroupuser.ClearGroupUser)
 

tasks/watergroup/month.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"

tasks/watergroup/week.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"

tasks/watergroup/year.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"

tasks/watergroup/yesterday.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"

tcpserver/parse.go

@@ -3,7 +3,7 @@ package tcpserver
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"go-wechat/types"
 	"log"
 	"net"
@@ -14,7 +14,7 @@ import (
 // @description: 解析消息
 // @param msg
 func parse(remoteAddr net.Addr, msg []byte) {
-	var m model.Message
+	var m dto.Message
 	if err := json.Unmarshal(msg, &m); err != nil {
 		log.Printf("[%s]消息解析失败： %v", remoteAddr, err)
 		log.Printf("[%s]消息内容： %d -> %v", remoteAddr, len(msg), string(msg))

utils/leigod.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/go-resty/resty/v2"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"log"
 )
 
@@ -14,7 +14,7 @@ import (
 // @description: 雷神加速器相关接口
 type LeiGod interface {
 	Login() error                          // 登录
-	Info() (model.LeiGodUserInfoResp, error) // 获取用户信息
+	Info() (dto.LeiGodUserInfoResp, error) // 获取用户信息
 	Pause() error                          // 暂停加速
 }
 
@@ -59,7 +59,7 @@ func (l *leiGod) Login() (err error) {
 	}
 	pbs, _ := json.Marshal(param)
 
-	var loginResp model.Response[any]
+	var loginResp dto.Response[any]
 	var resp *resty.Response
 
 	res := resty.New()
@@ -84,7 +84,7 @@ func (l *leiGod) Login() (err error) {
 		return
 	}
 
-	var loginInfo model.LeiGodLoginResp
+	var loginInfo dto.LeiGodLoginResp
 	if err = json.Unmarshal(bs, &loginInfo); err != nil {
 		return
 	}
@@ -100,7 +100,7 @@ func (l *leiGod) Login() (err error) {
 // @description: 获取用户信息
 // @receiver l
 // @return string
-func (l *leiGod) Info() (ui model.LeiGodUserInfoResp, err error) {
+func (l *leiGod) Info() (ui dto.LeiGodUserInfoResp, err error) {
 	// 组装参数
 	param := map[string]any{
 		"account_token": l.token,
@@ -109,7 +109,7 @@ func (l *leiGod) Info() (ui model.LeiGodUserInfoResp, err error) {
 	}
 	pbs, _ := json.Marshal(param)
 
-	var userInfoResp model.Response[model.LeiGodUserInfoResp]
+	var userInfoResp dto.Response[dto.LeiGodUserInfoResp]
 	var resp *resty.Response
 
 	res := resty.New()
@@ -145,7 +145,7 @@ func (l *leiGod) Pause() (err error) {
 	}
 	pbs, _ := json.Marshal(param)
 
-	var pauseResp model.Response[any]
+	var pauseResp dto.Response[any]
 	var resp *resty.Response
 
 	res := resty.New()

utils/news.go

@@ -3,7 +3,7 @@ package utils
 import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/config"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"log"
 )
 
@@ -11,6 +11,7 @@ import (
 // @description: 新闻
 type News interface {
 	MorningPost() []string           // 早报
+	GetHotTop() []dto.HotTopDataItem // 获取热搜排行榜
 }
 
 type news struct{}
@@ -29,7 +30,7 @@ func NewsUtil() News {
 // @receiver news
 // @return records
 func (news) MorningPost() (records []string) {
-	var newsResp model.MorningPost
+	var newsResp dto.MorningPost
 
 	res := resty.New()
 	resp, err := res.R().
@@ -38,10 +39,34 @@ func (news) MorningPost() (records []string) {
 		SetResult(&newsResp).
 		Post("https://v2.alapi.cn/api/zaobao")
 	if err != nil {
-		log.Panicf("每日早报获取失败: %s", err.Error())
+		log.Printf("每日早报获取失败: %s", err.Error())
+		return
 	}
 	log.Printf("每日早报获取结果: %s", unicodeToText(resp.String()))
 
 	records = newsResp.Data.News
 	return
 }
+
+// GetHotTop
+// @description: 获取热搜排行榜
+// @receiver news
+// @return records
+func (news) GetHotTop() (records []dto.HotTopDataItem) {
+	var respData dto.HotTop
+	res := resty.New()
+	resp, err := res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetResult(&respData).
+		Get("https://api.vvhan.com/api/hotlist/baiduRD")
+	if err != nil {
+		log.Printf("百度热榜获取失败: %s", err.Error())
+		return
+	}
+	log.Printf("百度热榜获取结果: %s", unicodeToText(resp.String()))
+	if !respData.Success {
+		log.Println("百度热榜获取失败")
+		return
+	}
+	return respData.Data
+}

utils/send.go

@@ -158,3 +158,33 @@ func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool
 		DeleteGroupMember(chatRoomId, memberIds, 5, true)
 	}
 }
+
+// QuitChatroom
+// @description: 退出群聊
+// @param chatRoomId string 群Id
+// @param retryCount int 重试次数
+func QuitChatroom(chatRoomId string, retryCount int) {
+	if retryCount > 5 {
+		log.Printf("重试五次失败，停止发送")
+		return
+	}
+
+	// 组装参数
+	param := map[string]any{
+		"chatRoomId": chatRoomId, // 群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/quitChatRoom"))
+	if err != nil {
+		log.Printf("退群失败: %s", err.Error())
+		// 休眠五秒后重新发送
+		time.Sleep(5 * time.Second)
+		QuitChatroom(chatRoomId, retryCount+1)
+	}
+	log.Printf("退群结果: %s", resp.String())
+}

views/components.html

@@ -192,6 +192,33 @@
 </button>
 {{end}}
 
+<!-- 热榜 -->
+{{define "hotTop"}}
+<button type="button"
+        class="{{ if eq .EnableHotTop 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="changeUserHotTopStatus({{.Wxid}})">
+  <span
+    class="{{ if eq .EnableHotTop 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 .EnableHotTop 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 .EnableHotTop 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

@@ -103,6 +103,13 @@
                 </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">
+                  {{ template "hotTop" . }}
+                </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

@@ -117,6 +117,13 @@
                   {{ template "news" . }}
                 </dd>
               </div>
+              <!-- 热榜 -->
+              <div class="flex justify-between gap-x-4 py-3 items-center">
+                <dt class="text-gray-500">热榜</dt>
+                <dd class="flex items-start gap-x-2">
+                  {{ template "hotTop" . }}
+                </dd>
+              </div>
               <!-- 指令 -->
               <div class="flex justify-between gap-x-4 py-3 items-center">
                 <dt class="text-gray-500">指令</dt>

views/groupuser.html

@@ -1,6 +1,19 @@
 <dialog id="groupUserModal" class="modal">
   <div class="modal-box w-11/12 max-w-7xl">
+    <div class="flex justify-between">
+      <div class="flex">
         <h3 class="font-bold text-lg" id="groupUserModalName">我是群名称</h3>
+        <h3 class="font-bold text-lg ml-5" id="groupUserCount">(健在成员100人)</h3>
+      </div>
+
+      <button type="button" onclick="document.getElementById('groupUserModal').close();" class="rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">
+        <span class="sr-only">关闭</span>
+        <svg class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
+          <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+        </svg>
+      </button>
+    </div>
+
     <div class="divider divider-warning">成员列表</div>
     <table class="table table-zebra">
       <thead>

views/static/js/index.js

@@ -99,6 +99,25 @@ function changeUserNewsStatus(wxId) {
   })
 }
 
+// 修改用户热搜开启状态
+function changeUserHotTopStatus(wxId) {
+  axios({
+    method: 'put',
+    url: '/api/hot-top/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({
@@ -162,12 +181,18 @@ function getGroupUsers(groupId, groupName) {
       groupId: groupId
     }
   }).then(function (response) {
-        // console.log(`返回结果: ${JSON.stringify(response)}`);
+    // console.log(`返回结果: ${JSON.stringify(response.data)}`);
     // 渲染群成员列表
-        const groupUsers = response.data
+    const groupUsers = response.data.records;
+    const groupUserCount = response.data.isOkCount;
+
+    // 设置成员总数
+    const groupUserCountTag = document.getElementById("groupUserCount");
+    groupUserCountTag.innerHTML = `健在成员: ${groupUserCount}人`
+
     // 循环渲染数据
     groupUsers.forEach((groupUser, i) => {
-            console.log(groupUser)
+      // console.log(groupUser)
       const {wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank} = groupUser;
 
       let row = tbody.insertRow(i);