Merge pull request '🐛 修复加群通知不提醒的BUG' (#69) from hotfix into main

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

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
-	Model string `json:"model" binding:"required"` // 模型代码
+	WxId  string `json:"wxid" binding:"required"` // 群Id或微信Id
+	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
@@ -205,3 +234,26 @@ func ChangeEnableNewsStatus(ctx *gin.Context) {
 
 	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"
-	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

@@ -1,4 +1,7 @@
 system:
+  # 每日新闻接口 Token
+  # 获取地址: https://admin.alapi.cn/api_manager/token_manager
+  alApiToken: xxx
   # 添加新好友或群之后通知给指定的人
   newFriendNotify:
     enable: true
@@ -42,7 +45,7 @@ mysql:
   schema: public # postgres 专用
 
 task:
-  enable: true
+  enable: false
   news:
     enable: true
     cron: '14 11 * * *' # 每天0:30
@@ -101,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 会变成全小写，所以这儿不能用大写字母

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"`   // 模型名称
-	Model string `json:"model" yaml:"model"` // 模型代码
+	Name  string `json:"name" yaml:"name"` // 模型名称
+	Model string `json:"dto" yaml:"dto"`   // 模型代码
 }

config/system.go

@@ -2,6 +2,7 @@ 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"`         // 默认规则
 }

initialization/plugin.go

@@ -2,7 +2,7 @@ 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"
@@ -19,25 +19,31 @@ 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 *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

@@ -1,4 +1,4 @@
-package model
+package dto
 
 // MorningPost
 // @description: 每日早报返回结构体

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

@@ -22,6 +22,7 @@ type Friend struct {
 	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,6 +15,7 @@ type FriendItem struct {
 	LastActive     types.DateTime // 最后活跃时间
 	EnableAi       bool           // 是否使用AI
 	AiModel        string         // AI模型
+	Prompt         string         // AI助手或者自定义提示词
 	EnableChatRank bool           // 是否使用聊天排行
 	EnableWelcome  bool           // 是否使用迎新
 	EnableCommand  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"
@@ -48,8 +48,23 @@ 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
 	}
 
 	// 组装消息体
@@ -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 {
-		log.Panicf("KFC接口1文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		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 {
-		log.Panicf("KFC接口2文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		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 {
-		log.Panicf("KFC接口3文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		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"
+	"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,24 @@
+package plugins
+
+import (
+	"fmt"
+	"go-wechat/config"
+	"go-wechat/plugin"
+	"go-wechat/utils"
+)
+
+// NotifyInvitationJoinGroup
+// @description: 通知邀请入群消息到配置用户
+// @param m
+func NotifyInvitationJoinGroup(m *plugin.MessageContext) {
+	// 如果是邀请进群，推送到配置的用户
+	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)
+			}
+		}
+	}
+}

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,16 +14,18 @@ func Init(g *gin.Engine) {
 		ctx.Redirect(302, "/index.html")
 	})
 
-	g.GET("/index.html", app.Index)   // 首页
-	g.GET("/friend.html", app.Friend) // 好友列表
-	g.GET("/group.html", app.Group)   // 群组列表
+	g.GET("/index.html", app.Index)         // 首页
+	g.GET("/friend.html", app.Friend)       // 好友列表
+	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)           // 修改是否开启早报状态
@@ -31,4 +33,7 @@ func Init(g *gin.Engine) {
 	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/vo"
+	"go-wechat/model/entity"
+	"go-wechat/model/vo"
+	"gorm.io/gorm"
 	"log"
 	"strings"
 )
@@ -82,7 +83,7 @@ func GetAllEnableNews() (records []entity.Friend, err error) {
 // @return records
 // @return err
 func GetAllEnableClearGroup() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("clear_members != 0").Where("is_ok IS TRUE").Find(&records).Error
+	err = client.MySQL.Where("clear_member > 0").Where("is_ok IS TRUE").Find(&records).Error
 	return
 }
 
@@ -119,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/vo"
+	"go-wechat/model/entity"
+	"go-wechat/model/vo"
 	"log"
 	"os"
 	"strconv"
