Merge pull request '🐛 Fix a bug.' (#20) from hotfix into main

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

app/friend.go

@@ -85,6 +85,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

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,7 @@ func Index(ctx *gin.Context) {
 	}
 	result["friends"] = friends
 	result["groups"] = groups
+	result["vnc"] = config.Conf.Wechat.VncUrl
 	// 渲染页面
 	ctx.HTML(http.StatusOK, "index.html", result)
 }

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
@@ -21,14 +23,15 @@ mysql:
 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
 
 # AI回复
 ai:

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"`           // 年排行榜
 }

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"`                 // 转发地址

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"]

entity/friend.go

@@ -7,15 +7,17 @@ import (
 // Friend
 // @description: 好友列表
 type Friend struct {
-	Wxid           string `json:"wxid"`                                                     // 微信原始Id
+	Wxid           string    `json:"wxid"`                                                     // 微信原始Id
-	CustomAccount  string `json:"customAccount"`                                            // 微信号
+	CustomAccount  string    `json:"customAccount"`                                            // 微信号
-	Nickname       string `json:"nickname"`                                                 // 昵称
+	Nickname       string    `json:"nickname"`                                                 // 昵称
-	Pinyin         string `json:"pinyin"`                                                   // 昵称拼音大写首字母
+	Pinyin         string    `json:"pinyin"`                                                   // 昵称拼音大写首字母
-	PinyinAll      string `json:"pinyinAll"`                                                // 昵称全拼
+	PinyinAll      string    `json:"pinyinAll"`                                                // 昵称全拼
-	EnableAi       bool   `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"`       // 是否使用AI
+	LastActive     time.Time `json:"lastActive"`                                               // 最后活跃时间
-	EnableChatRank bool   `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
+	EnableAi       bool      `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"`       // 是否使用AI
-	EnableWelcome  bool   `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"`  // 是否启用迎新
+	AiModel        string    `json:"aiModel"`                                                  // AI模型
-	IsOk           bool   `json:"isOk" gorm:"type:tinyint(1) default 0 not null"`           // 是否正常
+	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"` // 是否跳过聊天排行
 }

entity/plugindata.go

@@ -0,0 +1,13 @@
+package entity
+
+// PluginData
+// @description: 插件数据
+type PluginData struct {
+	UserId     string `json:"userId"`     // 用户Id
+	PluginCode string `json:"pluginCode"` // 插件编码
+	Data       string `json:"data"`       // 数据
+}
+
+func (PluginData) TableName() string {
+	return "t_plugin_data"
+}

go.mod

@@ -3,13 +3,13 @@ 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-co-op/gocron v1.37.0
-	github.com/go-resty/resty/v2 v2.10.0
+	github.com/go-resty/resty/v2 v2.11.0
-	github.com/sashabaranov/go-openai v1.17.9
+	github.com/sashabaranov/go-openai v1.17.11
-	github.com/spf13/viper v1.18.0
+	github.com/spf13/viper v1.18.2
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
 )
@@ -25,7 +25,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 +37,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 +50,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/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.15.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
 )

go.sum

@@ -16,6 +16,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 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=
@@ -28,6 +30,8 @@ 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=
@@ -38,6 +42,8 @@ github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqR
 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=
@@ -50,6 +56,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 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=
@@ -86,6 +94,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 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=
@@ -102,6 +112,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
 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=
@@ -112,6 +124,8 @@ 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=
@@ -138,13 +152,19 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 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/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-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
 golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+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=
@@ -155,6 +175,8 @@ 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=
@@ -169,6 +191,8 @@ 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=
@@ -194,6 +218,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 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=

initialization/plugin.go

@@ -5,6 +5,7 @@ import (
 	"go-wechat/model"
 	plugin "go-wechat/plugin"
 	"go-wechat/plugin/plugins"
+	"go-wechat/service"
 )
 
 // Plugin
