lxh/go-wxhelper
4
4
Fork 5
Code Issues 3 Pull Requests Actions Packages Projects 2 Releases 114 Wiki Activity

hotfix #48

Merged
李寻欢 merged 3 commits from hotfix into main 2024-05-15 11:15:56 +08:00
Conversation 0 Commits 3 Files Changed 18 +223 -10
17 changed files with 223 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 534f7a0ec8 - Show all commits

23
app/friend.go
View File

@ -182,3 +182,26 @@ func ChangeSkipGroupRankStatus(ctx *gin.Context) {
ctx.String(http.StatusOK, "操作成功")
}
// ChangeEnableNewsStatus
// @description: 修改是否开启新闻
// @param ctx
func ChangeEnableNewsStatus(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_news`", gorm.Expr(" !`enable_news`")).Error
if err != nil {
log.Printf("修改早报启用状态失败：%s", err)
ctx.String(http.StatusInternalServerError, "操作失败: %s", err)
return
}
ctx.String(http.StatusOK, "操作成功")
}

9
config.yaml
View File

@ -14,6 +14,8 @@ system:
summary: true
# 默认是否开启新成员加群欢迎
welcome: true
# 每日早报
news: true
# 微信HOOK配置
wechat:
@ -40,12 +42,15 @@ mysql:
schema: public # postgres 专用
task:
enable: false
enable: true
news:
enable: true
cron: '14 11 * * *' # 每天0:30
syncFriends:
enable: false
cron: '*/5 * * * *' # 五分钟一次
groupSummary:
enable: true
enable: false
cron: '30 0 * * *' # 每天0:30
waterGroup:
enable: false

1
config/system.go
View File

@ -18,4 +18,5 @@ type defaultRule struct {
ChatRank bool `json:"chatRank" yaml:"chatRank"` // 是否启用聊天排行榜
Summary bool `json:"summary" yaml:"summary"` // 是否启用聊天总结
Welcome bool `json:"welcome" yaml:"welcome"` // 是否启用欢迎新成员
News bool `json:"news" yaml:"news"` // 是否启用每日早报
}

1
config/task.go
View File

@ -4,6 +4,7 @@ package config
// @description: 定时任务
type task struct {
Enable bool `json:"enable" yaml:"enable"` // 是否启用
News syncFriends `json:"news" yaml:"news"` // 每日早报
SyncFriends syncFriends `json:"syncFriends" yaml:"syncFriends"` // 同步好友
WaterGroup waterGroup `json:"waterGroup" yaml:"waterGroup"` // 水群排行榜
GroupSummary syncFriends `json:"groupSummary" yaml:"groupSummary"` // 群聊总结

1
entity/friend.go
View File

@ -19,6 +19,7 @@ type Friend struct {
EnableChatRank bool `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行
EnableWelcome bool `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"` // 是否启用迎新
EnableSummary bool `json:"enableSummary" gorm:"type:tinyint(1) default 0 not null"` // 是否启用总结
EnableNews bool `json:"enableNews" gorm:"type:tinyint(1) default 0 not null"` // 是否启用新闻
IsOk bool `json:"isOk" gorm:"type:tinyint(1) default 0 not null"` // 是否正常
}

18
model/news.go Normal file
View File

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

1
router/router.go
View File

