Merge pull request 'hotfix' (#78) from hotfix into main

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

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"

app/group.go

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

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/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"`   // 模型代码
 }

initialization/plugin.go

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

initialization/wechat.go

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

model/dto/friend.go

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

model/dto/leigod.go

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

model/dto/message.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 import (
 	"encoding/xml"
@@ -209,7 +209,9 @@ func (m Message) IsInvitationJoinGroup() (flag bool, str string) {
 		if err := xml.Unmarshal([]byte(m.Content), &md); err != nil {
 			return
 		}
-		return md.AppMsg.Type == "5" && strings.Contains(md.AppMsg.Content, "邀请你加入群聊"), md.AppMsg.Des
+		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

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

model/entity/friend.go

@@ -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 {

mq/handler.go

@@ -3,10 +3,8 @@ package mq
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/config"
+	"go-wechat/model/dto"
-	"go-wechat/model"
 	"go-wechat/types"
-	"go-wechat/utils"
 	"log"
 	"strings"
 )
@@ -15,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))
@@ -39,16 +37,6 @@ func parse(msg []byte) {
 	}
 	log.Printf("收到新微信消息\n消息来源: %s\n群成员: %s\n消息类型: %v\n消息内容: %s", m.FromUser, m.GroupUser, m.Type, m.Content)
 
-	// 如果是邀请进群，推送到配置的用户
-	if flag, dec := m.IsInvitationJoinGroup(); flag {
-		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
-			if user != "" {
-				// 发送一条新消息
-				utils.SendMessage(user, "", dec, 0)
-			}
-		}
-	}
-
 	// 插件不为空，开始执行
 	if p := current.GetRobotMessageHandler(); p != nil {
 		p(&m)

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

plugin/plugins/command/ai.go

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

plugin/plugins/command/leigod.go

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

plugin/plugins/save2db.go

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

plugin/plugins/systemmessgae.go

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

plugin/plugins/welconenew.go

@@ -3,7 +3,7 @@ package plugins
 import (
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
 	"go-wechat/plugin"
 	"go-wechat/utils"
 )

service/aiassistant.go

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

service/friend.go

@@ -2,8 +2,9 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/entity"
+	"go-wechat/model/entity"
-	"go-wechat/vo"
+	"go-wechat/model/vo"
+	"gorm.io/gorm"
 	"log"
 	"strings"
 )
@@ -36,6 +37,16 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
 	return
 }
 
+// GetFriendInfoById
+// @description: 通过wxId获取好友信息
+// @param wxId
+// @return ent
+// @return err
+func GetFriendInfoById(wxId string) (ent entity.Friend, err error) {
+	err = client.MySQL.Where("wxid = ?", wxId).First(&ent).Error
+	return
+}
+
 // GetAllEnableAI
 // @description: 取出所有启用了AI的好友或群组
 // @return []entity.Friend
@@ -119,3 +130,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"

tasks/cleargroupuser/cleargroupuser.go

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

tasks/friends/friends.go

@@ -6,8 +6,8 @@ import (
 	"go-wechat/client"
 	"go-wechat/common/constant"
 	"go-wechat/config"
-	"go-wechat/entity"
+	"go-wechat/model/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").
@@ -155,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{
@@ -242,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/summary/summary.go

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

tasks/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,10 +3,8 @@ package tcpserver
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/config"
+	"go-wechat/model/dto"
-	"go-wechat/model"
 	"go-wechat/types"
-	"go-wechat/utils"
 	"log"
 	"net"
 	"strings"
@@ -16,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))
@@ -40,16 +38,6 @@ func parse(remoteAddr net.Addr, msg []byte) {
 	}
 	log.Printf("%s\n消息来源: %s\n群成员: %s\n消息类型: %v\n消息内容: %s", remoteAddr, m.FromUser, m.GroupUser, m.Type, m.Content)
 
-	// 如果是邀请进群，推送到配置的用户
-	if flag, dec := m.IsInvitationJoinGroup(); flag {
-		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
-			if user != "" {
-				// 发送一条新消息
-				utils.SendMessage(user, "", dec, 0)
-			}
-		}
-	}
-
 	// 插件不为空，开始执行
 	if p := current.GetRobotMessageHandler(); p != nil {
 		p(&m)

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

@@ -3,7 +3,7 @@ package utils
 import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/config"
-	"go-wechat/model"
+	"go-wechat/model/dto"
 	"log"
 )
 
