Merge pull request '✨ 新增被移除群聊通知' (#71) from hotfix into main

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

app/assistant.go

@@ -0,0 +1,14 @@
+package app
+
+import (
+	"github.com/gin-gonic/gin"
+)
+
+// SaveAssistant
+// @description: 保存AI助手
+// @param ctx
+func SaveAssistant(ctx *gin.Context) {
+
+	//ctx.String(http.StatusOK, "操作成功")
+	ctx.Redirect(302, "/assistant.html")
+}

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"
@@ -19,8 +19,15 @@ type changeStatusParam struct {
 // changeUseAiModelParam
 // @description: 修改使用的AI模型用的参数集
 type changeUseAiModelParam struct {
-	WxId  string `json:"wxid" binding:"required"`  // 群Id或微信Id
+	WxId  string `json:"wxid" binding:"required"` // 群Id或微信Id
-	Model string `json:"model" binding:"required"` // 模型代码
+	Model string `json:"dto"`                     // 模型代码
+}
+
+// autoClearMembers
+// @description: 自动清理群成员
+type autoClearMembers struct {
+	WxId string `json:"wxid" binding:"required"` // 群Id
+	Days int    `json:"days"`                    // 多少天未发言
 }
 
 // ChangeEnableAiStatus
@@ -67,6 +74,28 @@ func ChangeUseAiModel(ctx *gin.Context) {
 	ctx.String(http.StatusOK, "操作成功")
 }
 
+// ChangeUseAiAssistant
+// @description: 修改使用的AI助手
+// @param ctx
+func ChangeUseAiAssistant(ctx *gin.Context) {
+	// 此处复用一下结构体
+	var p changeUseAiModelParam
+	if err := ctx.ShouldBind(&p); err != nil {
+		ctx.String(http.StatusBadRequest, "参数错误")
+		return
+	}
+	err := client.MySQL.Model(&entity.Friend{}).
+		Where("wxid = ?", p.WxId).
+		Update("`prompt`", p.Model).Error
+	if err != nil {
+		log.Printf("修改【%s】的AI助手失败：%s", p.WxId, err)
+		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
+		return
+	}
+
+	ctx.String(http.StatusOK, "操作成功")
+}
+
 // ChangeEnableGroupRankStatus
 // @description: 修改是否开启水群排行榜
 // @param ctx
@@ -182,3 +211,49 @@ 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, "操作成功")
+}
+
+// AutoClearMembers
+// @description: 自动清理群成员
+// @param ctx
+func AutoClearMembers(ctx *gin.Context) {
+	var p autoClearMembers
+	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("`clear_member`", p.Days).Error
+	if err != nil {
+		log.Printf("修改自动清理群成员阈值失败：%s", err)
+		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
+		return
+	}
+
+	ctx.String(http.StatusOK, "操作成功")
+}

app/pages.go

@@ -66,6 +66,7 @@ func Friend(ctx *gin.Context) {
 	result["friends"] = friends
 	result["vnc"] = config.Conf.Wechat.VncUrl
 	result["aiModels"] = config.Conf.Ai.Models
+	result["assistant"], _ = service.GetAllAiAssistant()
 	// 渲染页面
 	ctx.HTML(http.StatusOK, "friend.html", result)
 }
@@ -85,11 +86,27 @@ func Group(ctx *gin.Context) {
 	result["groups"] = groups
 	result["vnc"] = config.Conf.Wechat.VncUrl
 	result["aiModels"] = config.Conf.Ai.Models
+	result["assistant"], _ = service.GetAllAiAssistant()
 
 	// 渲染页面
 	ctx.HTML(http.StatusOK, "group.html", result)
 }
 
+// Assistant
+// @description: AI角色
+// @param ctx
+func Assistant(ctx *gin.Context) {
+	var result = gin.H{
+		"msg": "success",
+	}
+
+	result["aiModels"] = config.Conf.Ai.Models
+	result["assistant"], _ = service.GetAllAiAssistant()
+
+	// 渲染页面
+	ctx.HTML(http.StatusOK, "assistant.html", result)
+}
+
 // PageNotFound
 // @description: 404页面
 // @param ctx

common/current/robot.go