@@ -22,10 +23,17 @@ func Plugin() {
 		return true
 	}, plugins.SaveToDb)
 
+	// 私聊指令消息
+	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 *model.Message) bool {
 		// 群内@或者私聊文字消息
-		return m.IsAt() || m.IsPrivateText()
+		return (m.IsAt() && !m.IsAtAll()) || m.IsPrivateText()
 	}, plugins.AI)
 
 	// 欢迎新成员

model/leigod.go

@@ -0,0 +1,73 @@
+package model
+
+// LeiGodLoginResp
+// @description: 雷神登录返回
+type LeiGodLoginResp struct {
+	LoginInfo struct {
+		AccountToken string `json:"account_token"` // Token
+		ExpiryTime   string `json:"expiry_time"`   // 有效期
+		NnToken      string `json:"nn_token"`
+	} `json:"login_info"`
+	UserInfo struct {
+		Nickname   string `json:"nickname"`
+		Email      string `json:"email"`
+		Mobile     string `json:"mobile"`
+		Avatar     string `json:"avatar"`
+		RegionCode int    `json:"region_code"`
+	} `json:"user_info"`
+}
+
+// LeiGodUserInfoResp
+// @description: 雷神用户信息返回
+type LeiGodUserInfoResp struct {
+	UserPauseTime         int    `json:"user_pause_time"`
+	Nickname              string `json:"nickname"`
+	Email                 string `json:"email"`
+	CountryCode           string `json:"country_code"`
+	Mobile                string `json:"mobile"`
+	UserName              string `json:"user_name"`
+	MasterAccount         string `json:"master_account"`
+	Birthday              string `json:"birthday"`
+	PublicIp              string `json:"public_ip"`
+	Sex                   string `json:"sex"`
+	LastLoginTime         string `json:"last_login_time"`
+	LastLoginIp           string `json:"last_login_ip"`
+	PauseStatus           string `json:"pause_status"`    // 暂停状态
+	PauseStatusId         int    `json:"pause_status_id"` // 暂停状态 0未暂停1已暂停
+	LastPauseTime         string `json:"last_pause_time"` // 最后一次暂停时间
+	VipLevel              string `json:"vip_level"`
+	Avatar                string `json:"avatar"`
+	AvatarNew             string `json:"avatar_new"`
+	PackageId             string `json:"package_id"`
+	IsSwitchPackage       int    `json:"is_switch_package"`
+	PackageTitle          string `json:"package_title"`
+	PackageLevel          string `json:"package_level"`
+	BillingType           string `json:"billing_type"`
+	Lang                  string `json:"lang"`
+	StopedRemaining       string `json:"stoped_remaining"`
+	ExpiryTime            string `json:"expiry_time"`      // 剩余时长
+	ExpiryTimeSamp        int    `json:"expiry_time_samp"` // 剩余时长秒数
+	Address               string `json:"address"`
+	MobileContactType     string `json:"mobile_contact_type"`
+	MobileContactNumber   string `json:"mobile_contact_number"`
+	MobileContactTitle    string `json:"mobile_contact_title"`
+	RegionCode            int    `json:"region_code"`
+	IsPayUser             string `json:"is_pay_user"`
+	WallLogSwitch         string `json:"wall_log_switch"`
+	IsSetAdminPass        int    `json:"is_set_admin_pass"`
+	ExpiredExperienceTime string `json:"expired_experience_time"`
+	ExperienceExpiryTime  string `json:"experience_expiry_time"`
+	ExperienceTime        int    `json:"experience_time"`
+	FirstInvoiceDiscount  int    `json:"first_invoice_discount"`
+	NnNumber              string `json:"nn_number"`
+	UserSignature         string `json:"user_signature"`
+	MobileExpiryTime      string `json:"mobile_expiry_time"`
+	MobileExpiryTimeSamp  int    `json:"mobile_expiry_time_samp"`
+	MobilePauseStatus     int    `json:"mobile_pause_status"`
+	BlackExpiredTime      string `json:"black_expired_time"`
+	MobileExperienceTime  string `json:"mobile_experience_time"`
+	SuperTime             string `json:"super_time"`
+	NowDate               string `json:"now_date"`
+	NowTimeSamp           int    `json:"now_time_samp"`
+	UserEarnMinutes       string `json:"user_earn_minutes"`
+}

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{}
@@ -91,6 +108,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 +132,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)
+}