@@ -29,7 +29,7 @@ func NewsUtil() News {
 // @receiver news
 // @return records
 func (news) MorningPost() (records []string) {
-	var newsResp model.MorningPost
+	var newsResp dto.MorningPost
 
 	res := resty.New()
 	resp, err := res.R().

utils/send.go

@@ -158,3 +158,33 @@ func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool
 		DeleteGroupMember(chatRoomId, memberIds, 5, true)
 	}
 }
+
+// QuitChatroom
+// @description: 退出群聊
+// @param chatRoomId string 群Id
+// @param retryCount int 重试次数
+func QuitChatroom(chatRoomId string, retryCount int) {
+	if retryCount > 5 {
+		log.Printf("重试五次失败，停止发送")
+		return
+	}
+
+	// 组装参数
+	param := map[string]any{
+		"chatRoomId": chatRoomId, // 群Id
+	}
+	pbs, _ := json.Marshal(param)
+
+	res := resty.New()
+	resp, err := res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetBody(string(pbs)).
+		Post(config.Conf.Wechat.GetURL("/api/quitChatRoom"))
+	if err != nil {
+		log.Printf("退群失败: %s", err.Error())
+		// 休眠五秒后重新发送
+		time.Sleep(5 * time.Second)
+		QuitChatroom(chatRoomId, retryCount+1)
+	}
+	log.Printf("退群结果: %s", resp.String())
+}

views/groupuser.html

@@ -1,6 +1,9 @@
 <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="flex">
+      <h3 class="font-bold text-lg" id="groupUserModalName">我是群名称</h3>
+      <h3 class="font-bold text-lg ml-5" id="groupUserCount">(健在成员100人)</h3>
+    </div>
     <div class="divider divider-warning">成员列表</div>
     <table class="table table-zebra">
       <thead>

views/static/js/index.js

