app/assistant.go

@@ -1,14 +0,0 @@
-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/model/entity"
+	"go-wechat/entity"
 	"gorm.io/gorm"
 	"log"
 	"net/http"
@@ -20,14 +20,7 @@ type changeStatusParam struct {
 // @description: 修改使用的AI模型用的参数集
 type changeUseAiModelParam struct {
 	WxId  string `json:"wxid" binding:"required"`  // 群Id或微信Id
-	Model string `json:"model"`                   // 模型代码
+	Model string `json:"model" binding:"required"` // 模型代码
-}
-
-// autoClearMembers
-// @description: 自动清理群成员
-type autoClearMembers struct {
-	WxId string `json:"wxid" binding:"required"` // 群Id
-	Days int    `json:"days"`                    // 多少天未发言
 }
 
 // ChangeEnableAiStatus
@@ -74,28 +67,6 @@ 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
@@ -234,72 +205,3 @@ func ChangeEnableNewsStatus(ctx *gin.Context) {
 
 	ctx.String(http.StatusOK, "操作成功")
 }
-
-// ChangeEnableHotTopStatus
-// @description: 修改是否开启热搜
-// @param ctx
-func ChangeEnableHotTopStatus(ctx *gin.Context) {
-	var p changeStatusParam
-	if err := ctx.ShouldBindJSON(&p); err != nil {
-		ctx.String(http.StatusBadRequest, "参数错误")
-		return
-	}
-	log.Printf("待修改的Id：%s", p.WxId)
-
-	err := client.MySQL.Model(&entity.Friend{}).
-		Where("wxid = ?", p.WxId).
-		Update("`enable_hot_top`", gorm.Expr(" !`enable_hot_top`")).Error
-	if err != nil {
-		log.Printf("修改热榜启用状态失败：%s", err)
-		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
-		return
-	}
-
-	ctx.String(http.StatusOK, "操作成功")
-}
-
-// AutoClearMembers
-// @description: 自动清理群成员
-// @param ctx
-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, "操作成功")
-}
-
-// ChangeAiFreeLimit
-// @description: 修改AI免费次数
-// @param ctx
-func ChangeAiFreeLimit(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("`ai_free_limit`", p.Days).Error
-	if err != nil {
-		log.Printf("修改AI免费次数失败：%s", err)
-		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
-		return
-	}
-
-	ctx.String(http.StatusOK, "操作成功")
-}

app/group.go

@@ -25,19 +25,6 @@ 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, result)
+	ctx.JSON(http.StatusOK, records)
 }

app/other.go

@@ -1,56 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"go-wechat/model/vo"
-	"go-wechat/service"
-	"go-wechat/utils"
-	"log"
-	"net/http"
-)
-
-// SendAiSummary
-// @description: 发送AI摘要
-// @param ctx
-func SendAiSummary(ctx *gin.Context) {
-	// 获取群Id
-	groupId := ctx.Query("id")
-	if groupId == "" {
-		ctx.String(http.StatusForbidden, "群Id不能为空")
-		return
-	}
-
-	// 取出群名称
-	groupInfo, err := service.GetFriendInfoById(groupId)
-	if err != nil {
-		ctx.String(http.StatusInternalServerError, "获取群信息失败")
-		return
-	}
-
-	// 获取对话记录
-	var records []vo.TextMessageItem
-	if records, err = service.GetTextMessagesById(groupId); err != nil {
-		log.Printf("获取群[%s]对话记录失败, 错误信息: %v", groupId, err)
-		ctx.String(http.StatusInternalServerError, "获取群对话记录失败")
-		return
-	}
-	if len(records) < 10 {
-		ctx.String(http.StatusForbidden, "群对话记录不足10条，建议自己看")
-		return
-	}
-
-	// 组装对话记录为字符串
-	var replyMsg string
-	replyMsg, err = utils.GetAiSummary(groupInfo.Nickname, records)
-	if err != nil {
-		log.Printf("群聊记录总结失败: %v", err.Error())
-		ctx.String(http.StatusInternalServerError, "群聊消息总结失败，错误信息: "+err.Error())
-		return
-	}
-
-	replyMsg = fmt.Sprintf("#昨日消息总结\n又是一天过去了，让我们一起来看看昨儿群友们都聊了什么有趣的话题吧~\n\n%s", replyMsg)
-	log.Printf("群[%s]对话记录总结成功，总结内容: %s", groupInfo.Nickname, replyMsg)
-	_ = utils.SendMessage(groupId, "", replyMsg, 0)
-	ctx.String(http.StatusOK, "操作完成")
-}

app/pages.go

@@ -66,7 +66,6 @@ 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)
 }
@@ -86,48 +85,11 @@ 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)
-}
-
-// ManageWithGroupAdmin
-// @description: 群组管理（管理员可用）
-// @param ctx
-func ManageWithGroupAdmin(ctx *gin.Context) {
-	// 取出id
-	id := ctx.Query("id")
-	if id == "" {
-		ctx.HTML(http.StatusOK, "404.html", nil)
-		return
-	}
-
-	var result = gin.H{
-		"msg": "success",
-	}
-	result["info"], _ = service.GetFriendInfoById(id)
-	result["aiModels"] = config.Conf.Ai.Models
-	result["assistant"], _ = service.GetAllAiAssistant()
-	// 渲染页面
-	ctx.HTML(http.StatusOK, "manager-one.html", result)
-}
-
 // PageNotFound
 // @description: 404页面
 // @param ctx

common/current/robot.go

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

config.yaml

@@ -1,11 +1,4 @@
 system:
-  # 每日新闻接口 Token
-  # 获取地址: https://admin.alapi.cn/api_manager/token_manager
-  alApiToken: xxx
-  # urlc.cn的Token，用来生成短链接
-  urlcApiToken: xxx
-  # 系统访问域名，必须是包括 http[s]:// 的完整域名
-  domain: https://wechat.abc.com
   # 添加新好友或群之后通知给指定的人
   newFriendNotify:
     enable: true
@@ -23,15 +16,11 @@ system:
     welcome: true
     # 每日早报
     news: true
-    # 热榜
-    hotTop: true
-    # 每天免费 AI 次数限制
-    aiFreeLimit: 50
 
 # 微信HOOK配置
 wechat:
   # 微信HOOK接口地址
-  host: 10.0.0.79:19098
+  host: 10.0.0.73:19088
   # 微信容器映射出来的vnc页面地址，没有就不填
   #  vncUrl: http://192.168.1.175:19087/vnc_lite.html
   # 是否在启动的时候自动设置hook服务的回调
@@ -52,18 +41,14 @@ mysql:
   db: wechat
   schema: public # postgres 专用
 
-# 定时任务
 task:
-  enable: false
-  news:
-    enable: false
-    cron: '14 11 * * *' # 每天0:30
-  hotTop:
   enable: true
-    cron: '0 */1 * * *' # 每小时一次
+  news:
-  syncFriends: # 逻辑已修改，每天大半夜同步一次即可(主要是用以修正数据)，平时会根据收到的消息针对性同步
+    enable: true
+    cron: '14 11 * * *' # 每天0:30
+  syncFriends:
     enable: false
-    cron: '0 4 * * *' # 每天4:00
+    cron: '*/5 * * * *' # 五分钟一次
   groupSummary:
     enable: false
     cron: '30 0 * * *' # 每天0:30
@@ -81,7 +66,7 @@ mq:
   enable: false
   # RabbitMQ配置
   rabbitmq:
-    host: 10.0.0.31
+    host: 10.0.0.247
     port: 5672
     user: wechat
     password: wechat123
@@ -102,10 +87,8 @@ ai:
   # 人设
   personality: 你的名字叫张三，你是一个百科机器人，你的爱好是看电影，你的性格是开朗的，你的专长是讲故事，你的梦想是当一名童话故事作家。你对政治没有一点儿兴趣，也不会讨论任何与政治相关的话题，你甚至可以拒绝回答这一类话题。
   models:
-    - name: 默认
     - name: ChatGPT-4
       model: gpt-4
-      canManager: false
     - name: 讯飞星火v3.1
       model: SparkDesk-v3.1
     - name: 讯飞星火v3.5
@@ -118,12 +101,6 @@ ai:
       model: moonshot-v1-128k
     - name: 跃问
       model: StepChat
-    - name: 豆包Lite-4k
-      model: Doubao-lite-4k
-      canManager: true
-    - name: 豆包Pro-4k
-      model: Doubao-pro-4k
-      canManager: true
 
 # 资源配置
 # map[k]v结构，k 会变成全小写，所以这儿不能用大写字母
@@ -140,7 +117,3 @@ resource:
   wordcloud:
     type: image
     path: D:\Share\wordcloud\%s
-  # 邀请入群消息回复
-  invitation-join-group:
-    type: text
-    path: "您的邀请消息已收到啦，正在通知我的主人来同意请求。在我加群之后将会进行初始化操作，直到收到我主动发送的消息就是初始化完成咯，在那之前请耐心等待喔~"

config/ai.go

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

config/system.go

@@ -2,8 +2,6 @@ package config
 
 // 系统配置
 type system struct {
-	Domain          string          `json:"domain" yaml:"domain"`                   // 域名
-	AlApiToken      string          `json:"alApiToken" yaml:"alApiToken"`           // AL API Token
 	NewFriendNotify newFriendNotify `json:"newFriendNotify" yaml:"newFriendNotify"` // 新好友通知
 	DefaultRule     defaultRule     `json:"defaultRule" yaml:"defaultRule"`         // 默认规则
 }
@@ -21,6 +19,4 @@ type defaultRule struct {
 	Summary  bool `json:"summary" yaml:"summary"`   // 是否启用聊天总结
 	Welcome  bool `json:"welcome" yaml:"welcome"`   // 是否启用欢迎新成员
 	News     bool `json:"news" yaml:"news"`         // 是否启用每日早报
-	HotTop      bool `json:"hotTop" yaml:"hotTop"`           // 是否启用热门话题
-	AiFreeLimit int  `json:"aiFreeLimit" yaml:"aiFreeLimit"` // AI免费次数
 }

config/task.go

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

entity/friend.go

@@ -0,0 +1,49 @@
+package entity
+
+import (
+	"time"
+)
+
+// Friend
+// @description: 好友列表
+type Friend struct {
+	Wxid           string    `json:"wxid"`                                                     // 微信原始Id
+	CustomAccount  string    `json:"customAccount"`                                            // 微信号
+	Nickname       string    `json:"nickname"`                                                 // 昵称
+	Pinyin         string    `json:"pinyin"`                                                   // 昵称拼音大写首字母
+	PinyinAll      string    `json:"pinyinAll"`                                                // 昵称全拼
+	LastActive     time.Time `json:"lastActive"`                                               // 最后活跃时间
+	EnableAi       bool      `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"`       // 是否使用AI
+	AiModel        string    `json:"aiModel"`                                                  // AI模型
+	Prompt         string    `json:"prompt"`                                                   // 提示词
+	EnableChatRank bool      `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
+	EnableWelcome  bool      `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
+	EnableSummary  bool      `json:"enableSummary" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用总结
+	EnableNews     bool      `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"`     // 是否启用新闻
+	ClearMember    int       `json:"clearMember"`                                              // 清理成员配置（多少天未活跃的）
+	IsOk           bool      `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
+}
+
+func (Friend) TableName() string {
+	return "t_friend"
+}
+
+// GroupUser
+// @description: 群成员
+type GroupUser struct {
+	GroupId      string     `json:"groupId"`                                                // 群Id
+	Wxid         string     `json:"wxid"`                                                   // 微信Id
+	Account      string     `json:"account"`                                                // 账号
+	HeadImage    string     `json:"headImage"`                                              // 头像
+	Nickname     string     `json:"nickname"`                                               // 昵称
+	IsMember     bool       `json:"isMember" gorm:"type:tinyint(1) default 0 not null"`     // 是否群成员
+	IsAdmin      bool       `json:"isAdmin" gorm:"type:tinyint(1) default 0 not null"`      // 是否群主
+	JoinTime     time.Time  `json:"joinTime"`                                               // 加入时间
+	LastActive   time.Time  `json:"lastActive"`                                             // 最后活跃时间
+	LeaveTime    *time.Time `json:"leaveTime"`                                              // 离开时间
+	SkipChatRank bool       `json:"skipChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否跳过聊天排行
+}
+
+func (GroupUser) TableName() string {
+	return "t_group_user"
+}

