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

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/26
🐛 修复扫码加入群聊的成员无法识别的BUG
2024-03-07 10:04:47 +08:00 · 2024-03-07 10:04:03 +08:00 · 2024-03-07 09:49:37 +08:00 · 2024-03-07 09:48:52 +08:00 · 2024-03-07 09:43:27 +08:00 · 2024-03-07 09:42:59 +08:00
36 changed files with 864 additions and 144 deletions
--- a/app/friend.go
+++ b/app/friend.go
@@ -16,6 +16,13 @@ type changeStatusParam struct {
 	UserId string `json:"userId"`
 }

+// changeUseAiModelParam
+// @description: 修改使用的AI模型用的参数集
+type changeUseAiModelParam struct {
+	WxId  string `json:"wxid" binding:"required"`  // 群Id或微信Id
+	Model string `json:"model" binding:"required"` // 模型代码
+}
+
 // ChangeEnableAiStatus
 // @description: 修改是否开启AI
 // @param ctx
@@ -39,6 +46,27 @@ func ChangeEnableAiStatus(ctx *gin.Context) {
 	ctx.String(http.StatusOK, "操作成功")
 }

+// ChangeUseAiModel
+// @description: 修改使用的AI模型
+// @param ctx
+func ChangeUseAiModel(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("`ai_model`", 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
@@ -85,6 +113,29 @@ func ChangeEnableWelcomeStatus(ctx *gin.Context) {
 	ctx.String(http.StatusOK, "操作成功")
 }

+// ChangeEnableCommandStatus
+// @description: 修改是否开启指令
+// @param ctx
+func ChangeEnableCommandStatus(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_command`", gorm.Expr(" !`enable_command`")).Error
+	if err != nil {
+		log.Printf("修改指令启用状态失败：%s", err)
+		ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
+		return
+	}
+
+	ctx.String(http.StatusOK, "操作成功")
+}
+
 // ChangeSkipGroupRankStatus
 // @description: 修改是否跳过水群排行榜
 // @param ctx
--- a/app/index.go
+++ b/app/index.go
@@ -3,6 +3,7 @@ package app
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"go-wechat/config"
 	"go-wechat/service"
 	"net/http"
 )
@@ -21,6 +22,8 @@ func Index(ctx *gin.Context) {
 	}
 	result["friends"] = friends
 	result["groups"] = groups
+	result["vnc"] = config.Conf.Wechat.VncUrl
+	result["aiModels"] = config.Conf.Ai.Models
 	// 渲染页面
 	ctx.HTML(http.StatusOK, "index.html", result)
 }
--- a/config.yaml
+++ b/config.yaml
@@ -2,6 +2,8 @@
 wechat:
  # 微信HOOK接口地址
  host: 10.0.0.73:19088
+  # 微信容器映射出来的vnc页面地址，没有就不填
+#  vncUrl: http://192.168.1.175:19087/vnc_lite.html
  # 是否在启动的时候自动设置hook服务的回调
  autoSetCallback: false
  # 回调IP，如果是Docker运行，本参数必填(填auto表示自动，不适用于 docker 环境)，如果Docker修改了映射，格式为 ip:port
@@ -12,23 +14,36 @@ wechat:

 # 数据库
 mysql:
+  drive: mysql # 使用的数据库驱动，支持 mysql、postgres
  host: 10.0.0.31
  port: 3307
  user: wechat
  password: wechat123
  db: wechat
+  schema: public # postgres 专用

 task:
  enable: false
  syncFriends:
-      enable: true
+      enable: false
      cron: '*/5 * * * *' # 五分钟一次
  waterGroup:
-      enable: false
+      enable: true
      cron:
        yesterday: '30 9 * * *' # 每天9:30
        week: '30 9 * * 1' # 每周一9:30
        month: '30 9 1 * *' # 每月1号9:30
+        year: '0 9 1 1 *' # 每年1月1号9:30
+
+# MQ配置
+mq:
+  # RabbitMQ配置
+  rabbitmq:
+    host: 10.0.0.247
+    port: 5672
+    user: wechat
+    password: wechat123
+    vhost: wechat

 # AI回复
 ai:
@@ -42,6 +57,19 @@ ai:
  baseUrl: https://sxxx
  # 人设
  personality: 你的名字叫张三，你是一个百科机器人，你的爱好是看电影，你的性格是开朗的，你的专长是讲故事，你的梦想是当一名童话故事作家。你对政治没有一点儿兴趣，也不会讨论任何与政治相关的话题，你甚至可以拒绝回答这一类话题。
+  models:
+    - name: ChatGPT-4
+      model: gpt-4-0613
+    - name: 讯飞星火v3
+      model: SparkDesk3
+    - name: 讯飞星火随机
+      model: SparkDesk
+    - name: 月之暗面-8k
+      model: moonshot-v1-8k
+    - name: 月之暗面-32k
+      model: moonshot-v1-32k
+    - name: 月之暗面-128k
+      model: moonshot-v1-128k

 # 资源配置
 # map[k]v结构，k 会变成全小写，所以这儿不能用大写字母
--- a/config/ai.go
+++ b/config/ai.go
@@ -3,9 +3,17 @@ package config
 // ai
 // @description: AI配置
 type ai struct {
-	Enable      bool   `json:"enable" yaml:"enable"`           // 是否启用AI
-	Model       string `json:"model" yaml:"model"`             // 模型
-	ApiKey      string `json:"apiKey" yaml:"apiKey"`           // API Key
-	BaseUrl     string `json:"baseUrl" yaml:"baseUrl"`         // API地址
-	Personality string `json:"personality" yaml:"personality"` // 人设
+	Enable      bool      `json:"enable" yaml:"enable"`           // 是否启用AI
+	Model       string    `json:"model" yaml:"model"`             // 模型
+	ApiKey      string    `json:"apiKey" yaml:"apiKey"`           // API Key
+	BaseUrl     string    `json:"baseUrl" yaml:"baseUrl"`         // API地址
+	Personality string    `json:"personality" yaml:"personality"` // 人设
+	Models      []aiModel `json:"models" yaml:"models"`           // 模型列表
+}
+
+// aiModel
+// @description: AI模型
+type aiModel struct {
+	Name  string `json:"name" yaml:"name"`   // 模型名称
+	Model string `json:"model" yaml:"model"` // 模型代码
 }
--- a/config/config.go
+++ b/config/config.go
@@ -9,6 +9,7 @@ type conf struct {
 	Task     task                    `json:"task" yaml:"task"`         // 定时任务配置
 	MySQL    mysql                   `json:"mysql" yaml:"mysql"`       // MySQL 配置
 	Wechat   wechat                  `json:"wechat" yaml:"wechat"`     // 微信助手
+	Mq       mq                      `json:"mq" yaml:"mq"`             // MQ 配置
 	Ai       ai                      `json:"ai" yaml:"ai"`             // AI配置
 	Resource map[string]resourceItem `json:"resource" yaml:"resource"` // 资源配置
 }
--- a/config/mq.go
+++ b/config/mq.go
@@ -0,0 +1,31 @@
+package config
+
+import "fmt"
+
+// mq
+// @description: MQ配置
+type mq struct {
+	RabbitMQ rabbitMq `json:"rabbitmq" yaml:"rabbitmq"` // RabbitMQ配置
+}
+
+// rabbitMq
+// @description: RabbitMQ配置
+type rabbitMq struct {
+	Host     string `json:"host" yaml:"host"`         // 主机地址
+	Port     int    `json:"port" yaml:"port"`         // 端口
+	User     string `json:"user" yaml:"user"`         // 用户名
+	Password string `json:"password" yaml:"password"` // 密码
+	VHost    string `json:"vhost" yaml:"vhost"`       // 虚拟主机
+}
+
+// GetURL
+// @description: 获取MQ连接地址
+// @receiver r
+// @return string
+func (r rabbitMq) GetURL() string {
+	port := r.Port
+	if port == 0 {
+		port = 5672
+	}
+	return fmt.Sprintf("amqp://%s:%s@%s:%d/%s", r.User, r.Password, r.Host, port, r.VHost)
+}
--- a/config/task.go
+++ b/config/task.go
@@ -28,4 +28,5 @@ type waterGroupCron struct {
 	Yesterday string `json:"yesterday" yaml:"yesterday"` // 昨日排行榜
 	Week      string `json:"week" yaml:"week"`           // 周排行榜
 	Month     string `json:"month" yaml:"month"`         // 月排行榜
+	Year      string `json:"year" yaml:"year"`           // 年排行榜
 }
--- a/config/wechat.go
+++ b/config/wechat.go
@@ -6,6 +6,7 @@ import "strings"
 // @description: 微信助手
 type wechat struct {
 	Host            string   `json:"host" yaml:"host"`                       // 接口地址
+	VncUrl          string   `json:"vncUrl" yaml:"vncUrl"`                   // vnc页面地址
 	AutoSetCallback bool     `json:"autoSetCallback" yaml:"autoSetCallback"` // 是否自动设置回调地址
 	Callback        string   `json:"callback" yaml:"callback"`               // 回调地址
 	Forward         []string `json:"forward" yaml:"forward"`                 // 转发地址
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.9'

 services:
  wechat:
-    image: lxh01/wxhelper-docker:3.9.5.81
+    image: lxh01/wxhelper-docker:3.9.5.81-v11
    container_name: gw-wechat
    restart: unless-stopped
    environment:
@@ -10,7 +10,7 @@ services:
    volumes:
      - ./data/wechat:/home/app/.wine/drive_c/users/app/Documents/WeChat\ Files
    ports:
-      - "8080:8080"
+      - "19087:8080"
      - "19088:19088"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:19088/api/checkLogin"]
--- a/entity/friend.go
+++ b/entity/friend.go
@@ -7,15 +7,17 @@ import (
 // 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"`                                                // 昵称全拼
-	EnableAi       bool   `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"`       // 是否使用AI
-	EnableChatRank bool   `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
-	EnableWelcome  bool   `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
-	IsOk           bool   `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
+	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模型
+	EnableChatRank bool      `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
+	EnableWelcome  bool      `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
+	IsOk           bool      `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
 }

 func (Friend) TableName() string {
@@ -31,7 +33,9 @@ type GroupUser struct {
 	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"` // 是否跳过聊天排行
 }
--- a/go.mod
+++ b/go.mod
@@ -3,13 +3,14 @@ module go-wechat
 go 1.21

 require (
-	github.com/duke-git/lancet/v2 v2.2.7
+	github.com/duke-git/lancet/v2 v2.2.8
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-co-op/gocron v1.36.1
-	github.com/go-resty/resty/v2 v2.10.0
-	github.com/sashabaranov/go-openai v1.17.9
-	github.com/spf13/viper v1.18.0
+	github.com/go-co-op/gocron v1.37.0
+	github.com/go-resty/resty/v2 v2.11.0
+	github.com/rabbitmq/amqp091-go v1.9.0
+	github.com/sashabaranov/go-openai v1.17.11
+	github.com/spf13/viper v1.18.2
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
 )
@@ -25,7 +26,7 @@ require (
 	github.com/go-playground/validator/v10 v10.16.0 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/uuid v1.4.0 // 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
@@ -37,7 +38,7 @@ require (
 	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.1.0 // 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.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -50,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.6.0 // indirect
-	golang.org/x/crypto v0.16.0 // indirect
-	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.31.0 // 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
 )
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 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.2.7 h1:u9zr6HR+MDUvZEtTlAFtSTIgZfEFsN7cKi27n5weZsw=
-github.com/duke-git/lancet/v2 v2.2.7/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
+github.com/duke-git/lancet/v2 v2.2.8 h1:wlruXhliDe4zls1e2cYmz4qLc+WtcvrpcCnk1VJdEaA=
+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=
@@ -26,8 +26,8 @@ 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.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-co-op/gocron v1.36.1 h1:BnyJ7kOixY/oGW/hkUvuLYOmAHBiY8Mr6kadX2DN1hE=
-github.com/go-co-op/gocron v1.36.1/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
+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=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -36,20 +36,19 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
 github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/go-resty/resty/v2 v2.10.0 h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
-github.com/go-resty/resty/v2 v2.10.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
+github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
+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.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 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 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+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=
@@ -84,12 +83,14 @@ 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.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+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.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
+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=
@@ -100,8 +101,8 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke
 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.17.9 h1:QEoBiGKWW68W79YIfXWEFZ7l5cEgZBV4/Ow3uy+5hNY=
-github.com/sashabaranov/go-openai v1.17.9/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.17.11 h1:XVr00J8JymJVx8Hjbh/5mG0V4PQHRarBU3v7k2x6MR0=
+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,8 +111,8 @@ 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.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0=
-github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
+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=
@@ -133,18 +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.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+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.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
-golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+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.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 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=
@@ -153,8 +156,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 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.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 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=
@@ -167,8 +170,8 @@ 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.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.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=
@@ -190,10 +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=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+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=
--- a/initialization/plugin.go
+++ b/initialization/plugin.go
@@ -5,6 +5,7 @@ import (
 	"go-wechat/model"
 	plugin "go-wechat/plugin"
 	"go-wechat/plugin/plugins"
+	"go-wechat/service"
 )

 // Plugin
@@ -24,14 +25,15 @@ func Plugin() {

 	// 私聊指令消息
 	dispatcher.RegisterHandler(func(m *model.Message) bool {
-		// 私聊消息直接进去
-		return m.IsPrivateText()
+		// 私聊消息 或 群聊艾特机器人并且以/开头的消息
+		isGroupAt := m.IsAt() && !m.IsAtAll()
+		return (m.IsPrivateText() || isGroupAt) && m.CleanContentStartWith("/") && service.CheckIsEnableCommand(m.FromUser)
 	}, plugins.Command)

 	// AI消息插件
 	dispatcher.RegisterHandler(func(m *model.Message) bool {
 		// 群内@或者私聊文字消息
-		return m.IsAt() || m.IsPrivateText()
+		return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText()
 	}, plugins.AI)

 	// 欢迎新成员
--- a/main.go
+++ b/main.go
@@ -4,6 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"go-wechat/config"
 	"go-wechat/initialization"
+	"go-wechat/mq"
 	"go-wechat/router"
 	"go-wechat/tasks"
 	"go-wechat/tcpserver"
@@ -20,6 +21,7 @@ func init() {
 	initialization.InitWechatRobotInfo() // 初始化机器人信息
 	initialization.Plugin()              // 注册插件
 	tasks.InitTasks()                    // 初始化定时任务
+	mq.Init()                            // 初始化MQ
 }

 func main() {
--- a/model/message.go
+++ b/model/message.go
@@ -2,7 +2,9 @@ package model

 import (
 	"encoding/xml"
+	"github.com/duke-git/lancet/v2/slice"
 	"go-wechat/types"
+	"regexp"
 	"strings"
 )

@@ -30,6 +32,21 @@ type systemMsgDataXml struct {
 	Type   string `xml:"type,attr"`
 }

+// atMsgDataXml
+// @description: 微信@消息的xml结构
+type atMsgDataXml struct {
+	XMLName     xml.Name `xml:"msgsource"`
+	Text        string   `xml:",chardata"`
+	AtUserList  string   `xml:"atuserlist"`
+	Silence     string   `xml:"silence"`
+	MemberCount string   `xml:"membercount"`
+	Signature   string   `xml:"signature"`
+	TmpNode     struct {
+		Text        string `xml:",chardata"`
+		PublisherID string `xml:"publisher-id"`
+	} `xml:"tmp_node"`
+}
+
 // sysMsg
 // @description: 消息主体
 type sysMsg struct{}
@@ -71,7 +88,13 @@ func (m Message) IsRevokeMsg() bool {
 // @receiver m
 // @return bool
 func (m Message) IsNewUserJoin() bool {
-	sysFlag := m.Type == types.MsgTypeSys && strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	if m.Type != types.MsgTypeSys {
+		return false
+	}
+
+	isInvitation := strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	isScanQrCode := strings.Contains(m.Content, "通过扫描") && strings.Contains(m.Content, "加入群聊")
+	sysFlag := isInvitation || isScanQrCode
 	if sysFlag {
 		return true
 	}
@@ -80,7 +103,7 @@ func (m Message) IsNewUserJoin() bool {
 	if err := xml.Unmarshal([]byte(m.Content), &d); err != nil {
 		return false
 	}
-	return m.Type == types.MsgTypeSys && d.Type == "delchatroommember"
+	return d.Type == "delchatroommember"
 }

 // IsAt
@@ -91,6 +114,22 @@ func (m Message) IsAt() bool {
 	return strings.HasSuffix(m.DisplayFullContent, "在群聊中@了你")
 }

+// IsAtAll
+// @description: 是否是At所有人的消息
+// @receiver m
+// @return bool
+func (m Message) IsAtAll() bool {
+	// 解析raw里面的xml
+	var d atMsgDataXml
+	if err := xml.Unmarshal([]byte(m.Signature), &d); err != nil {
+		return false
+	}
+	// 转换@用户列表为数组
+	atUserList := strings.Split(d.AtUserList, ",")
+	// 判断是否包含@所有人
+	return slice.Contain(atUserList, "notify@all")
+}
+
 // IsPrivateText
 // @description: 是否是私聊消息
 // @receiver m
@@ -99,3 +138,28 @@ func (m Message) IsPrivateText() bool {
 	// 发信人不以@chatroom结尾且消息类型为文本
 	return !strings.HasSuffix(m.FromUser, "chatroom") && m.Type == types.MsgTypeText
 }
+
+// CleanContentStartWith
+// @description: 判断是否包含指定消息前缀
+// @receiver m
+// @param prefix
+// @return bool
+func (m Message) CleanContentStartWith(prefix string) bool {
+	content := m.Content
+
+	// 如果是@消息，过滤掉@的内容
+	if m.IsAt() {
+		re := regexp.MustCompile(`@([^ | ]+)`)
+		matches := re.FindStringSubmatch(content)
+		if len(matches) > 0 {
+			// 过滤掉第一个匹配到的
+			content = strings.Replace(content, matches[0], "", 1)
+		}
+	}
+
+	// 去掉最前面的空格
+	content = strings.TrimLeft(content, " ")
+	content = strings.TrimLeft(content, " ")
+
+	return strings.HasPrefix(content, prefix)
+}
--- a/mq/handler.go
+++ b/mq/handler.go
@@ -0,0 +1,51 @@
+package mq
+
+import (
+	"encoding/json"
+	"go-wechat/common/current"
+	"go-wechat/model"
+	"go-wechat/types"
+	"log"
+	"strings"
+)
+
+// parse
+// @description: 解析消息
+// @param msg
+func parse(msg []byte) {
+	var m model.Message
+	if err := json.Unmarshal(msg, &m); err != nil {
+		log.Printf("消息解析失败： %v", err)
+		log.Printf("消息内容： %d -> %v", len(msg), string(msg))
+		return
+	}
+	// 记录原始数据
+	m.Raw = string(msg)
+
+	// 如果不是自己的消息，直接返回
+	if m.ToUser == current.GetRobotInfo().WxId {
+		return
+	}
+
+	// 提取出群成员信息
+	// Sys类型的消息正文不包含微信 Id，所以不需要处理
+	if m.IsGroup() && m.Type != types.MsgTypeSys {
+		// 群消息，处理一下消息和发信人
+		groupUser := strings.Split(m.Content, "\n")[0]
+		groupUser = strings.ReplaceAll(groupUser, ":", "")
+		// 如果两个id一致，说明是系统发的
+		if m.FromUser != groupUser {
+			m.GroupUser = groupUser
+		}
+		// 用户的操作单独提出来处理一下
+		m.Content = strings.Join(strings.Split(m.Content, "\n")[1:], "\n")
+	}
+	log.Printf("收到新微信消息\n消息来源: %s\n群成员: %s\n消息类型: %v\n消息内容: %s", m.FromUser, m.GroupUser, m.Type, m.Content)
+
+	// 插件不为空，开始执行
+	if p := current.GetRobotMessageHandler(); p != nil {
+		p(&m)
+	}
+
+	return
+}
--- a/mq/rabbitmq.go
+++ b/mq/rabbitmq.go
@@ -0,0 +1,114 @@
+package mq
+
+import (
+	amqp "github.com/rabbitmq/amqp091-go"
+	"go-wechat/config"
+	"log"
+)
+
+// MQ连接对象
+var conn *amqp.Connection
+var channel *amqp.Channel
+
+// 交换机名称
+const exchangeName = "wechat-message"
+
+// Init
+// @description: 初始化MQ
+func Init() {
+	// 读取MQ连接配置
+	mqUrl := config.Conf.Mq.RabbitMQ.GetURL()
+	if mqUrl == "" {
+		log.Panicf("MQ配置异常")
+	}
+
+	var err error
+	// 创建MQ连接
+	if conn, err = amqp.Dial(mqUrl); err != nil {
+		log.Panicf("RabbitMQ连接失败: %s", err)
+	}
+
+	//获取channel
+	if channel, err = conn.Channel(); err != nil {
+		log.Panicf("打开Channel失败: %s", err)
+	}
+	log.Println("RabbitMQ连接成功")
+	go Receive()
+	log.Println("开始监听消息")
+}
+
+// Receive
+// @description: 接收消息
+func Receive() (err error) {
+	// 创建交换机
+	if err = channel.ExchangeDeclare(
+		exchangeName,
+		"fanout",
+		true,
+		false,
+		//true表示这个exchange不可以被client用来推送消息，仅用来进行exchange和exchange之间的绑定
+		false,
+		false,
+		nil,
+	); err != nil {
+		log.Printf("声明Exchange失败: %s", err)
+		return
+	}
+	// 创建队列
+	var q amqp.Queue
+	q, err = channel.QueueDeclare(
+		"", //随机生产队列名称
+		false,
+		false,
+		true,
+		false,
+		nil,
+	)
+	if err != nil {
+		log.Printf("无法声明Queue: %s", err)
+		return
+	}
+	// 绑定队列到 exchange 中
+	err = channel.QueueBind(
+		q.Name,
+		//在pub/sub模式下，这里的key要为空
+		"",
+		exchangeName,
+		false,
+		nil)
+	if err != nil {
+		log.Printf("绑定队列失败: %s", err)
+		return
+	}
+
+	// 消费消息
+	var messages <-chan amqp.Delivery
+	messages, err = channel.Consume(
+		q.Name,
+		"",
+		false, // 不自动ack，手动处理，这样即使消费者挂掉，消息也不会丢失
+		false,
+		false,
+		false,
+		nil,
+	)
+	if err != nil {
+		log.Printf("无法使用队列: %s", err)
+		return
+	}
+	for {
+		msg, ok := <-messages
+		if !ok {
+			log.Printf("获取消息失败")
+			return Receive()
+		}
+		log.Printf("收到消息: %s", msg.Body)
+		parse(msg.Body)
+		// ACK消息
+		if err = msg.Ack(true); err != nil {
+			log.Printf("ACK消息失败: %s", err)
+			continue
+		}
+	}
+
+}
--- a/plugin/plugins/ai.go
+++ b/plugin/plugins/ai.go
@@ -28,9 +28,13 @@ func AI(m *plugin.MessageContext) {
 	}

 	// 取出所有启用了AI的好友或群组
-	var count int64
-	client.MySQL.Model(&entity.Friend{}).Where("enable_ai IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
-	if count < 1 {
+	var friendInfo entity.Friend
+	client.MySQL.Where("wxid = ?", m.FromUser).First(&friendInfo)
+	if friendInfo.Wxid == "" {
+		return
+	}
+	// 判断有没有启用AI
+	if !friendInfo.EnableAi {
 		return
 	}

@@ -93,7 +97,9 @@ func AI(m *plugin.MessageContext) {

 	// 配置模型
 	chatModel := openai.GPT3Dot5Turbo0613
-	if config.Conf.Ai.Model != "" {
+	if friendInfo.AiModel != "" {
+		chatModel = friendInfo.AiModel
+	} else if config.Conf.Ai.Model != "" {
 		chatModel = config.Conf.Ai.Model
 	}

@@ -117,6 +123,12 @@ func AI(m *plugin.MessageContext) {
 		return
 	}

+	// 返回消息为空
+	if resp.Choices[0].Message.Content == "" {
+		utils.SendMessage(m.FromUser, m.GroupUser, "AI似乎抽风了，没有告诉我你需要的回答~", 0)
+		return
+	}
+
 	// 保存一下AI 返回的消息，消息 Id 使用传入 Id 的负数
 	var replyMessage entity.Message
 	replyMessage.MsgId = -m.MsgId
--- a/plugin/plugins/command.go
+++ b/plugin/plugins/command.go
@@ -4,6 +4,7 @@ import (
 	"go-wechat/plugin"
 	"go-wechat/plugin/plugins/command"
 	"go-wechat/utils"
+	"regexp"
 	"strings"
 )

@@ -11,13 +12,27 @@ import (
 // @description: 自定义指令
 // @param m
 func Command(m *plugin.MessageContext) {
+	// 如果是群聊，提取出消息
+	content := m.Content
+
+	if m.IsGroup() {
+		re := regexp.MustCompile(`@([^ | ]+)`)
+		matches := re.FindStringSubmatch(content)
+		if len(matches) > 0 {
+			// 过滤掉第一个匹配到的
+			content = strings.Replace(content, matches[0], "", 1)
+		}
+		// 去掉最前面的空格
+		content = strings.TrimLeft(content, " ")
+		content = strings.TrimLeft(content, " ")
+	}
 	// 判断是不是指令
-	if !strings.HasPrefix(m.Content, "/") {
+	if !strings.HasPrefix(content, "/") {
 		return
 	}

 	// 用空格分割消息，下标0表示指令
-	msgArray := strings.Split(m.Content, " ")
+	msgArray := strings.Split(content, " ")
 	cmd := msgArray[0]

 	switch cmd {
--- a/plugin/plugins/command/kfc.go
+++ b/plugin/plugins/command/kfc.go
@@ -10,11 +10,14 @@ import (
 // @description: 肯德基疯狂星期四文案
 // @param userId string 发信人
 func KfcCrazyThursdayCmd(userId string) {
-	// 接口调用
+	// 随机选一个接口调用
 	str := kfcApi1()
 	if str == "" {
 		str = kfcApi2()
 	}
+	if str == "" {
+		str = kfcApi3()
+	}
 	if str == "" {
 		str = "文案获取失败"
 	}
@@ -64,3 +67,29 @@ func kfcApi2() string {
 	}
 	return resp.String()
 }
+
+// kfcApi3
+// @description: 肯德基疯狂星期四文案接口3
+// @return string
+func kfcApi3() string {
+	type result struct {
+		Code int    `json:"code"`
+		Msg  string `json:"msg"`
+		Text string `json:"text"`
+	}
+
+	var resData result
+
+	res := resty.New()
+	resp, err := res.R().
+		SetResult(&resData).
+		Post("https://api.pearktrue.cn/api/kfc")
+	if err != nil {
+		log.Panicf("KFC接口3文案获取失败: %s", err.Error())
+	}
+	log.Printf("KFC接口3文案获取结果: %s", resp.String())
+	if resData.Text != "" {
+		return resData.Text
+	}
+	return resp.String()
+}
--- a/readme.md
+++ b/readme.md
@@ -14,6 +14,8 @@ vim config.yaml # 编辑配置文件，内容如下，最新配置请参考项
 wechat:
  # 微信HOOK接口地址
  host: wechat:19088
+  # 微信容器映射出来的vnc页面地址，没有就不填
+  vncUrl: http://192.168.1.175:19087/vnc_lite.html
  # 是否在启动的时候自动设置hook服务的回调
  autoSetCallback: true
  # 回调IP，如果是Docker运行，本参数必填，如果Docker修改了映射，格式为 ip:port，如果使用项目提供的docker-compsoe.yaml文件启动，可以填`auto`
@@ -46,7 +48,7 @@ version: '3.9'

 services:
  wechat:
-    image: lxh01/wxhelper-docker:3.9.5.81
+    image: lxh01/wxhelper-docker:3.9.5.81-v11-novnc # 如果不用noVNC网页，就删掉后面的-novnc
    container_name: gw-wechat
    restart: unless-stopped
    environment:
@@ -54,8 +56,9 @@ services:
    volumes:
      - ./data/wechat:/home/app/.wine/drive_c/users/app/Documents/WeChat\ Files
    ports:
-      - "8080:8080"
-      - "19088:19088"
+      - "19086:5900" # vnc端口
+      - "19087:8080" # noVNC端口
+      - "19088:19088" # 微信HOOK端口
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:19088/api/checkLogin"]
      interval: 60s
@@ -98,4 +101,8 @@ services:
 # 以下命令选个能用的就行
 docker-compose up -d # 老版本
 docker compose up -d # 新版本
-```
+```
+
+## 注意事项
+1. 宿主机必须是`debian`系，因为`wine`的玄学`BUG`，其他系统可能会出现各种问题
+2. 登录微信可以用`vnc viewer`连接`5900`端口或者访问`noVNC`端口的`vnc_lite.html`页面进行扫码登录
--- a/router/router.go
+++ b/router/router.go
@@ -22,7 +22,9 @@ func Init(g *gin.Engine) {
 	// 接口
 	api := g.Group("/api")
 	api.PUT("/ai/status", app.ChangeEnableAiStatus)               // 修改是否开启AI状态
+	api.POST("/ai/model", app.ChangeUseAiModel)                   // 修改使用的AI模型
 	api.PUT("/welcome/status", app.ChangeEnableWelcomeStatus)     // 修改是否开启迎新状态
+	api.PUT("/command/status", app.ChangeEnableCommandStatus)     // 修改是否开启指令状态
 	api.PUT("/grouprank/status", app.ChangeEnableGroupRankStatus) // 修改是否开启水群排行榜状态
 	api.PUT("/grouprank/skip", app.ChangeSkipGroupRankStatus)     // 修改是否跳过水群排行榜状态
 	api.GET("/group/users", app.GetGroupUsers)                    // 获取群成员列表
--- a/service/friend.go
+++ b/service/friend.go
@@ -4,6 +4,7 @@ import (
 	"go-wechat/client"
 	"go-wechat/entity"
 	"go-wechat/vo"
+	"log"
 	"strings"
 )

@@ -16,10 +17,11 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) {
 	var records []vo.FriendItem
 	err = client.MySQL.
 		Table("t_friend AS tf").
-		Joins("LEFT JOIN t_message AS tm ON tf.wxid = tm.from_user").
-		Select("tf.*", "MAX(tm.create_at) AS last_active_time").
-		Group("tf.wxid").
-		Order("last_active_time DESC").
+		//Joins("LEFT JOIN t_message AS tm ON tf.wxid = tm.from_user").
+		//Select("tf.*", "MAX(tm.create_at) AS last_active").
+		Select("tf.*").
+		//Group("tf.wxid").
+		Order("tf.last_active DESC").
 		Find(&records).Error
 	if err != nil {
 		return
@@ -50,3 +52,37 @@ func GetAllEnableChatRank() (records []entity.Friend, err error) {
 	err = client.MySQL.Where("enable_chat_rank = ?", 1).Where("wxid LIKE '%@chatroom'").Find(&records).Error
 	return
 }
+
+// CheckIsEnableCommand
+// @description: 检查用户是否启用了指令
+// @param userId
+// @return flag
+func CheckIsEnableCommand(userId string) (flag bool) {
+	var coo int64
+	client.MySQL.Model(&entity.Friend{}).Where("enable_command = 1").Where("wxid = ?", userId).Count(&coo)
+	return coo > 0
+}
+
+// updateLastActive
+// @description: 更新最后活跃时间
+// @param msg
+func updateLastActive(msg entity.Message) {
+	var err error
+	// 如果是群，更新群成员最后活跃时间
+	if strings.HasSuffix(msg.FromUser, "@chatroom") {
+		err = client.MySQL.Model(&entity.GroupUser{}).
+			Where("group_id = ?", msg.FromUser).
+			Where("wxid = ?", msg.GroupUser).
+			Update("last_active", msg.CreateAt).Error
+		if err != nil {
+			log.Printf("更新群成员最后活跃时间失败, 错误信息: %v", err)
+		}
+	}
+	// 更新群或者好友活跃时间
+	err = client.MySQL.Model(&entity.Friend{}).
+		Where("wxid = ?", msg.FromUser).
+		Update("last_active", msg.CreateAt).Error
+	if err != nil {
+		log.Printf("更新群或者好友活跃时间失败, 错误信息: %v", err)
+	}
+}
--- a/service/group.go
+++ b/service/group.go
@@ -13,10 +13,9 @@ import (
 func GetGroupUsersByGroupId(groupId string) (records []vo.GroupUserItem, err error) {
 	err = client.MySQL.
 		Table("t_group_user AS tgu").
-		Joins("LEFT JOIN t_message AS tm ON tm.from_user = tgu.group_id AND tm.group_user = tgu.wxid").
-		//Select("tgu.wxid", "tgu.nickname", "tgu.head_image", "tgu.is_member", "tgu.leave_time",
-		//	"tgu.skip_chat_rank", "MAX(tm.create_at) AS last_active_time").
-		Select("tgu.*", "MAX(tm.create_at) AS last_active_time").
+		//Joins("LEFT JOIN t_message AS tm ON tm.from_user = tgu.group_id AND tm.group_user = tgu.wxid").
+		//Select("tgu.*", "MAX(tm.create_at) AS last_active").
+		Select("tgu.*").
 		Where("tgu.group_id = ?", groupId).
 		Group("tgu.group_id, tgu.wxid").
 		Order("tgu.join_time DESC").
--- a/service/message.go
+++ b/service/message.go
@@ -32,4 +32,10 @@ func SaveMessage(msg entity.Message) {
 		log.Printf("消息入库失败, 错误信息: %v", err)
 	}
 	log.Printf("消息入库成功，消息Id: %d", msg.MsgId)
+
+	// 更新最后活跃时间
+	// 只处理收到的消息
+	if msg.MsgId > 1 {
+		go updateLastActive(msg)
+	}
 }
--- a/tasks/friends/friends.go
+++ b/tasks/friends/friends.go
@@ -66,6 +66,7 @@ func Sync() {
 				PinyinAll:     friend.PinyinAll,
 				Wxid:          friend.Wxid,
 				IsOk:          true,
+				LastActive:    time.Now().Local(),
 			}).Error
 			if err != nil {
 				log.Printf("新增好友失败: %s", err.Error())
@@ -149,13 +150,15 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
 			if count == 0 {
 				// 新增
 				err = tx.Create(&entity.GroupUser{
-					GroupId:   gid,
-					Account:   cp.Account,
-					HeadImage: cp.HeadImage,
-					Nickname:  cp.Nickname,
-					Wxid:      cp.Wxid,
-					IsMember:  true,
-					JoinTime:  time.Now().Local(),
+					GroupId:    gid,
+					Account:    cp.Account,
+					HeadImage:  cp.HeadImage,
+					Nickname:   cp.Nickname,
+					Wxid:       cp.Wxid,
+					IsMember:   true,
+					IsAdmin:    wxid == baseResp.Data.Admin,
+					JoinTime:   time.Now().Local(),
+					LastActive: time.Now().Local(),
 				}).Error
 				if err != nil {
 					log.Printf("新增群成员失败: %s", err.Error())
@@ -168,6 +171,7 @@ func syncGroupUsers(tx *gorm.DB, gid string) {
 					"head_image": cp.HeadImage,
 					"nickname":   cp.Nickname,
 					"is_member":  true,
+					"is_admin":   wxid == baseResp.Data.Admin,
 					"leave_time": nil,
 				}
 				err = tx.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Where("wxid = ?", wxid).Updates(pm).Error
--- a/tasks/tasks.go
+++ b/tasks/tasks.go
@@ -32,6 +32,9 @@ func InitTasks() {
 		if config.Conf.Task.WaterGroup.Cron.Month != "" {
 			_, _ = s.Cron(config.Conf.Task.WaterGroup.Cron.Month).Do(watergroup.Month)
 		}
+		if config.Conf.Task.WaterGroup.Cron.Year != "" {
+			_, _ = s.Cron(config.Conf.Task.WaterGroup.Cron.Year).Do(watergroup.Year)
+		}
 	}

 	// 更新好友列表
--- a/tasks/watergroup/month.go
+++ b/tasks/watergroup/month.go
@@ -2,7 +2,9 @@ package watergroup

 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -55,6 +57,20 @@ func dealMonth(gid string) {
 		log.Printf("上月群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err != nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -63,6 +79,9 @@ func dealMonth(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ %s本群 %d 位朋友共产生 %d 条发言", monthStr, len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")

 	notifyMsgs = append(notifyMsgs, " ")
--- a/tasks/watergroup/utils.go
+++ b/tasks/watergroup/utils.go
@@ -18,7 +18,7 @@ type rankUser struct {
 // @return err
 func getRankData(groupId, date string) (rank []rankUser, err error) {
 	tx := client.MySQL.Table("t_message AS tm").
-		Joins("LEFT JOIN t_group_user AS tgu ON tgu.wxid = tm.group_user AND tm.from_user = tgu.group_id AND tgu.skip_chat_rank = 0").
+		Joins("LEFT JOIN t_group_user AS tgu ON tgu.wxid = tm.group_user AND tm.from_user = tgu.group_id AND tgu.skip_chat_rank = 0 AND is_member = 1").
 		Select("tm.group_user", "tgu.nickname", "count( 1 ) AS `count`").
 		Where("tm.from_user = ?", groupId).
 		Where("tm.type < 10000").
@@ -33,6 +33,8 @@ func getRankData(groupId, date string) (rank []rankUser, err error) {
 		tx.Where("YEARWEEK(date_format(tm.create_at, '%Y-%m-%d')) = YEARWEEK(now()) - 1")
 	case "month":
 		tx.Where("PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(create_at, '%Y%m')) = 1")
+	case "year":
+		tx.Where("YEAR(tm.create_at) = YEAR(NOW()) - 1")
 	}

 	// 查询指定时间段全部数据
--- a/tasks/watergroup/week.go
+++ b/tasks/watergroup/week.go
@@ -2,7 +2,9 @@ package watergroup

 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -54,6 +56,20 @@ func dealWeek(gid string) {
 		log.Printf("上周群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err != nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -62,6 +78,9 @@ func dealWeek(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 上周本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")

 	notifyMsgs = append(notifyMsgs, " ")
--- a/tasks/watergroup/year.go
+++ b/tasks/watergroup/year.go
@@ -0,0 +1,115 @@
+package watergroup
+
+import (
+	"fmt"
+	"go-wechat/client"
+	"go-wechat/config"
+	"go-wechat/entity"
+	"go-wechat/service"
+	"go-wechat/utils"
+	"log"
+	"strings"
+	"time"
+)
+
+// Year
+// @description: 年排行榜
+func Year() {
+	groups, err := service.GetAllEnableChatRank()
+	if err != nil {
+		log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
+		return
+	}
+
+	for _, group := range groups {
+		// 消息统计
+		dealYear(group.Wxid)
+
+		res, ok := config.Conf.Resource["wordcloud"]
+		if !ok {
+			continue
+		}
+
+		// 获取上周周数
+		year := time.Now().Local().AddDate(0, 0, -1).Year()
+		// 发送词云
+		fileName := fmt.Sprintf("%d_%s.png", year, group.Wxid)
+		utils.SendImage(group.Wxid, fmt.Sprintf(res.Path, fileName), 0)
+	}
+}
+
+// dealYear
+// @description: 处理年度排行榜
+// @param gid
+func dealYear(gid string) {
+	notifyMsgs := []string{"#年度水群排行榜"}
+
+	// 获取上周消息总数
+	records, err := getRankData(gid, "year")
+	if err != nil {
+		log.Printf("获取去年消息排行失败, 错误信息: %v", err)
+		return
+	}
+	log.Printf("去年消息总数: %+v", records)
+	// 莫得消息，直接返回
+	if len(records) == 0 {
+		log.Printf("去年本群[%s]无对话记录", gid)
+		return
+	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err != nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
+	// 计算消息总数
+	var msgCount int64
+	for _, v := range records {
+		msgCount += v.Count
+	}
+	// 组装消息总数推送信息
+	notifyMsgs = append(notifyMsgs, " ")
+	notifyMsgs = append(notifyMsgs, "亲爱的群友们，新年已经悄悄来临，让我们一起迎接这充满希望和美好的时刻。在这个特殊的日子里，我要向你们致以最真挚的祝福。")
+	notifyMsgs = append(notifyMsgs, "首先，我想对去年在群中表现出色、积极参与的成员们表示衷心的祝贺和感谢！你们的活跃与奉献让群聊更加充满了生机和活力。你们的贡献不仅仅是为了自己，更是为了我们整个群体的进步与成长。")
+	notifyMsgs = append(notifyMsgs, "特此给去年年度活跃成员排行榜上的朋友们送上真诚的祝福。你们的热情、智慧和参与度，令我们很是钦佩。愿新的一年中，你们继续保持着你们的活力和激情，为群中带来更多的惊喜和启迪。")
+	notifyMsgs = append(notifyMsgs, "对于那些未上榜的朋友们，我要说，你们也是我们群聊中非常重要的一部分。你们或许没有在排行榜上留下痕迹，但你们的存在和参与同样不可或缺。你们为群聊注入了新的思维和观点，为我们提供了不同的视角和见解。")
+	notifyMsgs = append(notifyMsgs, "因此，我想特别鼓励未上榜的朋友们，继续发扬你们的热情和积极性。无论是在分享知识、讨论问题、还是互相支持鼓励，你们的贡献都是宝贵的。让我们共同创造一个更加活跃和有意义的群聊环境。")
+	notifyMsgs = append(notifyMsgs, "最后，让我们一起迈向新的一年，相信自己的潜力和可能性，用我们的友谊和互助支持彼此。愿新的一年给我们带来更多的快乐、成功和成长。")
+	notifyMsgs = append(notifyMsgs, fmt.Sprintf("祝福你们新年快乐！让我们一起迎接%d年的到来！", time.Now().Local().Year()))
+	notifyMsgs = append(notifyMsgs, " ")
+	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 去年本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
+	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
+
+	notifyMsgs = append(notifyMsgs, " ")
+	for i, r := range records {
+		// 只取前十条
+		if i >= 10 {
+			break
+		}
+		log.Printf("账号: %s[%s] -> %d", r.Nickname, r.GroupUser, r.Count)
+		badge := "🏆"
+		switch i {
+		case 0:
+			badge = "🥇"
+		case 1:
+			badge = "🥈"
+		case 2:
+			badge = "🥉"
+		}
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("%s %s -> %d条", badge, r.Nickname, r.Count))
+	}
+
+	log.Printf("排行榜: \n%s", strings.Join(notifyMsgs, "\n"))
+	go utils.SendMessage(gid, "", strings.Join(notifyMsgs, "\n"), 0)
+}
--- a/tasks/watergroup/yesterday.go
+++ b/tasks/watergroup/yesterday.go
@@ -2,7 +2,9 @@ package watergroup

 import (
 	"fmt"
+	"go-wechat/client"
 	"go-wechat/config"
+	"go-wechat/entity"
 	"go-wechat/service"
 	"go-wechat/utils"
 	"log"
@@ -56,6 +58,20 @@ func dealYesterday(gid string) {
 		log.Printf("昨日群[%s]无对话记录", gid)
 		return
 	}
+
+	// 查询群成员总数
+	var groupUsers int64
+	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	if err != nil {
+		log.Printf("查询群成员总数失败, 错误信息: %v", err)
+	}
+	// 计算活跃度
+	showActivity := err != nil && groupUsers > 0
+	activity := "0.00"
+	if groupUsers > 0 {
+		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
+	}
+
 	// 计算消息总数
 	var msgCount int64
 	for _, v := range records {
@@ -64,6 +80,9 @@ func dealYesterday(gid string) {
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 昨日本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
+	if showActivity {
+		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")

 	notifyMsgs = append(notifyMsgs, " ")
--- a/tcpserver/parse.go
+++ b/tcpserver/parse.go
@@ -23,6 +23,11 @@ func parse(remoteAddr net.Addr, msg []byte) {
 	// 记录原始数据
 	m.Raw = string(msg)

+	// 如果不是自己的消息，直接返回
+	if m.ToUser == current.GetRobotInfo().WxId {
+		return
+	}
+
 	// 提取出群成员信息
 	// Sys类型的消息正文不包含微信 Id，所以不需要处理
 	if m.IsGroup() && m.Type != types.MsgTypeSys {
--- a/views/index.html
+++ b/views/index.html
@@ -4,7 +4,6 @@
    <meta charset="UTF-8">
    <title>水群助手</title>

-<!--    <link href="https://cdn.jsdelivr.net/npm/daisyui@4.4.14/dist/full.min.css" rel="stylesheet" type="text/css" />-->
    <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" />

@@ -37,6 +36,7 @@
                        <th>最后活跃时间</th>
                        <th>是否在通讯录</th>
                        <th>是否启用AI</th>
+                        <th>是否启用指令</th>
                    </tr>
                    </thead>
                    <tbody>
@@ -46,10 +46,10 @@
                        <td>{{ .CustomAccount }}</td>
                        <td>{{ .Nickname }}</td>
                        <td>
-                            {{ if eq .LastActiveTime.IsNil true }}
+                            {{ if eq .LastActive.IsNil true }}
                            无数据
                            {{ else }}
-                            {{ .LastActiveTime }}
+                            {{ .LastActive }}
                            {{ end }}
                        </td>
                        <td>
@@ -67,6 +67,24 @@
                            <label class="swap swap-flip {{ checkSwap .EnableAi }}">
                                <input type="checkbox" onclick="changeAiEnableStatus({{.Wxid}})"/>

+                                <div class="swap-on">✔️已启用</div>
+                                <div class="swap-off">❌已禁用</div>
+                            </label>
+                            {{ if .EnableAi }}
+                            <br />
+                            <select class="select select-success select-xs w-1/2 max-w-xs" onchange="aiModelChange(event, {{.Wxid}})">
+                                <option value="" {{ if eq .AiModel ""}}selected{{ end }}>默认(gpt-3.5-turbo-0613)</option>
+                                {{$useModel := .AiModel}}
+                                {{ range $.aiModels }}
+                                <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>{{.Name}}({{.Model}})</option>
+                                {{ end }}
+                            </select>
+                            {{ end }}
+                        </td>
+                        <td>
+                            <label class="swap swap-flip {{ checkSwap .EnableCommand }}">
+                                <input type="checkbox" onclick="changeCommandEnableStatus({{.Wxid}})"/>
+
                                <div class="swap-on">✔️已启用</div>
                                <div class="swap-off">❌已禁用</div>
                            </label>
@@ -91,6 +109,7 @@
                        <th>是否启用AI</th>
                        <th>是否启用水群排行榜</th>
                        <th>是否启用迎新</th>
+                        <th>是否启用指令</th>
                        <th>操作</th>
                    </tr>
                    </thead>
@@ -100,10 +119,10 @@
                        <td>{{ .Wxid }}</td>
                        <td>{{ .Nickname }}</td>
                        <td>
-                            {{ if eq .LastActiveTime.IsNil true }}
+                            {{ if eq .LastActive.IsNil true }}
                            无数据
                            {{ else }}
-                            {{ .LastActiveTime }}
+                            {{ .LastActive }}
                            {{ end }}
                        </td>
                        <td>
@@ -125,6 +144,16 @@
                                <div class="swap-on">✔️已启用</div>
                                <div class="swap-off">❌已禁用</div>
                            </label>
+                            {{ if .EnableAi }}
+                            <br />
+                            <select class="select select-success select-xs w-1/2 max-w-xs" onchange="aiModelChange(event, {{.Wxid}})">
+                                <option value="" {{ if eq .AiModel ""}}selected{{ end }}>默认(gpt-3.5-turbo-0613)</option>
+                                {{$useModel := .AiModel}}
+                                {{ range $.aiModels }}
+                                <option value="{{.Model}}" {{ if eq $useModel .Model}}selected{{ end }}>{{.Name}}({{.Model}})</option>
+                                {{ end }}
+                            </select>
+                            {{ end }}
                        </td>
                        <td>
                            <!-- EnableChatRank -->
@@ -143,6 +172,14 @@
                                <div class="swap-off">❌已禁用</div>
                            </label>
                        </td>
+                        <td>
+                            <label class="swap swap-flip {{ checkSwap .EnableCommand }}">
+                                <input type="checkbox" onclick="changeCommandEnableStatus({{.Wxid}})"/>
+
+                                <div class="swap-on">✔️已启用</div>
+                                <div class="swap-off">❌已禁用</div>
+                            </label>
+                        </td>
                        <td>
                            <button class="btn btn-link" onclick="getGroupUsers({{.Wxid}}, {{.Nickname}})">查看群成员</button>
                        </td>
@@ -151,6 +188,15 @@
                    </tbody>
                </table>
            </div>
+
+            {{ if ne .vnc "" }}
+            <input type="radio" name="friend_tab" role="tab" class="tab" aria-label="运行状态"/>
+            <div role="tabpanel" class="tab-content p-6">
+                <div style="height: 747px;width: 1280px;overflow: hidden !important;">
+                    <iframe src="{{ .vnc }}" frameborder="0" style="width: 100%;height: 100%;pointer-events: none;"></iframe>
+                </div>
+            </div>
+            {{ end }}
        </div>


@@ -174,6 +220,7 @@
                    <th>微信Id</th>
                    <th>昵称</th>
                    <th>是否群成员</th>
+                    <th>是否群主</th>
                    <th>加群时间</th>
                    <th>最后活跃时间</th>
                    <th>退群时间</th>
--- a/views/static/js/index.js
+++ b/views/static/js/index.js
@@ -51,6 +51,22 @@ function changeWelcomeEnableStatus(wxId) {
    })
 }

+// 修改指令权限启用状态
+function changeCommandEnableStatus(wxId) {
+    axios({
+        method: 'put',
+        url: '/api/command/status',
+        data: {
+            wxId: wxId
+        }
+    }).then(function (response) {
+        console.log(`返回结果: ${JSON.stringify(response)}`);
+    }).catch(function (error) {
+        console.log(`错误信息: ${error}`);
+        alert("修改失败")
+    })
+}
+
 // 修改群成员是否参与排行榜状态
 function changeUserGroupRankSkipStatus(groupId, userId) {
    console.log("修改水群排行榜开启状态: ", groupId, userId)
@@ -96,43 +112,21 @@ function getGroupUsers(groupId, groupName) {
        // 渲染群成员列表
        const groupUsers = response.data
        // 循环渲染数据
-        for (let i = 0; i < groupUsers.length; i++) {
-            const groupUser = groupUsers[i]
+        groupUsers.forEach((groupUser, i) => {
+            console.log(groupUser)
+            const { wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank } = groupUser;

-            let row = tbody.insertRow(i); // 插入新行
-
-            // 微信Id
-            let wxId = row.insertCell(0);
-            wxId.innerHTML = groupUser.wxid;
-
-            // 昵称
-            let nickname = row.insertCell(1);
-            nickname.innerHTML = groupUser.nickname;
-
-            // 是否群成员
-            let isMember = row.insertCell(2);
-            if (groupUser.isMember) {
-                isMember.innerHTML = '<div class="badge badge-info gap-2">是</div>';
-            } else {
-                isMember.innerHTML = '<div class="badge badge-error gap-2">否</div>';
-            }
-
-            // 加群时间
-            let joinTime = row.insertCell(3);
-            joinTime.innerHTML = groupUser.joinTime;
-
-            // 最后活跃时间
-            let lastActiveTime = row.insertCell(4);
-            lastActiveTime.innerHTML = groupUser.lastActiveTime;
-
-            // 退群时间
-            let leaveTime = row.insertCell(5);
-            leaveTime.innerHTML = groupUser.leaveTime;
-
-            // 是否跳过水群排行榜
-            let skipChatRank = row.insertCell(6);
-            skipChatRank.innerHTML = `<input type="checkbox" class="toggle toggle-error" ${groupUser.skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus(\'${groupId}\', \'${groupUser.wxid}\')" />`;
-        }
+            let row = tbody.insertRow(i);
+            // Insert data into cells
+            row.insertCell(0).innerHTML = wxid;
+            row.insertCell(1).innerHTML = nickname;
+            row.insertCell(2).innerHTML = `<div class="badge badge-${isMember ? 'info' : 'error'} gap-2">${isMember ? '是' : '否'}</div>`;
+            row.insertCell(3).innerHTML = `<div class="badge badge-${isAdmin ? 'info' : 'error'} gap-2">${isAdmin ? '是' : '否'}</div>`;
+            row.insertCell(4).innerHTML = joinTime;
+            row.insertCell(5).innerHTML = lastActive;
+            row.insertCell(6).innerHTML = leaveTime;
+            row.insertCell(7).innerHTML = `<input type="checkbox" class="toggle toggle-error" ${skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus('${groupId}', '${wxid}')" />`;
+        });
    }).catch(function (error) {
        console.log(`错误信息: ${error}`);
    }).finally(function () {
@@ -140,4 +134,25 @@ function getGroupUsers(groupId, groupName) {
        // loading.style.display = "none"
        groupNameTag.innerHTML = groupName
    })
-}
+}
+
+// AI模型变动
+function aiModelChange(event, wxid) {
+    // 取出变动后的值
+    const modelStr = event.target.value;
+    console.log("AI模型变动: ", wxid, modelStr)
+    axios({
+        method: 'post',
+        url: '/api/ai/model',
+        data: {
+            wxid: wxid,
+            model: modelStr
+        }
+    }).then(function (response) {
+        console.log(`返回结果: ${JSON.stringify(response)}`);
+        alert(`${response.data}`)
+    }).catch(function (error) {
+        console.log(`错误信息: ${error}`);
+        alert("修改失败")
+    })
+}
--- a/vo/friend.go
+++ b/vo/friend.go
@@ -12,23 +12,26 @@ type FriendItem struct {
 	Pinyin         string         // 昵称拼音大写首字母
 	PinyinAll      string         // 昵称全拼
 	Wxid           string         // 微信原始Id
+	LastActive     types.DateTime // 最后活跃时间
 	EnableAi       bool           // 是否使用AI
+	AiModel        string         // AI模型
 	EnableChatRank bool           // 是否使用聊天排行
 	EnableWelcome  bool           // 是否使用迎新
+	EnableCommand  bool           // 是否启用指令
 	IsOk           bool           // 是否还在通讯库(群聊是要还在群里也算)
-	LastActiveTime types.DateTime // 最后活跃时间
 }

 // GroupUserItem
 // @description: 群成员列表数据
 type GroupUserItem struct {
-	Wxid           string         `json:"wxid"`           // 微信Id
-	Account        string         `json:"account"`        // 账号
-	HeadImage      string         `json:"headImage"`      // 头像
-	Nickname       string         `json:"nickname"`       // 昵称
-	IsMember       bool           `json:"isMember" `      // 是否群成员
-	JoinTime       types.DateTime `json:"joinTime"`       // 加入时间
-	LastActiveTime types.DateTime `json:"lastActiveTime"` // 最后活跃时间
-	LeaveTime      types.DateTime `json:"leaveTime"`      // 离开时间
-	SkipChatRank   bool           `json:"skipChatRank" `  // 是否跳过聊天排行
+	Wxid         string         `json:"wxid"`          // 微信Id
+	Account      string         `json:"account"`       // 账号
+	HeadImage    string         `json:"headImage"`     // 头像
+	Nickname     string         `json:"nickname"`      // 昵称
+	IsMember     bool           `json:"isMember" `     // 是否群成员
+	IsAdmin      bool           `json:"isAdmin"`       // 是否群主
+	JoinTime     types.DateTime `json:"joinTime"`      // 加入时间
+	LastActive   types.DateTime `json:"lastActive"`    // 最后活跃时间
+	LeaveTime    types.DateTime `json:"leaveTime"`     // 离开时间
+	SkipChatRank bool           `json:"skipChatRank" ` // 是否跳过聊天排行
 }
Author	SHA1	Message	Date
李寻欢	d3f8a59390	Merge pull request 'hotfix' (#26 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/26	2024-03-07 10:04:47 +08:00
李寻欢	165fefdb48	🐛 修复扫码加入群聊的成员无法识别的BUG	2024-03-07 10:04:03 +08:00
李寻欢	22474efc57	🎨 逻辑完善	2024-03-07 09:49:37 +08:00
李寻欢	797821e2ed	🎨 逻辑完善	2024-03-07 09:48:52 +08:00
李寻欢	79cbeb6ea5	Merge pull request '🆕 水群排行榜新增群活跃度' (#25 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/25	2024-03-07 09:43:27 +08:00
李寻欢	49705a03a8	🆕 水群排行榜新增群活跃度	2024-03-07 09:42:59 +08:00
李寻欢	40e97608d3	Merge pull request '📝 完善文档' (#24 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/24	2024-02-26 15:30:56 +08:00
李寻欢	fe7bc02c08	📝 完善文档	2024-02-26 15:30:40 +08:00
李寻欢	bb2c4e919e	Merge pull request 'hotfix' (#23 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/23	2024-02-26 15:27:05 +08:00
李寻欢	0ea189fb82	📝 完善文档	2024-02-26 15:26:37 +08:00
李寻欢	778db8e349	📝 完善文档	2024-02-26 15:24:42 +08:00
李寻欢	4b7ad4126c	Merge pull request '🆕 新增MQ消息通道' (#22 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/22	2024-02-19 14:17:59 +08:00
李寻欢	1413181bd4	🆕 新增MQ消息通道	2024-02-19 14:17:26 +08:00
李寻欢	a11ba51246	Merge pull request '🆕 控制页面新增设置AI模型' (#21 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/21	2024-01-31 12:03:01 +08:00
李寻欢	ea4262adf0	🆕 控制页面新增设置AI模型	2024-01-31 12:02:33 +08:00
李寻欢	a9f6c9ff0d	Merge pull request '🐛 Fix a bug.' (#20 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/20	2024-01-26 12:00:53 +08:00
李寻欢	244bff5714	🐛 Fix a bug.	2024-01-26 12:00:29 +08:00
李寻欢	b46271a111	Merge pull request '🐛 Fix a bug.' (#19 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/19	2024-01-25 16:33:59 +08:00
李寻欢	5d11cc7c8a	🐛 Fix a bug.	2024-01-25 16:33:45 +08:00
李寻欢	c6da056f98	Merge pull request '🎨 逻辑优化，那个网页，大大地提速' (#18 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/18	2024-01-25 16:27:51 +08:00
李寻欢	61e03a6a7b	🎨 逻辑优化，那个网页，大大地提速	2024-01-25 16:27:12 +08:00
李寻欢	8ff18c3626	Merge pull request '🎨 逻辑优化' (#17 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/17	2024-01-25 11:46:30 +08:00
李寻欢	6acb3b79ec	🎨 逻辑优化	2024-01-25 11:46:03 +08:00
李寻欢	f895d045a7	Merge pull request '🐛 修复AI开关未生效的BUG' (#16 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/16	2024-01-23 16:23:52 +08:00
李寻欢	eb2e292e8e	🐛 修复AI开关未生效的BUG	2024-01-23 16:23:07 +08:00
李寻欢	8f378e7fc9	Merge pull request '🔧 新增数据库配置模型' (#15 ) from hotfix into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/15	2024-01-22 08:32:00 +08:00
李寻欢	497e17ec62	🔧 新增数据库配置模型	2024-01-22 08:31:38 +08:00
李寻欢	0a421dbb9d	Merge pull request 'dev' (#13 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/13	2024-01-15 11:48:29 +08:00
李寻欢	0e38036a68	🐛 修复AI插件会响应`@所有人`消息事件	2024-01-15 11:48:03 +08:00
李寻欢	7ff54e4d95	⬆️ 更新项目依赖	2024-01-13 15:30:55 +08:00
李寻欢	be15d42d93	Merge pull request 'dev' (#12 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/12	2024-01-12 22:54:50 +08:00
李寻欢	6a879cbef6	🆕 群成员新增`是否群主`	2024-01-12 22:54:27 +08:00
李寻欢	01051ff606	🆕 网页新增控制是否打开指令功能	2024-01-12 22:20:14 +08:00
李寻欢	450857dee8	Merge pull request '🐛 Fix a bug. #7 ' (#11 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/11	2024-01-12 21:51:25 +08:00
李寻欢	77c5a96c76	🐛 Fix a bug. #7	2024-01-12 21:50:56 +08:00
李寻欢	0c2010c348	Merge pull request '🐛 修复AI插件会响应`@所有人`消息事件 #7 ' (#9 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/9	2024-01-09 11:12:52 +08:00
李寻欢	2918924107	🐛 修复AI插件会响应`@所有人`消息事件	2024-01-09 11:11:09 +08:00
李寻欢	f796e7b3a8	Merge pull request 'dev' (#8 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/8	2024-01-09 10:49:21 +08:00
李寻欢	83efe20ddf	Merge remote-tracking branch 'origin/dev' into dev	2024-01-09 10:48:30 +08:00
李寻欢	f0bb46b9ab	🆕 新增显示vnc页面	2024-01-09 10:48:21 +08:00
李寻欢	68ae670429	🐛 Fix a bug.	2024-01-01 09:38:55 +08:00
李寻欢	1d14b036ed	🐛 Fix a bug.	2024-01-01 09:28:11 +08:00
李寻欢	f5cc7953f4	Merge pull request '🆕 新增水群年度排行榜' (#6 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/6	2024-01-01 00:59:54 +08:00
李寻欢	0db8e6bf95	🆕 新增水群年度排行榜	2024-01-01 00:57:52 +08:00
李寻欢	710aa53562	Merge pull request '✨ `肯德基疯狂星期四文案`指令新增支持群消息' (#4 ) from dev into main Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/4	2023-12-22 09:59:16 +08:00
李寻欢	6d127d1492	✨ `肯德基疯狂星期四文案`指令新增支持群消息	2023-12-22 09:58:27 +08:00