plugin/plugins/ai.go

@@ -28,9 +28,13 @@ func AI(m *plugin.MessageContext) {
 	}
 
 	// 取出所有启用了AI的好友或群组
-	var count int64
+	var friendInfo entity.Friend
-	client.MySQL.Model(&entity.Friend{}).Where("enable_ai IS TRUE").Where("wxid = ?", m.FromUser).Count(&count)
+	client.MySQL.Where("wxid = ?", m.FromUser).First(&friendInfo)
-	if count < 1 {
+	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

plugin/plugins/command.go

@@ -0,0 +1,51 @@
+package plugins
+
+import (
+	"go-wechat/plugin"
+	"go-wechat/plugin/plugins/command"
+	"go-wechat/utils"
+	"regexp"
+	"strings"
+)
+
+// Command
+// @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(content, "/") {
+		return
+	}
+
+	// 用空格分割消息，下标0表示指令
+	msgArray := strings.Split(content, " ")
+	cmd := msgArray[0]
+
+	switch cmd {
+	case "/帮助", "/h", "/help", "/?", "/？":
+		command.HelpCmd(m)
+	case "/雷神", "/ls":
+		command.LeiGodCmd(m.FromUser, msgArray[1], msgArray[2:]...)
+	case "/肯德基", "/kfc":
+		command.KfcCrazyThursdayCmd(m.FromUser)
+	default:
+		utils.SendMessage(m.FromUser, m.GroupUser, "指令错误", 0)
+	}
+
+	// 中止后续消息处理
+	m.Abort()
+}

plugin/plugins/command/help.go

@@ -0,0 +1,29 @@
+package command
+
+import (
+	"go-wechat/plugin"
+	"go-wechat/utils"
+)
+
+// HelpCmd
+// @description: 帮助指令
+func HelpCmd(m *plugin.MessageContext) {
+	str := `帮助菜单:
+指令消息必须以'/'开头，比如: '/帮助'。
+支持的指令:
+
+#1. 雷神加速器
+/ls option args
+option: 指令选项，可选值: 
+  绑定账户：'绑定'、'b'，参数: 账户名 密码 [-f]，-f表示强制绑定，非必传项
+  详情: '详情'、'i'
+  暂停: '暂停'、'p'
+示例: 绑定:
+/ls 绑定 123456 123456 或者 /ls b 123456 123456
+
+#2. 肯德基疯狂星期四文案
+/kfc、/肯德基
+`
+	utils.SendMessage(m.FromUser, m.GroupUser, str, 0)
+
+}

plugin/plugins/command/kfc.go

@@ -0,0 +1,95 @@
+package command
+
+import (
+	"github.com/go-resty/resty/v2"
+	"go-wechat/utils"
+	"log"
+)
+
+// KfcCrazyThursdayCmd
+// @description: 肯德基疯狂星期四文案
+// @param userId string 发信人
+func KfcCrazyThursdayCmd(userId string) {
+	// 随机选一个接口调用
+	str := kfcApi1()
+	if str == "" {
+		str = kfcApi2()
+	}
+	if str == "" {
+		str = kfcApi3()
+	}
+	if str == "" {
+		str = "文案获取失败"
+	}
+
+	// 发送消息
+	utils.SendMessage(userId, "", str, 0)
+}
+
+// kfcApi1
+// @description: 肯德基疯狂星期四文案接口1
+// @return string
+func kfcApi1() string {
+	res := resty.New()
+	resp, err := res.R().
+		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
+	if err != nil {
+		log.Panicf("KFC接口1文案获取失败: %s", err.Error())
+	}
+	log.Printf("KFC接口1文案获取结果: %s", resp.String())
+	return resp.String()
+}
+
+// kfcApi2
+// @description: 肯德基疯狂星期四文案接口2
+// @return string
+func kfcApi2() string {
+	type result struct {
+		Code int    `json:"code"`
+		Text string `json:"text"`
+		Data struct {
+			Msg string `json:"msg"`
+		} `json:"data"`
+	}
+
+	var resData result
+
+	res := resty.New()
+	resp, err := res.R().
+		SetResult(&resData).
+		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
+	if err != nil {
+		log.Panicf("KFC接口2文案获取失败: %s", err.Error())
+	}
+	log.Printf("KFC接口2文案获取结果: %s", resp.String())
+	if resData.Data.Msg != "" {
+		return resData.Data.Msg
+	}
+	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()
+}

