feat: add notify icon read
This commit is contained in:
Vendored
+1
-1
@@ -31,7 +31,7 @@ func LoadSiteCache() {
|
|||||||
var settings []models.Setting
|
var settings []models.Setting
|
||||||
database.DB.Where("section = ?", constant.SectionSite).Find(&settings)
|
database.DB.Where("section = ?", constant.SectionSite).Find(&settings)
|
||||||
for _, setting := range settings {
|
for _, setting := range settings {
|
||||||
siteCache[setting.Key] = setting.Value
|
siteCache[setting.Key] = string(setting.Value)
|
||||||
}
|
}
|
||||||
siteCacheInit = true
|
siteCacheInit = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ const (
|
|||||||
EventTaskFailed = "task_failed"
|
EventTaskFailed = "task_failed"
|
||||||
EventTaskTimeout = "task_timeout"
|
EventTaskTimeout = "task_timeout"
|
||||||
|
|
||||||
|
// 其他事件类型
|
||||||
|
EventSystemNotice = "system_notice"
|
||||||
|
EventNotifySent = "notify_sent"
|
||||||
|
|
||||||
// WebSocket 消息类型
|
// WebSocket 消息类型
|
||||||
WSTypeHeartbeat = "heartbeat"
|
WSTypeHeartbeat = "heartbeat"
|
||||||
WSTypeHeartbeatAck = "heartbeat_ack"
|
WSTypeHeartbeatAck = "heartbeat_ack"
|
||||||
@@ -110,6 +114,21 @@ const (
|
|||||||
// Agent 状态
|
// Agent 状态
|
||||||
AgentStatusOnline = "online"
|
AgentStatusOnline = "online"
|
||||||
AgentStatusOffline = "offline"
|
AgentStatusOffline = "offline"
|
||||||
|
// AppLog 分类
|
||||||
|
LogCategoryDefault = "default"
|
||||||
|
LogCategorySystemNotice = "system_notice"
|
||||||
|
LogCategoryPushLog = "push_log"
|
||||||
|
|
||||||
|
// AppLog 级别
|
||||||
|
LogLevelInfo = "info"
|
||||||
|
LogLevelWarning = "warning"
|
||||||
|
LogLevelError = "error"
|
||||||
|
|
||||||
|
// AppLog 状态
|
||||||
|
LogStatusUnread = "unread"
|
||||||
|
LogStatusRead = "read"
|
||||||
|
LogStatusSuccess = "success"
|
||||||
|
LogStatusFailed = "failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TablePrefix 表前缀,从配置文件读取
|
// TablePrefix 表前缀,从配置文件读取
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package controllers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/engigu/baihu-panel/internal/services"
|
||||||
|
"github.com/engigu/baihu-panel/internal/utils"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
type AppLogController struct {
|
||||||
|
appLogService *services.AppLogService
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewAppLogController() *AppLogController {
|
||||||
|
return &AppLogController{
|
||||||
|
appLogService: services.NewAppLogService(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetLogs 获取应用日志列表
|
||||||
|
// @Summary 获取应用日志列表
|
||||||
|
// @Tags 应用日志
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Security BearerAuth
|
||||||
|
// @Param category query string false "日志分类"
|
||||||
|
// @Param status query string false "状态"
|
||||||
|
// @Param level query string false "级别"
|
||||||
|
// @Param keyword query string false "搜索关键词"
|
||||||
|
// @Param page query int false "页码"
|
||||||
|
// @Param page_size query int false "每页数量"
|
||||||
|
// @Success 200 {object} utils.Response
|
||||||
|
// @Router /app-logs [get]
|
||||||
|
func (ac *AppLogController) GetLogs(c *gin.Context) {
|
||||||
|
p := utils.ParsePagination(c)
|
||||||
|
category := c.Query("category")
|
||||||
|
status := c.Query("status")
|
||||||
|
level := c.Query("level")
|
||||||
|
keyword := c.Query("keyword")
|
||||||
|
|
||||||
|
logs, total, err := ac.appLogService.List(category, status, level, p.Page, p.PageSize, keyword)
|
||||||
|
if err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
utils.PaginatedResponse(c, logs, total, p)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarkAsRead 标记已读
|
||||||
|
// @Summary 标记已读
|
||||||
|
// @Tags 应用日志
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Security BearerAuth
|
||||||
|
// @Param body body object true "请求体"
|
||||||
|
// @Success 200 {object} utils.Response
|
||||||
|
// @Router /app-logs/read [post]
|
||||||
|
func (ac *AppLogController) MarkAsRead(c *gin.Context) {
|
||||||
|
var req struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Category string `json:"category"`
|
||||||
|
}
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req.ID != "" {
|
||||||
|
if err := ac.appLogService.MarkAsRead(req.ID); err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if req.Category != "" {
|
||||||
|
if err := ac.appLogService.MarkAllAsRead(req.Category); err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
utils.BadRequest(c, "id 或 category 必须提供")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
utils.SuccessMsg(c, "标记成功")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearLogs 清理日志
|
||||||
|
// @Summary 清理日志
|
||||||
|
// @Tags 应用日志
|
||||||
|
// @Accept json
|
||||||
|
// @Produce json
|
||||||
|
// @Security BearerAuth
|
||||||
|
// @Param body body object true "请求体"
|
||||||
|
// @Success 200 {object} utils.Response
|
||||||
|
// @Router /app-logs/clear [post]
|
||||||
|
func (ac *AppLogController) ClearLogs(c *gin.Context) {
|
||||||
|
var req struct {
|
||||||
|
Category string `json:"category"`
|
||||||
|
}
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ac.appLogService.Clear(req.Category); err != nil {
|
||||||
|
utils.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
utils.SuccessMsg(c, "清理成功")
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/constant"
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
"github.com/engigu/baihu-panel/internal/middleware"
|
"github.com/engigu/baihu-panel/internal/middleware"
|
||||||
"github.com/engigu/baihu-panel/internal/models/vo"
|
"github.com/engigu/baihu-panel/internal/models/vo"
|
||||||
"github.com/engigu/baihu-panel/internal/services"
|
"github.com/engigu/baihu-panel/internal/services"
|
||||||
@@ -54,10 +55,13 @@ func (ac *AuthController) Login(c *gin.Context) {
|
|||||||
if val, ok := loginAttempts.Load(ip); ok {
|
if val, ok := loginAttempts.Load(ip); ok {
|
||||||
attempt := val.(*loginAttempt)
|
attempt := val.(*loginAttempt)
|
||||||
if attempt.Count >= 5 && time.Since(attempt.LastAttempt) < time.Minute {
|
if attempt.Count >= 5 && time.Since(attempt.LastAttempt) < time.Minute {
|
||||||
ac.loginLogService.Create(req.Username, ip, userAgent, "failed", "尝试次数过多,请一分钟后再试")
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
go services.NewNotificationService().TriggerEvent(constant.BindingTypeSystem, constant.EventBruteForceLogin, "", map[string]interface{}{
|
Type: constant.EventBruteForceLogin,
|
||||||
"ip": ip,
|
Payload: map[string]interface{}{
|
||||||
"username": req.Username,
|
"ip": ip,
|
||||||
|
"username": req.Username,
|
||||||
|
"userAgent": userAgent,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
utils.TooManyRequests(c, "尝试次数过多,请一分钟后再试")
|
utils.TooManyRequests(c, "尝试次数过多,请一分钟后再试")
|
||||||
return
|
return
|
||||||
@@ -77,7 +81,16 @@ func (ac *AuthController) Login(c *gin.Context) {
|
|||||||
attempt.LastAttempt = time.Now()
|
attempt.LastAttempt = time.Now()
|
||||||
|
|
||||||
// 记录登录失败日志
|
// 记录登录失败日志
|
||||||
ac.loginLogService.Create(req.Username, ip, userAgent, "failed", "用户名或密码错误")
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventUserLogin,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"ip": ip,
|
||||||
|
"username": req.Username,
|
||||||
|
"userAgent": userAgent,
|
||||||
|
"status": "failed",
|
||||||
|
"message": "用户名或密码错误",
|
||||||
|
},
|
||||||
|
})
|
||||||
utils.Unauthorized(c, "用户名或密码错误")
|
utils.Unauthorized(c, "用户名或密码错误")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -96,7 +109,16 @@ func (ac *AuthController) Login(c *gin.Context) {
|
|||||||
// 生成 token
|
// 生成 token
|
||||||
token, err := utils.GenerateToken(user.ID, user.Username, expireDays, constant.Secret)
|
token, err := utils.GenerateToken(user.ID, user.Username, expireDays, constant.Secret)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ac.loginLogService.Create(req.Username, ip, userAgent, "failed", "Token生成失败")
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventUserLogin,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"ip": ip,
|
||||||
|
"username": req.Username,
|
||||||
|
"userAgent": userAgent,
|
||||||
|
"status": "failed",
|
||||||
|
"message": "Token生成失败",
|
||||||
|
},
|
||||||
|
})
|
||||||
utils.ServerError(c, "登录失败")
|
utils.ServerError(c, "登录失败")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -105,11 +127,15 @@ func (ac *AuthController) Login(c *gin.Context) {
|
|||||||
middleware.SetAuthCookie(c, token, expireDays)
|
middleware.SetAuthCookie(c, token, expireDays)
|
||||||
|
|
||||||
// 记录登录成功日志
|
// 记录登录成功日志
|
||||||
ac.loginLogService.Create(req.Username, ip, userAgent, "success", "登录成功")
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventUserLogin,
|
||||||
go services.NewNotificationService().TriggerEvent(constant.BindingTypeSystem, constant.EventUserLogin, "", map[string]interface{}{
|
Payload: map[string]interface{}{
|
||||||
"ip": ip,
|
"ip": ip,
|
||||||
"username": req.Username,
|
"username": req.Username,
|
||||||
|
"userAgent": userAgent,
|
||||||
|
"status": "success",
|
||||||
|
"message": "登录成功",
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
utils.Success(c, gin.H{
|
utils.Success(c, gin.H{
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ func (lc *LogController) GetLogs(c *gin.Context) {
|
|||||||
TaskName: task.Name,
|
TaskName: task.Name,
|
||||||
TaskType: taskType,
|
TaskType: taskType,
|
||||||
AgentID: log.AgentID,
|
AgentID: log.AgentID,
|
||||||
Command: log.Command,
|
Command: string(log.Command),
|
||||||
Status: log.Status,
|
Status: log.Status,
|
||||||
Duration: log.Duration,
|
Duration: log.Duration,
|
||||||
StartTime: log.StartTime,
|
StartTime: log.StartTime,
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func (lc *LogWSController) StreamLog(c *gin.Context) {
|
|||||||
if err := database.DB.Where("id = ?", logID).First(&taskLog).Error; err == nil {
|
if err := database.DB.Where("id = ?", logID).First(&taskLog).Error; err == nil {
|
||||||
if taskLog.Status != "running" {
|
if taskLog.Status != "running" {
|
||||||
// 已结束,读取库内日志
|
// 已结束,读取库内日志
|
||||||
content, err := utils.DecompressFromBase64(taskLog.Output)
|
content, err := utils.DecompressFromBase64(string(taskLog.Output))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
conn.WriteMessage(websocket.TextMessage, []byte("解压日志失败: "+err.Error()))
|
conn.WriteMessage(websocket.TextMessage, []byte("解压日志失败: "+err.Error()))
|
||||||
return
|
return
|
||||||
@@ -75,7 +75,7 @@ func (lc *LogWSController) StreamLog(c *gin.Context) {
|
|||||||
// 任务结束,尝试刷新最后一次库内完整内容
|
// 任务结束,尝试刷新最后一次库内完整内容
|
||||||
var finalLog models.TaskLog
|
var finalLog models.TaskLog
|
||||||
if err := database.DB.Where("id = ?", logID).First(&finalLog).Error; err == nil {
|
if err := database.DB.Where("id = ?", logID).First(&finalLog).Error; err == nil {
|
||||||
content, _ := utils.DecompressFromBase64(finalLog.Output)
|
content, _ := utils.DecompressFromBase64(string(finalLog.Output))
|
||||||
if content != "" {
|
if content != "" {
|
||||||
conn.WriteMessage(websocket.TextMessage, []byte("\n--- 任务已结束 ---\n"))
|
conn.WriteMessage(websocket.TextMessage, []byte("\n--- 任务已结束 ---\n"))
|
||||||
// 这里可以选择性再推一次完整版,或直接退出
|
// 这里可以选择性再推一次完整版,或直接退出
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/constant"
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/database"
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
"github.com/engigu/baihu-panel/internal/models/vo"
|
"github.com/engigu/baihu-panel/internal/models/vo"
|
||||||
"github.com/engigu/baihu-panel/internal/services"
|
"github.com/engigu/baihu-panel/internal/services"
|
||||||
@@ -76,8 +76,11 @@ func (sc *SettingsController) ChangePassword(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
go services.NewNotificationService().TriggerEvent(constant.BindingTypeSystem, constant.EventPasswordChanged, "", map[string]interface{}{
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
"username": user.Username,
|
Type: constant.EventPasswordChanged,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"username": user.Username,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
utils.SuccessMsg(c, "密码修改成功")
|
utils.SuccessMsg(c, "密码修改成功")
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var DB *gorm.DB
|
var DB *gorm.DB
|
||||||
|
var DBConfig *Config
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Type string // sqlite, mysql, postgres
|
Type string // sqlite, mysql, postgres
|
||||||
@@ -28,6 +29,7 @@ type Config struct {
|
|||||||
|
|
||||||
func Init(cfg *Config) error {
|
func Init(cfg *Config) error {
|
||||||
var err error
|
var err error
|
||||||
|
DBConfig = cfg
|
||||||
// 设置东八区时区
|
// 设置东八区时区
|
||||||
loc := systime.CST
|
loc := systime.CST
|
||||||
time.Local = loc
|
time.Local = loc
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
package database
|
package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/logger"
|
"github.com/engigu/baihu-panel/internal/logger"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
"gorm.io/gorm/schema"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func Migrate() error {
|
func Migrate() error {
|
||||||
@@ -17,6 +14,7 @@ func Migrate() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
allModels := []interface{}{
|
allModels := []interface{}{
|
||||||
|
&models.AppLog{},
|
||||||
&models.User{},
|
&models.User{},
|
||||||
&models.Task{},
|
&models.Task{},
|
||||||
&models.TaskLog{},
|
&models.TaskLog{},
|
||||||
@@ -37,68 +35,9 @@ func Migrate() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// MySQL 的 TEXT 类型最大 64KB,LONGTEXT 最大 4GB
|
|
||||||
// 模型统一使用 type:text 保持跨数据库兼容,这里针对 MySQL 自动升级为 LONGTEXT
|
|
||||||
mysqlUpgradeTextColumns(allModels...)
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// mysqlUpgradeTextColumns 反射扫描所有模型,将 gorm tag 中 type:text 的字段在 MySQL 上升级为 LONGTEXT
|
|
||||||
func mysqlUpgradeTextColumns(allModels ...interface{}) {
|
|
||||||
if DB.Dialector.Name() != "mysql" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取当前数据库名
|
|
||||||
var dbName string
|
|
||||||
DB.Raw("SELECT DATABASE()").Scan(&dbName)
|
|
||||||
|
|
||||||
ns := schema.NamingStrategy{}
|
|
||||||
|
|
||||||
for _, model := range allModels {
|
|
||||||
typ := reflect.TypeOf(model)
|
|
||||||
if typ.Kind() == reflect.Ptr {
|
|
||||||
typ = typ.Elem()
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取表名
|
|
||||||
tableName := ""
|
|
||||||
if tabler, ok := model.(interface{ TableName() string }); ok {
|
|
||||||
tableName = tabler.TableName()
|
|
||||||
} else {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < typ.NumField(); i++ {
|
|
||||||
field := typ.Field(i)
|
|
||||||
gormTag := field.Tag.Get("gorm")
|
|
||||||
if gormTag == "" || !hasGormTypeText(gormTag) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// 从 gorm tag 获取列名,没有则用 GORM 命名策略转换
|
|
||||||
columnName := parseGormColumn(gormTag)
|
|
||||||
if columnName == "" {
|
|
||||||
columnName = ns.ColumnName("", field.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查当前列类型,已经是 longtext 则跳过
|
|
||||||
var columnType string
|
|
||||||
DB.Raw("SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME = ?",
|
|
||||||
dbName, tableName, columnName).Scan(&columnType)
|
|
||||||
if strings.EqualFold(columnType, "longtext") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
sql := fmt.Sprintf("ALTER TABLE `%s` MODIFY COLUMN `%s` LONGTEXT", tableName, columnName)
|
|
||||||
if err := DB.Exec(sql).Error; err != nil {
|
|
||||||
logger.Debugf("[Database] MySQL 升级 %s.%s 为 LONGTEXT: %v", tableName, columnName, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// hasGormTypeText 检查 gorm tag 中是否包含 type:text
|
// hasGormTypeText 检查 gorm tag 中是否包含 type:text
|
||||||
func hasGormTypeText(gormTag string) bool {
|
func hasGormTypeText(gormTag string) bool {
|
||||||
for _, part := range strings.Split(gormTag, ";") {
|
for _, part := range strings.Split(gormTag, ";") {
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package eventbus
|
||||||
|
|
||||||
|
import "sync"
|
||||||
|
|
||||||
|
// Event 统一定义的事件体内包含的数据
|
||||||
|
type Event struct {
|
||||||
|
Type string
|
||||||
|
Payload interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler 事件具体的执行句柄
|
||||||
|
type Handler func(event Event)
|
||||||
|
|
||||||
|
// Subscriber 事件订阅者接口,各业务 Service 若关注系统总线可实现此接口
|
||||||
|
type Subscriber interface {
|
||||||
|
SubscribeEvents(bus *EventBus)
|
||||||
|
}
|
||||||
|
|
||||||
|
type EventBus struct {
|
||||||
|
handlers map[string][]Handler
|
||||||
|
mu sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func New() *EventBus {
|
||||||
|
return &EventBus{
|
||||||
|
handlers: make(map[string][]Handler),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Subscribe 注册订阅事件
|
||||||
|
func (bus *EventBus) Subscribe(eventType string, handler Handler) {
|
||||||
|
bus.mu.Lock()
|
||||||
|
defer bus.mu.Unlock()
|
||||||
|
bus.handlers[eventType] = append(bus.handlers[eventType], handler)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Publish 异步抛出事件
|
||||||
|
func (bus *EventBus) Publish(event Event) {
|
||||||
|
bus.mu.RLock()
|
||||||
|
handlers := bus.handlers[event.Type]
|
||||||
|
bus.mu.RUnlock()
|
||||||
|
|
||||||
|
for _, handler := range handlers {
|
||||||
|
// 采用 Goroutine 异步不阻塞核心主线
|
||||||
|
go handler(event)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 全局唯一的事件总线实例
|
||||||
|
var DefaultBus = New()
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AppLog 统一应用日志与通知记录
|
||||||
|
type AppLog struct {
|
||||||
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
|
Category string `json:"category" gorm:"size:50;index;not null"` // 大类:constant.LogCategorySystemNotice(系统通知), constant.LogCategoryPushLog(推送记录) 等
|
||||||
|
Title string `json:"title" gorm:"size:255"` // 消息标题
|
||||||
|
Content BigText `json:"content"` // 详细内容/Payload
|
||||||
|
Level string `json:"level" gorm:"size:20;index"` // 级别:constant.LogLevelInfo, constant.LogLevelWarning, constant.LogLevelError
|
||||||
|
Status string `json:"status" gorm:"size:20;index"` // 状态:系统通知为 constant.LogStatusRead/constant.LogStatusUnread,推送为 constant.LogStatusSuccess/constant.LogStatusFailed
|
||||||
|
RefID string `json:"ref_id" gorm:"size:50;index"` // 关联对象ID(选填,比如绑定的通知渠道ID、任务ID等)
|
||||||
|
ErrorMsg BigText `json:"error_msg"` // 执行错误信息详情
|
||||||
|
CreatedAt LocalTime `json:"created_at" gorm:"index"`
|
||||||
|
ReadAt *LocalTime `json:"read_at"` // 已读时间(仅对通知生效)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (AppLog) TableName() string {
|
||||||
|
return constant.TablePrefix + "app_logs"
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
// BigText 自定义大数据文本类型,自动处理跨数据库类型差异
|
||||||
|
// MySQL: LONGTEXT (4GB)
|
||||||
|
// PostgreSQL: TEXT
|
||||||
|
// SQLite: TEXT
|
||||||
|
type BigText string
|
||||||
|
|
||||||
|
func (BigText) GormDBDataType(db *gorm.DB, field *schema.Field) string {
|
||||||
|
switch db.Dialector.Name() {
|
||||||
|
case "mysql":
|
||||||
|
return "LONGTEXT"
|
||||||
|
case "postgres":
|
||||||
|
return "TEXT"
|
||||||
|
case "sqlite":
|
||||||
|
return "TEXT"
|
||||||
|
}
|
||||||
|
return "TEXT"
|
||||||
|
}
|
||||||
@@ -14,7 +14,7 @@ type Dependency struct {
|
|||||||
Language string `json:"language" gorm:"size:100;index"` // 关联语言 (node, python...)
|
Language string `json:"language" gorm:"size:100;index"` // 关联语言 (node, python...)
|
||||||
LangVersion string `json:"lang_version" gorm:"size:100;index"` // 关联语言版本
|
LangVersion string `json:"lang_version" gorm:"size:100;index"` // 关联语言版本
|
||||||
Remark string `json:"remark" gorm:"size:255"`
|
Remark string `json:"remark" gorm:"size:255"`
|
||||||
Log string `json:"log" gorm:"type:text"`
|
Log BigText `json:"log"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
type EnvironmentVariable struct {
|
type EnvironmentVariable struct {
|
||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
Name string `json:"name" gorm:"size:255;not null"`
|
Name string `json:"name" gorm:"size:255;not null"`
|
||||||
Value string `json:"value" gorm:"type:text"`
|
Value BigText `json:"value"`
|
||||||
Remark string `json:"remark" gorm:"size:500"`
|
Remark string `json:"remark" gorm:"size:500"`
|
||||||
Hidden bool `json:"hidden" gorm:"default:true"`
|
Hidden bool `json:"hidden" gorm:"default:true"`
|
||||||
UserID string `json:"user_id" gorm:"size:20;index"`
|
UserID string `json:"user_id" gorm:"size:20;index"`
|
||||||
@@ -27,7 +27,7 @@ func (EnvironmentVariable) TableName() string {
|
|||||||
type Script struct {
|
type Script struct {
|
||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
Name string `json:"name" gorm:"size:255;not null"`
|
Name string `json:"name" gorm:"size:255;not null"`
|
||||||
Content string `json:"content" gorm:"type:text"`
|
Content BigText `json:"content"`
|
||||||
UserID string `json:"user_id" gorm:"size:20;index"`
|
UserID string `json:"user_id" gorm:"size:20;index"`
|
||||||
CreatedAt LocalTime `json:"created_at"`
|
CreatedAt LocalTime `json:"created_at"`
|
||||||
UpdatedAt LocalTime `json:"updated_at"`
|
UpdatedAt LocalTime `json:"updated_at"`
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ type NotifyWay struct {
|
|||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
Name string `json:"name" gorm:"size:100;not null"`
|
Name string `json:"name" gorm:"size:100;not null"`
|
||||||
Type string `json:"type" gorm:"size:50;not null;index"`
|
Type string `json:"type" gorm:"size:50;not null;index"`
|
||||||
Config string `json:"config" gorm:"type:text"`
|
Config BigText `json:"config"`
|
||||||
Enabled bool `json:"enabled" gorm:"default:true;index"`
|
Enabled bool `json:"enabled" gorm:"default:true;index"`
|
||||||
CreatedAt LocalTime `json:"created_at"`
|
CreatedAt LocalTime `json:"created_at"`
|
||||||
UpdatedAt LocalTime `json:"updated_at"`
|
UpdatedAt LocalTime `json:"updated_at"`
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ type Setting struct {
|
|||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
Section string `json:"section" gorm:"size:50;not null;index:idx_section_key"`
|
Section string `json:"section" gorm:"size:50;not null;index:idx_section_key"`
|
||||||
Key string `json:"key" gorm:"size:100;not null;index:idx_section_key"`
|
Key string `json:"key" gorm:"size:100;not null;index:idx_section_key"`
|
||||||
Value string `json:"value" gorm:"type:text"`
|
Value BigText `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (Setting) TableName() string {
|
func (Setting) TableName() string {
|
||||||
|
|||||||
+10
-10
@@ -35,23 +35,23 @@ type TaskConfig struct {
|
|||||||
type Task struct {
|
type Task struct {
|
||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
Name string `json:"name" gorm:"size:255;not null"`
|
Name string `json:"name" gorm:"size:255;not null"`
|
||||||
Command string `json:"command" gorm:"type:text"` // 普通任务的命令
|
Command BigText `json:"command"` // 普通任务的命令
|
||||||
Tags string `json:"tags" gorm:"size:255;default:''"` // 标签,逗号分隔
|
Tags string `json:"tags" gorm:"size:255;default:''"` // 标签,逗号分隔
|
||||||
Type string `json:"type" gorm:"size:20;default:'task'"` // 任务类型: constant.TaskTypeNormal, constant.TaskTypeRepo
|
Type string `json:"type" gorm:"size:20;default:'task'"` // 任务类型: constant.TaskTypeNormal, constant.TaskTypeRepo
|
||||||
TriggerType string `json:"trigger_type" gorm:"size:25;default:'cron'"` // 触发类型: constant.TriggerTypeCron, constant.TriggerTypeBaihuStartup
|
TriggerType string `json:"trigger_type" gorm:"size:25;default:'cron'"` // 触发类型: constant.TriggerTypeCron, constant.TriggerTypeBaihuStartup
|
||||||
Config string `json:"config" gorm:"type:text"` // 配置 JSON(仓库同步配置等)
|
Config BigText `json:"config"` // 配置 JSON(仓库同步配置等)
|
||||||
Schedule string `json:"schedule" gorm:"size:100"` // cron 表达式
|
Schedule string `json:"schedule" gorm:"size:100"` // cron 表达式
|
||||||
Timeout int `json:"timeout" gorm:"default:30"` // 超时时间(分钟),默认30分钟
|
Timeout int `json:"timeout" gorm:"default:30"` // 超时时间(分钟),默认30分钟
|
||||||
WorkDir string `json:"work_dir" gorm:"size:255;default:''"` // 工作目录,为空则使用 scripts 目录
|
WorkDir string `json:"work_dir" gorm:"size:255;default:''"` // 工作目录,为空则使用 scripts 目录
|
||||||
CleanConfig string `json:"clean_config" gorm:"size:255;default:''"` // 清理配置 JSON
|
CleanConfig string `json:"clean_config" gorm:"size:255;default:''"` // 清理配置 JSON
|
||||||
Envs string `json:"envs" gorm:"type:text"` // 环境变量ID列表,逗号分隔
|
Envs BigText `json:"envs"` // 环境变量ID列表,逗号分隔
|
||||||
Languages []map[string]string `json:"languages" gorm:"serializer:json;type:text"` // 针对本地任务的语言配置列表
|
Languages []map[string]string `json:"languages" gorm:"serializer:json"` // 针对本地任务的语言配置列表
|
||||||
AgentID *string `json:"agent_id" gorm:"size:20;index"` // Agent ID,为空表示本地执行
|
AgentID *string `json:"agent_id" gorm:"size:20;index"` // Agent ID,为空表示本地执行
|
||||||
RetryCount int `json:"retry_count" gorm:"default:0"` // 失败重试次数
|
RetryCount int `json:"retry_count" gorm:"default:0"` // 失败重试次数
|
||||||
RetryInterval int `json:"retry_interval" gorm:"default:0"` // 失败重试间隔(秒)
|
RetryInterval int `json:"retry_interval" gorm:"default:0"` // 失败重试间隔(秒)
|
||||||
RandomRange int `json:"random_range" gorm:"default:0"` // 随机延迟范围(秒)
|
RandomRange int `json:"random_range" gorm:"default:0"` // 随机延迟范围(秒)
|
||||||
Enabled bool `json:"enabled" gorm:"default:true"`
|
Enabled bool `json:"enabled" gorm:"default:true"`
|
||||||
RunningGo string `json:"running_go" gorm:"type:text"` // 正在运行的 go routine id 数组 (JSON)
|
RunningGo BigText `json:"running_go"` // 正在运行的 go routine id 数组 (JSON)
|
||||||
RuntimeEnvs []string `json:"-" gorm:"-"` // 运行时环境变量(非持久化)
|
RuntimeEnvs []string `json:"-" gorm:"-"` // 运行时环境变量(非持久化)
|
||||||
LastRun *LocalTime `json:"last_run"`
|
LastRun *LocalTime `json:"last_run"`
|
||||||
NextRun *LocalTime `json:"next_run"`
|
NextRun *LocalTime `json:"next_run"`
|
||||||
@@ -73,7 +73,7 @@ func (t *Task) GetName() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *Task) GetCommand() string {
|
func (t *Task) GetCommand() string {
|
||||||
return t.Command
|
return string(t.Command)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *Task) GetTimeout() int {
|
func (t *Task) GetTimeout() int {
|
||||||
@@ -85,7 +85,7 @@ func (t *Task) GetWorkDir() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *Task) GetEnvs() string {
|
func (t *Task) GetEnvs() string {
|
||||||
return t.Envs
|
return string(t.Envs)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *Task) GetLanguages() []map[string]string {
|
func (t *Task) GetLanguages() []map[string]string {
|
||||||
@@ -117,9 +117,9 @@ type TaskLog struct {
|
|||||||
ID string `json:"id" gorm:"primaryKey;size:20"`
|
ID string `json:"id" gorm:"primaryKey;size:20"`
|
||||||
TaskID string `json:"task_id" gorm:"size:20;index"`
|
TaskID string `json:"task_id" gorm:"size:20;index"`
|
||||||
AgentID *string `json:"agent_id" gorm:"size:20;index"` // Agent ID,为空表示本地执行
|
AgentID *string `json:"agent_id" gorm:"size:20;index"` // Agent ID,为空表示本地执行
|
||||||
Command string `json:"command" gorm:"type:text"`
|
Command BigText `json:"command"`
|
||||||
Output string `json:"-" gorm:"type:text"` // gzip+base64 压缩后的日志
|
Output BigText `json:"-"` // gzip+base64 压缩后的日志
|
||||||
Error string `json:"error" gorm:"type:text"` // 额外的系统错误信息
|
Error BigText `json:"error"` // 额外的系统错误信息
|
||||||
Status string `json:"status" gorm:"size:20;index"` // success, failed
|
Status string `json:"status" gorm:"size:20;index"` // success, failed
|
||||||
Duration int64 `json:"duration"` // 执行耗时(毫秒)
|
Duration int64 `json:"duration"` // 执行耗时(毫秒)
|
||||||
ExitCode int `json:"exit_code"`
|
ExitCode int `json:"exit_code"`
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ func ToDependencyVO(dep *models.Dependency) *DependencyVO {
|
|||||||
Language: dep.Language,
|
Language: dep.Language,
|
||||||
LangVersion: dep.LangVersion,
|
LangVersion: dep.LangVersion,
|
||||||
Remark: dep.Remark,
|
Remark: dep.Remark,
|
||||||
Log: dep.Log,
|
Log: string(dep.Log),
|
||||||
CreatedAt: dep.CreatedAt,
|
CreatedAt: dep.CreatedAt,
|
||||||
UpdatedAt: dep.UpdatedAt,
|
UpdatedAt: dep.UpdatedAt,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ func ToScriptVO(script *models.Script) *ScriptVO {
|
|||||||
return &ScriptVO{
|
return &ScriptVO{
|
||||||
ID: script.ID,
|
ID: script.ID,
|
||||||
Name: script.Name,
|
Name: script.Name,
|
||||||
Content: script.Content,
|
Content: string(script.Content),
|
||||||
CreatedAt: script.CreatedAt,
|
CreatedAt: script.CreatedAt,
|
||||||
UpdatedAt: script.UpdatedAt,
|
UpdatedAt: script.UpdatedAt,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ func ToEnvVO(env *models.EnvironmentVariable) *EnvVO {
|
|||||||
return &EnvVO{
|
return &EnvVO{
|
||||||
ID: env.ID,
|
ID: env.ID,
|
||||||
Name: env.Name,
|
Name: env.Name,
|
||||||
Value: env.Value,
|
Value: string(env.Value),
|
||||||
Remark: env.Remark,
|
Remark: env.Remark,
|
||||||
Hidden: env.Hidden,
|
Hidden: env.Hidden,
|
||||||
CreatedAt: env.CreatedAt,
|
CreatedAt: env.CreatedAt,
|
||||||
|
|||||||
@@ -39,16 +39,16 @@ func ToTaskVO(task *models.Task) *TaskVO {
|
|||||||
return &TaskVO{
|
return &TaskVO{
|
||||||
ID: task.ID,
|
ID: task.ID,
|
||||||
Name: task.Name,
|
Name: task.Name,
|
||||||
Command: task.Command,
|
Command: string(task.Command),
|
||||||
Tags: task.Tags,
|
Tags: task.Tags,
|
||||||
Type: task.Type,
|
Type: task.Type,
|
||||||
TriggerType: task.TriggerType,
|
TriggerType: task.TriggerType,
|
||||||
Config: task.Config,
|
Config: string(task.Config),
|
||||||
Schedule: task.Schedule,
|
Schedule: task.Schedule,
|
||||||
Timeout: task.Timeout,
|
Timeout: task.Timeout,
|
||||||
WorkDir: task.WorkDir,
|
WorkDir: task.WorkDir,
|
||||||
CleanConfig: task.CleanConfig,
|
CleanConfig: task.CleanConfig,
|
||||||
Envs: task.Envs,
|
Envs: string(task.Envs),
|
||||||
Languages: task.Languages,
|
Languages: task.Languages,
|
||||||
AgentID: task.AgentID,
|
AgentID: task.AgentID,
|
||||||
Enabled: task.Enabled,
|
Enabled: task.Enabled,
|
||||||
@@ -112,15 +112,15 @@ func ToTaskLogVO(log *models.TaskLog) *TaskLogVO {
|
|||||||
ID: log.ID,
|
ID: log.ID,
|
||||||
TaskID: log.TaskID,
|
TaskID: log.TaskID,
|
||||||
AgentID: log.AgentID,
|
AgentID: log.AgentID,
|
||||||
Command: log.Command,
|
Command: string(log.Command),
|
||||||
Error: log.Error,
|
Error: string(log.Error),
|
||||||
Status: log.Status,
|
Status: log.Status,
|
||||||
Duration: log.Duration,
|
Duration: log.Duration,
|
||||||
ExitCode: log.ExitCode,
|
ExitCode: log.ExitCode,
|
||||||
StartTime: log.StartTime,
|
StartTime: log.StartTime,
|
||||||
EndTime: log.EndTime,
|
EndTime: log.EndTime,
|
||||||
CreatedAt: log.CreatedAt,
|
CreatedAt: log.CreatedAt,
|
||||||
Output: log.Output,
|
Output: string(log.Output),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import (
|
||||||
|
// "fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
// "github.com/engigu/baihu-panel/internal/constant"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
|
// "github.com/engigu/baihu-panel/internal/logger"
|
||||||
|
// "github.com/engigu/baihu-panel/internal/models"
|
||||||
|
"github.com/engigu/baihu-panel/internal/services"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupEventHandlers(subscribers ...eventbus.Subscriber) {
|
||||||
|
bus := eventbus.DefaultBus
|
||||||
|
|
||||||
|
// 遍历并统一初始化所有订阅者的事件链路
|
||||||
|
for _, s := range subscribers {
|
||||||
|
s.SubscribeEvents(bus)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func startAppLogCleanup(appLogSvc *services.AppLogService) {
|
||||||
|
// 初始化时执行一次清理
|
||||||
|
appLogSvc.CleanUp()
|
||||||
|
|
||||||
|
// 每天凌晨或者定期清理
|
||||||
|
ticker := time.NewTicker(24 * time.Hour)
|
||||||
|
for range ticker.C {
|
||||||
|
appLogSvc.CleanUp()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,17 +26,23 @@ func RegisterControllers() *Controllers {
|
|||||||
|
|
||||||
taskLogService := tasks.NewTaskLogService(sendStatsService)
|
taskLogService := tasks.NewTaskLogService(sendStatsService)
|
||||||
// 创建任务执行服务(需要依赖注入)
|
// 创建任务执行服务(需要依赖注入)
|
||||||
|
notifyService := services.NewNotificationService()
|
||||||
|
appLogService := services.NewAppLogService()
|
||||||
|
|
||||||
// 清理 task 运行状态的任务可以直接由 executorService 承担或在此处通过 Database 直接清理
|
// 清理 task 运行状态的任务可以直接由 executorService 承担或在此处通过 Database 直接清理
|
||||||
// 简单期间,我们使用一个新方法 tasks.CleanupRunningTasks() 或者让 executorService 启动时清理
|
// 简单期间,我们使用一个新方法 tasks.CleanupRunningTasks() 或者让 executorService 启动时清理
|
||||||
|
|
||||||
executorService = tasks.NewExecutorService(taskService, taskLogService, agentWSManager, settingsService, envService, services.NewNotificationService())
|
executorService = tasks.NewExecutorService(taskService, taskLogService, agentWSManager, settingsService, envService)
|
||||||
// 启动时清理残留的运行状态
|
// 启动时清理残留的运行状态
|
||||||
_ = executorService.CleanupRunningTasks()
|
_ = executorService.CleanupRunningTasks()
|
||||||
|
|
||||||
// 启动计划任务
|
// 启动计划任务
|
||||||
executorService.StartCron()
|
executorService.StartCron()
|
||||||
|
|
||||||
|
// 初始化所有关注系统总线的服务
|
||||||
|
setupEventHandlers(appLogService, notifyService, loginLogService)
|
||||||
|
go startAppLogCleanup(appLogService)
|
||||||
|
|
||||||
// 初始化并返回控制器
|
// 初始化并返回控制器
|
||||||
return &Controllers{
|
return &Controllers{
|
||||||
Task: controllers.NewTaskController(taskService, executorService),
|
Task: controllers.NewTaskController(taskService, executorService),
|
||||||
@@ -54,6 +60,7 @@ func RegisterControllers() *Controllers {
|
|||||||
Agent: controllers.NewAgentController(settingsService),
|
Agent: controllers.NewAgentController(settingsService),
|
||||||
Mise: controllers.NewMiseController(services.NewMiseService()),
|
Mise: controllers.NewMiseController(services.NewMiseService()),
|
||||||
Notification: controllers.NewNotificationController(),
|
Notification: controllers.NewNotificationController(),
|
||||||
|
AppLog: controllers.NewAppLogController(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ type Controllers struct {
|
|||||||
Agent *controllers.AgentController
|
Agent *controllers.AgentController
|
||||||
Mise *controllers.MiseController
|
Mise *controllers.MiseController
|
||||||
Notification *controllers.NotificationController
|
Notification *controllers.NotificationController
|
||||||
|
AppLog *controllers.AppLogController
|
||||||
}
|
}
|
||||||
|
|
||||||
func mustSubFS(fsys fs.FS, dir string) fs.FS {
|
func mustSubFS(fsys fs.FS, dir string) fs.FS {
|
||||||
@@ -249,6 +250,7 @@ func initAuthorizedAPIRoutes(api *gin.RouterGroup, c *Controllers) {
|
|||||||
registerAgentRoutes(authorized, c)
|
registerAgentRoutes(authorized, c)
|
||||||
registerMiseRoutes(authorized, c)
|
registerMiseRoutes(authorized, c)
|
||||||
registerNotificationRoutes(authorized, c)
|
registerNotificationRoutes(authorized, c)
|
||||||
|
registerAppLogRoutes(authorized, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 通知发送 API(使用通知 Token 认证,供脚本调用)
|
// 通知发送 API(使用通知 Token 认证,供脚本调用)
|
||||||
@@ -421,6 +423,15 @@ func registerNotificationRoutes(g *gin.RouterGroup, c *Controllers) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func registerAppLogRoutes(g *gin.RouterGroup, c *Controllers) {
|
||||||
|
appLogs := g.Group("/app-logs")
|
||||||
|
{
|
||||||
|
appLogs.GET("", c.AppLog.GetLogs)
|
||||||
|
appLogs.POST("/read", c.AppLog.MarkAsRead)
|
||||||
|
appLogs.POST("/clear", c.AppLog.ClearLogs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func initAgentAPIRoutes(root *gin.RouterGroup, c *Controllers) {
|
func initAgentAPIRoutes(root *gin.RouterGroup, c *Controllers) {
|
||||||
// Agent API(供远程 Agent 调用,不使用 /v1 版本号)
|
// Agent API(供远程 Agent 调用,不使用 /v1 版本号)
|
||||||
agentAPI := root.Group("/api/agent")
|
agentAPI := root.Group("/api/agent")
|
||||||
|
|||||||
@@ -331,8 +331,8 @@ func (s *AgentService) GetTasks(agentID string) []models.AgentTask {
|
|||||||
|
|
||||||
if allEnvs {
|
if allEnvs {
|
||||||
envVars = envService.GetAllEnvVars()
|
envVars = envService.GetAllEnvVars()
|
||||||
} else if task.Envs != "" {
|
} else if string(task.Envs) != "" {
|
||||||
envVars = envService.GetEnvVarsByIDs(task.Envs)
|
envVars = envService.GetEnvVarsByIDs(string(task.Envs))
|
||||||
}
|
}
|
||||||
|
|
||||||
envVarsStr := executor.FormatEnvVars(envVars)
|
envVarsStr := executor.FormatEnvVars(envVars)
|
||||||
@@ -340,7 +340,7 @@ func (s *AgentService) GetTasks(agentID string) []models.AgentTask {
|
|||||||
result[i] = models.AgentTask{
|
result[i] = models.AgentTask{
|
||||||
ID: task.ID,
|
ID: task.ID,
|
||||||
Name: task.Name,
|
Name: task.Name,
|
||||||
Command: task.Command,
|
Command: string(task.Command),
|
||||||
Schedule: task.Schedule,
|
Schedule: task.Schedule,
|
||||||
Timeout: task.Timeout,
|
Timeout: task.Timeout,
|
||||||
WorkDir: task.WorkDir,
|
WorkDir: task.WorkDir,
|
||||||
|
|||||||
@@ -0,0 +1,239 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"fmt"
|
||||||
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
|
"github.com/engigu/baihu-panel/internal/logger"
|
||||||
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
|
"github.com/engigu/baihu-panel/internal/utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
type LogRetentionConfig struct {
|
||||||
|
Days int `json:"days"`
|
||||||
|
MaxCount int `json:"max_count"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AppLogService struct {
|
||||||
|
settingsService *SettingsService
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewAppLogService() *AppLogService {
|
||||||
|
return &AppLogService{
|
||||||
|
settingsService: NewSettingsService(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) Add(log *models.AppLog) error {
|
||||||
|
if log.ID == "" {
|
||||||
|
log.ID = utils.GenerateID()
|
||||||
|
}
|
||||||
|
return database.DB.Create(log).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) List(category string, status string, level string, page, pageSize int, keyword string) ([]models.AppLog, int64, error) {
|
||||||
|
var logs []models.AppLog
|
||||||
|
var total int64
|
||||||
|
query := database.DB.Model(&models.AppLog{})
|
||||||
|
|
||||||
|
if category != "" {
|
||||||
|
query = query.Where("category = ?", category)
|
||||||
|
}
|
||||||
|
if status != "" {
|
||||||
|
query = query.Where("status = ?", status)
|
||||||
|
}
|
||||||
|
if level != "" {
|
||||||
|
query = query.Where("level = ?", level)
|
||||||
|
}
|
||||||
|
if keyword != "" {
|
||||||
|
query = query.Where("(title LIKE ? OR content LIKE ?)", "%"+keyword+"%", "%"+keyword+"%")
|
||||||
|
}
|
||||||
|
|
||||||
|
query.Count(&total)
|
||||||
|
offset := (page - 1) * pageSize
|
||||||
|
err := query.Order("created_at desc").Offset(offset).Limit(pageSize).Find(&logs).Error
|
||||||
|
return logs, total, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) MarkAsRead(id string) error {
|
||||||
|
now := models.LocalTime(time.Now())
|
||||||
|
return database.DB.Model(&models.AppLog{}).Where("id = ?", id).Updates(map[string]interface{}{
|
||||||
|
"status": constant.LogStatusRead,
|
||||||
|
"read_at": &now,
|
||||||
|
}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) MarkAllAsRead(category string) error {
|
||||||
|
now := models.LocalTime(time.Now())
|
||||||
|
return database.DB.Model(&models.AppLog{}).Where("category = ? AND status = ?", category, constant.LogStatusUnread).Updates(map[string]interface{}{
|
||||||
|
"status": constant.LogStatusRead,
|
||||||
|
"read_at": &now,
|
||||||
|
}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) Clear(category string) error {
|
||||||
|
query := database.DB.Model(&models.AppLog{})
|
||||||
|
if category != "" {
|
||||||
|
query = query.Where("category = ?", category)
|
||||||
|
}
|
||||||
|
return query.Unscoped().Delete(&models.AppLog{}).Error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) GetRetentionConfigs() map[string]LogRetentionConfig {
|
||||||
|
val := s.settingsService.Get(constant.SectionSystem, "log_retention")
|
||||||
|
var configs map[string]LogRetentionConfig
|
||||||
|
if val != "" {
|
||||||
|
_ = json.Unmarshal([]byte(val), &configs)
|
||||||
|
}
|
||||||
|
if configs == nil {
|
||||||
|
configs = map[string]LogRetentionConfig{
|
||||||
|
constant.LogCategorySystemNotice: {Days: 30, MaxCount: 500},
|
||||||
|
constant.LogCategoryPushLog: {Days: 15, MaxCount: 5000},
|
||||||
|
constant.LogCategoryDefault: {Days: 30, MaxCount: 10000},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return configs
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) CleanUp() {
|
||||||
|
configs := s.GetRetentionConfigs()
|
||||||
|
categories := []string{constant.LogCategorySystemNotice, constant.LogCategoryPushLog}
|
||||||
|
|
||||||
|
for _, cat := range categories {
|
||||||
|
cfg, ok := configs[cat]
|
||||||
|
if !ok {
|
||||||
|
cfg = configs[constant.LogCategoryDefault]
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.Days > 0 {
|
||||||
|
deadline := time.Now().AddDate(0, 0, -cfg.Days)
|
||||||
|
database.DB.Unscoped().Where("category = ? AND created_at < ?", cat, deadline).Delete(&models.AppLog{})
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.MaxCount > 0 {
|
||||||
|
var total int64
|
||||||
|
database.DB.Model(&models.AppLog{}).Where("category = ?", cat).Count(&total)
|
||||||
|
if total > int64(cfg.MaxCount) {
|
||||||
|
deleteCount := total - int64(cfg.MaxCount)
|
||||||
|
var ids []string
|
||||||
|
database.DB.Model(&models.AppLog{}).Where("category = ?", cat).Order("created_at asc").Limit(int(deleteCount)).Pluck("id", &ids)
|
||||||
|
if len(ids) > 0 {
|
||||||
|
database.DB.Unscoped().Where("id IN ?", ids).Delete(&models.AppLog{})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.Debugf("[AppLog] 完成应用日志清理策略")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AppLogService) SubscribeEvents(bus *eventbus.EventBus) {
|
||||||
|
// 1. [订阅] 系统通知 -> 存储到数据库表现为红点消息
|
||||||
|
bus.Subscribe(constant.EventSystemNotice, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
title, _ := payload["title"].(string)
|
||||||
|
content, _ := payload["content"].(string)
|
||||||
|
level, _ := payload["level"].(string)
|
||||||
|
if level == "" {
|
||||||
|
level = constant.LogLevelInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
s.Add(&models.AppLog{
|
||||||
|
Category: constant.LogCategorySystemNotice,
|
||||||
|
Title: title,
|
||||||
|
Content: models.BigText(content),
|
||||||
|
Level: level,
|
||||||
|
Status: constant.LogStatusUnread,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// 2. [订阅] 推送结果 -> 存储到数据库供推送日志查看
|
||||||
|
bus.Subscribe(constant.EventNotifySent, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
title, _ := payload["title"].(string)
|
||||||
|
content, _ := payload["content"].(string)
|
||||||
|
success, _ := payload["success"].(bool)
|
||||||
|
errorMsg, _ := payload["error_msg"].(string)
|
||||||
|
channelName, _ := payload["channel_name"].(string)
|
||||||
|
|
||||||
|
status := constant.LogStatusSuccess
|
||||||
|
level := constant.LogLevelInfo
|
||||||
|
if !success {
|
||||||
|
status = constant.LogStatusFailed
|
||||||
|
level = constant.LogLevelError
|
||||||
|
}
|
||||||
|
|
||||||
|
s.Add(&models.AppLog{
|
||||||
|
Category: constant.LogCategoryPushLog,
|
||||||
|
Title: fmt.Sprintf("[%s] %s", channelName, title),
|
||||||
|
Content: models.BigText(content),
|
||||||
|
Level: level,
|
||||||
|
Status: status,
|
||||||
|
ErrorMsg: models.BigText(errorMsg),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// 3. 将某些业务事件转化为系统内部通知 (自动出现在小铃铛)
|
||||||
|
bus.Subscribe(constant.EventTaskFailed, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
taskName, _ := payload["task_name"].(string)
|
||||||
|
errMsg, _ := payload["error"].(string)
|
||||||
|
|
||||||
|
bus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventSystemNotice,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"title": fmt.Sprintf("任务 [%s] 执行失败", taskName),
|
||||||
|
"content": fmt.Sprintf("错误详情: %s", errMsg),
|
||||||
|
"level": constant.LogLevelError,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
bus.Subscribe(constant.EventTaskTimeout, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
taskName, _ := payload["task_name"].(string)
|
||||||
|
|
||||||
|
bus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventSystemNotice,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"title": fmt.Sprintf("任务 [%s] 执行超时", taskName),
|
||||||
|
"content": "任务已经超过预设的运行时间并被系统强制中止。",
|
||||||
|
"level": constant.LogLevelWarning,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
bus.Subscribe(constant.EventPasswordChanged, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
username, _ := payload["username"].(string)
|
||||||
|
|
||||||
|
bus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventSystemNotice,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"title": "账户安全提醒",
|
||||||
|
"content": fmt.Sprintf("用户 %s 的账号密码已被修改。", username),
|
||||||
|
"level": constant.LogLevelInfo,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -57,6 +57,7 @@ func (s *BackupService) getTableConfigs() []tableConfig {
|
|||||||
{"deps.json", s.exportTable(&[]models.Dependency{}, true), s.restoreTable(&[]models.Dependency{}, true)},
|
{"deps.json", s.exportTable(&[]models.Dependency{}, true), s.restoreTable(&[]models.Dependency{}, true)},
|
||||||
{"notify_ways.json", s.exportTable(&[]models.NotifyWay{}, true), s.restoreTable(&[]models.NotifyWay{}, true)},
|
{"notify_ways.json", s.exportTable(&[]models.NotifyWay{}, true), s.restoreTable(&[]models.NotifyWay{}, true)},
|
||||||
{"notify_bindings.json", s.exportTable(&[]models.NotifyBinding{}, true), s.restoreTable(&[]models.NotifyBinding{}, true)},
|
{"notify_bindings.json", s.exportTable(&[]models.NotifyBinding{}, true), s.restoreTable(&[]models.NotifyBinding{}, true)},
|
||||||
|
{"app_logs.json", s.exportTable(&[]models.AppLog{}, false), s.restoreTable(&[]models.AppLog{}, false)},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -235,6 +236,7 @@ func (s *BackupService) Restore(zipPath string) error {
|
|||||||
tx.Unscoped().Where("1=1").Delete(&models.Dependency{})
|
tx.Unscoped().Where("1=1").Delete(&models.Dependency{})
|
||||||
tx.Unscoped().Where("1=1").Delete(&models.NotifyWay{})
|
tx.Unscoped().Where("1=1").Delete(&models.NotifyWay{})
|
||||||
tx.Unscoped().Where("1=1").Delete(&models.NotifyBinding{})
|
tx.Unscoped().Where("1=1").Delete(&models.NotifyBinding{})
|
||||||
|
tx.Unscoped().Where("1=1").Delete(&models.AppLog{})
|
||||||
|
|
||||||
// 2. 依次恢复每个表
|
// 2. 依次恢复每个表
|
||||||
for _, cfg := range configs {
|
for _, cfg := range configs {
|
||||||
@@ -340,6 +342,8 @@ func (s *BackupService) restoreFromZipFile(tx *gorm.DB, f *zip.File, filename st
|
|||||||
return restoreStreamBatch[models.NotifyWay](tx, decoder)
|
return restoreStreamBatch[models.NotifyWay](tx, decoder)
|
||||||
case "notify_bindings.json":
|
case "notify_bindings.json":
|
||||||
return restoreStreamBatch[models.NotifyBinding](tx, decoder)
|
return restoreStreamBatch[models.NotifyBinding](tx, decoder)
|
||||||
|
case "app_logs.json":
|
||||||
|
return restoreStreamBatch[models.AppLog](tx, decoder)
|
||||||
default:
|
default:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -417,7 +421,7 @@ func (s *BackupService) GetBackupFile() string {
|
|||||||
if err := database.DB.Where("section = ? AND `key` = ?", BackupSection, BackupFileKey).First(&setting).Error; err != nil {
|
if err := database.DB.Where("section = ? AND `key` = ?", BackupSection, BackupFileKey).First(&setting).Error; err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
return setting.Value
|
return string(setting.Value)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *BackupService) ClearBackup() error {
|
func (s *BackupService) ClearBackup() error {
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ func (m *BaseManager) Install(dep *models.Dependency) error {
|
|||||||
|
|
||||||
logger.Infof("Installing %s package: %s", m.Language, packageSpec)
|
logger.Infof("Installing %s package: %s", m.Language, packageSpec)
|
||||||
output, err := m.runMiseCommand(dep.LangVersion, args)
|
output, err := m.runMiseCommand(dep.LangVersion, args)
|
||||||
dep.Log = string(output)
|
dep.Log = models.BigText(output)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("Install failed: %v, output: %s", err, string(output))
|
logger.Errorf("Install failed: %v, output: %s", err, string(output))
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func (es *EnvService) CreateEnvVar(name, value, remark string, hidden bool, user
|
|||||||
env := &models.EnvironmentVariable{
|
env := &models.EnvironmentVariable{
|
||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Name: name,
|
Name: name,
|
||||||
Value: value,
|
Value: models.BigText(value),
|
||||||
Remark: remark,
|
Remark: remark,
|
||||||
Hidden: hidden,
|
Hidden: hidden,
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
@@ -72,7 +72,7 @@ func (es *EnvService) UpdateEnvVar(id string, name, value, remark string, hidden
|
|||||||
}
|
}
|
||||||
updates := map[string]interface{}{
|
updates := map[string]interface{}{
|
||||||
"name": name,
|
"name": name,
|
||||||
"value": value,
|
"value": models.BigText(value),
|
||||||
"remark": remark,
|
"remark": remark,
|
||||||
"hidden": hidden,
|
"hidden": hidden,
|
||||||
}
|
}
|
||||||
@@ -98,7 +98,7 @@ func (es *EnvService) DeleteEnvVar(id string, force bool) (bool, []models.Task)
|
|||||||
err := database.DB.Transaction(func(tx *gorm.DB) error {
|
err := database.DB.Transaction(func(tx *gorm.DB) error {
|
||||||
// Update tasks to remove this env ID
|
// Update tasks to remove this env ID
|
||||||
for _, task := range associatedTasks {
|
for _, task := range associatedTasks {
|
||||||
ids := splitEnvIDs(task.Envs)
|
ids := splitEnvIDs(string(task.Envs))
|
||||||
var newIDs []string
|
var newIDs []string
|
||||||
for _, eid := range ids {
|
for _, eid := range ids {
|
||||||
if eid != id {
|
if eid != id {
|
||||||
@@ -166,12 +166,12 @@ func (es *EnvService) formatEnvVars(envs []models.EnvironmentVariable) []string
|
|||||||
|
|
||||||
for _, env := range envs {
|
for _, env := range envs {
|
||||||
if idx, ok := nameToIndex[env.Name]; ok {
|
if idx, ok := nameToIndex[env.Name]; ok {
|
||||||
mergedList[idx].values = append(mergedList[idx].values, env.Value)
|
mergedList[idx].values = append(mergedList[idx].values, string(env.Value))
|
||||||
} else {
|
} else {
|
||||||
nameToIndex[env.Name] = len(mergedList)
|
nameToIndex[env.Name] = len(mergedList)
|
||||||
mergedList = append(mergedList, mergedEnv{
|
mergedList = append(mergedList, mergedEnv{
|
||||||
name: env.Name,
|
name: env.Name,
|
||||||
values: []string{env.Value},
|
values: []string{string(env.Value)},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/database"
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
"github.com/engigu/baihu-panel/internal/utils"
|
"github.com/engigu/baihu-panel/internal/utils"
|
||||||
)
|
)
|
||||||
@@ -25,6 +28,61 @@ func (s *LoginLogService) Create(username, ip, userAgent, status, message string
|
|||||||
return database.DB.Create(log).Error
|
return database.DB.Create(log).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SubscribeEvents 注册订阅事件
|
||||||
|
func (s *LoginLogService) SubscribeEvents(bus *eventbus.EventBus) {
|
||||||
|
// 用户登录事件
|
||||||
|
bus.Subscribe(constant.EventUserLogin, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
username, _ := payload["username"].(string)
|
||||||
|
ip, _ := payload["ip"].(string)
|
||||||
|
userAgent, _ := payload["userAgent"].(string)
|
||||||
|
status, _ := payload["status"].(string)
|
||||||
|
message, _ := payload["message"].(string)
|
||||||
|
|
||||||
|
s.Create(username, ip, userAgent, status, message)
|
||||||
|
|
||||||
|
// 如果登录成功,触发系统通知
|
||||||
|
if status == "success" {
|
||||||
|
bus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventSystemNotice,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"title": "登录提醒",
|
||||||
|
"content": fmt.Sprintf("用户 %s 已从 IP %s 登录系统", username, ip),
|
||||||
|
"level": constant.LogLevelWarning,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// 暴力破解防御触发事件
|
||||||
|
bus.Subscribe(constant.EventBruteForceLogin, func(e eventbus.Event) {
|
||||||
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
username, _ := payload["username"].(string)
|
||||||
|
ip, _ := payload["ip"].(string)
|
||||||
|
userAgent, _ := payload["userAgent"].(string)
|
||||||
|
|
||||||
|
s.Create(username, ip, userAgent, "failed", "尝试次数过多,由于暴力破解防御机制已锁定")
|
||||||
|
|
||||||
|
// 触发系统通知
|
||||||
|
bus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventSystemNotice,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
|
"title": "系统安全警告",
|
||||||
|
"content": fmt.Sprintf("检测到 IP %s 正在尝试暴力破解用户 %s", ip, username),
|
||||||
|
"level": constant.LogLevelError,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// List 获取登录日志列表
|
// List 获取登录日志列表
|
||||||
func (s *LoginLogService) List(page, pageSize int, username string) ([]models.LoginLog, int64, error) {
|
func (s *LoginLogService) List(page, pageSize int, username string) ([]models.LoginLog, int64, error) {
|
||||||
var logs []models.LoginLog
|
var logs []models.LoginLog
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/constant"
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/database"
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
"github.com/engigu/baihu-panel/internal/logger"
|
"github.com/engigu/baihu-panel/internal/logger"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
"github.com/engigu/baihu-panel/internal/utils"
|
"github.com/engigu/baihu-panel/internal/utils"
|
||||||
@@ -98,7 +99,7 @@ func (s *NotificationService) SaveChannel(channel NotifyChannel) error {
|
|||||||
ID: channel.ID,
|
ID: channel.ID,
|
||||||
Name: channel.Name,
|
Name: channel.Name,
|
||||||
Type: channel.Type,
|
Type: channel.Type,
|
||||||
Config: string(configJSON),
|
Config: models.BigText(configJSON),
|
||||||
Enabled: channel.Enabled,
|
Enabled: channel.Enabled,
|
||||||
}
|
}
|
||||||
return database.DB.Create(notifyWay).Error
|
return database.DB.Create(notifyWay).Error
|
||||||
@@ -108,7 +109,7 @@ func (s *NotificationService) SaveChannel(channel NotifyChannel) error {
|
|||||||
updates := map[string]interface{}{
|
updates := map[string]interface{}{
|
||||||
"name": channel.Name,
|
"name": channel.Name,
|
||||||
"type": channel.Type,
|
"type": channel.Type,
|
||||||
"config": string(configJSON),
|
"config": models.BigText(configJSON),
|
||||||
"enabled": channel.Enabled,
|
"enabled": channel.Enabled,
|
||||||
}
|
}
|
||||||
return database.DB.Model(&models.NotifyWay{}).Where("id = ?", channel.ID).Updates(updates).Error
|
return database.DB.Model(&models.NotifyWay{}).Where("id = ?", channel.ID).Updates(updates).Error
|
||||||
@@ -202,12 +203,39 @@ func (s *NotificationService) SendToChannel(channel NotifyChannel, msg *NotifyMe
|
|||||||
Title: msg.Title,
|
Title: msg.Title,
|
||||||
Text: msg.Text,
|
Text: msg.Text,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
payload := map[string]interface{}{
|
||||||
|
"title": msg.Title,
|
||||||
|
"content": msg.Text,
|
||||||
|
"channel_name": channel.Name,
|
||||||
|
"success": false,
|
||||||
|
"error_msg": "",
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
payload["error_msg"] = err.Error()
|
||||||
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventNotifySent,
|
||||||
|
Payload: payload,
|
||||||
|
})
|
||||||
return &NotifyResult{Success: false, Error: err.Error()}
|
return &NotifyResult{Success: false, Error: err.Error()}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !result.Success {
|
if !result.Success {
|
||||||
|
payload["error_msg"] = result.Error
|
||||||
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventNotifySent,
|
||||||
|
Payload: payload,
|
||||||
|
})
|
||||||
return &NotifyResult{Success: false, Error: result.Error}
|
return &NotifyResult{Success: false, Error: result.Error}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
payload["success"] = true
|
||||||
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventNotifySent,
|
||||||
|
Payload: payload,
|
||||||
|
})
|
||||||
|
|
||||||
return &NotifyResult{Success: true}
|
return &NotifyResult{Success: true}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,62 +268,91 @@ func (s *NotificationService) SendByChannelID(channelID string, msg *NotifyMessa
|
|||||||
return s.SendToChannel(ch, msg)
|
return s.SendToChannel(ch, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TriggerEvent 触发事件通知(实现 tasks.Notifier 接口)
|
// SubscribeEvents 注册通知服务自身为事件流的订阅者
|
||||||
func (s *NotificationService) TriggerEvent(bindingType string, eventType string, dataID string, templateData map[string]interface{}) {
|
func (s *NotificationService) SubscribeEvents(bus *eventbus.EventBus) {
|
||||||
var title, text string
|
// 系统事件
|
||||||
|
systemEvents := []string{constant.EventUserLogin, constant.EventBruteForceLogin, constant.EventPasswordChanged}
|
||||||
|
for _, evt := range systemEvents {
|
||||||
|
bus.Subscribe(evt, s.handleEvent(constant.BindingTypeSystem))
|
||||||
|
}
|
||||||
|
|
||||||
switch eventType {
|
// 任务事件
|
||||||
case constant.EventUserLogin:
|
taskEvents := []string{constant.EventTaskSuccess, constant.EventTaskFailed, constant.EventTaskTimeout}
|
||||||
title = "用户登录通知"
|
for _, evt := range taskEvents {
|
||||||
text = fmt.Sprintf("用户 %v 在 IP %v 登录成功", templateData["username"], templateData["ip"])
|
bus.Subscribe(evt, s.handleEvent(constant.BindingTypeTask))
|
||||||
case constant.EventBruteForceLogin:
|
}
|
||||||
title = "系统安全警告"
|
|
||||||
text = fmt.Sprintf("检测到 IP %v 正在尝试暴力破解用户 %v", templateData["ip"], templateData["username"])
|
// 通用系统通知
|
||||||
case constant.EventPasswordChanged:
|
bus.Subscribe(constant.EventSystemNotice, s.handleEvent(constant.BindingTypeSystem))
|
||||||
title = "账户安全通知"
|
}
|
||||||
text = fmt.Sprintf("用户 %v 刚刚修改了密码", templateData["username"])
|
|
||||||
case constant.EventTaskSuccess:
|
func (s *NotificationService) handleEvent(bindingType string) eventbus.Handler {
|
||||||
title = fmt.Sprintf("任务[%v] 成功", templateData["task_name"])
|
return func(e eventbus.Event) {
|
||||||
text = fmt.Sprintf("任务 #%v %v\n状态: 成功\n耗时: %vms", templateData["task_id"], templateData["task_name"], templateData["duration"])
|
payload, ok := e.Payload.(map[string]interface{})
|
||||||
case constant.EventTaskFailed:
|
if !ok {
|
||||||
title = fmt.Sprintf("任务[%v] 失败", templateData["task_name"])
|
return
|
||||||
if errStr, ok := templateData["error"]; ok {
|
|
||||||
text = fmt.Sprintf("任务 #%v %v\n执行失败\n错误: %v", templateData["task_id"], templateData["task_name"], errStr)
|
|
||||||
} else {
|
|
||||||
text = fmt.Sprintf("任务 #%v %v\n执行失败\n状态: %v\n耗时: %vms", templateData["task_id"], templateData["task_name"], templateData["status"], templateData["duration"])
|
|
||||||
}
|
}
|
||||||
case constant.EventTaskTimeout:
|
|
||||||
title = fmt.Sprintf("任务[%v] 超时", templateData["task_name"])
|
|
||||||
text = fmt.Sprintf("任务 #%v %v\n执行超时\n耗时: %vms", templateData["task_id"], templateData["task_name"], templateData["duration"])
|
|
||||||
default:
|
|
||||||
title = "系统通知"
|
|
||||||
text = "收到未知事件"
|
|
||||||
}
|
|
||||||
|
|
||||||
msg := &NotifyMessage{Title: title, Text: text}
|
var dataID string
|
||||||
|
if id, ok := payload["task_id"].(string); ok {
|
||||||
bindings := s.GetBindingsByEvent(bindingType, eventType, dataID)
|
dataID = id
|
||||||
if len(bindings) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
channels := s.GetChannels()
|
|
||||||
channelMap := make(map[string]NotifyChannel)
|
|
||||||
for _, ch := range channels {
|
|
||||||
channelMap[ch.ID] = ch
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, binding := range bindings {
|
|
||||||
ch, ok := channelMap[binding.WayID]
|
|
||||||
if !ok || !ch.Enabled {
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
go func(channel NotifyChannel) {
|
|
||||||
result := s.SendToChannel(channel, msg)
|
var title, text string
|
||||||
if !result.Success {
|
switch e.Type {
|
||||||
logger.Warnf("[Notify] 发送事件 %s 到渠道 %s(%s) 失败: %s", eventType, channel.Name, channel.Type, result.Error)
|
case constant.EventUserLogin:
|
||||||
|
title = "用户登录通知"
|
||||||
|
text = fmt.Sprintf("用户 %v 在 IP %v 登录成功", payload["username"], payload["ip"])
|
||||||
|
case constant.EventBruteForceLogin:
|
||||||
|
title = "系统安全警告"
|
||||||
|
text = fmt.Sprintf("检测到 IP %v 正在尝试暴力破解用户 %v", payload["ip"], payload["username"])
|
||||||
|
case constant.EventPasswordChanged:
|
||||||
|
title = "账户安全通知"
|
||||||
|
text = fmt.Sprintf("用户 %v 刚刚修改了密码", payload["username"])
|
||||||
|
case constant.EventTaskSuccess:
|
||||||
|
title = fmt.Sprintf("任务[%v] 成功", payload["task_name"])
|
||||||
|
text = fmt.Sprintf("任务 #%v %v\n状态: 成功\n耗时: %vms", payload["task_id"], payload["task_name"], payload["duration"])
|
||||||
|
case constant.EventTaskFailed:
|
||||||
|
title = fmt.Sprintf("任务[%v] 失败", payload["task_name"])
|
||||||
|
if errStr, ok := payload["error"]; ok {
|
||||||
|
text = fmt.Sprintf("任务 #%v %v\n执行失败\n错误: %v", payload["task_id"], payload["task_name"], errStr)
|
||||||
|
} else {
|
||||||
|
text = fmt.Sprintf("任务 #%v %v\n执行失败\n状态: %v\n耗时: %vms", payload["task_id"], payload["task_name"], payload["status"], payload["duration"])
|
||||||
}
|
}
|
||||||
}(ch)
|
case constant.EventTaskTimeout:
|
||||||
|
title = fmt.Sprintf("任务[%v] 超时", payload["task_name"])
|
||||||
|
text = fmt.Sprintf("任务 #%v %v\n执行超时\n耗时: %vms", payload["task_id"], payload["task_name"], payload["duration"])
|
||||||
|
case constant.EventSystemNotice:
|
||||||
|
title, _ = payload["title"].(string)
|
||||||
|
text, _ = payload["content"].(string)
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
msg := &NotifyMessage{Title: title, Text: text}
|
||||||
|
bindings := s.GetBindingsByEvent(bindingType, e.Type, dataID)
|
||||||
|
if len(bindings) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
channels := s.GetChannels()
|
||||||
|
channelMap := make(map[string]NotifyChannel)
|
||||||
|
for _, ch := range channels {
|
||||||
|
channelMap[ch.ID] = ch
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, binding := range bindings {
|
||||||
|
ch, ok := channelMap[binding.WayID]
|
||||||
|
if !ok || !ch.Enabled {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
go func(channel NotifyChannel) {
|
||||||
|
result := s.SendToChannel(channel, msg)
|
||||||
|
if !result.Success {
|
||||||
|
logger.Warnf("[Notify] 发送事件 %s 到渠道 %s(%s) 失败: %s", e.Type, channel.Name, channel.Type, result.Error)
|
||||||
|
}
|
||||||
|
}(ch)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ func (ss *ScriptService) CreateScript(name, content string, userID string) *mode
|
|||||||
script := &models.Script{
|
script := &models.Script{
|
||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Name: name,
|
Name: name,
|
||||||
Content: content,
|
Content: models.BigText(content),
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
}
|
}
|
||||||
database.DB.Create(script)
|
database.DB.Create(script)
|
||||||
@@ -43,7 +43,7 @@ func (ss *ScriptService) UpdateScript(id string, name, content string) *models.S
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
script.Name = name
|
script.Name = name
|
||||||
script.Content = content
|
script.Content = models.BigText(content)
|
||||||
database.DB.Save(&script)
|
database.DB.Save(&script)
|
||||||
return &script
|
return &script
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ func (s *SettingsService) InitSettings() error {
|
|||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Section: section,
|
Section: section,
|
||||||
Key: key,
|
Key: key,
|
||||||
Value: value,
|
Value: models.BigText(value),
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -47,7 +47,7 @@ func (s *SettingsService) InitSettings() error {
|
|||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Section: constant.SectionSecurity,
|
Section: constant.SectionSecurity,
|
||||||
Key: constant.KeySecret,
|
Key: constant.KeySecret,
|
||||||
Value: secretValue,
|
Value: models.BigText(secretValue),
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -72,7 +72,7 @@ func (s *SettingsService) Get(section, key string) string {
|
|||||||
}
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
return setting.Value
|
return string(setting.Value)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set 设置单个值
|
// Set 设置单个值
|
||||||
@@ -83,10 +83,10 @@ func (s *SettingsService) Set(section, key, value string) error {
|
|||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Section: section,
|
Section: section,
|
||||||
Key: key,
|
Key: key,
|
||||||
Value: value,
|
Value: models.BigText(value),
|
||||||
}).Error
|
}).Error
|
||||||
}
|
}
|
||||||
return database.DB.Model(&setting).Update("value", value).Error
|
return database.DB.Model(&setting).Update("value", models.BigText(value)).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete 删除单个设置
|
// Delete 删除单个设置
|
||||||
@@ -108,7 +108,7 @@ func (s *SettingsService) GetSection(section string) map[string]string {
|
|||||||
var settings []models.Setting
|
var settings []models.Setting
|
||||||
database.DB.Where("section = ?", section).Find(&settings)
|
database.DB.Where("section = ?", section).Find(&settings)
|
||||||
for _, setting := range settings {
|
for _, setting := range settings {
|
||||||
result[setting.Key] = setting.Value
|
result[setting.Key] = string(setting.Value)
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
|
|
||||||
"github.com/engigu/baihu-panel/internal/constant"
|
"github.com/engigu/baihu-panel/internal/constant"
|
||||||
"github.com/engigu/baihu-panel/internal/database"
|
"github.com/engigu/baihu-panel/internal/database"
|
||||||
|
"github.com/engigu/baihu-panel/internal/eventbus"
|
||||||
"github.com/engigu/baihu-panel/internal/executor"
|
"github.com/engigu/baihu-panel/internal/executor"
|
||||||
"github.com/engigu/baihu-panel/internal/logger"
|
"github.com/engigu/baihu-panel/internal/logger"
|
||||||
"github.com/engigu/baihu-panel/internal/models"
|
"github.com/engigu/baihu-panel/internal/models"
|
||||||
@@ -39,19 +40,12 @@ type EnvService interface {
|
|||||||
GetAllEnvVars() []string
|
GetAllEnvVars() []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notifier 通知服务接口定义(避免循环依赖)
|
|
||||||
type Notifier interface {
|
|
||||||
TriggerEvent(bindingType string, eventType string, dataID string, templateData map[string]interface{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// ExecutorService handles task execution and scheduling
|
|
||||||
type ExecutorService struct {
|
type ExecutorService struct {
|
||||||
taskService *TaskService
|
taskService *TaskService
|
||||||
taskLogService *TaskLogService
|
taskLogService *TaskLogService
|
||||||
agentWSManager AgentWSManager
|
agentWSManager AgentWSManager
|
||||||
settingsService SettingsService
|
settingsService SettingsService
|
||||||
envService EnvService
|
envService EnvService
|
||||||
notifier Notifier
|
|
||||||
scheduler *executor.Scheduler
|
scheduler *executor.Scheduler
|
||||||
cronManager *executor.CronManager
|
cronManager *executor.CronManager
|
||||||
results []executor.ExecutionResult
|
results []executor.ExecutionResult
|
||||||
@@ -64,14 +58,12 @@ func (es *ExecutorService) GetScheduler() *executor.Scheduler {
|
|||||||
return es.scheduler
|
return es.scheduler
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewExecutorService creates a new executor service
|
|
||||||
func NewExecutorService(
|
func NewExecutorService(
|
||||||
taskService *TaskService,
|
taskService *TaskService,
|
||||||
taskLogService *TaskLogService,
|
taskLogService *TaskLogService,
|
||||||
agentWSManager AgentWSManager,
|
agentWSManager AgentWSManager,
|
||||||
settingsService SettingsService,
|
settingsService SettingsService,
|
||||||
envService EnvService,
|
envService EnvService,
|
||||||
notifier Notifier,
|
|
||||||
) *ExecutorService {
|
) *ExecutorService {
|
||||||
es := &ExecutorService{
|
es := &ExecutorService{
|
||||||
taskService: taskService,
|
taskService: taskService,
|
||||||
@@ -79,7 +71,6 @@ func NewExecutorService(
|
|||||||
agentWSManager: agentWSManager,
|
agentWSManager: agentWSManager,
|
||||||
settingsService: settingsService,
|
settingsService: settingsService,
|
||||||
envService: envService,
|
envService: envService,
|
||||||
notifier: notifier,
|
|
||||||
results: make([]executor.ExecutionResult, 0, 100),
|
results: make([]executor.ExecutionResult, 0, 100),
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
}
|
}
|
||||||
@@ -143,7 +134,8 @@ func (h *ServerSchedulerHandler) OnTaskExecuting(req *executor.ExecutionRequest)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
// 并发限制,更新日志状态为失败
|
// 并发限制,更新日志状态为失败
|
||||||
taskLog.Status = constant.TaskStatusFailed
|
taskLog.Status = constant.TaskStatusFailed
|
||||||
taskLog.Output, _ = utils.CompressToBase64("任务并发数限制,拒绝执行")
|
comp, _ := utils.CompressToBase64("任务并发数限制,拒绝执行")
|
||||||
|
taskLog.Output = models.BigText(comp)
|
||||||
h.es.taskLogService.SaveTaskLog(taskLog)
|
h.es.taskLogService.SaveTaskLog(taskLog)
|
||||||
return nil, nil, fmt.Errorf("任务并发限制: %v", err)
|
return nil, nil, fmt.Errorf("任务并发限制: %v", err)
|
||||||
}
|
}
|
||||||
@@ -225,9 +217,9 @@ func (h *ServerSchedulerHandler) OnTaskCompleted(req *executor.ExecutionRequest,
|
|||||||
taskLog := &models.TaskLog{
|
taskLog := &models.TaskLog{
|
||||||
ID: req.LogID,
|
ID: req.LogID,
|
||||||
TaskID: task.ID,
|
TaskID: task.ID,
|
||||||
Command: req.Command,
|
Command: models.BigText(req.Command),
|
||||||
Output: output,
|
Output: models.BigText(output),
|
||||||
Error: result.Error,
|
Error: models.BigText(result.Error),
|
||||||
Status: result.Status,
|
Status: result.Status,
|
||||||
Duration: result.Duration,
|
Duration: result.Duration,
|
||||||
ExitCode: result.ExitCode,
|
ExitCode: result.ExitCode,
|
||||||
@@ -256,27 +248,29 @@ func (h *ServerSchedulerHandler) OnTaskCompleted(req *executor.ExecutionRequest,
|
|||||||
h.es.HandleTaskRetry(task, req, result.Success, result.Status, result.ExitCode)
|
h.es.HandleTaskRetry(task, req, result.Success, result.Status, result.ExitCode)
|
||||||
|
|
||||||
// ======= 通知触发 =======
|
// ======= 通知触发 =======
|
||||||
if h.es.notifier != nil {
|
// ======= 通知触发 =======
|
||||||
go func() {
|
go func() {
|
||||||
var eventType string
|
var eventType string
|
||||||
switch result.Status {
|
switch result.Status {
|
||||||
case constant.TaskStatusSuccess:
|
case constant.TaskStatusSuccess:
|
||||||
eventType = constant.EventTaskSuccess
|
eventType = constant.EventTaskSuccess
|
||||||
case constant.TaskStatusFailed:
|
case constant.TaskStatusFailed:
|
||||||
eventType = constant.EventTaskFailed
|
eventType = constant.EventTaskFailed
|
||||||
case constant.TaskStatusTimeout:
|
case constant.TaskStatusTimeout:
|
||||||
eventType = constant.EventTaskTimeout
|
eventType = constant.EventTaskTimeout
|
||||||
}
|
}
|
||||||
if eventType != "" {
|
if eventType != "" {
|
||||||
h.es.notifier.TriggerEvent(constant.BindingTypeTask, eventType, task.ID, map[string]interface{}{
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: eventType,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
"task_id": task.ID,
|
"task_id": task.ID,
|
||||||
"task_name": task.Name,
|
"task_name": task.Name,
|
||||||
"status": result.Status,
|
"status": result.Status,
|
||||||
"duration": result.Duration,
|
"duration": result.Duration,
|
||||||
})
|
},
|
||||||
}
|
})
|
||||||
}()
|
}
|
||||||
}
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *ServerSchedulerHandler) OnTaskFailed(req *executor.ExecutionRequest, err error) {
|
func (h *ServerSchedulerHandler) OnTaskFailed(req *executor.ExecutionRequest, err error) {
|
||||||
@@ -305,9 +299,9 @@ func (h *ServerSchedulerHandler) OnTaskFailed(req *executor.ExecutionRequest, er
|
|||||||
taskLog := &models.TaskLog{
|
taskLog := &models.TaskLog{
|
||||||
ID: req.LogID,
|
ID: req.LogID,
|
||||||
TaskID: taskID,
|
TaskID: taskID,
|
||||||
Command: req.Command,
|
Command: models.BigText(req.Command),
|
||||||
Output: output,
|
Output: models.BigText(output),
|
||||||
Error: err.Error(),
|
Error: models.BigText(err.Error()),
|
||||||
Status: constant.TaskStatusFailed,
|
Status: constant.TaskStatusFailed,
|
||||||
Duration: 0,
|
Duration: 0,
|
||||||
ExitCode: 1,
|
ExitCode: 1,
|
||||||
@@ -338,19 +332,21 @@ func (h *ServerSchedulerHandler) OnTaskFailed(req *executor.ExecutionRequest, er
|
|||||||
h.es.HandleTaskRetry(task, req, false, constant.TaskStatusFailed, 1)
|
h.es.HandleTaskRetry(task, req, false, constant.TaskStatusFailed, 1)
|
||||||
|
|
||||||
// ======= 通知触发 =======
|
// ======= 通知触发 =======
|
||||||
if h.es.notifier != nil {
|
// ======= 通知触发 =======
|
||||||
go func() {
|
go func() {
|
||||||
taskName := "未知任务"
|
taskName := "未知任务"
|
||||||
if task != nil {
|
if task != nil {
|
||||||
taskName = task.Name
|
taskName = task.Name
|
||||||
}
|
}
|
||||||
h.es.notifier.TriggerEvent(constant.BindingTypeTask, constant.EventTaskFailed, taskID, map[string]interface{}{
|
eventbus.DefaultBus.Publish(eventbus.Event{
|
||||||
|
Type: constant.EventTaskFailed,
|
||||||
|
Payload: map[string]interface{}{
|
||||||
"task_id": taskID,
|
"task_id": taskID,
|
||||||
"task_name": taskName,
|
"task_name": taskName,
|
||||||
"error": err.Error(),
|
"error": err.Error(),
|
||||||
})
|
},
|
||||||
}()
|
})
|
||||||
}
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleTaskRetry 处理任务失败重试逻辑
|
// HandleTaskRetry 处理任务失败重试逻辑
|
||||||
@@ -372,11 +368,11 @@ func (es *ExecutorService) HandleTaskRetry(task *models.Task, req *executor.Exec
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
newEnvs := es.loadEnvVars(latestTask.ID, latestTask.Envs)
|
newEnvs := es.loadEnvVars(latestTask.ID, string(latestTask.Envs))
|
||||||
return &executor.ExecutionRequest{
|
return &executor.ExecutionRequest{
|
||||||
TaskID: req.TaskID,
|
TaskID: req.TaskID,
|
||||||
Name: latestTask.Name,
|
Name: latestTask.Name,
|
||||||
Command: latestTask.Command,
|
Command: string(latestTask.Command),
|
||||||
WorkDir: latestTask.WorkDir,
|
WorkDir: latestTask.WorkDir,
|
||||||
Envs: newEnvs,
|
Envs: newEnvs,
|
||||||
Timeout: latestTask.Timeout,
|
Timeout: latestTask.Timeout,
|
||||||
@@ -501,7 +497,7 @@ func (es *ExecutorService) AddCronTask(task *models.Task) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// 在加入调度器前,预先加载好环境信息
|
// 在加入调度器前,预先加载好环境信息
|
||||||
task.RuntimeEnvs = es.loadEnvVars(task.ID, task.Envs)
|
task.RuntimeEnvs = es.loadEnvVars(task.ID, string(task.Envs))
|
||||||
|
|
||||||
return es.cronManager.AddTask(task)
|
return es.cronManager.AddTask(task)
|
||||||
}
|
}
|
||||||
@@ -582,7 +578,7 @@ func (es *ExecutorService) ExecuteTask(taskID string, extraEnvs []string) *execu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
envs := es.loadEnvVars(task.ID, task.Envs)
|
envs := es.loadEnvVars(task.ID, string(task.Envs))
|
||||||
if len(extraEnvs) > 0 {
|
if len(extraEnvs) > 0 {
|
||||||
envs = append(envs, extraEnvs...)
|
envs = append(envs, extraEnvs...)
|
||||||
}
|
}
|
||||||
@@ -590,7 +586,7 @@ func (es *ExecutorService) ExecuteTask(taskID string, extraEnvs []string) *execu
|
|||||||
req := &executor.ExecutionRequest{
|
req := &executor.ExecutionRequest{
|
||||||
TaskID: task.ID,
|
TaskID: task.ID,
|
||||||
Name: task.Name,
|
Name: task.Name,
|
||||||
Command: task.Command,
|
Command: string(task.Command),
|
||||||
WorkDir: task.WorkDir,
|
WorkDir: task.WorkDir,
|
||||||
Envs: envs,
|
Envs: envs,
|
||||||
Timeout: task.Timeout,
|
Timeout: task.Timeout,
|
||||||
@@ -749,13 +745,13 @@ func (es *ExecutorService) CheckConcurrency(taskID string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
var goids []int64
|
var goids []int64
|
||||||
if task.RunningGo != "" {
|
if string(task.RunningGo) != "" {
|
||||||
_ = json.Unmarshal([]byte(task.RunningGo), &goids)
|
_ = json.Unmarshal([]byte(string(task.RunningGo)), &goids)
|
||||||
}
|
}
|
||||||
|
|
||||||
var config models.TaskConfig
|
var config models.TaskConfig
|
||||||
if task.Config != "" {
|
if string(task.Config) != "" {
|
||||||
_ = json.Unmarshal([]byte(task.Config), &config)
|
_ = json.Unmarshal([]byte(string(task.Config)), &config)
|
||||||
}
|
}
|
||||||
|
|
||||||
if config.Concurrency == 0 && len(goids) > 0 {
|
if config.Concurrency == 0 && len(goids) > 0 {
|
||||||
@@ -792,7 +788,7 @@ func (es *ExecutorService) AddRunningGo(taskID string) (int64, error) {
|
|||||||
|
|
||||||
goids = append(goids, goid)
|
goids = append(goids, goid)
|
||||||
data, _ := json.Marshal(goids)
|
data, _ := json.Marshal(goids)
|
||||||
return tx.Model(&task).Update("running_go", string(data)).Error
|
return tx.Model(&task).Update("running_go", models.BigText(data)).Error
|
||||||
})
|
})
|
||||||
if lastErr == nil {
|
if lastErr == nil {
|
||||||
return goid, nil
|
return goid, nil
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ func (s *TaskLogService) CreateEmptyLog(taskID string, command string) (*models.
|
|||||||
taskLog := &models.TaskLog{
|
taskLog := &models.TaskLog{
|
||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
TaskID: taskID,
|
TaskID: taskID,
|
||||||
Command: command,
|
Command: models.BigText(command),
|
||||||
Status: "running",
|
Status: "running",
|
||||||
StartTime: &startTime,
|
StartTime: &startTime,
|
||||||
CreatedAt: models.Now(),
|
CreatedAt: models.Now(),
|
||||||
@@ -162,9 +162,9 @@ func (s *TaskLogService) CreateTaskLogFromAgentResult(result *models.AgentTaskRe
|
|||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
TaskID: result.TaskID,
|
TaskID: result.TaskID,
|
||||||
AgentID: &result.AgentID,
|
AgentID: &result.AgentID,
|
||||||
Command: result.Command,
|
Command: models.BigText(result.Command),
|
||||||
Output: compressed,
|
Output: models.BigText(compressed),
|
||||||
Error: result.Error,
|
Error: models.BigText(result.Error),
|
||||||
Status: result.Status,
|
Status: result.Status,
|
||||||
Duration: result.Duration,
|
Duration: result.Duration,
|
||||||
ExitCode: result.ExitCode,
|
ExitCode: result.ExitCode,
|
||||||
@@ -206,9 +206,9 @@ func (s *TaskLogService) CreateTaskLogFromLocalExecution(taskID string, command,
|
|||||||
taskLog := &models.TaskLog{
|
taskLog := &models.TaskLog{
|
||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
TaskID: taskID,
|
TaskID: taskID,
|
||||||
Command: command,
|
Command: models.BigText(command),
|
||||||
Output: compressed,
|
Output: models.BigText(compressed),
|
||||||
Error: systemErr,
|
Error: models.BigText(systemErr),
|
||||||
Status: status,
|
Status: status,
|
||||||
Duration: duration,
|
Duration: duration,
|
||||||
ExitCode: exitCode,
|
ExitCode: exitCode,
|
||||||
|
|||||||
@@ -23,16 +23,16 @@ func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, w
|
|||||||
task := &models.Task{
|
task := &models.Task{
|
||||||
ID: utils.GenerateID(),
|
ID: utils.GenerateID(),
|
||||||
Name: name,
|
Name: name,
|
||||||
Command: command,
|
Command: models.BigText(command),
|
||||||
Tags: tags,
|
Tags: tags,
|
||||||
Type: taskType,
|
Type: taskType,
|
||||||
TriggerType: triggerType,
|
TriggerType: triggerType,
|
||||||
Config: config,
|
Config: models.BigText(config),
|
||||||
Schedule: schedule,
|
Schedule: schedule,
|
||||||
Timeout: timeout,
|
Timeout: timeout,
|
||||||
WorkDir: workDir,
|
WorkDir: workDir,
|
||||||
CleanConfig: cleanConfig,
|
CleanConfig: cleanConfig,
|
||||||
Envs: envs,
|
Envs: models.BigText(envs),
|
||||||
Languages: languages,
|
Languages: languages,
|
||||||
AgentID: agentID,
|
AgentID: agentID,
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
@@ -94,17 +94,17 @@ func (ts *TaskService) UpdateTask(id string, name, command, schedule string, tim
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
task.Name = name
|
task.Name = name
|
||||||
task.Command = command
|
task.Command = models.BigText(command)
|
||||||
task.Tags = tags
|
task.Tags = tags
|
||||||
task.Schedule = schedule
|
task.Schedule = schedule
|
||||||
task.Timeout = timeout
|
task.Timeout = timeout
|
||||||
task.WorkDir = workDir
|
task.WorkDir = workDir
|
||||||
task.CleanConfig = cleanConfig
|
task.CleanConfig = cleanConfig
|
||||||
task.Envs = envs
|
task.Envs = models.BigText(envs)
|
||||||
task.Enabled = enabled
|
task.Enabled = enabled
|
||||||
task.AgentID = agentID
|
task.AgentID = agentID
|
||||||
task.Languages = languages
|
task.Languages = languages
|
||||||
task.Config = config
|
task.Config = models.BigText(config)
|
||||||
task.RetryCount = retryCount
|
task.RetryCount = retryCount
|
||||||
task.RetryInterval = retryInterval
|
task.RetryInterval = retryInterval
|
||||||
task.RandomRange = randomRange
|
task.RandomRange = randomRange
|
||||||
|
|||||||
Generated
+22
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"name": "baihu2",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {
|
||||||
|
"": {
|
||||||
|
"dependencies": {
|
||||||
|
"date-fns": "^4.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/date-fns": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/kossnocorp"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"dependencies": {
|
||||||
|
"date-fns": "^4.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -287,6 +287,20 @@ export const api = {
|
|||||||
deleteBinding: (id: string) => request('/notify/bindings/' + id, { method: 'DELETE' }),
|
deleteBinding: (id: string) => request('/notify/bindings/' + id, { method: 'DELETE' }),
|
||||||
send: (data: { channel_id: string; title: string; text: string }) =>
|
send: (data: { channel_id: string; title: string; text: string }) =>
|
||||||
request<NotifyResult>('/notify/send', { method: 'POST', body: JSON.stringify(data) })
|
request<NotifyResult>('/notify/send', { method: 'POST', body: JSON.stringify(data) })
|
||||||
|
},
|
||||||
|
appLogs: {
|
||||||
|
list: (params?: { page?: number; page_size?: number; category?: string; status?: string; level?: string; keyword?: string }) => {
|
||||||
|
const query = new URLSearchParams()
|
||||||
|
if (params?.page) query.set('page', String(params.page))
|
||||||
|
if (params?.page_size) query.set('page_size', String(params.page_size))
|
||||||
|
if (params?.category) query.set('category', params.category)
|
||||||
|
if (params?.status) query.set('status', params.status)
|
||||||
|
if (params?.level) query.set('level', params.level)
|
||||||
|
if (params?.keyword) query.set('keyword', params.keyword)
|
||||||
|
return request<AppLogListResponse>(`/app-logs?${query}`)
|
||||||
|
},
|
||||||
|
markAsRead: (data: { id?: string; category?: string }) => request('/app-logs/read', { method: 'POST', body: JSON.stringify(data) }),
|
||||||
|
clear: (category: string) => request('/app-logs/clear', { method: 'POST', body: JSON.stringify({ category }) })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -561,4 +575,40 @@ export interface NotifyResult {
|
|||||||
error?: string
|
error?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface AppLog {
|
||||||
|
id: string
|
||||||
|
category: string
|
||||||
|
title: string
|
||||||
|
content: string
|
||||||
|
level: string
|
||||||
|
status: string
|
||||||
|
ref_id: string
|
||||||
|
error_msg: string
|
||||||
|
created_at: string
|
||||||
|
read_at: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AppLogListResponse {
|
||||||
|
data: AppLog[]
|
||||||
|
total: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export const LOG_CATEGORY = {
|
||||||
|
SYSTEM_NOTICE: 'system_notice',
|
||||||
|
PUSH_LOG: 'push_log'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export const LOG_LEVEL = {
|
||||||
|
INFO: 'info',
|
||||||
|
WARNING: 'warning',
|
||||||
|
ERROR: 'error'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export const LOG_STATUS = {
|
||||||
|
UNREAD: 'unread',
|
||||||
|
READ: 'read',
|
||||||
|
SUCCESS: 'success',
|
||||||
|
FAILED: 'failed'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,125 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, onMounted, onUnmounted } from 'vue'
|
||||||
|
import { Bell, Check } from 'lucide-vue-next'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
||||||
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
|
import { Badge } from '@/components/ui/badge'
|
||||||
|
import { api, AppLog, LOG_CATEGORY, LOG_STATUS } from '@/api'
|
||||||
|
import { toast } from 'vue-sonner'
|
||||||
|
import { format } from 'date-fns'
|
||||||
|
|
||||||
|
const notices = ref<AppLog[]>([])
|
||||||
|
const unreadCount = ref(0)
|
||||||
|
const loading = ref(false)
|
||||||
|
const open = ref(false)
|
||||||
|
|
||||||
|
async function fetchNotices() {
|
||||||
|
try {
|
||||||
|
const res = await api.appLogs.list({
|
||||||
|
category: LOG_CATEGORY.SYSTEM_NOTICE,
|
||||||
|
status: LOG_STATUS.UNREAD,
|
||||||
|
page: 1,
|
||||||
|
page_size: 50
|
||||||
|
})
|
||||||
|
notices.value = res.data || []
|
||||||
|
unreadCount.value = notices.value.length
|
||||||
|
} catch (error: any) {
|
||||||
|
console.error('Failed to fetch notices:', error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function markAsRead(id: string) {
|
||||||
|
try {
|
||||||
|
await api.appLogs.markAsRead({ id })
|
||||||
|
notices.value = notices.value.filter((n: AppLog) => n.id !== id)
|
||||||
|
unreadCount.value = notices.value.length
|
||||||
|
} catch (error: any) {
|
||||||
|
toast.error(error.message || '标记已读失败')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function markAllAsRead() {
|
||||||
|
if (notices.value.length === 0) return
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
await api.appLogs.markAsRead({ category: LOG_CATEGORY.SYSTEM_NOTICE })
|
||||||
|
notices.value = []
|
||||||
|
unreadCount.value = 0
|
||||||
|
toast.success('已清空未读消息')
|
||||||
|
open.value = false
|
||||||
|
} catch (error: any) {
|
||||||
|
toast.error(error.message || '全部已读失败')
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let timer: number
|
||||||
|
onMounted(() => {
|
||||||
|
fetchNotices()
|
||||||
|
timer = window.setInterval(fetchNotices, 60000) // 每分钟拉取一次
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (timer) clearInterval(timer)
|
||||||
|
})
|
||||||
|
|
||||||
|
function formatDate(dateStr: string) {
|
||||||
|
if (!dateStr) return ''
|
||||||
|
try {
|
||||||
|
return format(new Date(dateStr), 'MM-dd HH:mm')
|
||||||
|
} catch {
|
||||||
|
return dateStr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getLevelColor(level: string) {
|
||||||
|
switch (level) {
|
||||||
|
case 'error': return 'destructive'
|
||||||
|
case 'warning': return 'warning'
|
||||||
|
default: return 'secondary'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Popover v-model:open="open">
|
||||||
|
<PopoverTrigger asChild>
|
||||||
|
<Button variant="ghost" size="icon" class="relative">
|
||||||
|
<Bell class="h-5 w-5" />
|
||||||
|
<span v-if="unreadCount > 0" class="absolute top-1 right-1 h-2 w-2 rounded-full bg-red-500 animate-pulse"></span>
|
||||||
|
</Button>
|
||||||
|
</PopoverTrigger>
|
||||||
|
<PopoverContent class="w-80 p-0" align="end">
|
||||||
|
<div class="flex items-center justify-between px-4 py-3 border-b">
|
||||||
|
<span class="font-medium text-sm">系统通知 <span class="text-xs text-muted-foreground ml-1" v-if="unreadCount">({{ unreadCount }})</span></span>
|
||||||
|
<Button variant="ghost" size="sm" class="h-auto p-0 text-xs text-muted-foreground hover:text-foreground" :disabled="loading || unreadCount === 0" @click="markAllAsRead">
|
||||||
|
<Check class="h-3 w-3 mr-1" />
|
||||||
|
全标已读
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ScrollArea class="h-[300px]" v-if="notices.length > 0">
|
||||||
|
<div class="flex flex-col">
|
||||||
|
<div v-for="notice in notices" :key="notice.id" class="p-4 border-b last:border-0 hover:bg-muted/50 transition-colors group relative">
|
||||||
|
<div class="flex items-start justify-between gap-2 mb-1 cursor-pointer" @click="markAsRead(notice.id)">
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="flex items-center gap-2 mb-1">
|
||||||
|
<Badge :variant="getLevelColor(notice.level) as any" class="px-1.5 py-0 text-[10px]">{{ notice.level || 'info' }}</Badge>
|
||||||
|
<span class="text-sm font-medium truncate">{{ notice.title }}</span>
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-muted-foreground line-clamp-2">{{ notice.content }}</p>
|
||||||
|
<p class="text-[10px] text-muted-foreground mt-1">{{ formatDate(notice.created_at) }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ScrollArea>
|
||||||
|
<div v-else class="py-8 text-center text-sm text-muted-foreground flex flex-col items-center">
|
||||||
|
<Bell class="h-8 w-8 text-muted mb-2 opacity-20" />
|
||||||
|
暂无新通知
|
||||||
|
</div>
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
</template>
|
||||||
@@ -5,6 +5,7 @@ import { resetAuthCache } from '@/router'
|
|||||||
import { LayoutDashboard, ListTodo, FileCode, Settings, LogOut, ScrollText, Terminal, Variable, KeyRound, Menu, X, Server, Globe, Bell } from 'lucide-vue-next'
|
import { LayoutDashboard, ListTodo, FileCode, Settings, LogOut, ScrollText, Terminal, Variable, KeyRound, Menu, X, Server, Globe, Bell } from 'lucide-vue-next'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import ThemeToggle from '@/components/ThemeToggle.vue'
|
import ThemeToggle from '@/components/ThemeToggle.vue'
|
||||||
|
import SystemNotice from '@/components/SystemNotice.vue'
|
||||||
import { api } from '@/api'
|
import { api } from '@/api'
|
||||||
import { useSiteSettings } from '@/composables/useSiteSettings'
|
import { useSiteSettings } from '@/composables/useSiteSettings'
|
||||||
|
|
||||||
@@ -150,7 +151,10 @@ onMounted(() => {
|
|||||||
<span class="sm:hidden">{{ sentenceContent }}</span>
|
<span class="sm:hidden">{{ sentenceContent }}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<ThemeToggle />
|
<div class="flex items-center gap-2">
|
||||||
|
<SystemNotice />
|
||||||
|
<ThemeToggle />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="p-4 lg:p-6">
|
<div class="p-4 lg:p-6">
|
||||||
<RouterView />
|
<RouterView />
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import ChannelList from './components/ChannelList.vue'
|
|||||||
import EventBinding from './components/EventBinding.vue'
|
import EventBinding from './components/EventBinding.vue'
|
||||||
import ApiUsage from './components/ApiUsage.vue'
|
import ApiUsage from './components/ApiUsage.vue'
|
||||||
import ChannelDialog from './components/ChannelDialog.vue'
|
import ChannelDialog from './components/ChannelDialog.vue'
|
||||||
|
import PushLog from './components/PushLog.vue'
|
||||||
|
|
||||||
const activeTab = ref('channels')
|
const activeTab = ref('channels')
|
||||||
|
|
||||||
@@ -322,9 +323,10 @@ onMounted(() => {
|
|||||||
<h2 class="text-xl sm:text-2xl font-bold tracking-tight">消息推送</h2>
|
<h2 class="text-xl sm:text-2xl font-bold tracking-tight">消息推送</h2>
|
||||||
<p class="text-muted-foreground text-sm">配置通知渠道,绑定系统事件实现自动推送</p>
|
<p class="text-muted-foreground text-sm">配置通知渠道,绑定系统事件实现自动推送</p>
|
||||||
</div>
|
</div>
|
||||||
<TabsList class="w-full sm:w-auto grid grid-cols-3 sm:inline-flex h-9 gap-1 p-1">
|
<TabsList class="w-full sm:w-auto grid grid-cols-4 sm:inline-flex h-9 gap-1 p-1">
|
||||||
<TabsTrigger value="channels" class="text-xs px-3 py-1">渠道管理</TabsTrigger>
|
<TabsTrigger value="channels" class="text-xs px-3 py-1">渠道管理</TabsTrigger>
|
||||||
<TabsTrigger value="events" class="text-xs px-3 py-1">事件绑定</TabsTrigger>
|
<TabsTrigger value="events" class="text-xs px-3 py-1">事件绑定</TabsTrigger>
|
||||||
|
<TabsTrigger value="logs" class="text-xs px-3 py-1">推送日志</TabsTrigger>
|
||||||
<TabsTrigger value="api" class="text-xs px-3 py-1">脚本调用</TabsTrigger>
|
<TabsTrigger value="api" class="text-xs px-3 py-1">脚本调用</TabsTrigger>
|
||||||
</TabsList>
|
</TabsList>
|
||||||
</div>
|
</div>
|
||||||
@@ -346,6 +348,11 @@ onMounted(() => {
|
|||||||
<ApiUsage :channels="channels" :channel-types="channelTypes" :api-token="apiToken"
|
<ApiUsage :channels="channels" :channel-types="channelTypes" :api-token="apiToken"
|
||||||
@generate-token="generateApiToken" @copy-token="copyApiToken" @copy-example="copyApiExample" />
|
@generate-token="generateApiToken" @copy-token="copyApiToken" @copy-example="copyApiExample" />
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
|
<!-- 推送日志 -->
|
||||||
|
<TabsContent value="logs">
|
||||||
|
<PushLog />
|
||||||
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
||||||
<!-- 添加/编辑渠道弹窗 -->
|
<!-- 添加/编辑渠道弹窗 -->
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ const shellExample = computed(() => `curl -s -X POST "http://${host.value}/api/v
|
|||||||
<div v-for="ch in channels" :key="ch.id"
|
<div v-for="ch in channels" :key="ch.id"
|
||||||
class="flex items-center gap-2 text-xs bg-zinc-100/80 dark:bg-zinc-900 px-2 py-1.5 rounded border border-zinc-200 dark:border-zinc-800 hover:border-zinc-300 dark:hover:border-zinc-700 transition-colors group">
|
class="flex items-center gap-2 text-xs bg-zinc-100/80 dark:bg-zinc-900 px-2 py-1.5 rounded border border-zinc-200 dark:border-zinc-800 hover:border-zinc-300 dark:hover:border-zinc-700 transition-colors group">
|
||||||
<code class="text-primary font-bold tracking-tighter font-code"
|
<code class="text-primary font-bold tracking-tighter font-code"
|
||||||
:title="ch.id">{{ ch.id.slice(0, 8) }}</code>
|
:title="ch.id">{{ ch.id.slice(0, 8) }}...</code>
|
||||||
<span class="text-zinc-600 dark:text-zinc-500 truncate max-w-[100px]">{{ ch.name }}</span>
|
<span class="text-zinc-600 dark:text-zinc-500 truncate max-w-[100px]">{{ ch.name }}</span>
|
||||||
<Button variant="ghost" size="icon"
|
<Button variant="ghost" size="icon"
|
||||||
class="h-5 w-5 ml-auto text-zinc-400 hover:text-zinc-800 dark:hover:text-zinc-200 hover:bg-zinc-200 dark:hover:bg-zinc-800 opacity-0 group-hover:opacity-100 transition-all rounded"
|
class="h-5 w-5 ml-auto text-zinc-400 hover:text-zinc-800 dark:hover:text-zinc-200 hover:bg-zinc-200 dark:hover:bg-zinc-800 opacity-0 group-hover:opacity-100 transition-all rounded"
|
||||||
|
|||||||
@@ -0,0 +1,274 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, onMounted, computed } from 'vue'
|
||||||
|
import { api, type AppLog, LOG_CATEGORY, LOG_STATUS } from '@/api'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { Input } from '@/components/ui/input'
|
||||||
|
import { Badge } from '@/components/ui/badge'
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from '@/components/ui/select'
|
||||||
|
import Pagination from '@/components/Pagination.vue'
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
} from '@/components/ui/dialog'
|
||||||
|
import { toast } from 'vue-sonner'
|
||||||
|
import { format } from 'date-fns'
|
||||||
|
import {
|
||||||
|
RefreshCw, Trash2, Check, X, Search
|
||||||
|
} from 'lucide-vue-next'
|
||||||
|
import { useSiteSettings } from '@/composables/useSiteSettings'
|
||||||
|
|
||||||
|
|
||||||
|
const { pageSize } = useSiteSettings()
|
||||||
|
|
||||||
|
const logs = ref<AppLog[]>([])
|
||||||
|
const selectedLogId = ref<string | null>(null)
|
||||||
|
const total = ref(0)
|
||||||
|
const loading = ref(false)
|
||||||
|
|
||||||
|
const filters = ref({
|
||||||
|
status: 'all',
|
||||||
|
keyword: '',
|
||||||
|
page: 1
|
||||||
|
})
|
||||||
|
|
||||||
|
let searchTimer: ReturnType<typeof setTimeout> | null = null
|
||||||
|
|
||||||
|
|
||||||
|
const detailDialogProps = ref({
|
||||||
|
open: false,
|
||||||
|
title: '',
|
||||||
|
content: '',
|
||||||
|
error: ''
|
||||||
|
})
|
||||||
|
|
||||||
|
async function fetchLogs() {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
const res = await api.appLogs.list({
|
||||||
|
category: LOG_CATEGORY.PUSH_LOG,
|
||||||
|
status: filters.value.status === 'all' ? undefined : filters.value.status,
|
||||||
|
keyword: filters.value.keyword || undefined,
|
||||||
|
page: filters.value.page,
|
||||||
|
page_size: pageSize.value
|
||||||
|
})
|
||||||
|
logs.value = res.data || []
|
||||||
|
total.value = res.total || 0
|
||||||
|
} catch (e: any) {
|
||||||
|
toast.error(e.message || '获取推送日志失败')
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSearch() {
|
||||||
|
if (searchTimer) clearTimeout(searchTimer)
|
||||||
|
searchTimer = setTimeout(() => {
|
||||||
|
filters.value.page = 1
|
||||||
|
fetchLogs()
|
||||||
|
}, 300)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handlePageChange(page: number) {
|
||||||
|
filters.value.page = page
|
||||||
|
fetchLogs()
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleStatusChange(val: any) {
|
||||||
|
if (val === null || val === undefined) return
|
||||||
|
filters.value.status = String(val)
|
||||||
|
filters.value.page = 1
|
||||||
|
fetchLogs()
|
||||||
|
}
|
||||||
|
|
||||||
|
function showDetail(log: AppLog) {
|
||||||
|
selectedLogId.value = log.id
|
||||||
|
detailDialogProps.value = {
|
||||||
|
open: true,
|
||||||
|
title: log.title,
|
||||||
|
content: log.content,
|
||||||
|
error: log.error_msg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleClear() {
|
||||||
|
try {
|
||||||
|
await api.appLogs.clear(LOG_CATEGORY.PUSH_LOG)
|
||||||
|
toast.success('清空成功')
|
||||||
|
filters.value.page = 1
|
||||||
|
fetchLogs()
|
||||||
|
} catch (e: any) {
|
||||||
|
toast.error('清空失败: ' + (e.message || ''))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
fetchLogs()
|
||||||
|
})
|
||||||
|
|
||||||
|
const selectedLog = computed(() => logs.value.find((l: AppLog) => l.id === selectedLogId.value))
|
||||||
|
|
||||||
|
function getStatusBadgeClass(status: string) {
|
||||||
|
switch (status) {
|
||||||
|
case LOG_STATUS.SUCCESS:
|
||||||
|
return 'bg-green-500/10 text-green-700 border-green-200/50 dark:bg-green-500/20 dark:text-green-400 dark:border-green-900/50'
|
||||||
|
case LOG_STATUS.FAILED:
|
||||||
|
return 'bg-red-500/10 text-red-700 border-red-200/50 dark:bg-red-500/20 dark:text-red-400 dark:border-red-900/50'
|
||||||
|
default:
|
||||||
|
return 'bg-secondary text-secondary-foreground border-transparent'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getLogIndex(index: number) {
|
||||||
|
return total.value - (filters.value.page - 1) * pageSize.value - index
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDate(dateStr: string) {
|
||||||
|
if (!dateStr) return '-'
|
||||||
|
try {
|
||||||
|
return format(new Date(dateStr), 'yyyy-MM-dd HH:mm:ss')
|
||||||
|
} catch {
|
||||||
|
return dateStr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDialogClose(open: boolean) {
|
||||||
|
if (!open) {
|
||||||
|
selectedLogId.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="space-y-6">
|
||||||
|
<div class="flex items-center justify-between gap-2">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<div class="relative flex-1 sm:flex-none">
|
||||||
|
<Search class="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
||||||
|
<Input v-model="filters.keyword" placeholder="搜索标题或内容..." class="h-9 pl-9 w-full sm:w-56 text-sm"
|
||||||
|
@input="handleSearch" />
|
||||||
|
</div>
|
||||||
|
<div class="relative flex-1 sm:flex-none">
|
||||||
|
<Select :model-value="filters.status" @update:model-value="handleStatusChange">
|
||||||
|
<SelectTrigger class="h-9 w-full sm:w-28 text-sm">
|
||||||
|
<SelectValue placeholder="状态" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="all">所有状态</SelectItem>
|
||||||
|
<SelectItem :value="LOG_STATUS.SUCCESS">发送成功</SelectItem>
|
||||||
|
<SelectItem :value="LOG_STATUS.FAILED">发送失败</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<Button variant="outline" size="icon" class="h-9 w-9 shrink-0" @click="fetchLogs" :disabled="loading" title="刷新">
|
||||||
|
<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': loading }" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<Button variant="outline"
|
||||||
|
class="h-9 px-4 shrink-0 text-sm text-destructive hover:bg-destructive/10 hover:text-destructive border-destructive/20"
|
||||||
|
@click="handleClear">
|
||||||
|
<Trash2 class="h-4 w-4 sm:mr-2" /> <span class="hidden sm:inline" style="padding-left: 2px;">清空记录</span>
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="rounded-lg border bg-card overflow-x-auto">
|
||||||
|
<!-- 表头 -->
|
||||||
|
<div
|
||||||
|
class="flex items-center gap-2 sm:gap-4 px-3 sm:px-4 py-2 border-b bg-muted/50 text-xs sm:text-sm text-muted-foreground font-medium sm:min-w-[700px]">
|
||||||
|
<span class="w-12 sm:w-16 shrink-0">序号</span>
|
||||||
|
<span class="w-40 sm:w-56 shrink-0">标题及渠道</span>
|
||||||
|
<span class="hidden sm:flex sm:flex-1">内容详情</span>
|
||||||
|
<span class="w-10 sm:w-16 shrink-0 text-center">状态</span>
|
||||||
|
<span class="shrink-0 w-24 sm:w-40 sm:text-right">发送时间</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 列表 -->
|
||||||
|
<div class="divide-y sm:min-w-[700px]">
|
||||||
|
<div v-if="logs.length === 0 && !loading" class="text-sm text-muted-foreground text-center py-8">
|
||||||
|
暂无推送记录
|
||||||
|
</div>
|
||||||
|
<div v-for="(log, index) in logs" :key="log.id"
|
||||||
|
class="flex items-center gap-2 sm:gap-4 px-3 sm:px-4 py-2 hover:bg-muted/50 transition-colors cursor-pointer group"
|
||||||
|
:class="[selectedLogId === log.id && 'bg-accent/50']"
|
||||||
|
@click="showDetail(log)">
|
||||||
|
<span class="w-12 sm:w-16 shrink-0 text-muted-foreground text-xs sm:text-sm">#{{ getLogIndex(index) }}</span>
|
||||||
|
<span class="w-40 sm:w-56 shrink-0 font-medium text-xs sm:text-sm truncate" :title="log.title">{{ log.title }}</span>
|
||||||
|
<span class="hidden sm:flex sm:flex-1 font-medium text-xs sm:text-sm text-muted-foreground truncate" :title="log.content">
|
||||||
|
{{ log.content || '-' }}
|
||||||
|
</span>
|
||||||
|
<span class="w-10 sm:w-16 shrink-0 flex justify-center">
|
||||||
|
<span :class="['h-2 w-2 rounded-full', log.status === LOG_STATUS.SUCCESS ? 'bg-green-500 shadow-[0_0_8px_rgba(34,197,94,0.4)]' : 'bg-red-500 shadow-[0_0_8px_rgba(239,68,68,0.4)]']"></span>
|
||||||
|
</span>
|
||||||
|
<span class="shrink-0 w-24 sm:w-40 sm:text-right text-[10px] sm:text-xs text-muted-foreground font-mono">
|
||||||
|
{{ formatDate(log.created_at) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 分页 -->
|
||||||
|
<Pagination :total="total" :page="filters.page" @update:page="handlePageChange" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Dialog v-model:open="detailDialogProps.open" @update:open="onDialogClose">
|
||||||
|
<DialogContent class="sm:max-w-2xl max-h-[90vh] flex flex-col p-0 overflow-hidden">
|
||||||
|
<DialogHeader class="px-6 py-4 border-b bg-muted/20">
|
||||||
|
<div class="flex items-center justify-between pr-8">
|
||||||
|
<DialogTitle>日志详情</DialogTitle>
|
||||||
|
<Badge variant="outline" :class="[
|
||||||
|
'px-2 py-0.5 text-[10px] font-bold rounded-full border shadow-sm transition-all duration-300',
|
||||||
|
selectedLog ? getStatusBadgeClass(selectedLog.status) : ''
|
||||||
|
]">
|
||||||
|
<div class="flex items-center gap-1.5 uppercase tracking-wider">
|
||||||
|
<Check v-if="selectedLog?.status === LOG_STATUS.SUCCESS" class="h-3 w-3" />
|
||||||
|
<X v-else class="h-3 w-3" />
|
||||||
|
<span>{{ selectedLog?.status === LOG_STATUS.SUCCESS ? 'Success' : 'Failed' }}</span>
|
||||||
|
</div>
|
||||||
|
</Badge>
|
||||||
|
</div>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<div class="flex-1 overflow-y-auto">
|
||||||
|
<!-- 基础信息区 -->
|
||||||
|
<div class="px-6 py-4 border-b space-y-3 bg-card">
|
||||||
|
<div class="flex justify-between items-center text-sm">
|
||||||
|
<span class="text-muted-foreground">标题</span>
|
||||||
|
<span class="font-medium text-foreground">{{ detailDialogProps.title }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-between items-center text-sm">
|
||||||
|
<span class="text-muted-foreground">发生时间</span>
|
||||||
|
<span class="font-mono text-xs text-muted-foreground">{{ selectedLog ? formatDate(selectedLog.created_at) : '-' }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 内容输出区 -->
|
||||||
|
<div class="flex flex-col min-h-0 bg-muted/5">
|
||||||
|
<div class="px-6 py-2.5 text-xs font-semibold text-muted-foreground border-b bg-muted/10 uppercase tracking-wider">
|
||||||
|
推送内容
|
||||||
|
</div>
|
||||||
|
<div class="p-6">
|
||||||
|
<pre v-if="detailDialogProps.content"
|
||||||
|
class="text-xs font-mono bg-muted/30 p-4 rounded-lg border border-muted/50 whitespace-pre-wrap break-all leading-relaxed shadow-inner">{{ detailDialogProps.content }}</pre>
|
||||||
|
<div v-else class="text-xs text-muted-foreground italic py-2">无推送内容</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<template v-if="detailDialogProps.error">
|
||||||
|
<div class="px-6 py-2.5 text-xs font-semibold text-red-500 border-y bg-red-500/5 uppercase tracking-wider">
|
||||||
|
错误信息
|
||||||
|
</div>
|
||||||
|
<div class="p-6">
|
||||||
|
<pre class="text-xs font-mono bg-red-500/5 text-red-600/90 p-4 rounded-lg border border-red-500/20 whitespace-pre-wrap break-all leading-relaxed shadow-inner">{{ detailDialogProps.error }}</pre>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
"types": [
|
"types": [
|
||||||
"vite/client"
|
"vite/client"
|
||||||
],
|
],
|
||||||
|
"moduleResolution": "bundler",
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": [
|
"@/*": [
|
||||||
|
|||||||
+11
-3
@@ -1,13 +1,21 @@
|
|||||||
{
|
{
|
||||||
"files": [],
|
"files": [],
|
||||||
"references": [
|
"references": [
|
||||||
{ "path": "./tsconfig.app.json" },
|
{
|
||||||
{ "path": "./tsconfig.node.json" }
|
"path": "./tsconfig.app.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "./tsconfig.node.json"
|
||||||
|
}
|
||||||
],
|
],
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["src/*"]
|
"@/*": [
|
||||||
|
"src/*"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user