@@ -2,82 +2,82 @@ console.log("打开首页")
 
 //	改变AI开启状态
 function changeAiEnableStatus(wxId) {
-    // console.log("修改AI开启状态: ", wxId)
+  // console.log("修改AI开启状态: ", wxId)
 
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/ai/status',
+    url: '/api/ai/status',
-        data: {
+    data: {
-            wxId: wxId
+      wxId: wxId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 修改水群排行榜状态
 function changeGroupRankEnableStatus(wxId) {
-    // console.log("修改水群排行榜开启状态: ", wxId)
+  // console.log("修改水群排行榜开启状态: ", wxId)
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/grouprank/status',
+    url: '/api/grouprank/status',
-        data: {
+    data: {
-            wxId: wxId
+      wxId: wxId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 修改水群排行榜状态
 function changeSummaryEnableStatus(wxId) {
-    // console.log("修改聊天记录总结开启状态: ", wxId)
+  // console.log("修改聊天记录总结开启状态: ", wxId)
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/summary/status',
+    url: '/api/summary/status',
-        data: {
+    data: {
-            wxId: wxId
+      wxId: wxId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 修改欢迎语开启状态
 function changeWelcomeEnableStatus(wxId) {
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/welcome/status',
+    url: '/api/welcome/status',
-        data: {
+    data: {
-            wxId: wxId
+      wxId: wxId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 修改用户新闻开启状态
@@ -101,117 +101,123 @@ function changeUserNewsStatus(wxId) {
 
 // 修改指令权限启用状态
 function changeCommandEnableStatus(wxId) {
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/command/status',
+    url: '/api/command/status',
-        data: {
+    data: {
-            wxId: wxId
+      wxId: wxId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 修改群成员是否参与排行榜状态
 function changeUserGroupRankSkipStatus(groupId, userId) {
-    console.log("修改水群排行榜开启状态: ", groupId, userId)
+  console.log("修改水群排行榜开启状态: ", groupId, userId)
-    axios({
+  axios({
-        method: 'put',
+    method: 'put',
-        url: '/api/grouprank/skip',
+    url: '/api/grouprank/skip',
-        data: {
+    data: {
-            wxId: groupId,
+      wxId: groupId,
-            userId: userId
+      userId: userId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // 获取群成员列表
 function getGroupUsers(groupId, groupName) {
-    // 获取表格的tbody部分，以便稍后向其中添加行
+  // 获取表格的tbody部分，以便稍后向其中添加行
-    var tbody = document.getElementById("groupUsers");
+  var tbody = document.getElementById("groupUsers");
-    tbody.innerHTML = ""
+  tbody.innerHTML = ""
 
-    // 打开模态框
+  // 打开模态框
-    const modal = document.getElementById("groupUserModal");
+  const modal = document.getElementById("groupUserModal");
-    modal.showModal()
+  modal.showModal()
 
-    // 设置群名称
+  // 设置群名称
-    const groupNameTag = document.getElementById("groupUserModalName");
+  const groupNameTag = document.getElementById("groupUserModalName");
-    groupNameTag.innerHTML = '<span class="loading loading-dots loading-lg"></span>'
+  groupNameTag.innerHTML = '<span class="loading loading-dots loading-lg"></span>'
 
-    // 显示加载框
+  // 显示加载框
-    // const loading = document.getElementById("groupUserDataLoading");
+  // const loading = document.getElementById("groupUserDataLoading");
-    // loading.style.display = "block"
+  // loading.style.display = "block"
 
-    axios.get('/api/group/users', {
+  axios.get('/api/group/users', {
-        params: {
+    params: {
-            groupId: groupId
+      groupId: groupId
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        // console.log(`返回结果: ${JSON.stringify(response)}`);
+    // console.log(`返回结果: ${JSON.stringify(response.data)}`);
-        // 渲染群成员列表
+    // 渲染群成员列表
-        const groupUsers = response.data
+    const groupUsers = response.data.records;
-        // 循环渲染数据
+    const groupUserCount = response.data.isOkCount;
-        groupUsers.forEach((groupUser, i) => {
-            console.log(groupUser)
-            const { wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank } = groupUser;
 
-            let row = tbody.insertRow(i);
+    // 设置成员总数
-            // Insert data into cells
+    const groupUserCountTag = document.getElementById("groupUserCount");
-            row.insertCell(0).innerHTML = wxid;
+    groupUserCountTag.innerHTML = `健在成员: ${groupUserCount}人`
-            row.insertCell(1).innerHTML = nickname;
+
-            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 = `<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>`;
+    groupUsers.forEach((groupUser, i) => {
-            row.insertCell(4).innerHTML = joinTime;
+      // console.log(groupUser)
-            row.insertCell(5).innerHTML = lastActive;
+      const {wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank} = groupUser;
-            row.insertCell(6).innerHTML = leaveTime;
+
-            // row.insertCell(7).innerHTML = `<input type="checkbox" class="toggle toggle-error" ${skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus('${groupId}', '${wxid}')" />`;
+      let row = tbody.insertRow(i);
-            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>`;
+      // Insert data into cells
-        });
+      row.insertCell(0).innerHTML = wxid;
-    }).catch(function (error) {
+      row.insertCell(1).innerHTML = nickname;
-        console.log(`错误信息: ${error}`);
+      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>`;
-    }).finally(function () {
+      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;
-        // loading.style.display = "none"
+      row.insertCell(5).innerHTML = lastActive;
-        groupNameTag.innerHTML = groupName
+      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 = `<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}`);
+  }).finally(function () {
+    // 隐藏加载框
+    // loading.style.display = "none"
+    groupNameTag.innerHTML = groupName
+  })
 }
 
 // AI模型变动
 function aiModelChange(event, wxid) {
-    // 取出变动后的值
+  // 取出变动后的值
-    const modelStr = event.target.value;
+  const modelStr = event.target.value;
-    console.log("AI模型变动: ", wxid, modelStr)
+  console.log("AI模型变动: ", wxid, modelStr)
-    axios({
+  axios({
-        method: 'post',
+    method: 'post',
-        url: '/api/ai/model',
+    url: '/api/ai/model',
-        data: {
+    data: {
-            wxid: wxid,
+      wxid: wxid,
-            model: modelStr
+      model: modelStr
-        }
+    }
-    }).then(function (response) {
+  }).then(function (response) {
-        console.log(`返回结果: ${JSON.stringify(response)}`);
+    console.log(`返回结果: ${JSON.stringify(response)}`);
-        alert(`${response.data}`)
+    alert(`${response.data}`)
-    }).catch(function (error) {
+  }).catch(function (error) {
-        console.log(`错误信息: ${error}`);
+    console.log(`错误信息: ${error}`);
-        alert("修改失败")
+    alert("修改失败")
-    }).finally(function () {
+  }).finally(function () {
-        window.location.reload();
+    window.location.reload();
-    })
+  })
 }
 
 // AI角色变动