plugin/plugins/command/leigod.go

@@ -0,0 +1,205 @@
+package command
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"go-wechat/client"
+	"go-wechat/entity"
+	"go-wechat/model"
+	"go-wechat/utils"
+	"go-wechat/vo"
+	"gorm.io/gorm"
+	"log"
+	"strings"
+)
+
+// leiGod
+// @description: 雷神加速器相关接口
+type leiGodI interface {
+	binding(string, string, bool) string // 绑定雷神加速器账号
+	info() string                        // 账户详情
+	pause() string                       // 暂停加速
+}
+
+type leiGod struct {
+	userId string // 用户Id
+}
+
+// newLeiGod
+// @description: 创建一个雷神加速器实例
+// @param userId
+// @return leiGodI
+func newLeiGod(userId string) leiGodI {
+	return &leiGod{userId: userId}
+}
+
+// LeiGodCmd
+// @description: 雷神加速器指令
+// @param userId
+// @param cmd
+// @param args
+// @return string
+func LeiGodCmd(userId, cmd string, args ...string) {
+	lg := newLeiGod(userId)
+
+	var replyMsg string
+	switch cmd {
+	case "绑定", "b":
+		var force bool
+		if len(args) == 3 && args[2] == "-f" {
+			force = true
+		}
+		replyMsg = lg.binding(args[0], args[1], force)
+	case "详情", "i":
+		replyMsg = lg.info()
+	case "暂停", "p":
+		replyMsg = lg.pause()
+	default:
+		replyMsg = "指令错误"
+	}
+
+	// 返回消息
+	if strings.TrimSpace(replyMsg) != "" {
+		utils.SendMessage(userId, "", replyMsg, 0)
+	}
+}
+
+// binding
+// @description: 绑定雷神加速器账号
+// @receiver l
+// @param account
+// @param password
+// @param force
+// @return flag
+func (l leiGod) binding(account, password string, force bool) (replyMsg string) {
+	log.Printf("用户[%s]绑定雷神加速器账号[%s] -> %s", l.userId, account, password)
+
+	// 取出已绑定的账号
+	var data entity.PluginData
+	client.MySQL.Where("user_id = ?", l.userId).Where("plugin_code = 'leigod'").First(&data)
+
+	var ac vo.LeiGodAccount
+	if data.UserId != "" {
+		if err := json.Unmarshal([]byte(data.Data), &ac); err != nil {
+			log.Printf("用户[%s]已绑定雷神账号解析失败: %v", l.userId, err)
+			return
+		}
+		log.Printf("用户[%s]已绑定账号[%s]", l.userId, ac.Account)
+	}
+
+	// 如果已经绑定账号，且不是强制绑定，则返回
+	if ac.Account != "" && !force {
+		replyMsg = "您已绑定账号[" + ac.Account + "]，如需更换请使用 -f 参数: \n/雷神 绑定 账号 密码 -f"
+		return
+	}
+
+	accountStr := fmt.Sprintf("{\"account\": \"%s\", \"password\":\"%s\"}", account, password)
+
+	// 绑定账号
+	var err error
+	if data.UserId != "" {
+		// 修改
+		err = client.MySQL.Model(&data).
+			Where("user_id = ?", l.userId).
+			Where("plugin_code = 'leigod'").
+			Update("data", accountStr).Error
+	} else {
+		// 新增
+		data = entity.PluginData{
+			UserId:     l.userId,
+			PluginCode: "leigod",
+			Data:       accountStr,
+		}
+		err = client.MySQL.Create(&data).Error
+	}
+
+	if err != nil {
+		log.Printf("用户[%s]绑定雷神账号失败: %v", l.userId, err)
+		replyMsg = "绑定失败: " + err.Error()
+	} else {
+		replyMsg = "绑定成功"
+	}
+
+	return
+}
+
+// info
+// @description: 账户详情
+// @receiver l
+// @return replyMsg
+func (l leiGod) info() (replyMsg string) {
+	log.Printf("用户[%s]获取雷神账户详情", l.userId)
+
+	// 取出已绑定的账号
+	var data entity.PluginData
+	err := client.MySQL.Where("user_id = ?", l.userId).Where("plugin_code = 'leigod'").First(&data).Error
+	if err != nil {
+		log.Printf("用户[%s]获取雷神账户详情失败: %v", l.userId, err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			replyMsg = "您还未绑定账号，请先绑定后再使用，绑定指定:\n/雷神 绑定 你的账号 你的密码"
+		} else {
+			replyMsg = "系统错误: " + err.Error()
+		}
+		return
+	}
+
+	// 解析为结构体
+	var ac vo.LeiGodAccount
+	if err = json.Unmarshal([]byte(data.Data), &ac); err != nil {
+		log.Printf("用户[%s]已绑定雷神账号解析失败: %v", l.userId, err)
+		replyMsg = "系统炸了，请耐心等待修复"
+		return
+	}
+
+	lgu := utils.LeiGodUtil(ac.Account, ac.Password)
+	if err = lgu.Login(); err != nil {
+		return "登录失败: " + err.Error()
+	}
+	var ui model.LeiGodUserInfoResp
+	if ui, err = lgu.Info(); err != nil {
+		return "获取详情失败: " + err.Error()
+	}
+	replyMsg = fmt.Sprintf("#账户 %s\n#剩余时长 %s\n#暂停状态 %s\n#最后暂停时间 %s",
+		ui.Mobile, ui.ExpiryTime, ui.PauseStatus, ui.LastPauseTime)
+	return
+}
+
+// pause
+// @description: 暂停加速
+// @receiver l
+// @return flag
+func (l leiGod) pause() (replyMsg string) {
+	log.Printf("用户[%s]暂停加速", l.userId)
+
+	// 取出已绑定的账号
+	var data entity.PluginData
+	err := client.MySQL.Where("user_id = ?", l.userId).Where("plugin_code = 'leigod'").First(&data).Error
+	if err != nil {
+		log.Printf("用户[%s]获取雷神账户详情失败: %v", l.userId, err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			replyMsg = "您还未绑定账号，请先绑定后再使用，绑定指定:\n/雷神 绑定 你的账号 你的密码"
+		} else {
+			replyMsg = "系统错误: " + err.Error()
+		}
+		return
+	}
+
+	// 解析为结构体
+	var ac vo.LeiGodAccount
+	if err = json.Unmarshal([]byte(data.Data), &ac); err != nil {
+		log.Printf("用户[%s]已绑定雷神账号解析失败: %v", l.userId, err)
+		replyMsg = "系统炸了，请耐心等待修复"
+		return
+	}
+
+	lgu := utils.LeiGodUtil(ac.Account, ac.Password)
+	if err = lgu.Login(); err != nil {
+		return "登录失败: " + err.Error()
+	}
+	if err = lgu.Pause(); err != nil {
+		return "暂停失败: " + err.Error()
+	}
+
+	return "暂停成功"
+}

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
     container_name: gw-wechat
     restart: unless-stopped
     environment:
