Compare commits

...

44 Commits

Author SHA1 Message Date
李寻欢
a08966d454 Merge pull request 'hotfix' (#78) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/78
2024-07-12 10:04:23 +08:00
李寻欢
24ddb1befe Merge remote-tracking branch 'origin/hotfix' into hotfix 2024-07-12 10:03:51 +08:00
李寻欢
bb58b5090b 🎨 优化被移除群聊之后的处理逻辑 2024-07-12 10:03:45 +08:00
李寻欢
6df5816867 Merge pull request '🐛 Fix a bug.' (#77) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/77
2024-07-11 19:37:42 +08:00
李寻欢
e58c683b37 🐛 Fix a bug. 2024-07-11 19:37:27 +08:00
李寻欢
534fc904a2 Merge pull request '🐛 Fix a bug.' (#76) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/76
2024-07-11 19:32:47 +08:00
李寻欢
e8bca43992 🐛 Fix a bug. 2024-07-11 19:32:21 +08:00
李寻欢
f8f2d384f4 Merge pull request 'hotfix' (#75) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/75
2024-07-11 15:47:53 +08:00
李寻欢
28f08085ee 🎨 优化群成员显示效果 2024-07-11 15:47:35 +08:00
李寻欢
d802cbd6ca 🎨 优化群成员显示效果 2024-07-11 15:46:49 +08:00
李寻欢
5b187ff026 Merge pull request '🎨 优化新增加好友或者群之后的响应逻辑' (#74) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/74
2024-07-11 13:56:57 +08:00
李寻欢
e1c2eb78aa 🎨 优化新增加好友或者群之后的响应逻辑 2024-07-11 13:56:33 +08:00
李寻欢
3bc33f1d64 Merge pull request '🎨 优化被移除群聊通知逻辑' (#73) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/73
2024-07-11 09:14:18 +08:00
李寻欢
bc5adf26d9 🎨 优化被移除群聊通知逻辑 2024-07-11 09:13:54 +08:00
李寻欢
23ca86e75c Merge pull request '🎨 优化被移除群聊通知逻辑' (#72) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/72
2024-07-10 16:32:39 +08:00
李寻欢
1d41fc5a6b 🎨 优化被移除群聊通知逻辑 2024-07-10 16:32:18 +08:00
李寻欢
bcdf0a45d2 Merge pull request ' 新增被移除群聊通知' (#71) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/71
2024-07-10 14:56:49 +08:00
李寻欢
4d3bef7cf5 新增被移除群聊通知 2024-07-10 14:56:11 +08:00
李寻欢
205e34f67e Merge pull request '🎨 逻辑优化' (#70) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/70
2024-07-09 08:38:51 +08:00
李寻欢
9b5152e294 🎨 逻辑优化 2024-07-09 08:38:16 +08:00
李寻欢
c0f8169588 Merge pull request '🐛 修复加群通知不提醒的BUG' (#69) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/69
2024-07-08 10:58:22 +08:00
李寻欢
2e5632c203 🐛 修复加群通知不提醒的BUG 2024-07-08 10:57:52 +08:00
李寻欢
d3ec63ff6c Merge pull request 'hotfix' (#68) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/68
2024-07-05 09:44:42 +08:00
李寻欢
f747bf5ead 新增记录群或者好友已使用的tokens信息 2024-07-05 09:44:07 +08:00
李寻欢
9e8c3f5e6f 🐛 修复AI返回数据为空时会下标越界的BUG 2024-07-05 09:43:34 +08:00
李寻欢
d07b3b9456 🔥 代码结构调整 2024-07-05 09:32:39 +08:00
李寻欢
f396a7f674 Merge pull request 'hotfix' (#67) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/67
2024-07-05 09:17:03 +08:00
李寻欢
42ac0a5ae0 Merge remote-tracking branch 'origin/hotfix' into hotfix 2024-07-05 09:16:49 +08:00
李寻欢
a905c3ca99 推送邀请加群消息到配置的用户 2024-07-05 09:16:43 +08:00
李寻欢
c881a1c395 🎨 新闻消息推送格式优化 2024-07-05 09:06:38 +08:00
李寻欢
df05070e0b Merge pull request '🐛 Fix a bug.' (#66) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/66
2024-07-04 21:18:06 +08:00
李寻欢
703e183424 🐛 Fix a bug. 2024-07-04 21:17:29 +08:00
李寻欢
5afe50975b Merge pull request '🐛 修复修改 AI 模型和角色无法设置为默认的 BUG' (#65) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/65
2024-07-04 19:42:42 +08:00
李寻欢
83458e649a 🐛 修复修改 AI 模型和角色无法设置为默认的 BUG 2024-07-04 19:41:42 +08:00
李寻欢
28f111c812 Merge pull request '🔥 修改每日早报接口 Token 为手动配置' (#64) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/64
2024-06-24 08:40:53 +08:00
李寻欢
0adc2ff628 🔥 修改每日早报接口 Token 为手动配置 2024-06-24 08:40:24 +08:00
李寻欢
4c08c5caeb Merge pull request '🐛 Fix a bug.' (#63) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/63
2024-06-22 08:50:01 +08:00
李寻欢
de278f25e9 🐛 Fix a bug. 2024-06-22 08:49:28 +08:00
李寻欢
4fcf1779de Merge pull request '🎨 页面美化' (#62) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/62
2024-06-19 14:21:33 +08:00
李寻欢
f39f46bfbf 🎨 页面美化 2024-06-19 14:21:07 +08:00
李寻欢
f946044f13 Merge pull request '🎨 页面美化' (#61) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/61
2024-06-19 08:42:35 +08:00
李寻欢
5819ac3c04 🎨 页面美化 2024-06-19 08:41:58 +08:00
李寻欢
44b8e4a162 Merge pull request '🐛 Fix a bug.' (#60) from hotfix into main
Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/60
2024-06-18 17:30:27 +08:00
李寻欢
c4964a9e21 🐛 Fix a bug. 2024-06-18 17:30:05 +08:00
49 changed files with 491 additions and 255 deletions

View File

@@ -3,7 +3,7 @@ package app
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go-wechat/client" "go-wechat/client"
"go-wechat/entity" "go-wechat/model/entity"
"gorm.io/gorm" "gorm.io/gorm"
"log" "log"
"net/http" "net/http"
@@ -19,8 +19,8 @@ type changeStatusParam struct {
// changeUseAiModelParam // changeUseAiModelParam
// @description: 修改使用的AI模型用的参数集 // @description: 修改使用的AI模型用的参数集
type changeUseAiModelParam struct { 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:"model"` // 模型代码
} }
// autoClearMembers // autoClearMembers

View File

@@ -25,6 +25,19 @@ func GetGroupUsers(ctx *gin.Context) {
ctx.String(http.StatusInternalServerError, "查询失败: %s", err.Error()) ctx.String(http.StatusInternalServerError, "查询失败: %s", err.Error())
return 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)
} }

View File

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

View File

@@ -1,4 +1,7 @@
system: system:
# 每日新闻接口 Token
# 获取地址: https://admin.alapi.cn/api_manager/token_manager
alApiToken: xxx
# 添加新好友或群之后通知给指定的人 # 添加新好友或群之后通知给指定的人
newFriendNotify: newFriendNotify:
enable: true enable: true

View File

@@ -4,7 +4,7 @@ package config
// @description: AI配置 // @description: AI配置
type ai struct { type ai struct {
Enable bool `json:"enable" yaml:"enable"` // 是否启用AI 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"` // 总结模型 SummaryModel string `json:"summaryModel" yaml:"summaryModel"` // 总结模型
ApiKey string `json:"apiKey" yaml:"apiKey"` // API Key ApiKey string `json:"apiKey" yaml:"apiKey"` // API Key
BaseUrl string `json:"baseUrl" yaml:"baseUrl"` // API地址 BaseUrl string `json:"baseUrl" yaml:"baseUrl"` // API地址
@@ -15,6 +15,6 @@ type ai struct {
// aiModel // aiModel
// @description: AI模型 // @description: AI模型
type aiModel struct { 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"` // 模型代码
} }

View File

@@ -2,6 +2,7 @@ package config
// 系统配置 // 系统配置
type system struct { type system struct {
AlApiToken string `json:"alApiToken" yaml:"alApiToken"` // AL API Token
NewFriendNotify newFriendNotify `json:"newFriendNotify" yaml:"newFriendNotify"` // 新好友通知 NewFriendNotify newFriendNotify `json:"newFriendNotify" yaml:"newFriendNotify"` // 新好友通知
DefaultRule defaultRule `json:"defaultRule" yaml:"defaultRule"` // 默认规则 DefaultRule defaultRule `json:"defaultRule" yaml:"defaultRule"` // 默认规则
} }

View File

@@ -2,10 +2,11 @@ package initialization
import ( import (
"go-wechat/common/current" "go-wechat/common/current"
"go-wechat/model" "go-wechat/model/dto"
plugin "go-wechat/plugin" plugin "go-wechat/plugin"
"go-wechat/plugin/plugins" "go-wechat/plugin/plugins"
"go-wechat/service" "go-wechat/service"
"go-wechat/types"
) )
// Plugin // Plugin
@@ -19,25 +20,39 @@ func Plugin() {
// 注册插件 // 注册插件
// 保存消息进数据库 // 保存消息进数据库
dispatcher.RegisterHandler(func(*model.Message) bool { dispatcher.RegisterHandler(func(*dto.Message) bool {
return true return true
}, plugins.SaveToDb) }, 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() isGroupAt := m.IsAt() && !m.IsAtAll()
return (m.IsPrivateText() || isGroupAt) && m.CleanContentStartWith("/") && service.CheckIsEnableCommand(m.FromUser) return (m.IsPrivateText() || isGroupAt) && m.CleanContentStartWith("/") && service.CheckIsEnableCommand(m.FromUser)
}, plugins.Command) }, plugins.Command)
// AI消息插件 // AI消息插件
dispatcher.RegisterHandler(func(m *model.Message) bool { dispatcher.RegisterHandler(func(m *dto.Message) bool {
// 群内@或者私聊文字消息 // 群内@或者私聊文字消息
return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText() return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText()
}, plugins.AI) }, plugins.AI)
// 欢迎新成员 // 欢迎新成员
dispatcher.RegisterHandler(func(m *model.Message) bool { dispatcher.RegisterHandler(func(m *dto.Message) bool {
return m.IsNewUserJoin() return m.IsNewUserJoin()
}, plugins.WelcomeNew) }, plugins.WelcomeNew)

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package model package dto
import ( import (
"encoding/xml" "encoding/xml"
@@ -32,6 +32,39 @@ type systemMsgDataXml struct {
Type string `xml:"type,attr"` 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 // atMsgDataXml
// @description: 微信@消息的xml结构 // @description: 微信@消息的xml结构
type atMsgDataXml struct { type atMsgDataXml struct {
@@ -163,3 +196,22 @@ func (m Message) CleanContentStartWith(prefix string) bool {
return strings.HasPrefix(content, prefix) 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
}

View File

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

View File

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

View File

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

View File

@@ -14,7 +14,7 @@ type AiAssistant struct {
CreatedAt types.DateTime `json:"createdAt"` CreatedAt types.DateTime `json:"createdAt"`
Name string `json:"name" gorm:"type:varchar(10);not null;comment:'名称'"` Name string `json:"name" gorm:"type:varchar(10);not null;comment:'名称'"`
Personality string `json:"personality" gorm:"type:varchar(999);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:'是否启用'"` Enable bool `json:"enable" gorm:"type:tinyint(1);not null;default:1;comment:'是否启用'"`
} }

View File

@@ -22,6 +22,7 @@ type Friend struct {
EnableNews bool `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"` // 是否启用新闻 EnableNews bool `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"` // 是否启用新闻
ClearMember int `json:"clearMember"` // 清理成员配置(多少天未活跃的) ClearMember int `json:"clearMember"` // 清理成员配置(多少天未活跃的)
IsOk bool `json:"isOk" gorm:"type:tinyint(1) default 0 not null"` // 是否正常 IsOk bool `json:"isOk" gorm:"type:tinyint(1) default 0 not null"` // 是否正常
UsedTokens int `json:"usedTokens"` // 已使用的AI Token数量
} }
func (Friend) TableName() string { func (Friend) TableName() string {

View File

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

View File

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

View File

@@ -8,7 +8,7 @@ import (
"go-wechat/client" "go-wechat/client"
"go-wechat/common/current" "go-wechat/common/current"
"go-wechat/config" "go-wechat/config"
"go-wechat/entity" "go-wechat/model/entity"
"go-wechat/plugin" "go-wechat/plugin"
"go-wechat/service" "go-wechat/service"
"go-wechat/types" "go-wechat/types"
@@ -48,8 +48,23 @@ func AI(m *plugin.MessageContext) {
// 处理预设角色,默认是配置文件里的,如果数据库配置不为空,则使用数据库配置 // 处理预设角色,默认是配置文件里的,如果数据库配置不为空,则使用数据库配置
prompt := config.Conf.Ai.Personality prompt := config.Conf.Ai.Personality
var dbPrompt entity.AiAssistant
if friendInfo.Prompt != "" { 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, Content: m.Content,
}) })
// 配置模型
chatModel := openai.GPT3Dot5Turbo0613
if friendInfo.AiModel != "" {
chatModel = friendInfo.AiModel
} else if config.Conf.Ai.Model != "" {
chatModel = config.Conf.Ai.Model
}
// 默认使用AI回复 // 默认使用AI回复
conf := openai.DefaultConfig(config.Conf.Ai.ApiKey) conf := openai.DefaultConfig(config.Conf.Ai.ApiKey)
if config.Conf.Ai.BaseUrl != "" { 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) utils.SendMessage(m.FromUser, m.GroupUser, "AI似乎抽风了没有告诉我你需要的回答~", 0)
return return
} }
// 异步更新一下已使用的AI次数
go service.UpdateUsedAiTokens(m.FromUser, resp.Usage.TotalTokens)
// 保存一下AI 返回的消息,消息 Id 使用传入 Id 的负数 // 保存一下AI 返回的消息,消息 Id 使用传入 Id 的负数
var replyMessage entity.Message var replyMessage entity.Message
replyMessage.MsgId = -m.MsgId replyMessage.MsgId = -m.MsgId

View File

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

View File

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

View File

@@ -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)
}
}
}
}

View File

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

View File

@@ -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)
}
}

View File

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

View File

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

View File

@@ -2,8 +2,9 @@ package service
import ( import (
"go-wechat/client" "go-wechat/client"
"go-wechat/entity" "go-wechat/model/entity"
"go-wechat/vo" "go-wechat/model/vo"
"gorm.io/gorm"
"log" "log"
"strings" "strings"
) )
@@ -36,6 +37,16 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
return 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 // GetAllEnableAI
// @description: 取出所有启用了AI的好友或群组 // @description: 取出所有启用了AI的好友或群组
// @return []entity.Friend // @return []entity.Friend
@@ -119,3 +130,16 @@ func updateLastActive(msg entity.Message) {
log.Printf("更新群或者好友活跃时间失败, 错误信息: %v", err) 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)
}
}

View File

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

View File

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

View File

@@ -3,7 +3,7 @@ package cleargroupuser
import ( import (
"fmt" "fmt"
"go-wechat/client" "go-wechat/client"
"go-wechat/entity" "go-wechat/model/entity"
"go-wechat/service" "go-wechat/service"
"go-wechat/utils" "go-wechat/utils"
"log" "log"
@@ -38,7 +38,7 @@ func ClearGroupUser() {
memberMap[member.Nickname] = member.LastActive.Format("2006-01-02 15:04:05") 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) ms := make([]string, 0)
for k, v := range memberMap { for k, v := range memberMap {

View File

@@ -6,8 +6,8 @@ import (
"go-wechat/client" "go-wechat/client"
"go-wechat/common/constant" "go-wechat/common/constant"
"go-wechat/config" "go-wechat/config"
"go-wechat/entity" "go-wechat/model/dto"
"go-wechat/model" "go-wechat/model/entity"
"go-wechat/utils" "go-wechat/utils"
"gorm.io/gorm" "gorm.io/gorm"
"log" "log"
@@ -24,7 +24,7 @@ var hc = resty.New()
// Sync // Sync
// @description: 同步好友列表 // @description: 同步好友列表
func Sync() { func Sync() {
var base model.Response[[]model.FriendItem] var base dto.Response[[]dto.FriendItem]
resp, err := hc.R(). resp, err := hc.R().
SetHeader("Content-Type", "application/json;chartset=utf-8"). SetHeader("Content-Type", "application/json;chartset=utf-8").
@@ -155,7 +155,7 @@ func Sync() {
// @description: 同步群成员 // @description: 同步群成员
// @param gid // @param gid
func syncGroupUsers(tx *gorm.DB, gid string) { func syncGroupUsers(tx *gorm.DB, gid string) {
var baseResp model.Response[model.GroupUser] var baseResp dto.Response[dto.GroupUser]
// 组装参数 // 组装参数
param := map[string]any{ param := map[string]any{
@@ -242,8 +242,8 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
// @param wxid // @param wxid
// @return ent // @return ent
// @return err // @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{ param := map[string]any{

View File

@@ -24,7 +24,7 @@ func DailyNews() {
return 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 { for _, group := range groups {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,7 +2,8 @@ package utils
import ( import (
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"go-wechat/model" "go-wechat/config"
"go-wechat/model/dto"
"log" "log"
) )
@@ -28,12 +29,12 @@ func NewsUtil() News {
// @receiver news // @receiver news
// @return records // @return records
func (news) MorningPost() (records []string) { func (news) MorningPost() (records []string) {
var newsResp model.MorningPost var newsResp dto.MorningPost
res := resty.New() res := resty.New()
resp, err := res.R(). resp, err := res.R().
SetHeader("Content-Type", "application/json;chartset=utf-8"). SetHeader("Content-Type", "application/json;chartset=utf-8").
SetQueryParam("token", "cFoMZNNBxT4jQovS"). SetQueryParam("token", config.Conf.System.AlApiToken).
SetResult(&newsResp). SetResult(&newsResp).
Post("https://v2.alapi.cn/api/zaobao") Post("https://v2.alapi.cn/api/zaobao")
if err != nil { if err != nil {

View File

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

View File

@@ -119,7 +119,7 @@
</div> </div>
<!-- 指令 --> <!-- 指令 -->
<div class="flex justify-between gap-x-4 py-3 items-center"> <div class="flex justify-between gap-x-4 py-3 items-center">
<dt class="text-gray-500">迎新</dt> <dt class="text-gray-500">指令</dt>
<dd class="flex items-start gap-x-2"> <dd class="flex items-start gap-x-2">
{{ template "command" . }} {{ template "command" . }}
</dd> </dd>
@@ -128,7 +128,7 @@
<div class="flex justify-between gap-x-4 py-3 items-center"> <div class="flex justify-between gap-x-4 py-3 items-center">
<dt class="text-gray-500">末位淘汰</dt> <dt class="text-gray-500">末位淘汰</dt>
<dd class="flex items-start gap-x-2 items-center"> <dd class="flex items-start gap-x-2 items-center">
<div class="relative rounded-md shadow-sm"> <div class="relative rounded-md">
<label> <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天不活跃自动移除" <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}}" value="{{.ClearMember}}"

View File

@@ -1,6 +1,9 @@
<dialog id="groupUserModal" class="modal"> <dialog id="groupUserModal" class="modal">
<div class="modal-box w-11/12 max-w-7xl"> <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> <div class="divider divider-warning">成员列表</div>
<table class="table table-zebra"> <table class="table table-zebra">
<thead> <thead>

View File

@@ -2,82 +2,82 @@ console.log("打开首页")
// 改变AI开启状态 // 改变AI开启状态
function changeAiEnableStatus(wxId) { 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) { 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) { 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) { 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) { 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) { 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) { 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模型变动 // AI模型变动
function aiModelChange(event, wxid) { 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角色变动 // AI角色变动