go.mod

@@ -3,46 +3,44 @@ module go-wechat
 go 1.21
 
 require (
-	github.com/duke-git/lancet/v2 v2.3.1
+	github.com/duke-git/lancet/v2 v2.2.8
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/gin-gonic/gin v1.10.0
+	github.com/gin-gonic/gin v1.9.1
 	github.com/go-co-op/gocron v1.37.0
-	github.com/go-resty/resty/v2 v2.13.1
+	github.com/go-resty/resty/v2 v2.11.0
-	github.com/google/uuid v1.6.0
+	github.com/rabbitmq/amqp091-go v1.9.0
-	github.com/rabbitmq/amqp091-go v1.10.0
+	github.com/sashabaranov/go-openai v1.17.11
-	github.com/sashabaranov/go-openai v1.26.3
+	github.com/spf13/viper v1.18.2
-	github.com/spf13/viper v1.19.0
+	gorm.io/driver/mysql v1.5.2
-	gorm.io/driver/mysql v1.5.7
+	gorm.io/gorm v1.25.5
-	gorm.io/gorm v1.25.11
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
-	github.com/bytedance/sonic v1.11.9 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/bytedance/sonic/loader v0.1.1 // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.4 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.0 // indirect
+	github.com/go-playground/validator/v10 v10.16.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
@@ -53,13 +51,13 @@ require (
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
+	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
-	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,30 +1,31 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.11.9 h1:LFHENlIY/SLzDWverzdOvgMztTxcfcF+cqNsz9pK5zg=
+github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
-github.com/bytedance/sonic v1.11.9/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
+github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
-github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
+github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/duke-git/lancet/v2 v2.3.1 h1:cYZHQp57CZKP41EFkV/7TGbUrmhjaPMI5vi3Q+9KJNo=
+github.com/duke-git/lancet/v2 v2.2.8 h1:wlruXhliDe4zls1e2cYmz4qLc+WtcvrpcCnk1VJdEaA=
-github.com/duke-git/lancet/v2 v2.3.1/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
+github.com/duke-git/lancet/v2 v2.2.8/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
 github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -33,21 +34,21 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
+github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
-github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g=
+github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
-github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0=
+github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -57,8 +58,8 @@ github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -69,8 +70,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -82,26 +83,26 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
+github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
-github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
+github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
+github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
-github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
+github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/sashabaranov/go-openai v1.26.3 h1:Tjnh4rcvsSU68f66r05mys+Zou4vo4qyvkne6AIRJPI=
+github.com/sashabaranov/go-openai v1.17.11 h1:XVr00J8JymJVx8Hjbh/5mG0V4PQHRarBU3v7k2x6MR0=
-github.com/sashabaranov/go-openai v1.26.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.17.11/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
@@ -110,21 +111,19 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
 github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
+github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
-github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
+github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@@ -135,21 +134,20 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
-golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
-golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -157,10 +155,9 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -172,25 +169,23 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -198,8 +193,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -210,10 +205,10 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
-gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
+gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
-gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

initialization/plugin.go

@@ -2,7 +2,7 @@ package initialization
 
 import (
 	"go-wechat/common/current"
-	"go-wechat/model/dto"
+	"go-wechat/model"
 	plugin "go-wechat/plugin"
 	"go-wechat/plugin/plugins"
 	"go-wechat/service"
@@ -19,39 +19,25 @@ func Plugin() {
 	// 注册插件
 
 	// 保存消息进数据库
-	dispatcher.RegisterHandler(func(*dto.Message) bool {
+	dispatcher.RegisterHandler(func(*model.Message) bool {
 		return true
 	}, plugins.SaveToDb)
 
-	// 通知邀请入群消息到配置用户
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
-		flag, _ := m.IsInvitationJoinGroup()
-		return flag && !m.IsGroup()
-	}, plugins.NotifyInvitationJoinGroup)
-	// 被移除群聊通知到配置用户
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
-		return m.IsRemoveFromChatroom()
-	}, plugins.NotifyRemoveFromChatroom)
-	// 响应好友添加成功消息
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
-		return m.IsNewFriendAdd() || m.IsJoinToGroup() || m.IsOldFriendBack()
-	}, plugins.ReplyNewFriend)
-
 	// 私聊指令消息
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+	dispatcher.RegisterHandler(func(m *model.Message) bool {
 		// 私聊消息 或 群聊艾特机器人并且以/开头的消息
 		isGroupAt := m.IsAt() && !m.IsAtAll()
 		return (m.IsPrivateText() || isGroupAt) && m.CleanContentStartWith("/") && service.CheckIsEnableCommand(m.FromUser)
 	}, plugins.Command)
 
 	// AI消息插件
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+	dispatcher.RegisterHandler(func(m *model.Message) bool {
 		// 群内@或者私聊文字消息
 		return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText()
 	}, plugins.AI)
 
 	// 欢迎新成员
-	dispatcher.RegisterHandler(func(m *dto.Message) bool {
+	dispatcher.RegisterHandler(func(m *model.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/dto"
+	"go-wechat/model"
 	"log"
 )
 
@@ -12,7 +12,7 @@ import (
 // @description: 初始化微信机器人信息
 func InitWechatRobotInfo() {
 	// 获取数据
-	var base dto.Response[dto.RobotUserInfo]
+	var base model.Response[model.RobotUserInfo]
 	_, err := resty.New().R().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
 		SetResult(&base).

main.go

@@ -12,8 +12,6 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"os"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -24,13 +22,6 @@ func init() {
 	initialization.Plugin()              // 注册插件
 	tasks.InitTasks()                    // 初始化定时任务
 	mq.Init()                            // 初始化MQ
-
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SEND")); flag {
-		log.Printf("已设置环境变量DONT_SEND，不发送消息")
-	}
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SAVE")); flag {
-		log.Printf("已设置环境变量DONT_SAVE，不保存消息")
-	}
 }
 
 func main() {
@@ -57,8 +48,6 @@ func main() {
 				return "群组列表"
 			case "index":
 				return "首页"
-			case "assistant":
-				return "AI角色"
 			default:
 				return "其他页面"
 			}
@@ -69,10 +58,6 @@ func main() {
 			}
 			return "否"
 		},
-		"checkIsGroup": func(str string) bool {
-			// 如果id包含@chatroom就是群组
-			return strings.HasSuffix(str, "@chatroom")
-		},
 	})
 
 	app.LoadHTMLGlob("views/*.html")

model/dto/news.go

@@ -1,38 +0,0 @@
-package dto
-
-// MorningPost
-// @description: 每日早报返回结构体
-type MorningPost struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data struct {
-		Date      string   `json:"date"`       // 新闻日期
-		News      []string `json:"news"`       // 新闻标题文字版
-		WeiYu     string   `json:"weiyu"`      // 微语，就是一句屁话
-		Image     string   `json:"image"`      // 早报完整图片
-		HeadImage string   `json:"head_image"` // 早报头部图片
-	} `json:"data"`
-	Time  int    `json:"time"`
-	Usage int    `json:"usage"`
-	LogId string `json:"log_id"`
-}
-
-// HotTop
-// @description: 热搜排行榜返回结构体
-type HotTop struct {
-	Success    bool             `json:"success"`     // 是否成功
-	Name       string           `json:"name"`        // 渠道
-	Subtitle   string           `json:"subtitle"`    // 副标题
-	UpdateTime string           `json:"update_time"` // 更新时间
-	Data       []HotTopDataItem `json:"data"`        // 数据
-}
-
-// HotTopDataItem
-// @description: 热搜排行榜数据项
-type HotTopDataItem struct {
-	Index    int    `json:"index"`    // 排行
-	Title    string `json:"title"`    // 标题
-	Hot      string `json:"hot"`      // 热度
-	Url      string `json:"url"`      // 链接
-	MobilUrl string `json:"mobilUrl"` // 手机端链接
-}

model/dto/urlc.go

@@ -1,8 +0,0 @@
-package dto
-
-// ShortUrlResponse
-// @description: 短链接返回结构体
-type ShortUrlResponse struct {
-	Error int    `json:"error"` // 错误码，1表示发生错误，0则正常
-	Short string `json:"short"` // 短链接
-}

model/entity/aiassistant.go

@@ -1,39 +0,0 @@
-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

@@ -1,54 +0,0 @@
-package entity
-
-import (
-	"go-wechat/common/types"
-	"time"
-)
-
-// Friend
-// @description: 好友列表
-type Friend struct {
-	Wxid           string         `json:"wxid"`                                                     // 微信原始Id
-	CustomAccount  string         `json:"customAccount"`                                            // 微信号
-	Nickname       string         `json:"nickname"`                                                 // 昵称
-	Pinyin         string         `json:"pinyin"`                                                   // 昵称拼音大写首字母
-	PinyinAll      string         `json:"pinyinAll"`                                                // 昵称全拼
-	LastActive     types.DateTime `json:"lastActive"`                                               // 最后活跃时间
-	EnableAi       bool           `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"`       // 是否使用AI
-	AiModel        string         `json:"aiModel"`                                                  // AI模型
-	Prompt         string         `json:"prompt"`                                                   // 提示词
-	EnableChatRank bool           `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
-	EnableWelcome  bool           `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
-	EnableSummary  bool           `json:"enableSummary" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用总结
-	EnableNews     bool           `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"`     // 是否启用新闻
-	EnableHotTop   bool           `json:"enableHotTop" gorm:"type:tinyint(1) default 0 not null"`   // 是否启用热榜新闻
-	ClearMember    int            `json:"clearMember"`                                              // 清理成员配置（多少天未活跃的）
-	IsOk           bool           `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
-	UsedTokens     int            `json:"usedTokens"`                                               // 已使用的AI Token数量
-	AiFreeLimit    int            `json:"aiFreeLimit"`                                              // AI免费次数
-	AiUsedToday    int            `json:"aiUsedToday"`                                              // 今日已使用的AI次数
-}
-
-func (Friend) TableName() string {
-	return "t_friend"
-}
-
-// GroupUser
-// @description: 群成员
-type GroupUser struct {
-	GroupId      string     `json:"groupId"`                                                // 群Id
-	Wxid         string     `json:"wxid"`                                                   // 微信Id
-	Account      string     `json:"account"`                                                // 账号
-	HeadImage    string     `json:"headImage"`                                              // 头像
-	Nickname     string     `json:"nickname"`                                               // 昵称
-	IsMember     bool       `json:"isMember" gorm:"type:tinyint(1) default 0 not null"`     // 是否群成员
-	IsAdmin      bool       `json:"isAdmin" gorm:"type:tinyint(1) default 0 not null"`      // 是否群主
-	JoinTime     time.Time  `json:"joinTime"`                                               // 加入时间
-	LastActive   time.Time  `json:"lastActive"`                                             // 最后活跃时间
-	LeaveTime    *time.Time `json:"leaveTime"`                                              // 离开时间
-	SkipChatRank bool       `json:"skipChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否跳过聊天排行
-}
-
-func (GroupUser) TableName() string {
-	return "t_group_user"
-}