@@ -54,7 +56,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"]

router/router.go

@@ -23,6 +23,7 @@ func Init(g *gin.Engine) {
 	api := g.Group("/api")
 	api.PUT("/ai/status", app.ChangeEnableAiStatus)               // 修改是否开启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)                    // 获取群成员列表

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").
+		//Joins("LEFT JOIN t_message AS tm ON tf.wxid = tm.from_user").
-		Select("tf.*", "MAX(tm.create_at) AS last_active_time").
+		//Select("tf.*", "MAX(tm.create_at) AS last_active").
-		Group("tf.wxid").
+		Select("tf.*").
-		Order("last_active_time DESC").
+		//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)
+	}
+}

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").
+		//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",
+		//Select("tgu.*", "MAX(tm.create_at) AS last_active").
-		//	"tgu.skip_chat_rank", "MAX(tm.create_at) AS last_active_time").
+		Select("tgu.*").
-		Select("tgu.*", "MAX(tm.create_at) AS last_active_time").
 		Where("tgu.group_id = ?", groupId).
 		Group("tgu.group_id, tgu.wxid").
 		Order("tgu.join_time DESC").

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

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,
+					GroupId:    gid,
-					Account:   cp.Account,
+					Account:    cp.Account,
-					HeadImage: cp.HeadImage,
+					HeadImage:  cp.HeadImage,
-					Nickname:  cp.Nickname,
+					Nickname:   cp.Nickname,
-					Wxid:      cp.Wxid,
+					Wxid:       cp.Wxid,
-					IsMember:  true,
+					IsMember:   true,
-					JoinTime:  time.Now().Local(),
+					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

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)
+		}
 	}
 
 	// 更新好友列表