@@ -1,14 +1,14 @@
 package current
 
 import (
-	"go-wechat/model"
+	"go-wechat/model/dto"
-	plugin "go-wechat/plugin"
+	"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
+// @return dto.RobotUserInfo
-func GetRobotInfo() model.RobotUserInfo {
+func GetRobotInfo() dto.RobotUserInfo {
 	return ri.info
 }
 

config.yaml

@@ -1,3 +1,25 @@
+system:
+  # 每日新闻接口 Token
+  # 获取地址: https://admin.alapi.cn/api_manager/token_manager
+  alApiToken: xxx
+  # 添加新好友或群之后通知给指定的人
+  newFriendNotify:
+    enable: true
+    toUser:
+      - "wxid_xxx"
+  # 默认AI等配置
+  defaultRule:
+    # 默认是否开启AI
+    ai: true
+    # 默认是否开启水群排行榜
+    chatRank: true
+    # 默认是否开启聊天记录总结
+    summary: true
+    # 默认是否开启新成员加群欢迎
+    welcome: true
+    # 每日早报
+    news: true
+
 # 微信HOOK配置
 wechat:
   # 微信HOOK接口地址
@@ -24,11 +46,14 @@ mysql:
 
 task:
   enable: false
+  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
@@ -79,6 +104,10 @@ ai:
       model: moonshot-v1-128k
     - name: 跃问
       model: StepChat
+    - name: 豆包Lite-4k
+      model: Doubao-lite-4k
+    - name: 豆包Pro-4k
+      model: Doubao-pro-4k
 
 # 资源配置
 # map[k]v结构，k 会变成全小写，所以这儿不能用大写字母
@@ -87,6 +116,10 @@ resource:
   welcome-new:
     type: emotion
     path: 58e4150be2bba8f7b71974b10391f9e9
+  # 给新好友或者群的自我介绍，不配置就不发送
+  introduce:
+    type: text
+    path: "大家好，我是一个AI机器人，可以直接@我询问你想问的问题。"
   # 水群排行榜词云，只能是图片，末尾的`\%s`也是必须的
   wordcloud:
     type: image

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地址
@@ -15,6 +15,6 @@ type ai struct {
 // aiModel
 // @description: AI模型
 type aiModel struct {
-	Name  string `json:"name" yaml:"name"`   // 模型名称
+	Name  string `json:"name" yaml:"name"` // 模型名称
-	Model string `json:"model" yaml:"model"` // 模型代码
+	Model string `json:"dto" yaml:"dto"`   // 模型代码
 }

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,23 @@
+package config
+
+// 系统配置
+type system struct {
+	AlApiToken      string          `json:"alApiToken" yaml:"alApiToken"`           // AL API Token
+	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"` // 群聊总结

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,35 @@ 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 *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).

main.go

@@ -48,6 +48,8 @@ func main() {
 				return "群组列表"
 			case "index":
 				return "首页"
+			case "assistant":
+				return "AI角色"
 			default:
 				return "其他页面"
 			}

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

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

@@ -0,0 +1,39 @@
+package entity
+
+import (
+	"github.com/google/uuid"
+	"go-wechat/common/types"
+	"gorm.io/gorm"
+	"strings"
+)
+
+// AiAssistant
+// @description: AI助手表
+type AiAssistant struct {
+	Id          string         `json:"id" gorm:"type:varchar(32);primarykey"`
+	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:"dto" gorm:"type:varchar(50);not null;comment:'使用的模型'"`
+	Enable      bool           `json:"enable" gorm:"type:tinyint(1);not null;default:1;comment:'是否启用'"`
+}
+
+// TableName
+// @description: 表名
+// @receiver AiAssistant
+// @return string
+func (AiAssistant) TableName() string {
+	return "t_ai_assistant"
+}
+
+// BeforeCreate
+// @description: 创建数据库对象之前生成UUID
+// @receiver m
+// @param *gorm.DB
+// @return err
+func (m *AiAssistant) BeforeCreate(*gorm.DB) (err error) {
+	if m.Id == "" {
+		m.Id = strings.ReplaceAll(uuid.New().String(), "-", "")
+	}
+	return
+}

model/entity/friend.go

@@ -19,7 +19,10 @@ 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"`           // 是否正常
+	UsedTokens     int       `json:"usedTokens"`                                               // 已使用的AI Token数量
 }
 
 func (Friend) TableName() string {

model/vo/friend.go

@@ -15,10 +15,13 @@ type FriendItem struct {
 	LastActive     types.DateTime // 最后活跃时间
 	EnableAi       bool           // 是否使用AI
 	AiModel        string         // AI模型
+	Prompt         string         // AI助手或者自定义提示词
 	EnableChatRank bool           // 是否使用聊天排行
 	EnableWelcome  bool           // 是否使用迎新
 	EnableCommand  bool           // 是否启用指令
 	EnableSummary  bool           // 是否启用总结
+	EnableNews     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) {
+func DispatchMessage(dispatcher MessageDispatcher) func(msg *dto.Message) {
-	return func(msg *model.Message) { dispatcher.Dispatch(msg) }
+	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"
@@ -48,13 +48,28 @@ func AI(m *plugin.MessageContext) {
 
 	// 处理预设角色，默认是配置文件里的，如果数据库配置不为空，则使用数据库配置
 	prompt := config.Conf.Ai.Personality
+	var dbPrompt entity.AiAssistant
 	if friendInfo.Prompt != "" {
-		prompt = friendInfo.Prompt
+		// 取出配置的角色
+		client.MySQL.First(&dbPrompt, "id = ?", friendInfo.Prompt)
+		if dbPrompt.Id != "" {
+			prompt = dbPrompt.Personality
+		}
+	}
+
+	// 配置模型
+	chatModel := openai.GPT3Dot5Turbo0613
+	if friendInfo.AiModel != "" {
+		chatModel = friendInfo.AiModel
+	} else if dbPrompt.Model != "" {
+		chatModel = dbPrompt.Model
+	} else if config.Conf.Ai.Model != "" {
+		chatModel = config.Conf.Ai.Model
 	}
 
 	// 组装消息体
 	messages := make([]openai.ChatCompletionMessage, 0)
-	if config.Conf.Ai.Personality != "" {
+	if prompt != "" {
 		// 填充人设
 		messages = append(messages, openai.ChatCompletionMessage{
 			Role:    openai.ChatMessageRoleSystem,
@@ -101,14 +116,6 @@ func AI(m *plugin.MessageContext) {
 		Content: m.Content,
 	})
 
-	// 配置模型
-	chatModel := openai.GPT3Dot5Turbo0613
-	if friendInfo.AiModel != "" {
-		chatModel = friendInfo.AiModel
-	} else if config.Conf.Ai.Model != "" {
-		chatModel = config.Conf.Ai.Model
-	}
-
 	// 默认使用AI回复
 	conf := openai.DefaultConfig(config.Conf.Ai.ApiKey)
 	if config.Conf.Ai.BaseUrl != "" {
@@ -130,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/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 != "" {

plugin/plugins/command/leigod.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/dto"
-	"go-wechat/model"
+	"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,43 @@
+package plugins
+
+import (
+	"fmt"
+	"go-wechat/config"
+	"go-wechat/plugin"
+	"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, "\"移出群聊") {
+		// 如果是被移出群聊，推送到配置的用户
+		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
+			if user != "" {
+				// 发送一条新消息
+				utils.SendMessage(user, "", m.Content, 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/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"
 )

router/router.go

@@ -14,20 +14,26 @@ func Init(g *gin.Engine) {
 		ctx.Redirect(302, "/index.html")
 	})
 
-	g.GET("/index.html", app.Index)   // 首页
+	g.GET("/index.html", app.Index)         // 首页
-	g.GET("/friend.html", app.Friend) // 好友列表
+	g.GET("/friend.html", app.Friend)       // 好友列表
-	g.GET("/group.html", app.Group)   // 群组列表
+	g.GET("/group.html", app.Group)         // 群组列表
+	g.GET("/assistant.html", app.Assistant) // AI角色
 
 	g.GET("/404.html", app.PageNotFound) // 群组列表
 
 	// 接口
 	api := g.Group("/api")
 	api.PUT("/ai/status", app.ChangeEnableAiStatus)               // 修改是否开启AI状态
-	api.POST("/ai/model", app.ChangeUseAiModel)                   // 修改使用的AI模型
+	api.POST("/ai/dto", app.ChangeUseAiModel)                     // 修改使用的AI模型
+	api.POST("/ai/assistant", app.ChangeUseAiAssistant)           // 修改使用的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)                    // 获取群成员列表
 	api.PUT("/summary/status", app.ChangeEnableSummaryStatus)     // 修改是否开启群聊总结状态
+	api.PUT("/clearmembers", app.AutoClearMembers)                // 自动清理群成员
+
+	api.POST("/assistant", app.SaveAssistant) // 保存AI助手
 }

service/aiassistant.go

@@ -0,0 +1,14 @@
+package service
+
+import (
+	"go-wechat/client"
+	"go-wechat/model/entity"
+)
+
+// GetAllAiAssistant
+// @description: 取出所有AI助手
+// @return records
+func GetAllAiAssistant() (records []entity.AiAssistant, err error) {
+	err = client.MySQL.Order("created_at DESC").Find(&records).Error
+	return
+}

service/friend.go

@@ -2,8 +2,9 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
-	"go-wechat/vo"
+	"go-wechat/model/vo"
+	"gorm.io/gorm"
 	"log"
 	"strings"
 )
@@ -49,7 +50,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 +62,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
 }
 
@@ -95,3 +120,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/model/entity"
-	"go-wechat/vo"
+	"go-wechat/model/vo"
 	"log"
 	"os"
 	"strconv"
@@ -47,13 +47,34 @@ func SaveMessage(msg entity.Message) {
 // @return records
 // @return err
 func GetTextMessagesById(id string) (records []vo.TextMessageItem, err error) {
+	// APP消息类型
+	appMsgList := []string{"57", "4", "5", "6"}
+	// 这个查询子句抽出来写，方便后续扩展
+	selectStr := `CASE
+		WHEN tm.type = 49 THEN
+	CASE
+			WHEN EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) = '57' THEN
+			EXTRACTVALUE ( tm.content, "/msg/appmsg/title" )
+			WHEN EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) = '5' THEN
+			CONCAT("网页分享消息，标题: ", EXTRACTVALUE (tm.content, "/msg/appmsg/title"), "，描述：", EXTRACTVALUE (tm.content, "/msg/appmsg/des"))
+			WHEN EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) = '4' THEN
+			CONCAT("网页分享消息，标题: ", EXTRACTVALUE (tm.content, "/msg/appmsg/title"), "，描述：", EXTRACTVALUE (tm.content, "/msg/appmsg/des"))
+			WHEN EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) = '6' THEN
+			CONCAT("文件消息，文件名: ", EXTRACTVALUE (tm.content, "/msg/appmsg/title"))
+
+			ELSE EXTRACTVALUE ( tm.content, "/msg/appmsg/des" )
+		END ELSE tm.content
+	END`
+
 	tx := client.MySQL.
 		Table("`t_message` AS tm").
 		Joins("LEFT JOIN t_group_user AS tgu ON tm.group_user = tgu.wxid AND tgu.group_id = tm.from_user").
-		Select("tgu.nickname", "IF( tm.type = 49, EXTRACTVALUE ( tm.content, \"/msg/appmsg/title\" ), tm.content ) AS message").
+		Select("tgu.nickname", selectStr+" AS message").
 		Where("tm.`from_user` = ?", id).
-		Where(`(tm.type = 1 OR ( tm.type = 49 AND EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) = '57' ))`).
+		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/model/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, false)
+		// 发送通知到群里
+		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

@@ -6,8 +6,8 @@ import (
 	"go-wechat/client"
 	"go-wechat/common/constant"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/dto"
-	"go-wechat/model"
+	"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").
@@ -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,26 +64,46 @@ 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
-			utils.SendMessage(friend.Wxid, "", "大家好，我是一个AI机器人，可以直接@我询问你想问的问题。该功能默认未启用，请群主艾特我并发送 /ai enable 指令启用", 0)
+			if conf, ok := config.Conf.Resource["introduce"]; ok {
+				// 发送一条新消息
+				switch conf.Type {
+				case "text":
+					// 文字类型
+					utils.SendMessage(friend.Wxid, "", conf.Path, 0)
+				case "image":
+					// 图片类型
+					utils.SendImage(friend.Wxid, conf.Path, 0)
+				case "emotion":
+					// 表情类型
+					utils.SendEmotion(friend.Wxid, conf.Path, 0)
+				}
+			}
 		} else {
 			pm := map[string]any{
 				"nickname":       friend.Nickname,
 				"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 {
@@ -95,8 +118,35 @@ 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
+	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 {
+		log.Printf("清理好友失败: %s", err.Error())
+	}
 
 	log.Println("同步好友列表完成")
 }
@@ -105,7 +155,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{
@@ -192,8 +242,8 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
 // @param wxid
 // @return ent
 // @return err
-func getContactProfile(wxid string) (ent model.ContactProfile, err error) {
+func getContactProfile(wxid string) (ent dto.ContactProfile, err error) {
-	var baseResp model.Response[model.ContactProfile]
+	var baseResp dto.Response[dto.ContactProfile]
 
 	// 组装参数
 	param := map[string]any{

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 \n"))
+
+	// 循环发送新闻
+	for _, group := range groups {
+		// 发送消息
+		utils.SendMessage(group.Wxid, "", newsStr, 0)
+		// 休眠一秒，防止频繁发送
+		time.Sleep(time.Second)
+	}
+}

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"
 )
@@ -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{
@@ -81,6 +82,7 @@ func AiSummary() {
 			continue
 		}
 		replyMsg := fmt.Sprintf("#昨日消息总结\n又是一天过去了，让我们一起来看看昨儿群友们都聊了什么有趣的话题吧~\n\n%s", resp.Choices[0].Message.Content)
+		//log.Printf("群[%s]对话记录总结成功，总结内容: %s", group.Wxid, replyMsg)
 		utils.SendMessage(group.Wxid, "", replyMsg, 0)
 	}
 }

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/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/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")
 	}

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,16 +6,16 @@ import (
 	"errors"
 	"fmt"
 	"github.com/go-resty/resty/v2"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"log"
 )
 
 // LeiGod
 // @description: 雷神加速器相关接口
 type LeiGod interface {
-	Login() error                            // 登录
+	Login() error                          // 登录
-	Info() (model.LeiGodUserInfoResp, error) // 获取用户信息
+	Info() (dto.LeiGodUserInfoResp, error) // 获取用户信息
-	Pause() error                            // 暂停加速
+	Pause() error                          // 暂停加速
 }
 
 type leiGod struct {
@@ -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

@@ -0,0 +1,47 @@
+package utils
+
+import (
+	"github.com/go-resty/resty/v2"
+	"go-wechat/config"
+	"go-wechat/model/dto"
+	"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 dto.MorningPost
+
+	res := resty.New()
+	resp, err := res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetQueryParam("token", config.Conf.System.AlApiToken).
+		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,40 @@ func SendEmotion(toId, emotionHash string, retryCount int) {
 	}
 	log.Printf("发送表情包消息结果: %s", resp.String())
 }
+
+// DeleteGroupMember
+// @description: 删除群成员
+// @param chatRoomId 群Id
+// @param memberIds 成员id,用','分隔
+// @param retryCount 重试次数
+// @param isSure 是否确认删除
+func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool) {
+	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)
+		DeleteGroupMember(chatRoomId, memberIds, retryCount+1, isSure)
+	}
+	log.Printf("[%s]删除群成员结果: %s", chatRoomId, resp.String())
+	// 这个逼接口要调用两次，第一次调用成功，第二次调用才会真正删除
+	if !isSure {
+		DeleteGroupMember(chatRoomId, memberIds, 5, true)
+	}
+}

views/assistant.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="en" class="h-full bg-gray-100">
+
+<head>
+  <meta charset="UTF-8">
+  <title>水群助手</title>
+
+  <link href="assets/css/daisyui-4.4.14-full.min.css" rel="stylesheet" type="text/css"/>
+  <link href="assets/css/index.css" rel="stylesheet" type="text/css"/>
+
+  <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
+  <script src="https://cdn.bootcdn.net/ajax/libs/axios/1.5.0/axios.min.js"></script>
+
+  <script src="assets/js/index.js"></script>
+</head>
+
+<body class="h-full">
+<div class="min-h-full">
+  {{ template "head.html" "assistant" }}
+
+  <main class="-mt-32">
+    <div class="mx-auto max-w-7xl px-4 pb-12 sm:px-6 lg:px-8">
+      <div class="rounded-lg bg-white px-5 py-6 shadow sm:px-6 text-2xl">
+        <ul role="list" class="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-2 xl:gap-x-8">
+          {{ range .assistant }}
+          <li class="overflow-hidden rounded-xl border border-gray-200">
+            <!-- 头 -->
+<!--            <div class="flex items -center gap-x-4 border-b border-gray-900/5 bg-gray-50 p-6">-->
+<!--              <div class="text-sm flex-1">-->
+<!--                <div class="font-medium leading-6 text-gray-900">{{ .Name }}</div>-->
+<!--                <div class="font-medium text-gray-500">{{ .CreatedAt }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+
+            <!-- body -->
+            <form action="/api/assistant" method="post">
+              <div class="-my-3 divide-y divide-gray-100 px-6 py-4 text-sm leading-6">
+                <div class="border-b border-gray-900/10 pb-12">
+                  <div class="mt-10 grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+                    <div class="sm:col-span-4">
+                      <label for="name-{{.Id}}" class="block text-sm font-medium leading-6 text-gray-900">角色名称</label>
+                      <div class="mt-2">
+                        <div class="flex rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600 sm:max-w-md">
+                          <input type="text" value="{{.Name}}" name="name" id="name-{{.Id}}" class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6" placeholder="请输入角色名称">
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-span-full">
+                      <label for="about-{{.Id}}" class="block text-sm font-medium leading-6 text-gray-900">Prompt</label>
+                      <div class="mt-2">
+                        <textarea id="about-{{.Id}}" name="about" rows="4" class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" placeholder="请输入角色Prompt">{{.Personality}}</textarea>
+                      </div>
+                    </div>
+
+                    <div class="col-span-full">
+                      <label for="model-{{.Id}}" class="block text-sm font-medium leading-6 text-gray-900">AI模型</label>
+                      <div class="mt-2">
+                        <select id="model-{{.Id}}" class="block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-green-600 sm:text-sm sm:leading-6">
+                          {{$useModel := .Model}}
+                          {{ range $.aiModels }}
+                          <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>
+                            {{.Name}}
+                          </option>
+                          {{ end }}
+                        </select>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <div class="mt-6 flex items-center justify-end gap-x-6">
+                <button type="submit" class="rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">Save</button>
+              </div>
+            </form>
+          </li>
+          {{ end }}
+        </ul>
+      </div>
+    </div>
+  </main>
+
+  {{ template "footer.html" }}
+
+  {{ template "groupuser.html" }}
+</div>
+
+</body>

views/components.html

@@ -136,3 +136,70 @@
   </span>
 </button>
 {{end}}
+
+
+<!-- 水群排行榜 -->
+{{define "groupRank"}}
+<button type="button"
+        class="{{ if eq .EnableWelcome 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="changeUserGroupRankSkipStatus({{.Wxid}})">
+  <span
+    class="{{ if eq .EnableWelcome 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 .EnableWelcome 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 .EnableWelcome 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}}
+
+<!-- 早报 -->
+{{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"}}
+{{ if eq . true }}
+<span
+  class="inline-flex items-center rounded-md bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">在通讯录</span>
+{{ else }}
+<span
+  class="inline-flex items-center rounded-md bg-red-50 px-2 py-1 text-xs font-medium text-red-700 ring-1 ring-inset ring-red-600/20">不在通讯录</span>
+{{ end }}
+{{end}}

views/friend.html

@@ -28,11 +28,7 @@
               <img src="assets/img/status-{{ if eq .IsOk true }}ok{{else}}fail{{end}}.png" alt="Tuple" class="h-12 w-12 flex-none rounded-lg bg-white object-cover ring-1 ring-gray-900/10">
               <div class="flex-1">
                 <div class="text-sm font-medium leading-6 text-gray-900">{{ .Nickname }}</div>
-                {{ if eq .IsOk true }}
+                {{ template "flagTag" .IsOk }}
-                <span class="inline-flex items-center rounded-md bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">正常</span>
-                {{ else }}
-                <span class="inline-flex items-center rounded-md bg-red-50 px-2 py-1 text-xs font-medium text-red-700 ring-1 ring-inset ring-red-600/20">已删除</span>
-                {{ end }}
               </div>
             </div>
             <dl class="-my-3 divide-y divide-gray-100 px-6 py-4 text-sm leading-6">
@@ -80,8 +76,33 @@
                   </label>
                 </dd>
               </div>
+
+              <div class="flex justify-between gap-x-4 py-3">
+                <dt class="text-gray-500 mt-2">AI角色</dt>
+                <dd class="flex items-start gap-x-2">
+                  <label>
+                    <select class="block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-green-600 sm:text-sm sm:leading-6" onchange="aiAssistantChange(event, {{.Wxid}})">
+                      <option value="" {{ if eq .Prompt "" }}selected{{ end }}>默认</option>
+
+                      {{$usePrompt := .Prompt}}
+                      {{ range $.assistant }}
+                      <option value="{{.Id}}" {{ if eq $usePrompt .Id}}selected{{ end }}>
+                        {{.Name}}
+                      </option>
+                      {{ end }}
+                    </select>
+                  </label>
+                </dd>
+              </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

@@ -21,98 +21,136 @@
   <main class="-mt-32">
     <div class="mx-auto max-w-7xl px-4 pb-12 sm:px-6 lg:px-8">
       <div class="rounded-lg bg-white px-5 py-6 shadow sm:px-6 text-2xl">
-        <table class="min-w-full divide-y divide-gray-300">
+        <ul role="list" class="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-2 xl:gap-x-8">
-          <thead class="bg-gray-50">
-          <tr>
-            <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">
-              是否启用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>
-          </tr>
-          </thead>
-          <tbody class="divide-y divide-gray-200 bg-white">
           {{ range .groups }}
-          <tr class="even:bg-gray-50">
+          <li class="overflow-hidden rounded-xl border border-gray-200">
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+            <div class="flex items -center gap-x-4 border-b border-gray-900/5 bg-gray-50 p-6">
-              <div class="font-medium text-gray-900">{{ .Nickname }}</div>
+              <img src="assets/img/status-{{ if eq .IsOk true }}ok{{else}}fail{{end}}.png" alt="Tuple"
-              <div class="mt-1 truncate text-gray-500">{{ .Wxid }}</div>
+                   class="h-12 w-12 flex-none rounded-lg bg-white object-cover ring-1 ring-gray-900/10">
-            </td>
+              <div class="text-sm flex-1">
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                <div class="font-medium leading-6 text-gray-900">{{ .Nickname }}</div>
-              {{ if eq .LastActive.IsNil true }}
+                <div class="font-medium text-gray-500">{{ .Wxid }}</div>
-              无数据
+                {{ template "flagTag" .IsOk }}
-              {{ else }}
+                <button type="button" class="btn-link float-end text-red-600" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">群成员</button>
-              {{ .LastActive }}
+              </div>
-              {{ end }}
+            </div>
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ if eq .IsOk true }}
-              <span
-                class="inline-flex items-center rounded-md bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">是</span>
-              {{ else }}
-              <span
-                class="inline-flex items-center rounded-md bg-red-50 px-2 py-1 text-xs font-medium text-red-700 ring-1 ring-inset ring-red-600/20">否</span>
-              {{ end }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "ai" . }}
-              <!-- 使用的模型 -->
-              {{ if eq .EnableAi true }}
-              <select id="location" name="location"
-                      class="mt-2 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-green-600 sm:text-sm sm:leading-6"
-                      onchange="aiModelChange(event, {{.Wxid}})">
-                <option value="" {{ if eq .AiModel
-                "" }}selected{{ end }}>默认(gpt-3.5-turbo-0613)
-                </option>
 
-                {{$useModel := .AiModel}}
+            <dl class="-my-3 divide-y divide-gray-100 px-6 py-4 text-sm leading-6">
-                {{ range $.aiModels }}
+              <!-- 最后活跃时间 -->
-                <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>
+              <div class="flex justify-between gap-x-4 py-3 items-center">
-                  {{.Name}}({{.Model}})
+                <dt class="text-gray-500">最后活跃时间</dt>
-                </option>
+                <dd class="flex items-start gap-x-2">
-                {{ end }}
+                  {{ if eq .LastActive.IsNil true }}
-              </select>
+                  无活跃数据
-              {{ end }}
+                  {{ else }}
-            </td>
+                  <time datetime="{{ .LastActive }}">{{ .LastActive }}</time>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                  {{ end }}
-              {{ template "chatRank" . }}
+                </dd>
-            </td>
+              </div>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+              <!-- AI -->
-              {{ template "summary" . }}
+              <div class="flex justify-between gap-x-4 py-3 items-center">
-            </td>
+                <dt class="text-gray-500">AI(模型可选默认或者指定模型)</dt>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                <dd class="flex items-start gap-x-2 items-center">
-              {{ template "welcome" . }}
+                  <div>
-            </td>
+                    {{ template "ai" . }}
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                  </div>
-              {{ template "command" . }}
+                  {{ if eq .EnableAi true }}
-            </td>
+                  <div class="float-end">
-          </tr>
+                    <div>
-          {{ end }}
+                      <label>
-          </tbody>
+                        <select class="block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-green-600 sm:text-sm sm:leading-6" onchange="aiModelChange(event, {{.Wxid}})">
-        </table>
+                          {{$useModel := .AiModel}}
+                          {{ range $.aiModels }}
+                          <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>
+                            {{.Name}}
+                          </option>
+                          {{ end }}
+                        </select>
+                      </label>
+                    </div>
+                    <div class="float-end mt-1">
+                      <label>
+                        <select
+                          class="block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-green-600 sm:text-sm sm:leading-6"
+                          onchange="aiAssistantChange(event, {{.Wxid}})">
+                          <option value="" {{ if eq .Prompt
+                          "" }}selected{{ end }}>默认</option>
+
+                          {{$usePrompt := .Prompt}}
+                          {{ range $.assistant }}
+                          <option value="{{.Id}}" {{ if eq $usePrompt .Id}}selected{{ end }}>
+                            {{.Name}}
+                          </option>
+                          {{ end }}
+                        </select>
+                      </label>
+                    </div>
+                  </div>
+                  {{ end }}
+                </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 "chatRank" . }}
+                </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 "summary" . }}
+                </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 "welcome" . }}
+                </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 "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 "command" . }}
+                </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 items-center">
+                  <div class="relative rounded-md">
+                    <label>
+                      <input type="number" id="auto-cm-{{ .Wxid }}" min="0" class="block w-1/2 float-end rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" placeholder="N天不活跃自动移除"
+                             value="{{.ClearMember}}"
+                             onblur="changeClearMember({{.Wxid}}, {{.ClearMember}}, this.value)"
+                      >
+                    </label>
+                    <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
+                      <span class="text-gray-500 sm:text-sm" id="price-currency">天</span>
+                    </div>
+                  </div>
+                </dd>
+              </div>
+            </dl>
+            {{ end }}
+        </ul>
       </div>
     </div>
   </main>
 
   {{ template "footer.html" }}
+
+  {{ template "groupuser.html" }}
 </div>
 
 </body>

views/groupuser.html

@@ -0,0 +1,21 @@
+<dialog id="groupUserModal" class="modal">
+  <div class="modal-box w-11/12 max-w-7xl">
+    <h3 class="font-bold text-lg" id="groupUserModalName">我是群名称</h3>
+    <div class="divider divider-warning">成员列表</div>
+    <table class="table table-zebra">
+      <thead>
+      <tr>
+        <th>微信Id</th>
+        <th>昵称</th>
+        <th>是否群成员</th>
+        <th>是否群主</th>
+        <th>加群时间</th>
+        <th>最后活跃时间</th>
+        <th>退群时间</th>
+        <th>是否跳过水群排行榜</th>
+      </tr>
+      </thead>
+      <tbody id="groupUsers"></tbody>
+    </table>
+  </div>
+</dialog>

views/head.html

@@ -13,6 +13,7 @@
               <a href="/friend.html" class="{{ if eq . "friend" }}bg-green-700{{ else }}hover:bg-green-500 hover:bg-opacity-75{{ end }} text-white rounded-md py-2 px-3 text-sm font-medium" aria-current="page">好友</a>
               <a href="/group.html" class="{{ if eq . "group" }}bg-green-700{{ else }}hover:bg-green-500 hover:bg-opacity-75{{ end }} text-white rounded-md py-2 px-3 text-sm font-medium">群组</a>
 <!--              <a href="/index.html" class="{{ if eq . "vnc" }}bg-green-700{{ else }}hover:bg-green-500 hover:bg-opacity-75{{ end }} text-white rounded-md py-2 px-3 text-sm font-medium">VNC</a>-->
+              <a href="/assistant.html" class="{{ if eq . "assistant" }}bg-green-700{{ else }}hover:bg-green-500 hover:bg-opacity-75{{ end }} text-white rounded-md py-2 px-3 text-sm font-medium">AI角色</a>
             </div>
           </div>
         </div>

views/static/css/index.css

@@ -1,4 +1,14 @@
 /* 隐藏滚动条 */
 ::-webkit-scrollbar {
     display: none;
-}
+}
+
+/* 隐藏input输入数字时的箭头 */
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+input[type=number] {
+  -moz-appearance:textfield;
+}

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({
@@ -155,12 +174,13 @@ function getGroupUsers(groupId, groupName) {
             // Insert data into cells
             row.insertCell(0).innerHTML = wxid;
             row.insertCell(1).innerHTML = nickname;
-            row.insertCell(2).innerHTML = `<div class="badge badge-${isMember ? 'info' : 'error'} gap-2">${isMember ? '是' : '否'}</div>`;
+            row.insertCell(2).innerHTML = `<span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset ${isMember ? 'bg-green-50 text-green-700 ring-green-600/20' : 'bg-red-50 text-red-700 ring-red-600/20'}">${isMember ? '是' : '否'}</span>`;
-            row.insertCell(3).innerHTML = `<div class="badge badge-${isAdmin ? 'info' : 'error'} gap-2">${isAdmin ? '是' : '否'}</div>`;
+            row.insertCell(3).innerHTML = `<span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset ${isAdmin ? 'bg-green-50 text-green-700 ring-green-600/20' : 'bg-red-50 text-red-700 ring-red-600/20'}">${isAdmin ? '是' : '否'}</span>`;
             row.insertCell(4).innerHTML = joinTime;
             row.insertCell(5).innerHTML = lastActive;
             row.insertCell(6).innerHTML = leaveTime;
-            row.insertCell(7).innerHTML = `<input type="checkbox" class="toggle toggle-error" ${skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus('${groupId}', '${wxid}')" />`;
+            // row.insertCell(7).innerHTML = `<input type="checkbox" class="toggle toggle-error" ${skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus('${groupId}', '${wxid}')" />`;
+            row.insertCell(7).innerHTML = `<span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset ${skipChatRank ? 'bg-green-50 text-green-700 ring-green-600/20' : 'bg-red-50 text-red-700 ring-red-600/20'}">${skipChatRank ? '是' : '否'}</span>`;
         });
     }).catch(function (error) {
         console.log(`错误信息: ${error}`);
@@ -193,3 +213,56 @@ function aiModelChange(event, wxid) {
         window.location.reload();
     })
 }
+
+// AI角色变动
+function aiAssistantChange(event, wxid) {
+  // 取出变动后的值
+  const assistantStr = event.target.value;
+  console.log("AI角色变动: ", wxid, assistantStr)
+  axios({
+    method: 'post',
+    url: '/api/ai/assistant',
+    data: {
+      wxid: wxid,
+      model: assistantStr
+    }
+  }).then(function (response) {
+    console.log(`返回结果: ${JSON.stringify(response)}`);
+    alert(`${response.data}`)
+  }).catch(function (error) {
+    console.log(`错误信息: ${error}`);
+    alert("修改失败")
+  }).finally(function () {
+    window.location.reload();
+  })
+}
+
+// 修改清理群成员值
+function changeClearMember(wxid, oldVal, newVal) {
+  oldVal = Number(oldVal)
+  newVal = Number(newVal)
+
+  if (oldVal === newVal) {
+    return
+  }
+  if (newVal < 0) {
+    alert('不活跃天数的值不能小于0')
+  }
+  // 请求接口
+  axios({
+    method: 'put',
+    url: '/api/clearmembers',
+    data: {
+      wxid: wxid,
+      days: Number(newVal)
+    }
+  }).then(function (response) {
+    console.log(`返回结果: ${JSON.stringify(response)}`);
+    alert(`${response.data}`)
+  }).catch(function (error) {
+    console.log(`错误信息: ${error}`);
+    alert("修改失败")
+  }).finally(function () {
+    window.location.reload();
+  })
+}