model/entity/hottop.go

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

model/friend.go

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

model/leigod.go

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

model/message.go

@@ -1,4 +1,4 @@
-package dto
+package model
 
 import (
 	"encoding/xml"
@@ -32,39 +32,6 @@ 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 {
@@ -160,11 +127,7 @@ func (m Message) IsAtAll() bool {
 	// 转换@用户列表为数组
 	atUserList := strings.Split(d.AtUserList, ",")
 	// 判断是否包含@所有人
-	if slice.Contain(atUserList, "notify@all") {
+	return slice.Contain(atUserList, "notify@all")
-		return true
-	}
-	// 数据格式变动，再检查一下字符串是否包含 @所有人 字样
-	return m.IsAt() && strings.Contains(m.Content, "@所有人")
 }
 
 // IsPrivateText
@@ -200,81 +163,3 @@ 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
-}
-
-// IsNewFriendAdd
-// @description: 是否是新好友添加消息
-// @receiver m
-// @return flag
-func (m Message) IsNewFriendAdd() (flag bool) {
-	if m.Type != types.MsgTypeSys {
-		return
-	}
-	return strings.HasPrefix(m.Content, "你已添加了") && strings.HasSuffix(m.Content, "，现在可以开始聊天了。")
-}
-
-// IsOldFriendBack
-// @description: 是否是老好友回归消息
-// @receiver m
-// @return flag
-func (m Message) IsOldFriendBack() (flag bool) {
-	if m.Type != types.MsgTypeSys {
-		return
-	}
-	return m.Content == "以上是打招呼的内容"
-}
-
-// IsJoinToGroup
-// @description: 是否是加入群聊消息
-// @receiver m
-// @return flag
-func (m Message) IsJoinToGroup() (flag bool) {
-	if m.Type != types.MsgTypeSys {
-		return
-	}
-	flag = strings.Contains(m.Content, "\"邀请你加入了群聊，群聊参与人还有：")
-	if flag {
-		return
-	}
-	return strings.Contains(m.Content, "\"邀请你和\"") && strings.Contains(m.Content, "\"加入了群聊")
-}
-
-// IsRemoveFromChatroom
-// @description: 是否是被移出群聊消息
-// @receiver m
-// @return flag
-func (m Message) IsRemoveFromChatroom() (flag bool) {
-	if m.Type != types.MsgTypeSys {
-		return
-	}
-	return strings.HasPrefix(m.Content, "你被\"") && strings.HasSuffix(m.Content, "\"移出群聊")
-}
-
-// IsChangeGroupName
-// @description: 是否是修改群名称消息
-// @receiver m
-// @return flag
-func (m Message) IsChangeGroupName() (flag bool) {
-	if m.Type != types.MsgTypeSys {
-		return
-	}
-	return strings.HasPrefix(m.Content, "\"修改群名为“")
-}

model/news.go

@@ -0,0 +1,18 @@
+package model
+
+// MorningPost
+// @description: 每日早报返回结构体
+type MorningPost struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data struct {
+		Date      string   `json:"date"`       // 新闻日期
+		News      []string `json:"news"`       // 新闻标题文字版
+		WeiYu     string   `json:"weiyu"`      // 微语，就是一句屁话
+		Image     string   `json:"image"`      // 早报完整图片
+		HeadImage string   `json:"head_image"` // 早报头部图片
+	} `json:"data"`
+	Time  int    `json:"time"`
+	Usage int    `json:"usage"`
+	LogId string `json:"log_id"`
+}

model/response.go

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

model/userinfo.go

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

mq/handler.go