tasks/watergroup/utils.go

@@ -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")
 	}
 
 	// 查询指定时间段全部数据

tasks/watergroup/year.go

@@ -0,0 +1,96 @@
+package watergroup
+
+import (
+	"fmt"
+	"go-wechat/config"
+	"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 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))
+	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)
+}

utils/leigod.go

@@ -0,0 +1,169 @@
+package utils
+
+import (
+	"crypto/md5"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/go-resty/resty/v2"
+	"go-wechat/model"
+	"log"
+)
+
+// LeiGod
+// @description: 雷神加速器相关接口
+type LeiGod interface {
+	Login() error                            // 登录
+	Info() (model.LeiGodUserInfoResp, error) // 获取用户信息
+	Pause() error                            // 暂停加速
+}
+
+type leiGod struct {
+	account, password string // 账号、密码
+	token             string
+}
+
+// LeiGodUtil
+// @description: 创建一个雷神加速器工具类
+// @param userId
+// @return leiGodI
+func LeiGodUtil(account, password string) LeiGod {
+	// 把密码md5一下
+	hash := md5.New()
+	hash.Write([]byte(password))
+	password = fmt.Sprintf("%x", hash.Sum(nil))
+
+	return &leiGod{account: account, password: password}
+}
+
+// Login
+// @description: 登录
+// @receiver l
+// @return string
+func (l *leiGod) Login() (err error) {
+	// 组装参数
+	param := map[string]any{
+		"account_token": nil,
+		"country_code":  86,
+		"lang":          "zh_CN",
+		"os_type":       4,
+		"mobile_num":    l.account,
+		"username":      l.account,
+		"password":      l.password,
+		"region_code":   1,
+		"src_channel":   "guanwang",
+		"sem_ad_img_url": map[string]any{
+			"btn_yrl": "",
+			"url":     "",
+		},
+	}
+	pbs, _ := json.Marshal(param)
+
+	var loginResp model.Response[any]
+	var resp *resty.Response
+
+	res := resty.New()
+	resp, err = res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetBody(string(pbs)).
+		SetResult(&loginResp).
+		Post("https://webapi.leigod.com/api/auth/login")
+	if err != nil {
+		log.Panicf("雷神加速器登录失败: %s", err.Error())
+	}
+	log.Printf("雷神加速器登录结果: %s", unicodeToText(resp.String()))
+
+	// 返回状态码不是0表示有错
+	if loginResp.Code != 0 {
+		return errors.New(loginResp.Msg)
+	}
+
+	// 将Data字段转为结构体
+	var bs []byte
+	if bs, err = json.Marshal(loginResp.Data); err != nil {
+		return
+	}
+
+	var loginInfo model.LeiGodLoginResp
+	if err = json.Unmarshal(bs, &loginInfo); err != nil {
+		return
+	}
+
+	if loginInfo.LoginInfo.AccountToken != "" {
+		l.token = loginInfo.LoginInfo.AccountToken
+	}
+
+	return
+}
+
+// Info
+// @description: 获取用户信息
+// @receiver l
+// @return string
+func (l *leiGod) Info() (ui model.LeiGodUserInfoResp, err error) {
+	// 组装参数
+	param := map[string]any{
+		"account_token": l.token,
+		"lang":          "zh_CN",
+		"os_type":       4,
+	}
+	pbs, _ := json.Marshal(param)
+
+	var userInfoResp model.Response[model.LeiGodUserInfoResp]
+	var resp *resty.Response
+
+	res := resty.New()
+	resp, err = res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetBody(string(pbs)).
+		SetResult(&userInfoResp).
+		Post("https://webapi.leigod.com/api/user/info")
+	if err != nil {
+		log.Panicf("雷神加速器用户信息获取失败: %s", err.Error())
+	}
+	log.Printf("雷神加速器用户信息获取结果: %s", unicodeToText(resp.String()))
+
+	// 返回状态码不是0表示有错
+	if userInfoResp.Code != 0 {
+		err = errors.New(userInfoResp.Msg)
+		return
+	}
+
+	return userInfoResp.Data, err
+}
+
+// Pause
+// @description: 暂停加速
+// @receiver l
+// @return string
+func (l *leiGod) Pause() (err error) {
+	// 组装参数
+	param := map[string]any{
+		"account_token": l.token,
+		"lang":          "zh_CN",
+		"os_type":       4,
+	}
+	pbs, _ := json.Marshal(param)
+
+	var pauseResp model.Response[any]
+	var resp *resty.Response
+
+	res := resty.New()
+	resp, err = res.R().
+		SetHeader("Content-Type", "application/json;chartset=utf-8").
+		SetBody(string(pbs)).
+		SetResult(&pauseResp).
+		Post("https://webapi.leigod.com/api/user/pause")
+	if err != nil {
+		log.Panicf("雷神加速器暂停失败: %s", err.Error())
+	}
+	log.Printf("雷神加速器暂停结果: %s", unicodeToText(resp.String()))
+
+	// 返回状态码不是0表示有错
+	if pauseResp.Code != 0 {
+		err = errors.New(pauseResp.Msg)
+		return
+	}
+
+	return
+}