@ -26,6 +26,7 @@ func Init(g *gin.Engine) {
api.POST("/ai/model", app.ChangeUseAiModel) // 修改使用的AI模型
api.PUT("/welcome/status", app.ChangeEnableWelcomeStatus) // 修改是否开启迎新状态
api.PUT("/command/status", app.ChangeEnableCommandStatus) // 修改是否开启指令状态
api.PUT("/news/status", app.ChangeEnableNewsStatus) // 修改是否开启早报状态
api.PUT("/grouprank/status", app.ChangeEnableGroupRankStatus) // 修改是否开启水群排行榜状态
api.PUT("/grouprank/skip", app.ChangeSkipGroupRankStatus) // 修改是否跳过水群排行榜状态
api.GET("/group/users", app.GetGroupUsers) // 获取群成员列表

19
service/friend.go
View File

@ -49,7 +49,10 @@ func GetAllEnableAI() (records []entity.Friend, err error) {
// @return records
// @return err
func GetAllEnableChatRank() (records []entity.Friend, err error) {
err = client.MySQL.Where("enable_chat_rank = ?", 1).Where("wxid LIKE '%@chatroom'").Find(&records).Error
err = client.MySQL.Where("enable_chat_rank = ?", 1).
Where("is_ok IS TRUE").
Where("wxid LIKE '%@chatroom'").
Find(&records).Error
return
}
@ -58,7 +61,19 @@ func GetAllEnableChatRank() (records []entity.Friend, err error) {
// @return records
// @return err
func GetAllEnableSummary() (records []entity.Friend, err error) {
err = client.MySQL.Where("enable_summary = ?", 1).Where("wxid LIKE '%@chatroom'").Find(&records).Error
err = client.MySQL.Where("enable_summary = ?", 1).
Where("is_ok IS TRUE").
Where("wxid LIKE '%@chatroom'").
Find(&records).Error
return
}
// GetAllEnableNews
// @description: 取出所有启用了新闻的好友或群组
// @return records
// @return err
func GetAllEnableNews() (records []entity.Friend, err error) {
err = client.MySQL.Where("enable_news = ?", 1).Where("is_ok IS TRUE").Find(&records).Error
return
}

1
tasks/friends/friends.go
View File

@ -74,6 +74,7 @@ func Sync() {
EnableChatRank: config.Conf.System.DefaultRule.ChatRank,
EnableSummary: config.Conf.System.DefaultRule.Summary,
EnableWelcome: config.Conf.System.DefaultRule.Welcome,
EnableNews: config.Conf.System.DefaultRule.News,
LastActive: time.Now().Local(),
}).Error
if err != nil {

36
tasks/news/news.go Normal file
View File

@ -0,0 +1,36 @@
package news
import (
"fmt"
"go-wechat/service"
"go-wechat/utils"
"log"
"strings"
"time"
)
// DailyNews
// @description: 每日新闻
func DailyNews() {
groups, err := service.GetAllEnableNews()
if err != nil {
log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err)
return
}
news := utils.NewsUtil().MorningPost()
if len(news) == 0 {
log.Println("每日早报获取失败")
return
}
newsStr := fmt.Sprintf("#每日早报#\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n"))
// 循环发送新闻
for _, group := range groups {
// 发送消息
utils.SendMessage(group.Wxid, "", newsStr, 0)
// 休眠一秒，防止频繁发送
time.Sleep(time.Second)
}
}

7
tasks/tasks.go
View File

@ -4,6 +4,7 @@ import (
"github.com/go-co-op/gocron"
"go-wechat/config"
"go-wechat/tasks/friends"
"go-wechat/tasks/news"
"go-wechat/tasks/summary"
"go-wechat/tasks/watergroup"
"log"
@ -42,7 +43,6 @@ func InitTasks() {
if config.Conf.Task.GroupSummary.Enable {
log.Printf("群聊总结任务已启用，执行表达式: %s", config.Conf.Task.GroupSummary.Cron)
_, _ = s.Cron(config.Conf.Task.GroupSummary.Cron).Do(summary.AiSummary)
}
// 更新好友列表
@ -51,6 +51,11 @@ func InitTasks() {
_, _ = s.Cron(config.Conf.Task.SyncFriends.Cron).Do(friends.Sync)
}
// 每日早报
if config.Conf.Task.News.Enable {
_, _ = s.Cron(config.Conf.Task.News.Cron).Do(news.DailyNews)
}
// 开启定时任务
s.StartAsync()
log.Println("定时任务初始化成功")

46
utils/news.go Normal file
View File

@ -0,0 +1,46 @@
package utils
import (
"github.com/go-resty/resty/v2"
"go-wechat/model"
"log"
)
// News
// @description: 新闻
type News interface {
MorningPost() []string // 早报
}
type news struct{}
// NewsUtil
// @description: 新闻工具
// @param account
// @param password
// @return LeiGod
func NewsUtil() News {
return &news{}
}
// MorningPost
// @description: 早报
// @receiver news
// @return records
func (news) MorningPost() (records []string) {
var newsResp model.MorningPost
res := resty.New()
resp, err := res.R().
SetHeader("Content-Type", "application/json;chartset=utf-8").
SetQueryParam("token", "cFoMZNNBxT4jQovS").
SetResult(&newsResp).
Post("https://v2.alapi.cn/api/zaobao")
if err != nil {
log.Panicf("每日早报获取失败: %s", err.Error())
}
log.Printf("每日早报获取结果: %s", unicodeToText(resp.String()))
records = newsResp.Data.News
return
}

27
views/components.html
View File

@ -165,6 +165,33 @@
</button>
{{end}}
<!-- 早报 -->
{{define "news"}}
<button type="button"
class="{{ if eq .EnableNews true }}bg-green-600{{ else }}bg-gray-200{{ end }} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-green-600 focus:ring-offset-2"
role="switch" aria-checked="false" onclick="changeUserNewsStatus({{.Wxid}})">
<span
class="{{ if eq .EnableNews true }}translate-x-5{{ else }}translate-x-0{{ end }} pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out">
<span
class="{{ if eq .EnableNews true }}opacity-0 duration-100 ease-out{{ else }}opacity-100 duration-200 ease-in{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
aria-hidden="true">
<svg class="h-3 w-3 text-gray-400" fill="none" viewBox="0 0 12 12">
<path d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2" stroke="currentColor" stroke-width="2" stroke-linecap="round"
stroke-linejoin="round"/>
</svg>
</span>
<span
class="{{ if eq .EnableNews true }}opacity-100 duration-200 ease-in{{ else }}opacity-0 duration-100 ease-out{{ end }} absolute inset-0 flex h-full w-full items-center justify-center transition-opacity"
aria-hidden="true">
<svg class="h-3 w-3 text-green-600" fill="currentColor" viewBox="0 0 12 12">
<path
d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"/>
</svg>
</span>
</span>
</button>
{{end}}
<!-- 是否tag -->
{{define "flagTag"}}

7
views/friend.html
View File

@ -78,6 +78,13 @@
</div>
{{ end }}
<div class="flex justify-between gap-x-4 py-3">
<dt class="text-gray-500">早报</dt>
<dd class="flex items-start gap-x-2">
{{ template "news" . }}
</dd>
</div>
<div class="flex justify-between gap-x-4 py-3">
<dt class="text-gray-500">指令</dt>
<dd class="flex items-start gap-x-2">

16
views/group.html
View File

@ -33,19 +33,22 @@
是否在通讯录
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
是否启用AI
AI
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
是否启用水群排行榜
排行榜
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
是否启用聊天记录总结
总结
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
是否启用迎新
迎新
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
是否启用指令
早报
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
指令
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
操作
@ -98,6 +101,9 @@
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{{ template "welcome" . }}
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{{ template "news" . }}
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{{ template "command" . }}
</td>

19
views/static/js/index.js
View File

@ -80,6 +80,25 @@ function changeWelcomeEnableStatus(wxId) {
})
}
// 修改用户新闻开启状态
function changeUserNewsStatus(wxId) {
axios({
method: 'put',
url: '/api/news/status',
data: {
wxId: wxId
}
}).then(function (response) {
console.log(`返回结果: ${JSON.stringify(response)}`);
alert(`${response.data}`)
}).catch(function (error) {
console.log(`错误信息: ${error}`);
alert("修改失败")
}).finally(function () {
window.location.reload();
})
}
// 修改指令权限启用状态
function changeCommandEnableStatus(wxId) {
axios({

1
vo/friend.go
View File

@ -19,6 +19,7 @@ type FriendItem struct {
EnableWelcome bool // 是否使用迎新
EnableCommand bool // 是否启用指令
EnableSummary bool // 是否启用总结
EnableNews bool // 是否启用新闻
IsOk bool // 是否还在通讯库(群聊是要还在群里也算)
}