@@ -3,7 +3,7 @@ package mq
 import (
 	"encoding/json"
 	"go-wechat/common/current"
-	"go-wechat/model/dto"
+	"go-wechat/model"
 	"go-wechat/types"
 	"log"
 	"strings"
@@ -13,7 +13,7 @@ import (
 // @description: 解析消息
 // @param msg
 func parse(msg []byte) {
-	var m dto.Message
+	var m model.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/dto"
+	"go-wechat/model"
 )
 
 // MessageHandler 消息处理函数
-type MessageHandler func(msg *dto.Message)
+type MessageHandler func(msg *model.Message)
 
 // MessageDispatcher 消息分发处理接口
 // 跟 DispatchMessage 结合封装成 MessageHandler
 type MessageDispatcher interface {
-	Dispatch(msg *dto.Message)
+	Dispatch(msg *model.Message)
 }
 
 // DispatchMessage 跟 MessageDispatcher 结合封装成 MessageHandler
-func DispatchMessage(dispatcher MessageDispatcher) func(msg *dto.Message) {
+func DispatchMessage(dispatcher MessageDispatcher) func(msg *model.Message) {
-	return func(msg *dto.Message) { dispatcher.Dispatch(msg) }
+	return func(msg *model.Message) { dispatcher.Dispatch(msg) }
 }
 
 // MessageDispatcher impl
@@ -30,7 +30,7 @@ type MessageContext struct {
 	index           int
 	abortIndex      int
 	messageHandlers MessageContextHandlerGroup
-	*dto.Message
+	*model.Message
 }
 
 // Next 主动调用下一个消息处理函数(或开始调用)
@@ -65,11 +65,11 @@ func (c *MessageContext) AbortHandler() MessageContextHandler {
 }
 
 // MatchFunc 消息匹配函数,返回为true则表示匹配
-type MatchFunc func(*dto.Message) bool
+type MatchFunc func(*model.Message) bool
 
 // MatchFuncList 将多个MatchFunc封装成一个MatchFunc
 func MatchFuncList(matchFuncs ...MatchFunc) MatchFunc {
-	return func(message *dto.Message) bool {
+	return func(message *model.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 *dto.Message){
+//	dispatcher.OnText(func(msg *model.Message){
 //			msg.ReplyText("hello")
 //	})
 //	bot := DefaultBot()
@@ -113,7 +113,7 @@ func (m *MessageMatchDispatcher) SetAsync(async bool) {
 // 遍历 MessageMatchDispatcher 所有的消息处理函数
 // 获取所有匹配上的函数
 // 执行处理的消息处理方法
-func (m *MessageMatchDispatcher) Dispatch(msg *dto.Message) {
+func (m *MessageMatchDispatcher) Dispatch(msg *model.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/model/entity"
+	"go-wechat/entity"
 	"go-wechat/plugin"
 	"go-wechat/service"
 	"go-wechat/types"
@@ -19,12 +19,6 @@ import (
 	"time"
 )
 
-// 已经通知过的群组或者好友map
-var notifyMap = make(map[string]bool)
-
-// 拉取最近消息条数
-const fetchMessageCount = 20
-
 // AI
 // @description: AI消息
 // @param m
@@ -43,23 +37,6 @@ func AI(m *plugin.MessageContext) {
 	if !friendInfo.EnableAi {
 		return
 	}
-	if friendInfo.AiFreeLimit > 0 && friendInfo.AiUsedToday >= friendInfo.AiFreeLimit {
-		if notifyMap[m.FromUser] {
-			return
-		}
-		_ = utils.SendMessage(m.FromUser, "", fmt.Sprintf("本群今天的免费次数已经用完啦，明天再来找我聊天吧~\n每天限制%d次，0点自动重置", friendInfo.AiFreeLimit), 0)
-		notifyMap[m.FromUser] = true
-		return
-	} else {
-		notifyMap[m.FromUser] = false
-	}
-
-	var err error
-	defer func() {
-		if err == nil {
-			service.UpdateAiUsedToday(m.FromUser)
-		}
-	}()
 
 	// 预处理一下发送的消息，用正则去掉@机器人的内容
 	re := regexp.MustCompile(`@([^ | ]+)`)
@@ -71,23 +48,8 @@ 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
 	}
 
 	// 组装消息体
@@ -139,6 +101,14 @@ 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 != "" {
@@ -155,19 +125,16 @@ func AI(m *plugin.MessageContext) {
 
 	if err != nil {
 		log.Printf("OpenAI聊天发起失败: %v", err.Error())
-		_ = utils.SendMessage(m.FromUser, m.GroupUser, "AI聊天初始化失败，我已经通知我主人来修啦，请稍候一下下喔～", 0)
+		utils.SendMessage(m.FromUser, m.GroupUser, "AI炸啦~", 0)
 		return
 	}
 
 	// 返回消息为空
-	if len(resp.Choices) == 0 || resp.Choices[0].Message.Content == "" {
+	if resp.Choices[0].Message.Content == "" {
-		_ = utils.SendMessage(m.FromUser, m.GroupUser, "AI似乎抽风了，没有告诉我你需要的回答~", 0)
+		utils.SendMessage(m.FromUser, m.GroupUser, "AI似乎抽风了，没有告诉我你需要的回答~", 0)
 		return
 	}
 
-	// 异步更新一下已使用的AI tokens
-	go service.UpdateUsedAiTokens(m.FromUser, resp.Usage.TotalTokens)
-
 	// 保存一下AI 返回的消息，消息 Id 使用传入 Id 的负数
 	var replyMessage entity.Message
 	replyMessage.MsgId = -m.MsgId
@@ -185,7 +152,7 @@ func AI(m *plugin.MessageContext) {
 	if m.GroupUser != "" {
 		replyMsg = "\n" + resp.Choices[0].Message.Content
 	}
-	err = utils.SendMessage(m.FromUser, m.GroupUser, replyMsg, 0)
+	utils.SendMessage(m.FromUser, m.GroupUser, replyMsg, 0)
 }
 
 // getGroupUserMessages
@@ -202,7 +169,7 @@ func getGroupUserMessages(msgId int64, groupId, groupUserId string) (records []e
 		Where("create_at >= DATE_SUB(NOW(),INTERVAL 30 MINUTE)").
 		Where(subQuery).
 		Order("create_at desc").
-		Limit(fetchMessageCount).Find(&records)
+		Limit(4).Find(&records)
 	return
 }
 
@@ -218,6 +185,6 @@ func getUserPrivateMessages(userId string) (records []entity.Message) {
 		Where("create_at >= DATE_SUB(NOW(),INTERVAL 30 MINUTE)").
 		Where(subQuery).
 		Order("create_at desc").
-		Limit(fetchMessageCount).Find(&records)
+		Limit(4).Find(&records)
 	return
 }

plugin/plugins/command/ai.go

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

plugin/plugins/command/leigod.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/model/dto"
+	"go-wechat/entity"
-	"go-wechat/model/entity"
+	"go-wechat/model"
-	"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 dto.LeiGodUserInfoResp
+	var ui model.LeiGodUserInfoResp
 	if ui, err = lgu.Info(); err != nil {
 		return "获取详情失败: " + err.Error()
 	}

plugin/plugins/notify2configuser.go

@@ -1,68 +0,0 @@
-package plugins
-
-import (
-	"fmt"
-	"go-wechat/client"
-	"go-wechat/config"
-	"go-wechat/model/entity"
-	"go-wechat/plugin"
-	"go-wechat/service"
-	"go-wechat/utils"
-)
-
-// NotifyInvitationJoinGroup
-// @description: 通知邀请入群消息到配置用户
-// @param m
-func NotifyInvitationJoinGroup(m *plugin.MessageContext) {
-	// 先回复一条固定消息
-	if conf, e := config.Conf.Resource["invitation-join-group"]; e {
-		// 发送一条新消息
-		switch conf.Type {
-		case "text":
-			// 文字类型
-			_ = utils.SendMessage(m.FromUser, "", conf.Path, 0)
-		case "image":
-			// 图片类型
-			utils.SendImage(m.FromUser, conf.Path, 0)
-		case "emotion":
-			// 表情类型
-			utils.SendEmotion(m.FromUser, conf.Path, 0)
-		}
-	}
-
-	// 推送到配置的用户
-	_, dec := m.IsInvitationJoinGroup()
-	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) {
-	// 调用一下退出群聊接口，防止被移出后还能从好友列表接口拉到相关信息
-	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)
-		}
-	}
-
-	// 修改is_ok状态
-	client.MySQL.Model(&entity.Friend{}).Where("wxid = ?", m.FromUser).Update("is_ok", false)
-}

plugin/plugins/save2db.go

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

plugin/plugins/systemmessgae.go

@@ -1,31 +0,0 @@
-package plugins
-
-import (
-	"go-wechat/plugin"
-	"go-wechat/service"
-	"go-wechat/utils"
-	"time"
-)
-
-// ReplyNewFriend
-// @description: 响应好友添加成功消息
-// @param m
-func ReplyNewFriend(m *plugin.MessageContext) {
-	if m.IsNewFriendAdd() || m.IsJoinToGroup() {
-		_ = utils.SendMessage(m.FromUser, m.GroupUser, "AI正在初始化，请稍等几分钟，初始化完成之后我将主动告知您。", 0)
-	}
-	if m.IsOldFriendBack() {
-		_ = utils.SendMessage(m.FromUser, "", "嘿，我的朋友，你为何要离我而去？又为何去而复返？", 0)
-	}
-
-	go func() {
-		// 等待5秒
-		time.Sleep(5 * time.Second)
-		// 刷新好友列表
-		service.SyncFriend()
-		// 如果是加入群，刷新群成员列表
-		if m.IsJoinToGroup() {
-			service.SyncGroupMembers(m.FromUser)
-		}
-	}()
-}

plugin/plugins/welconenew.go

@@ -3,9 +3,8 @@ package plugins
 import (
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/model/entity"
+	"go-wechat/entity"
 	"go-wechat/plugin"
-	"go-wechat/service"
 	"go-wechat/utils"
 )
 
@@ -15,7 +14,7 @@ import (
 func WelcomeNew(m *plugin.MessageContext) {
 	// 判断是否开启迎新
 	var count int64
-	client.MySQL.Model(&entity.Friend{}).Where("enable_welcome IS TRUE").Where("is_ok IS TRUE").Where("is_ok IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
+	client.MySQL.Model(&entity.Friend{}).Where("enable_welcome IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
 	if count < 1 {
 		return
 	}
@@ -29,7 +28,7 @@ func WelcomeNew(m *plugin.MessageContext) {
 	switch conf.Type {
 	case "text":
 		// 文字类型
-		_ = utils.SendMessage(m.FromUser, "", conf.Path, 0)
+		utils.SendMessage(m.FromUser, "", conf.Path, 0)
 	case "image":
 		// 图片类型
 		utils.SendImage(m.FromUser, conf.Path, 0)
@@ -37,7 +36,4 @@ func WelcomeNew(m *plugin.MessageContext) {
 		// 表情类型
 		utils.SendEmotion(m.FromUser, conf.Path, 0)
 	}
-
-	// 刷新群成员列表
-	go service.SyncGroupMembers(m.FromUser)
 }

router/router.go

@@ -17,8 +17,6 @@ func Init(g *gin.Engine) {
 	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("/manager.html", app.ManageWithGroupAdmin) // 自己管理配置
 
 	g.GET("/404.html", app.PageNotFound) // 群组列表
 
@@ -26,18 +24,11 @@ func Init(g *gin.Engine) {
 	api := g.Group("/api")
 	api.PUT("/ai/status", app.ChangeEnableAiStatus)               // 修改是否开启AI状态
 	api.POST("/ai/model", app.ChangeUseAiModel)                   // 修改使用的AI模型
-	api.POST("/ai/free", app.ChangeAiFreeLimit)                   // 修改AI免费次数
-	api.POST("/ai/assistant", app.ChangeUseAiAssistant)           // 修改使用的AI助手
-	api.POST("/ai/summary", app.SendAiSummary)                    // 手动发送AI聊天总结
 	api.PUT("/welcome/status", app.ChangeEnableWelcomeStatus)     // 修改是否开启迎新状态
 	api.PUT("/command/status", app.ChangeEnableCommandStatus)     // 修改是否开启指令状态
 	api.PUT("/news/status", app.ChangeEnableNewsStatus)           // 修改是否开启早报状态
-	api.PUT("/hot-top/status", app.ChangeEnableHotTopStatus)      // 修改是否开启热榜状态
 	api.PUT("/grouprank/status", app.ChangeEnableGroupRankStatus) // 修改是否开启水群排行榜状态
 	api.PUT("/grouprank/skip", app.ChangeSkipGroupRankStatus)     // 修改是否跳过水群排行榜状态
 	api.GET("/group/users", app.GetGroupUsers)                    // 获取群成员列表
 	api.PUT("/summary/status", app.ChangeEnableSummaryStatus)     // 修改是否开启群聊总结状态
-	api.PUT("/clearmembers", app.AutoClearMembers)                // 自动清理群成员
-
-	api.POST("/assistant", app.SaveAssistant) // 保存AI助手
 }

service/aiassistant.go

@@ -1,14 +0,0 @@
-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,9 +2,8 @@ package service
 
 import (
 	"go-wechat/client"
-	"go-wechat/model/entity"
+	"go-wechat/entity"
-	"go-wechat/model/vo"
+	"go-wechat/vo"
-	"gorm.io/gorm"
 	"log"
 	"strings"
 )
@@ -37,21 +36,11 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
 	return
 }
 
-// GetFriendInfoById
-// @description: 通过wxId获取好友信息
-// @param wxId
-// @return ent
-// @return err
-func GetFriendInfoById(wxId string) (ent entity.Friend, err error) {
-	err = client.MySQL.Where("wxid = ?", wxId).First(&ent).Error
-	return
-}
-
 // GetAllEnableAI
 // @description: 取出所有启用了AI的好友或群组
 // @return []entity.Friend
 func GetAllEnableAI() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("enable_ai = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
+	err = client.MySQL.Where("enable_ai = ?", 1).Find(&records).Error
 	return
 }
 
@@ -88,15 +77,6 @@ func GetAllEnableNews() (records []entity.Friend, err error) {
 	return
 }
 
-// GetAllEnableHotTop
-// @description: 获取所有启用了热搜排行榜的好友或群组
-// @return records
-// @return err
-func GetAllEnableHotTop() (records []entity.Friend, err error) {
-	err = client.MySQL.Where("enable_hot_top = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
-	return
-}
-
 // GetAllEnableClearGroup
 // @description: 获取所有需要清理成员的群组
 // @return records
@@ -139,38 +119,3 @@ 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)
-	}
-}
-
-// UpdateAiUsedToday
-// @description: 更新AI今日使用次数
-// @param wxId
-func UpdateAiUsedToday(wxId string) {
-	err := client.MySQL.Model(&entity.Friend{}).
-		Where("wxid = ?", wxId).
-		Update("`ai_used_today`", gorm.Expr(" `ai_used_today` + 1")).Error
-	if err != nil {
-		log.Printf("更新AI今日使用次数失败, 错误信息: %v", err)
-	}
-}
-
-// ClearAiUsedToday
-// @description: 清空AI今日使用次数
-func ClearAiUsedToday() {
-	err := client.MySQL.Model(&entity.Friend{}).Where("is_ok = 1").
-		Update("`ai_used_today`", 0).Error
-	if err != nil {
-		log.Printf("清空AI今日使用次数失败, 错误信息: %v", err)
-	}
-}

service/friendsync.go

@@ -1,257 +0,0 @@
-package service
-
-import (
-	"go-wechat/client"
-	"go-wechat/common/types"
-	"go-wechat/config"
-	"go-wechat/model/entity"
-	"go-wechat/utils"
-	"log"
-	"strings"
-	"time"
-)
-
-// SyncFriend
-// @description: 同步好友列表
-func SyncFriend() {
-	// 获取好友列表
-	friends, err := utils.GetFriendList()
-	if err != nil {
-		log.Printf("获取好友列表失败: %s", err.Error())
-		return
-	}
-	// 当前获取到的成员Id，用于后续设置is_ok状态
-	nowIds := make([]string, 0)
-	// 取出已存在的成员信息
-	var oldData []entity.Friend
-	err = client.MySQL.Find(&oldData).Error
-	if err != nil {
-		log.Printf("查询好友列表失败: %s", err.Error())
-		return
-	}
-	// 将历史数据整理成map
-	oldMap := make(map[string]bool)
-	for _, item := range oldData {
-		oldMap[item.Wxid] = item.IsOk
-	}
-
-	// 新增的成员，用于通知给指定的人
-	var notifyMap = make(map[string]string)
-
-	// 开启事务
-	tx := client.MySQL.Begin()
-	defer tx.Commit()
-
-	// 循环获取到的好友列表
-	for _, item := range friends {
-		// 填充当前存在的账号
-		nowIds = append(nowIds, item.Wxid)
-
-		// 判断是否已经存在
-		if _, ok := oldMap[item.Wxid]; ok {
-			// 已存在，修改
-			pm := map[string]any{
-				"nickname":       item.Nickname,
-				"custom_account": item.CustomAccount,
-				"pinyin":         item.Pinyin,
-				"pinyin_all":     item.PinyinAll,
-				"is_ok":          true,
-			}
-			err = tx.Model(&entity.Friend{}).Where("wxid = ?", item.Wxid).Updates(pm).Error
-			if err != nil {
-				log.Printf("修改好友失败: %s", err.Error())
-				continue
-			}
-
-			// 如果已存在但是是已退出的群，也通知一下
-			if !oldMap[item.Wxid] {
-				notifyMap[item.Wxid] = item.Nickname + " #秽土转生"
-
-				// 通知一下，初始化完成
-				if conf, e := config.Conf.Resource["introduce"]; e {
-					// 发送一条新消息
-					switch conf.Type {
-					case "text":
-						// 文字类型
-						_ = utils.SendMessage(item.Wxid, "", conf.Path, 0)
-					case "image":
-						// 图片类型
-						utils.SendImage(item.Wxid, conf.Path, 0)
-					case "emotion":
-						// 表情类型
-						utils.SendEmotion(item.Wxid, conf.Path, 0)
-					}
-				}
-				// 发送配置网页
-				if config.Conf.System.Domain != "" {
-					title := "欢迎使用微信机器人(切勿转发)"
-					desc := "点我可以配置功能喔，提示非微信官方网页，点击继续访问即可"
-					url := utils.GetManagerUrl(item.Wxid)
-					utils.SendPublicMsg(item.Wxid, title, desc, url, 0)
-				}
-			}
-		} else {
-			// 新增
-			err = tx.Create(&entity.Friend{
-				CustomAccount:  item.CustomAccount,
-				Nickname:       item.Nickname,
-				Pinyin:         item.Pinyin,
-				PinyinAll:      item.PinyinAll,
-				Wxid:           item.Wxid,
-				IsOk:           true,
-				EnableAi:       config.Conf.System.DefaultRule.Ai,
-				EnableChatRank: config.Conf.System.DefaultRule.ChatRank,
-				EnableSummary:  config.Conf.System.DefaultRule.Summary,
-				EnableWelcome:  config.Conf.System.DefaultRule.Welcome,
-				EnableNews:     config.Conf.System.DefaultRule.News,
-				EnableHotTop:   config.Conf.System.DefaultRule.HotTop,
-				AiFreeLimit:    config.Conf.System.DefaultRule.AiFreeLimit,
-				ClearMember:    0,
-				LastActive:     types.DateTime(time.Now().Local()),
-			}).Error
-			if err != nil {
-				log.Printf("新增好友失败: %s", err.Error())
-				continue
-			}
-			notifyMap[item.Wxid] = item.Nickname
-			if conf, e := config.Conf.Resource["introduce"]; e {
-				// 发送一条新消息
-				switch conf.Type {
-				case "text":
-					// 文字类型
-					_ = utils.SendMessage(item.Wxid, "", conf.Path, 0)
-				case "image":
-					// 图片类型
-					utils.SendImage(item.Wxid, conf.Path, 0)
-				case "emotion":
-					// 表情类型
-					utils.SendEmotion(item.Wxid, conf.Path, 0)
-				}
-			}
-			// 发送配置网页
-			if config.Conf.System.Domain != "" {
-				title := "欢迎使用微信机器人(切勿转发)"
-				desc := "点我可以配置功能喔，提示非微信官方网页，点击继续访问即可"
-				url := utils.GetManagerUrl(item.Wxid)
-				utils.SendPublicMsg(item.Wxid, title, desc, url, 0)
-			}
-		}
-	}
-
-	// 通知有新成员
-	if len(notifyMap) > 0 && config.Conf.System.NewFriendNotify.Enable {
-		// 组装成一句话
-		msg := []string{"#新好友通知\n"}
-		for wxId, nickname := range notifyMap {
-			msg = append(msg, "微信Id: "+wxId+"\n昵称: "+nickname)
-		}
-		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
-			if user != "" {
-				// 发送一条新消息
-				_ = utils.SendMessage(user, "", strings.Join(msg, "\n-------\n"), 0)
-			}
-		}
-	}
-
-	// 清理不在列表中的好友
-	clearPm := map[string]any{
-		"is_ok": false,
-	}
-	err = tx.Model(&entity.Friend{}).Where("wxid NOT IN (?)", nowIds).Updates(clearPm).Error
-	if err != nil {
-		log.Printf("清理好友失败: %s", err.Error())
-	}
-
-	log.Println("同步好友列表完成")
-}
-
-// SyncGroupMembers
-// @description: 同步群成员
-// @param wxId
-func SyncGroupMembers(wxId string) {
-	membersIds, admin, err := utils.GetGroupMembers(wxId)
-	if err != nil {
-		return
-	}
-
-	// 修改不在数组的群成员状态为不在
-	pm := map[string]any{
-		"is_member":  false,
-		"leave_time": time.Now().Local(),
-	}
-	err = client.MySQL.Model(&entity.GroupUser{}).
-		Where("group_id = ?", wxId).
-		Where("is_member IS TRUE").
-		Where("wxid NOT IN (?)", membersIds).
-		Updates(pm).Error
-	if err != nil {
-		log.Printf("修改群成员状态失败: %s", err.Error())
-		return
-	}
-
-	// 取出当前数据库存在的成员信息
-	var oldData []entity.GroupUser
-	err = client.MySQL.Model(&entity.GroupUser{}).
-		Where("group_id = ?", wxId).
-		Find(&oldData).Error
-	if err != nil {
-		log.Printf("查询群成员失败: %s", err.Error())
-		return
-	}
-	// 将历史数据整理成map
-	oldMap := make(map[string]bool)
-	for _, item := range oldData {
-		oldMap[item.Wxid] = item.IsMember
-	}
-
-	// 循环获取到的群成员列表
-	for _, wxid := range membersIds {
-		// 如果历史数据中存在，且是成员，跳过
-		if isMember, ok := oldMap[wxid]; ok && isMember {
-			continue
-		}
-		// 获取成员信息
-		cp, e := utils.GetContactProfile(wxid)
-		if e != nil {
-			log.Printf("获取成员信息失败: %s", e.Error())
-			continue
-		}
-		if cp.Wxid != "" {
-			if _, ok := oldMap[wxid]; ok {
-				// 历史数据中存在，修改
-				// 修改
-				gupm := map[string]any{
-					"account":    cp.Account,
-					"head_image": cp.HeadImage,
-					"nickname":   cp.Nickname,
-					"is_member":  true,
-					"is_admin":   cp.Wxid == admin,
-					"leave_time": nil,
-				}
-				err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", wxId).Where("wxid = ?", wxid).Updates(gupm).Error
-				if err != nil {
-					log.Printf("修改群成员失败: %s", err.Error())
-					continue
-				}
-			} else {
-				// 新增的
-				// 新增
-				err = client.MySQL.Create(&entity.GroupUser{
-					GroupId:    wxId,
-					Account:    cp.Account,
-					HeadImage:  cp.HeadImage,
-					Nickname:   cp.Nickname,
-					Wxid:       cp.Wxid,
-					IsMember:   true,
-					IsAdmin:    cp.Wxid == admin,
-					JoinTime:   time.Now().Local(),
-					LastActive: time.Now().Local(),
-				}).Error
-				if err != nil {
-					log.Printf("新增群成员失败: %s", err.Error())
-					continue
-				}
-			}
-		}
-	}
-}

service/group.go

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

service/message.go

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

tasks/cleargroupuser/cleargroupuser.go

@@ -3,8 +3,7 @@ package cleargroupuser
 import (
 	"fmt"
 	"go-wechat/client"
-	"go-wechat/common/current"
+	"go-wechat/entity"
-	"go-wechat/model/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -16,7 +15,7 @@ import (
 func ClearGroupUser() {
 	groups, err := service.GetAllEnableClearGroup()
 	if err != nil {
-		log.Printf("获取启用了末位淘汰的群组失败, 错误信息: %v", err)
+		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
 		return
 	}
 
@@ -39,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, false)
+		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0)
 		// 发送通知到群里
 		ms := make([]string, 0)
 		for k, v := range memberMap {
 			ms = append(ms, fmt.Sprintf("昵称：%s\n最后活跃时间：%s", k, v))
 		}
-		msg := fmt.Sprintf("#清理群成员\n\n很遗憾地通知各位，就在刚刚，有%d名群友因活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n详细信息: \n%s",
+		msg := fmt.Sprintf("#清理群成员\n\n很遗憾地通知各位，就在刚刚，有%d名群友引活跃度不够暂时离开了我们，希望还健在的群友引以为戒、保持活跃！\n\n活跃信息: \n%s",
 			memberCount, strings.Join(ms, "\n"))
 		utils.SendMessage(group.Wxid, "", msg, 0)
 	}
@@ -57,9 +56,7 @@ func ClearGroupUser() {
 // @param days 需要清理的未活跃的天数
 // @return members
 func getNeedDeleteMembers(groupId string, days int) (members []entity.GroupUser) {
-	err := client.MySQL.Model(&entity.GroupUser{}).
+	err := client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", groupId).
-		Where("group_id = ?", groupId).
-		Where("wxid != ?", current.GetRobotInfo().WxId).
 		Where("is_member IS TRUE").
 		Where("DATEDIFF( NOW(), last_active ) >= ?", days).
 		Order("last_active DESC").

tasks/friends/ai.go

@@ -1,9 +0,0 @@
-package friends
-
-import "go-wechat/service"
-
-// ClearAiUsedToday
-// @description: 清空AI日使用次数
-func ClearAiUsedToday() {
-	service.ClearAiUsedToday()
-}

tasks/friends/friends.go

@@ -5,10 +5,9 @@ import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/client"
 	"go-wechat/common/constant"
-	"go-wechat/common/types"
 	"go-wechat/config"
-	"go-wechat/model/dto"
+	"go-wechat/entity"
-	"go-wechat/model/entity"
+	"go-wechat/model"
 	"go-wechat/utils"
 	"gorm.io/gorm"
 	"log"
@@ -25,7 +24,7 @@ var hc = resty.New()
 // Sync
 // @description: 同步好友列表
 func Sync() {
-	var base dto.Response[[]dto.FriendItem]
+	var base model.Response[[]model.FriendItem]
 
 	resp, err := hc.R().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
@@ -42,19 +41,6 @@ func Sync() {
 
 	nowIds := []string{}
 
-	// 取出已存在的成员信息
-	var oldData []entity.Friend
-	err = tx.Find(&oldData).Error
-	if err != nil {
-		log.Printf("查询好友列表失败: %s", err.Error())
-		return
-	}
-	// 将历史数据整理成map
-	oldMap := make(map[string]bool)
-	for _, item := range oldData {
-		oldMap[item.Wxid] = item.IsOk
-	}
-
 	// 新增的成员，用于通知给指定的人
 	var newItmes = make(map[string]string)
 
@@ -70,7 +56,12 @@ func Sync() {
 		nowIds = append(nowIds, friend.Wxid)
 
 		// 判断是否存在，不存在的话就新增，存在就修改一下名字
-		if _, e := oldMap[friend.Wxid]; !e {
+		var count int64
+		err = tx.Model(&entity.Friend{}).Where("wxid = ?", friend.Wxid).Count(&count).Error
+		if err != nil {
+			continue
+		}
+		if count == 0 {
 			// 新增
 			err = tx.Create(&entity.Friend{
 				CustomAccount:  friend.CustomAccount,
@@ -84,10 +75,8 @@ func Sync() {
 				EnableSummary:  config.Conf.System.DefaultRule.Summary,
 				EnableWelcome:  config.Conf.System.DefaultRule.Welcome,
 				EnableNews:     config.Conf.System.DefaultRule.News,
-				EnableHotTop:   config.Conf.System.DefaultRule.HotTop,
-				AiFreeLimit:    config.Conf.System.DefaultRule.AiFreeLimit,
 				ClearMember:    0,
-				LastActive:     types.DateTime(time.Now().Local()),
+				LastActive:     time.Now().Local(),
 			}).Error
 			if err != nil {
 				log.Printf("新增好友失败: %s", err.Error())
@@ -108,14 +97,6 @@ func Sync() {
 					utils.SendEmotion(friend.Wxid, conf.Path, 0)
 				}
 			}
-			// 发送配置网页
-			if config.Conf.System.Domain != "" {
-				title := "欢迎使用微信机器人(切勿转发)"
-				desc := "点我可以配置功能喔，提示非微信官方网页，点击继续访问即可"
-				url := utils.GetManagerUrl(friend.Wxid)
-				utils.SendPublicMsg(friend.Wxid, title, desc, url, 0)
-			}
-
 		} else {
 			pm := map[string]any{
 				"nickname":       friend.Nickname,
@@ -129,33 +110,6 @@ func Sync() {
 				log.Printf("修改好友失败: %s", err.Error())
 				continue
 			}
-			// 如果已存在但是是已退出的群，也通知一下
-			if !oldMap[friend.Wxid] {
-				newItmes[friend.Wxid] = friend.Nickname
-
-				// 通知一下，初始化完成
-				if conf, ok := config.Conf.Resource["introduce"]; ok {
-					// 发送一条新消息
-					switch conf.Type {
-					case "text":
-						// 文字类型
-						utils.SendMessage(friend.Wxid, "", conf.Path, 0)
-					case "image":
-						// 图片类型
-						utils.SendImage(friend.Wxid, conf.Path, 0)
-					case "emotion":
-						// 表情类型
-						utils.SendEmotion(friend.Wxid, conf.Path, 0)
-					}
-				}
-				// 发送配置网页
-				if config.Conf.System.Domain != "" {
-					title := "欢迎使用微信机器人(切勿转发)"
-					desc := "点我可以配置功能喔，提示非微信官方网页，点击继续访问即可"
-					url := utils.GetManagerUrl(friend.Wxid)
-					utils.SendPublicMsg(friend.Wxid, title, desc, url, 0)
-				}
-			}
 		}
 
 		// 群成员，同步一下成员信息
@@ -180,13 +134,7 @@ func Sync() {
 	}
 
 	// 清理不在列表中的好友
-	clearPm := map[string]any{
+	err = tx.Model(&entity.Friend{}).Where("wxid NOT IN (?)", nowIds).Update("is_ok", false).Error
-		"is_ok": false,
-	}
-	err = tx.Model(&entity.Friend{}).Where("wxid NOT IN (?)", nowIds).Updates(clearPm).Error
-	if err != nil {
-		log.Printf("清理好友失败: %s", err.Error())
-	}
 
 	log.Println("同步好友列表完成")
 }
@@ -195,7 +143,7 @@ func Sync() {
 // @description: 同步群成员
 // @param gid
 func syncGroupUsers(tx *gorm.DB, gid string) {
-	var baseResp dto.Response[dto.GroupUser]
+	var baseResp model.Response[model.GroupUser]
 
 	// 组装参数
 	param := map[string]any{
@@ -282,8 +230,8 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
 // @param wxid
 // @return ent
 // @return err
-func getContactProfile(wxid string) (ent dto.ContactProfile, err error) {
+func getContactProfile(wxid string) (ent model.ContactProfile, err error) {
-	var baseResp dto.Response[dto.ContactProfile]
+	var baseResp model.Response[model.ContactProfile]
 
 	// 组装参数
 	param := map[string]any{

tasks/hottop/hottop.go

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

tasks/news/news.go

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

tasks/summary/summary.go

@@ -1,12 +1,15 @@
 package summary
 
 import (
+	"context"
 	"fmt"
-	"go-wechat/model/vo"
+	"github.com/sashabaranov/go-openai"
+	"go-wechat/config"
 	"go-wechat/service"
 	"go-wechat/utils"
+	"go-wechat/vo"
 	"log"
-	"time"
+	"strings"
 )
 
 // AiSummary
@@ -19,9 +22,6 @@ func AiSummary() {
 	}
 
 	for _, group := range groups {
-		// 记录开始时间
-		var start = time.Now()
-
 		// 获取对话记录
 		var records []vo.TextMessageItem
 		if records, err = service.GetTextMessagesById(group.Wxid); err != nil {
@@ -33,21 +33,56 @@ func AiSummary() {
 			continue
 		}
 		// 组装对话记录为字符串
-		var replyMsg string
+		var content []string
-		replyMsg, err = utils.GetAiSummary(group.Nickname, records)
+		for _, record := range records {
+			content = append(content, fmt.Sprintf(`{"%s": "%s"}--end--`, record.Nickname, strings.ReplaceAll(record.Message, "\n", "。。")))
+		}
+
+		msgTmp := `请帮我总结一下一下的群聊内容的梗概，生成的梗概需要尽可能详细，需要带上一些聊天关键信息，并且带上群友名字。
+注意，他们可能是多个话题，请仔细甄别。
+每一行代表一个人的发言，每一行的的格式为： {"{nickname}": "{content}"}--end--
+
+群名称: %s
+聊天记录如下:
+%s
+`
+
+		msg := fmt.Sprintf(msgTmp, group.Nickname, strings.Join(content, "\n"))
+
+		// AI总结
+		messages := []openai.ChatCompletionMessage{
+			{
+				Role:    openai.ChatMessageRoleUser,
+				Content: msg,
+			},
+		}
+
+		// 默认使用AI回复
+		conf := openai.DefaultConfig(config.Conf.Ai.ApiKey)
+		if config.Conf.Ai.BaseUrl != "" {
+			conf.BaseURL = fmt.Sprintf("%s/v1", config.Conf.Ai.BaseUrl)
+		}
+		ai := openai.NewClientWithConfig(conf)
+		var resp openai.ChatCompletionResponse
+		resp, err = ai.CreateChatCompletion(
+			context.Background(),
+			openai.ChatCompletionRequest{
+				Model:    config.Conf.Ai.SummaryModel,
+				Messages: messages,
+			},
+		)
+
 		if err != nil {
 			log.Printf("群聊记录总结失败: %v", err.Error())
-			_ = utils.SendMessage(group.Wxid, "", "#昨日消息总结\n\n群聊消息总结失败，错误信息: "+err.Error(), 0)
 			continue
 		}
 
-		replyMsg = fmt.Sprintf("#昨日消息总结\n又是一天过去了，让我们一起来看看昨儿群友们都聊了什么有趣的话题吧~\n\n%s", replyMsg)
+		// 返回消息为空
+		if resp.Choices[0].Message.Content == "" {
+			continue
+		}
+		replyMsg := fmt.Sprintf("#昨日消息总结\n又是一天过去了，让我们一起来看看昨儿群友们都聊了什么有趣的话题吧~\n\n%s", resp.Choices[0].Message.Content)
 		//log.Printf("群[%s]对话记录总结成功，总结内容: %s", group.Wxid, replyMsg)
-		_ = utils.SendMessage(group.Wxid, "", replyMsg, 0)
+		utils.SendMessage(group.Wxid, "", replyMsg, 0)
-
-		// 判断耗时是否达到一分钟，不足就等待
-		if used := time.Now().Sub(start); used < time.Minute {
-			time.Sleep(time.Minute - used)
-		}
 	}
 }

tasks/tasks.go

@@ -5,7 +5,6 @@ import (
 	"go-wechat/config"
 	"go-wechat/tasks/cleargroupuser"
 	"go-wechat/tasks/friends"
-	"go-wechat/tasks/hottop"
 	"go-wechat/tasks/news"
 	"go-wechat/tasks/summary"
 	"go-wechat/tasks/watergroup"
@@ -58,15 +57,8 @@ func InitTasks() {
 		_, _ = s.Cron(config.Conf.Task.News.Cron).Do(news.DailyNews)
 	}
 
-	// 热榜
-	if config.Conf.Task.HotTop.Enable {
-		_, _ = s.Cron(config.Conf.Task.HotTop.Cron).Do(hottop.HotTop)
-	}
-
 	// 每天0点检查一次处理清理群成员
 	_, _ = s.Cron("0 0 * * *").Do(cleargroupuser.ClearGroupUser)
-	// 每天0点清空AI日使用次数
-	_, _ = s.Cron("0 0 * * *").Do(friends.ClearAiUsedToday)
 
 	// 开启定时任务
 	s.StartAsync()

tasks/watergroup/month.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-wechat/client"
 	"go-wechat/config"
-	"go-wechat/model/entity"
+	"go-wechat/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/model/entity"
+	"go-wechat/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/model/entity"
+	"go-wechat/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/model/entity"
+	"go-wechat/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/dto"
+	"go-wechat/model"
 	"go-wechat/types"
 	"log"
 	"net"
@@ -14,7 +14,7 @@ import (
 // @description: 解析消息
 // @param msg
 func parse(remoteAddr net.Addr, msg []byte) {
-	var m dto.Message
+	var m model.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/friend.go

@@ -1,105 +0,0 @@
-package utils
-
-import (
-	"encoding/json"
-	"github.com/go-resty/resty/v2"
-	"go-wechat/common/constant"
-	"go-wechat/config"
-	"go-wechat/model/dto"
-	"log"
-	"slices"
-	"strings"
-)
-
-// http客户端
-var hc = resty.New()
-
-// GetFriendList
-// @description: 获取好友列表
-// @return friends
-// @return err
-func GetFriendList() (friends []dto.FriendItem, err error) {
-	var base dto.Response[[]dto.FriendItem]
-	resp, err := hc.R().
-		SetHeader("Content-Type", "application/json;chartset=utf-8").
-		SetResult(&base).
-		Post(config.Conf.Wechat.GetURL("/api/getContactList"))
-	if err != nil {
-		log.Printf("获取好友列表失败: %s", err.Error())
-		return
-	}
-	log.Printf("获取好友列表结果: %s", resp.String())
-
-	// 循环获取到的好友列表
-	for _, item := range base.Data {
-		// 跳过特殊账号
-		// 跳过公众号和企业微信好友
-		if strings.Contains(item.Wxid, "gh_") || strings.Contains(item.Wxid, "@openim") {
-			continue
-		}
-		// 特殊Id跳过
-		if slices.Contains(constant.SpecialId, item.Wxid) {
-			continue
-		}
-		// 添加到待返回列表
-		friends = append(friends, item)
-	}
-
-	return
-}
-
-// GetGroupMembers
-// @description: 获取指定群成员
-// @param wxId 群Id
-// @return ids 群成员id数组
-// @return members 群成员信息
-// @return err 错误信息
-func GetGroupMembers(wxId string) (ids []string, admin string, err error) {
-	var base dto.Response[dto.GroupUser]
-	// 组装参数
-	param := map[string]any{
-		"chatRoomId": wxId, // 群Id
-	}
-	pbs, _ := json.Marshal(param)
-
-	_, err = hc.R().
-		SetHeader("Content-Type", "application/json;chartset=utf-8").
-		SetBody(string(pbs)).
-		SetResult(&base).
-		Post(config.Conf.Wechat.GetURL("/api/getMemberFromChatRoom"))
-	if err != nil {
-		log.Printf("获取群成员信息失败: %s", err.Error())
-		return
-	}
-	// 昵称Id
-	ids = strings.Split(base.Data.Members, "^G")
-	admin = base.Data.Admin
-	return
-}
-
-// GetContactProfile
-// @description: 获取联系人信息
-// @param wxId 微信Id
-// @return info 联系人信息
-// @return err 错误信息
-func GetContactProfile(wxId string) (info dto.ContactProfile, err error) {
-	var baseResp dto.Response[dto.ContactProfile]
-
-	// 组装参数
-	param := map[string]any{
-		"wxid": wxId, // 群Id
-	}
-	pbs, _ := json.Marshal(param)
-
-	_, err = hc.R().
-		SetHeader("Content-Type", "application/json;chartset=utf-8").
-		SetBody(string(pbs)).
-		SetResult(&baseResp).
-		Post(config.Conf.Wechat.GetURL("/api/getContactProfile"))
-	if err != nil {
-		log.Printf("获取成员详情失败: %s", err.Error())
-		return
-	}
-	info = baseResp.Data
-	return
-}

utils/leigod.go

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

utils/news.go

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

utils/send.go

@@ -2,14 +2,11 @@ package utils
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"github.com/go-resty/resty/v2"
 	"go-wechat/common/current"
 	"go-wechat/config"
 	"log"
-	"os"
-	"strconv"
 	"time"
 )
 
@@ -18,14 +15,9 @@ import (
 // @param toId
 // @param atId
 // @param msg
-func SendMessage(toId, atId, msg string, retryCount int) (err error) {
+func SendMessage(toId, atId, msg string, retryCount int) {
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SEND")); flag {
-		return
-	}
-
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
-		err = errors.New("重试五次失败，停止发送")
 		return
 	}
 
@@ -56,10 +48,9 @@ func SendMessage(toId, atId, msg string, retryCount int) (err error) {
 		log.Printf("发送文本消息失败: %s", err.Error())
 		// 休眠五秒后重新发送
 		time.Sleep(5 * time.Second)
-		return SendMessage(toId, atId, msg, retryCount+1)
+		SendMessage(toId, atId, msg, retryCount+1)
 	}
 	log.Printf("发送文本消息结果: %s", resp.String())
-	return
 }
 
 // SendImage
@@ -68,10 +59,6 @@ func SendMessage(toId, atId, msg string, retryCount int) (err error) {
 // @param imgPath string 图片路径
 // @param retryCount int 重试次数
 func SendImage(toId, imgPath string, retryCount int) {
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SEND")); flag {
-		return
-	}
-
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
 		return
@@ -104,10 +91,6 @@ func SendImage(toId, imgPath string, retryCount int) {
 // @param emotionHash string 表情包hash(md5值)
 // @param retryCount int 重试次数
 func SendEmotion(toId, emotionHash string, retryCount int) {
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SEND")); flag {
-		return
-	}
-
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
 		return
@@ -143,9 +126,7 @@ func SendEmotion(toId, emotionHash string, retryCount int) {
 // @description: 删除群成员
 // @param chatRoomId 群Id
 // @param memberIds 成员id,用','分隔
-// @param retryCount 重试次数
+func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
-// @param isSure 是否确认删除
-func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool) {
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
 		return
@@ -167,84 +148,7 @@ func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool
 		log.Printf("删除群成员失败: %s", err.Error())
 		// 休眠五秒后重新发送
 		time.Sleep(5 * time.Second)
-		DeleteGroupMember(chatRoomId, memberIds, retryCount+1, isSure)
+		SendImage(chatRoomId, memberIds, retryCount+1)
 	}
-	log.Printf("[%s]删除群成员结果: %s", chatRoomId, resp.String())
+	log.Printf("删除群成员结果: %s", resp.String())
-	// 这个逼接口要调用两次，第一次调用成功，第二次调用才会真正删除
-	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())
-}
-
-// SendPublicMsg
-// @description: 发送公众号消息
-// @param wxId string 群或者好友Id
-// @param title string 标题
-// @param digest string 摘要
-// @param url string 链接
-// @param retryCount int 重试次数
-func SendPublicMsg(wxId, title, digest, url string, retryCount int) {
-	if flag, _ := strconv.ParseBool(os.Getenv("DONT_SEND")); flag {
-		return
-	}
-
-	if retryCount > 5 {
-		log.Printf("重试五次失败，停止发送")
-		return
-	}
-
-	// 组装参数
-	param := map[string]any{
-		"appName":  "公安部网安局",          // 假装是公安部发的，看着都牛逼
-		"userName": "gh_e406f4bcdf34", // 这个是公安部网安局的公众号id
-		"title":    title,
-		"digest":   digest,
-		"url":      url,
-		"thumbUrl": "https://gitee.ltd/assets/img/logo.png", // 这个logo写死了，懒得搞，要改的自己改一下
-		"wxid":     wxId,
-	}
-	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/forwardPublicMsg"))
-	if err != nil {
-		log.Printf("发送公众号消息失败: %s", err.Error())
-		// 休眠五秒后重新发送
-		time.Sleep(5 * time.Second)
-		SendPublicMsg(wxId, title, digest, url, retryCount+1)
-	}
-	log.Printf("发送公众号消息结果: %s", resp.String())
 }

utils/summary.go

@@ -1,108 +0,0 @@
-package utils
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/sashabaranov/go-openai"
-	"go-wechat/config"
-	"go-wechat/model/vo"
-	"log"
-	"strings"
-)
-
-// GetAiSummary
-// @description: AI总结群聊记录
-// @param groupName
-// @param records
-// @return replyMsg
-// @return err
-func GetAiSummary(groupName string, records []vo.TextMessageItem) (replyMsg string, err error) {
-	// 组装对话记录为字符串
-	var content []string
-	for _, record := range records {
-		content = append(content, fmt.Sprintf(`{"%s": "%s"}--end--`, record.Nickname, strings.ReplaceAll(record.Message, "\n", "。。")))
-	}
-
-	prompt := `# Role: 数据分析师和信息整理专家
-        # Background: 用户需要从群聊记录中提取有价值的信息，包括技术话题讨论、工具分享、网站或资源链接。
-        # Profile: 你是一位专业的数据分析师，擅长从大量文本中提取关键信息，并能够高效地整理和总结内容。
-        # Skills: 数据分析、信息提取、内容总结、网络资源评估。
-        # Goals: 设计一个流程，帮助用户识别群聊中的技术话题、共享的工具和资源，并高效地总结每个话题的要点。
-        # Constrains: 该流程需要简洁明了，易于用户理解和操作，同时确保不遗漏任何重要信息。
-        # OutputFormat: 结构化的文本总结，包含关键讨论点、结论等。
-        # Workflow:
-        ## 1. 快速浏览群聊记录
-         - 通过快速浏览聊天记录，初步识别出主要话题。
-        ## 2. 识别和分类主要话题
-         - 识别群聊中的主要话题，分类讨论内容。
-         - 每个话题独立提取，避免混淆。
-		 - 话题识别尽可能准确，确保不遗漏重要信息。
-        ## 3. 编写总结概括
-         - 对每个话题进行总结，包含以下内容：
-           - 关键讨论点：主要的讨论内容和观点。
-           - 参与成员：参与讨论的成员的昵称。
-           - 结论：得出的结论或共识，内容要尽可能详细。
-        ## 4. 组织信息
-         - 以逻辑清晰、易于理解的方式组织信息。
-         - 使用结构化文本，使总结内容易于阅读。
-        ## 5. 生成最终总结
-         - 根据上述步骤，生成每个话题的详细总结。
-         - 确保每个总结完整且有条理。
-         - 返回数据格式为结构化文本，方便用户查阅。
-        ## 6. 群聊记录消息格式
-        格式: {"{nickname}": "{content}"}--end--
-        # Examples:
-        - 话题：技术讨论 - AI在医疗领域的应用
-          - 关键讨论点：讨论了AI在医疗诊断中的应用前景和现有挑战。
-          - 成员：张三、李四、王五。
-          - 结论：AI技术有望提高医疗诊断的准确性和效率，但数据隐私和模型解释性仍需解决。
-
-        - 话题：美食讨论 - 杭州到底有没有美食
-          - 关键讨论点：讨论了杭州的美食有哪些、分布地区、评价如何。
-          - 成员：张三、李四、王五。
-          - 结论：杭州好像没有美食。
-`
-
-	msg := fmt.Sprintf("群名称: %s\n聊天记录如下:\n%s", groupName, strings.Join(content, "\n"))
-
-	// AI总结
-	messages := []openai.ChatCompletionMessage{
-		{
-			Role:    openai.ChatMessageRoleSystem,
-			Content: prompt,
-		},
-		{
-			Role:    openai.ChatMessageRoleUser,
-			Content: msg,
-		},
-	}
-
-	// 默认使用AI回复
-	conf := openai.DefaultConfig(config.Conf.Ai.ApiKey)
-	if config.Conf.Ai.BaseUrl != "" {
-		conf.BaseURL = fmt.Sprintf("%s/v1", config.Conf.Ai.BaseUrl)
-	}
-	ai := openai.NewClientWithConfig(conf)
-	var resp openai.ChatCompletionResponse
-	resp, err = ai.CreateChatCompletion(
-		context.Background(),
-		openai.ChatCompletionRequest{
-			Model:    config.Conf.Ai.SummaryModel,
-			Messages: messages,
-		},
-	)
-
-	if err != nil {
-		log.Printf("群聊记录总结失败: %v", err.Error())
-		return
-	}
-
-	// 返回消息为空
-	if resp.Choices[0].Message.Content == "" {
-		err = errors.New("AI返回结果为空")
-		return
-	}
-	replyMsg = resp.Choices[0].Message.Content
-	return
-}

utils/url.go

@@ -1,21 +0,0 @@
-package utils
-
-import (
-	"encoding/base64"
-	"fmt"
-	"go-wechat/config"
-)
-
-// GetManagerUrl
-// @description: 获取管理页面链接
-// @param wxId
-// @return newUrl
-func GetManagerUrl(wxId string) (url string) {
-	// 生成管理页面链接
-	url = fmt.Sprintf("%s/manager.html?id=%s", config.Conf.System.Domain, wxId)
-	// base64一下
-	encodeString := base64.StdEncoding.EncodeToString([]byte(url))
-	// 拼接新链接（这个是一个已备案的域名）
-	url = "https://redirect.gitee.ltd/?s=" + encodeString
-	return
-}

views/assistant.html

@@ -1,89 +0,0 @@
-<!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

@@ -57,9 +57,6 @@
 
 <!-- 消息总结 -->
 {{define "summary"}}
-{{ if eq .EnableSummary true }}
-<button type="button" class="btn-link float-end text-blue-600" onclick="sendAiSummary({{.Wxid}})">手动发送总结</button>
-{{ end }}
 <button type="button"
         class="{{ if eq .EnableSummary true }}bg-green-600{{ else }}bg-gray-200{{ end }} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-green-600 focus:ring-offset-2"
         role="switch" aria-checked="false" onclick="changeSummaryEnableStatus({{.Wxid}})">
@@ -195,41 +192,14 @@
 </button>
 {{end}}
 
-<!-- 热榜 -->
-{{define "hotTop"}}
-<button type="button"
-        class="{{ if eq .EnableHotTop true }}bg-green-600{{ else }}bg-gray-200{{ end }} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-green-600 focus:ring-offset-2"
-        role="switch" aria-checked="false" onclick="changeUserHotTopStatus({{.Wxid}})">
-  <span
-    class="{{ if eq .EnableHotTop true }}translate-x-5{{ else }}translate-x-0{{ end }} pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out">
-    <span
-      class="{{ if eq .EnableHotTop true }}opacity-0 duration-100 ease-out{{ else }}opacity-100 duration-200 ease-in{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-      aria-hidden="true">
-      <svg class="h-3 w-3 text-gray-400" fill="none" viewBox="0 0 12 12">
-        <path d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2" stroke="currentColor" stroke-width="2" stroke-linecap="round"
-              stroke-linejoin="round"/>
-      </svg>
-    </span>
-    <span
-      class="{{ if eq .EnableHotTop true }}opacity-100 duration-200 ease-in{{ else }}opacity-0 duration-100 ease-out{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
-      aria-hidden="true">
-      <svg class="h-3 w-3 text-green-600" fill="currentColor" viewBox="0 0 12 12">
-        <path
-          d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"/>
-      </svg>
-    </span>
-  </span>
-</button>
-{{end}}
-
 
 <!-- 是否tag -->
 {{define "flagTag"}}
 {{ 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,44 +76,6 @@
                   </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>
-
-              <!-- 每日 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 class="relative rounded-md">
-                    <label>
-                      <input type="number" id="auto-ai-{{ .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="每日 AI 免费次数限制"
-                             value="{{.AiFreeLimit}}"
-                             onblur="changeAiFreeLimit({{.Wxid}}, 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>
               {{ end }}
 
               <div class="flex justify-between gap-x-4 py-3">
@@ -123,13 +85,6 @@
                 </dd>
               </div>
 
-              <div class="flex justify-between gap-x-4 py-3">
-                <dt class="text-gray-500">热榜</dt>
-                <dd class="flex items-start gap-x-2">
-                  {{ template "hotTop" . }}
-                </dd>
-              </div>
-
               <div class="flex justify-between gap-x-4 py-3">
                 <dt class="text-gray-500">指令</dt>
                 <dd class="flex items-start gap-x-2">

views/group.html

@@ -21,158 +21,105 @@
   <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">
+        <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">
           {{ range .groups }}
-          <li class="overflow-hidden rounded-xl border border-gray-200">
+          <tr class="even:bg-gray-50">
-            <div class="flex items -center gap-x-4 border-b border-gray-900/5 bg-gray-50 p-6">
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <img src="assets/img/status-{{ if eq .IsOk true }}ok{{else}}fail{{end}}.png" alt="Tuple"
+              <div class="font-medium text-gray-900">{{ .Nickname }}</div>
-                   class="h-12 w-12 flex-none rounded-lg bg-white object-cover ring-1 ring-gray-900/10">
+              <div class="mt-1 truncate text-gray-500">{{ .Wxid }}</div>
-              <div class="text-sm flex-1">
+            </td>
-                <div class="font-medium leading-6 text-gray-900">{{ .Nickname }}</div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                <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>
-
-            <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>
+              {{ .LastActive }}
               {{ end }}
-                </dd>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- AI -->
+              {{ template "flagTag" .IsOk }}
-              <div class="flex justify-between gap-x-4 py-3 items-center">
+            </td>
-                <dt class="text-gray-500">AI(模型可选默认或者指定模型)</dt>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                <dd class="flex items-start gap-x-2 items-center">
-                  <div>
               {{ template "ai" . }}
-                  </div>
+              <!-- 使用的模型 -->
               {{ if eq .EnableAi true }}
-                  <div class="float-end">
+              <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"
-                    <div>
+                      onchange="aiModelChange(event, {{.Wxid}})">
-                      <label>
+                <option value="" {{ if eq .AiModel
-                        <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}})">
+                "" }}selected{{ end }}>默认(gpt-3.5-turbo-0613)
+                </option>
+
                 {{$useModel := .AiModel}}
                 {{ range $.aiModels }}
                 <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>
-                            {{.Name}}
+                  {{.Name}}({{.Model}})
                 </option>
                 {{ end }}
               </select>
-                      </label>
-                    </div>
-                    <!-- AI角色 -->
-                    <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>
+            </td>
-                      </label>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                    </div>
-                  </div>
-                  {{ end }}
-                </dd>
-              </div>
-              <!-- 每日 AI 免费次数限制 -->
-              <div class="flex justify-between gap-x-4 py-3 items-center">
-                <dt class="text-gray-500">
-                  每日 AI 免费次数限制
-                  <span class="text-red-300">(0表示不限)</span>
-                </dt>
-                <dd class="flex items-start gap-x-2 items-center">
-                  <div class="relative rounded-md">
-                    <label>
-                      <input type="number" id="auto-ai-{{ .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="每日 AI 免费次数限制"
-                             value="{{.AiFreeLimit}}"
-                             onblur="changeAiFreeLimit({{.Wxid}}, 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>
-              <!-- 水群排行榜 -->
-              <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>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- 群聊总结 -->
-              <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>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- 迎新 -->
-              <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>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- 早报 -->
-              <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>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- 热榜 -->
-              <div class="flex justify-between gap-x-4 py-3 items-center">
-                <dt class="text-gray-500">热榜</dt>
-                <dd class="flex items-start gap-x-2">
-                  {{ template "hotTop" . }}
-                </dd>
-              </div>
-              <!-- 指令 -->
-              <div class="flex justify-between gap-x-4 py-3 items-center">
-                <dt class="text-gray-500">指令</dt>
-                <dd class="flex items-start gap-x-2">
               {{ template "command" . }}
-                </dd>
+            </td>
-              </div>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-              <!-- 自动清理不活跃成员 -->
+              {{ .ClearMember }}
-              <div class="flex justify-between gap-x-4 py-3 items-center">
+            </td>
-                <dt class="text-gray-500">末位淘汰</dt>
+            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                <dd class="flex items-start gap-x-2 items-center">
+              <button class="btn btn-link" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">成员</button>
-                  <div class="relative rounded-md">
+            </td>
-                    <label>
+          </tr>
-                      <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>
-          </li>
           {{ end }}
-        </ul>
+          </tbody>
+        </table>
       </div>
     </div>
   </main>

views/groupuser.html

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

views/head.html

@@ -13,7 +13,6 @@
               <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/manager-one.html

@@ -1,179 +0,0 @@
-<!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 flex items-center justify-center">
-
-    <div 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 .info.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">{{ .info.Nickname }}</div>
-          <div class="font-medium text-gray-500">{{ .info.Wxid }}</div>
-          {{ template "flagTag" .info.IsOk }}
-<!--          <button type="button" class="btn-link float-end text-red-600" onclick="getGroupUsers({{.info.Wxid}}, {{.info.Nickname}})">群成员</button>-->
-        </div>
-      </div>
-
-      <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 .info.LastActive.IsNil true }}
-            无活跃数据
-            {{ else }}
-            <time datetime="{{ .LastActive }}">{{ .info.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" .info }}
-            </div>
-            {{ if eq .info.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, {{.info.Wxid}})">
-                    {{$useModel := .info.AiModel}}
-                    {{ range $.aiModels }}
-                    <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }} {{ if not .CanManager}}disabled{{ 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, {{.info.Wxid}})">
-                    <option value="" {{ if eq .info.Prompt
-                    "" }}selected{{ end }}>默认</option>
-
-                    {{$usePrompt := .info.Prompt}}
-                    {{ range $.assistant }}
-                    <option value="{{.Id}}" {{ if eq $usePrompt .Id}}selected{{ end }}>
-                      {{.Name}}
-                    </option>
-                    {{ end }}
-                  </select>
-                </label>
-              </div>
-            </div>
-            {{ end }}
-          </dd>
-        </div>
-        <!-- 今日 AI 对话已使用次数 -->
-        <div class="flex justify-between gap-x-4 py-3 items-center">
-          <dt class="text-gray-500">
-            今日 AI 对话已使用次数
-            <br/>
-            <span class="text-red-300">* 每天0点重置</span>
-            <p class="text-gray-400">需要扩容请添加微信: _Elixir</p>
-          </dt>
-          <dd class="flex items-start gap-x-2">
-            {{ .info.AiUsedToday }}次{{ if lt 1 .info.AiFreeLimit }}(限制{{ .info.AiFreeLimit }}次){{ end }}
-          </dd>
-        </div>
-
-        {{$isGroup := checkIsGroup .info.Wxid}}
-        {{ if eq $isGroup true }}
-        <!-- 水群排行榜 -->
-        <div class="flex justify-between gap-x-4 py-3 items-center">
-          <dt class="text-gray-500">
-            水群排行榜
-            <br/>
-            <span class="text-red-300">* 每天早上七点半定时发送</span>
-          </dt>
-          <dd class="flex items-start gap-x-2">
-            {{ template "chatRank" .info }}
-          </dd>
-        </div>
-        <!-- 群聊总结 -->
-        <div class="flex justify-between gap-x-4 py-3 items-center">
-          <dt class="text-gray-500">
-            群聊总结
-            <br/>
-            <span class="text-red-300">* 每天0点30定时发送</span>
-          </dt>
-          <dd class="flex items-start gap-x-2">
-            {{ template "summary" .info }}
-          </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" .info }}
-          </dd>
-        </div>
-        {{ end }}
-        <!-- 早报 -->
-        <div class="flex justify-between gap-x-4 py-3 items-center">
-          <dt class="text-gray-500">
-            早报
-            <br/>
-            <span class="text-red-300">* 每天早上八点定时发送</span>
-          </dt>
-          <dd class="flex items-start gap-x-2">
-            {{ template "news" .info }}
-          </dd>
-        </div>
-        <!-- 热榜 -->
-<!--        <div class="flex justify-between gap-x-4 py-3 items-center">-->
-<!--          <dt class="text-gray-500">-->
-<!--            热榜-->
-<!--            <br/>-->
-<!--            <span class="text-red-300">* 每个整点定时发送</span>-->
-<!--          </dt>-->
-<!--          <dd class="flex items-start gap-x-2">-->
-<!--            {{ template "hotTop" .info }}-->
-<!--          </dd>-->
-<!--        </div>-->
-        {{ if eq $isGroup true }}
-        <!-- 自动清理不活跃成员 -->
-        <div class="flex justify-between gap-x-4 py-3 items-center">
-          <dt class="text-gray-500">
-            末位淘汰(需要机器人是<span class="text-red-500">管理员</span>)
-            <br/>
-            <span class="text-red-300">* 清理多少天不说话的成员，0表示不清理</span>
-          </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="{{.info.ClearMember}}"
-                       onblur="changeClearMember({{.info.Wxid}}, {{.info.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>
-        {{ end }}
-      </dl>
-    </div>
-
-  </div>
-</body>
-</html>

views/static/css/index.css

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

@@ -99,25 +99,6 @@ function changeUserNewsStatus(wxId) {
   })
 }
 
-// 修改用户热搜开启状态
-function changeUserHotTopStatus(wxId) {
-  axios({
-    method: 'put',
-    url: '/api/hot-top/status',
-    data: {
-      wxId: wxId
-    }
-  }).then(function (response) {
-    console.log(`返回结果: ${JSON.stringify(response)}`);
-    alert(`${response.data}`)
-  }).catch(function (error) {
-    console.log(`错误信息: ${error}`);
-    alert("修改失败")
-  }).finally(function () {
-    window.location.reload();
-  })
-}
-
 // 修改指令权限启用状态
 function changeCommandEnableStatus(wxId) {
     axios({
@@ -181,18 +162,12 @@ function getGroupUsers(groupId, groupName) {
             groupId: groupId
         }
     }).then(function (response) {
-    // console.log(`返回结果: ${JSON.stringify(response.data)}`);
+        // console.log(`返回结果: ${JSON.stringify(response)}`);
         // 渲染群成员列表
-    const groupUsers = response.data.records;
+        const groupUsers = response.data
-    const groupUserCount = response.data.isOkCount;
-
-    // 设置成员总数
-    const groupUserCountTag = document.getElementById("groupUserCount");
-    groupUserCountTag.innerHTML = `健在成员: ${groupUserCount}人`
-
         // 循环渲染数据
         groupUsers.forEach((groupUser, i) => {
-      // console.log(groupUser)
+            console.log(groupUser)
             const { wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank } = groupUser;
 
             let row = tbody.insertRow(i);
@@ -238,109 +213,3 @@ 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();
-  })
-}
-
-// 修改每日免费 AI 对话次数
-function changeAiFreeLimit(wxid, limitNumber) {
-  limitNumber = Number(limitNumber)
-
-  if (limitNumber < 0) {
-    alert('值不能小于0')
-  }
-  // 请求接口
-  axios({
-    method: 'post',
-    url: '/api/ai/free',
-    data: {
-      wxid: wxid,
-      days: Number(limitNumber)
-    }
-  }).then(function (response) {
-    console.log(`返回结果: ${JSON.stringify(response)}`);
-    alert(`${response.data}`)
-  }).catch(function (error) {
-    console.log(`错误信息: ${error}`);
-    alert("修改失败")
-  }).finally(function () {
-    window.location.reload();
-  })
-}
-
-// 发送AI群聊总结
-function sendAiSummary(wxid) {
-  if (wxid === '') {
-    alert("wxid不能为空")
-    return
-  }
-  if (!confirm("确定发送AI群聊总结吗?")) {
-    return
-  }
-  // 请求接口
-  axios({
-    method: 'post',
-    url: '/api/ai/summary',
-    params: {
-      id: wxid,
-    }
-  }).then(function (response) {
-    console.log(`返回结果: ${JSON.stringify(response)}`);
-    alert(`${response.data}`)
-  }).catch(function (error) {
-    console.log(`错误信息: ${error}`);
-    alert(`${response.data}`)
-  }).finally(function () {
-    window.location.reload();
-  })
-}

vo/friend.go

@@ -15,17 +15,13 @@ type FriendItem struct {
 	LastActive     types.DateTime // 最后活跃时间
 	EnableAi       bool           // 是否使用AI
 	AiModel        string         // AI模型
-	Prompt         string         // AI助手或者自定义提示词
 	EnableChatRank bool           // 是否使用聊天排行
 	EnableWelcome  bool           // 是否使用迎新
 	EnableCommand  bool           // 是否启用指令
 	EnableSummary  bool           // 是否启用总结
 	EnableNews     bool           // 是否启用新闻
-	EnableHotTop   bool           // 是否启用热搜
 	ClearMember    int            // 清理成员配置（多少天未活跃的）
 	IsOk           bool           // 是否还在通讯库(群聊是要还在群里也算)
-	AiFreeLimit    int            // AI免费次数
-	AiUsedToday    int            // 今日已使用的AI次数
 }
 
 // GroupUserItem