utils/string.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"strconv"
+	"strings"
+)
+
+// unicodeToText
+// @description: unicode转文本
+// @param str
+// @return dst
+func unicodeToText(str string) (dst string) {
+	dst, _ = strconv.Unquote(strings.Replace(strconv.Quote(str), `\\u`, `\u`, -1))
+	return
+}

views/index.html

@@ -37,6 +37,7 @@
                         <th>最后活跃时间</th>
                         <th>是否在通讯录</th>
                         <th>是否启用AI</th>
+                        <th>是否启用指令</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -46,10 +47,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 +68,14 @@
                             <label class="swap swap-flip {{ checkSwap .EnableAi }}">
                                 <input type="checkbox" onclick="changeAiEnableStatus({{.Wxid}})"/>
 
+                                <div class="swap-on">✔️已启用</div>
+                                <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>
@@ -91,6 +100,7 @@
                         <th>是否启用AI</th>
                         <th>是否启用水群排行榜</th>
                         <th>是否启用迎新</th>
+                        <th>是否启用指令</th>
                         <th>操作</th>
                     </tr>
                     </thead>
@@ -100,10 +110,10 @@
                         <td>{{ .Wxid }}</td>
                         <td>{{ .Nickname }}</td>
                         <td>
-                            {{ if eq .LastActiveTime.IsNil true }}
+                            {{ if eq .LastActive.IsNil true }}
                             无数据
                             {{ else }}