@@ -73,6 +73,8 @@ func GetTextMessagesById(id string) (records []vo.TextMessageItem, err error) {
 		Where("tm.`from_user` = ?", id).
 		Where(`(tm.type = 1 OR ( tm.type = 49 AND EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) IN (?) ))`, appMsgList).
 		Where("DATE ( tm.create_at ) = DATE ( CURDATE() - INTERVAL 1 DAY )").
+		Where("tm.content NOT LIKE '#昨日水群排行榜%'").
+		Where("tm.content NOT LIKE '#昨日消息总结%'").
 		Order("tm.create_at ASC")
 
 	err = tx.Find(&records).Error

tasks/cleargroupuser/cleargroupuser.go

@@ -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"
@@ -13,7 +13,7 @@ import (
 // ClearGroupUser
 // @description: 清理群成员
 func ClearGroupUser() {
-	groups, err := service.GetAllEnableNews()
+	groups, err := service.GetAllEnableClearGroup()
 	if err != nil {
 		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
 		return
@@ -38,13 +38,13 @@ func ClearGroupUser() {
 			memberMap[member.Nickname] = member.LastActive.Format("2006-01-02 15:04:05")
 		}
 		// 调用接口
-		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0)
+		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0, false)
 		// 发送通知到群里
 		ms := make([]string, 0)
 		for k, v := range memberMap {
-			ms = append(ms, fmt.Sprintf("%s: %s", k, v))
+			ms = append(ms, fmt.Sprintf("昵称：%s\n最后活跃时间：%s", k, v))
 		}
-		msg := fmt.Sprintf("#清理群成员#\n\n很遗憾地通知各位，就在刚刚，有%d名群友引活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n活跃信息: \n%s",
+		msg := fmt.Sprintf("#清理群成员\n\n很遗憾地通知各位，就在刚刚，有%d名群友因活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n详细信息: \n%s",
 			memberCount, strings.Join(ms, "\n"))
 		utils.SendMessage(group.Wxid, "", msg, 0)
 	}

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").
@@ -103,6 +103,7 @@ func Sync() {
 				"custom_account": friend.CustomAccount,
 				"pinyin":         friend.Pinyin,
 				"pinyin_all":     friend.PinyinAll,
+				"is_ok":          true,
 			}
 			err = tx.Model(&entity.Friend{}).Where("wxid = ?", friend.Wxid).Updates(pm).Error
 			if err != nil {
@@ -122,18 +123,30 @@ func Sync() {
 		// 组装成一句话
 		msg := []string{"#新好友通知\n"}
 		for wxId, nickname := range newItmes {
-			msg = append(msg, "微信Id: "+wxId+" -> 昵称: "+nickname)
+			msg = append(msg, "微信Id: "+wxId+"\n昵称: "+nickname)
 		}
 		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
 			if user != "" {
 				// 发送一条新消息
-				utils.SendMessage(user, "", strings.Join(msg, "\n"), 0)
+				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("同步好友列表完成")
 }
@@ -142,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{
@@ -229,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) {
-	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/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"
 )
@@ -42,11 +42,12 @@ func AiSummary() {
 注意，他们可能是多个话题，请仔细甄别。
 每一行代表一个人的发言，每一行的的格式为： {"{nickname}": "{content}"}--end--
 
+群名称: %s
 聊天记录如下:
 %s
 `
 
-		msg := fmt.Sprintf(msgTmp, strings.Join(content, "\n"))
+		msg := fmt.Sprintf(msgTmp, group.Nickname, strings.Join(content, "\n"))
 
 		// AI总结
 		messages := []openai.ChatCompletionMessage{

tasks/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,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                            // 登录
-	Info() (model.LeiGodUserInfoResp, error) // 获取用户信息
-	Pause() error                            // 暂停加速
+	Login() error                          // 登录
+	Info() (dto.LeiGodUserInfoResp, 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

@@ -2,7 +2,8 @@ package utils
 
 import (
 	"github.com/go-resty/resty/v2"
-	"go-wechat/model"
+	"go-wechat/config"
+	"go-wechat/model/dto"
 	"log"
 )
 
@@ -28,12 +29,12 @@ 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().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
-		SetQueryParam("token", "cFoMZNNBxT4jQovS").
+		SetQueryParam("token", config.Conf.System.AlApiToken).
 		SetResult(&newsResp).
 		Post("https://v2.alapi.cn/api/zaobao")
 	if err != nil {

utils/send.go

@@ -126,7 +126,9 @@ func SendEmotion(toId, emotionHash string, retryCount int) {
 // @description: 删除群成员
 // @param chatRoomId 群Id
 // @param memberIds 成员id,用','分隔
-func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
+// @param retryCount 重试次数
+// @param isSure 是否确认删除
+func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool) {
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
 		return
@@ -148,7 +150,11 @@ func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
 		log.Printf("删除群成员失败: %s", err.Error())
 		// 休眠五秒后重新发送
 		time.Sleep(5 * time.Second)
-		SendImage(chatRoomId, memberIds, retryCount+1)
+		DeleteGroupMember(chatRoomId, memberIds, retryCount+1, isSure)
+	}
+	log.Printf("[%s]删除群成员结果: %s", chatRoomId, resp.String())
+	// 这个逼接口要调用两次，第一次调用成功，第二次调用才会真正删除
+	if !isSure {
+		DeleteGroupMember(chatRoomId, memberIds, 5, true)
 	}
-	log.Printf("删除群成员结果: %s", resp.String())
 }

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

@@ -197,9 +197,9 @@
 {{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>
+  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>
+  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

@@ -76,6 +76,24 @@
                   </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">

views/group.html

@@ -21,105 +21,129 @@
   <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">
-          <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>
-            <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">
+        <ul role="list" class="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-2 xl:gap-x-8">
           {{ range .groups }}
-          <tr class="even:bg-gray-50">
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <div class="font-medium text-gray-900">{{ .Nickname }}</div>
-              <div class="mt-1 truncate text-gray-500">{{ .Wxid }}</div>
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ if eq .LastActive.IsNil true }}
-              无数据
-              {{ else }}
-              {{ .LastActive }}
-              {{ end }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "flagTag" .IsOk }}
-            </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>
+          <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">
+              <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="text-sm flex-1">
+                <div class="font-medium leading-6 text-gray-900">{{ .Nickname }}</div>
+                <div class="font-medium text-gray-500">{{ .Wxid }}</div>
+                {{ template "flagTag" .IsOk }}
+                <button type="button" class="btn-link float-end text-red-600" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">群成员</button>
+              </div>
+            </div>
 
-                {{$useModel := .AiModel}}
-                {{ range $.aiModels }}
-                <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>
-                  {{.Name}}({{.Model}})
-                </option>
-                {{ end }}
-              </select>
-              {{ end }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "chatRank" . }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "summary" . }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "welcome" . }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "news" . }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ template "command" . }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              {{ .ClearMember }}
-            </td>
-            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <button class="btn btn-link" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">成员</button>
-            </td>
-          </tr>
-          {{ end }}
-          </tbody>
-        </table>
+            <dl class="-my-3 divide-y divide-gray-100 px-6 py-4 text-sm leading-6">
+              <!-- 最后活跃时间 -->
+              <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">
+                  {{ if eq .LastActive.IsNil true }}
+                  无活跃数据
+                  {{ else }}
+                  <time datetime="{{ .LastActive }}">{{ .LastActive }}</time>
+                  {{ end }}
+                </dd>
+              </div>
+              <!-- AI -->
+              <div class="flex justify-between gap-x-4 py-3 items-center">
+                <dt class="text-gray-500">AI(模型可选默认或者指定模型)</dt>
+                <dd class="flex items-start gap-x-2 items-center">
+                  <div>
+                    {{ template "ai" . }}
+                  </div>
+                  {{ if eq .EnableAi true }}
+                  <div class="float-end">
+                    <div>
+                      <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="aiModelChange(event, {{.Wxid}})">
+                          {{$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>

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

@@ -2,3 +2,13 @@
 ::-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

@@ -213,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();
+  })
+}