-                            {{ .LastActiveTime }}
+                            {{ .LastActive }}
                             {{ end }}
                         </td>
                         <td>
@@ -143,6 +153,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 +169,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 +201,7 @@
                     <th>微信Id</th>
                     <th>昵称</th>
                     <th>是否群成员</th>
+                    <th>是否群主</th>
                     <th>加群时间</th>
                     <th>最后活跃时间</th>
                     <th>退群时间</th>

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++) {
+        groupUsers.forEach((groupUser, i) => {
-            const groupUser = groupUsers[i]
+            console.log(groupUser)
+            const { wxid, nickname, isMember, isAdmin, joinTime, lastActive, leaveTime, skipChatRank } = groupUser;
 
-            let row = tbody.insertRow(i); // 插入新行
+            let row = tbody.insertRow(i);
-
+            // Insert data into cells
-            // 微信Id
+            row.insertCell(0).innerHTML = wxid;
-            let wxId = row.insertCell(0);
+            row.insertCell(1).innerHTML = nickname;
-            wxId.innerHTML = groupUser.wxid;
+            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;
-            let nickname = row.insertCell(1);
+            row.insertCell(5).innerHTML = lastActive;
-            nickname.innerHTML = groupUser.nickname;
+            row.insertCell(6).innerHTML = leaveTime;
-
+            row.insertCell(7).innerHTML = `<input type="checkbox" class="toggle toggle-error" ${skipChatRank ? 'checked' : ''} onclick="changeUserGroupRankSkipStatus('${groupId}', '${wxid}')" />`;
-            // 是否群成员
+        });
-            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}\')" />`;
-        }
     }).catch(function (error) {
         console.log(`错误信息: ${error}`);
     }).finally(function () {

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
+	Wxid         string         `json:"wxid"`          // 微信Id
-	Account        string         `json:"account"`        // 账号
+	Account      string         `json:"account"`       // 账号
-	HeadImage      string         `json:"headImage"`      // 头像
+	HeadImage    string         `json:"headImage"`     // 头像
-	Nickname       string         `json:"nickname"`       // 昵称
+	Nickname     string         `json:"nickname"`      // 昵称
-	IsMember       bool           `json:"isMember" `      // 是否群成员
+	IsMember     bool           `json:"isMember" `     // 是否群成员
-	JoinTime       types.DateTime `json:"joinTime"`       // 加入时间
+	IsAdmin      bool           `json:"isAdmin"`       // 是否群主
-	LastActiveTime types.DateTime `json:"lastActiveTime"` // 最后活跃时间
+	JoinTime     types.DateTime `json:"joinTime"`      // 加入时间
-	LeaveTime      types.DateTime `json:"leaveTime"`      // 离开时间
+	LastActive   types.DateTime `json:"lastActive"`    // 最后活跃时间
-	SkipChatRank   bool           `json:"skipChatRank" `  // 是否跳过聊天排行
+	LeaveTime    types.DateTime `json:"leaveTime"`     // 离开时间
+	SkipChatRank bool           `json:"skipChatRank" ` // 是否跳过聊天排行
 }

vo/leigod.go

@@ -0,0 +1,8 @@
+package vo
+
+// LeiGodAccount
+// @description: 雷神账号
+type LeiGodAccount struct {
+	Account  string `json:"account"`  // 账号
+	Password string `json:"password"` // 密码
+}