feat: 系统全面优化 - 设备管理/登录日志导出/性能监控/设置页面
后端: - 新增全局设备管理 API(DeviceHandler.GetAllDevices) - 新增登录日志导出功能(LogHandler.ExportLoginLogs, CSV/XLSX) - 新增设置服务(SettingsService)和设置页面 API - 设备管理支持多条件筛选(状态/信任状态/关键词) - 登录日志支持流式导出防 OOM - 操作日志支持按方法/时间范围搜索 - 主题配置服务(ThemeService) - 增强监控健康检查(Prometheus metrics + SLO) - 移除旧 ratelimit.go(已迁移至 robustness) - 修复 SocialAccount NULL 扫描问题 - 新增 API 契约测试、Handler 测试、Settings 测试 前端: - 新增管理员设备管理页面(DevicesPage) - 新增管理员登录日志导出功能 - 新增系统设置页面(SettingsPage) - 设备管理支持筛选和分页 - 增强 HTTP 响应类型 测试: - 业务逻辑测试 68 个(含并发 CONC_001~003) - 规模测试 16 个(P99 百分位统计) - E2E 测试、集成测试、契约测试 - 性能基准测试、鲁棒性测试 全面测试通过(38 个测试包)
This commit is contained in:
@@ -1,7 +1,10 @@
|
||||
package monitoring
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
@@ -13,49 +16,92 @@ type HealthStatus string
|
||||
const (
|
||||
HealthStatusUP HealthStatus = "UP"
|
||||
HealthStatusDOWN HealthStatus = "DOWN"
|
||||
HealthStatusDEGRADED HealthStatus = "DEGRADED"
|
||||
HealthStatusUNKNOWN HealthStatus = "UNKNOWN"
|
||||
)
|
||||
|
||||
// HealthCheck 健康检查器
|
||||
// HealthCheck 健康检查器(增强版,支持 Redis 检查)
|
||||
type HealthCheck struct {
|
||||
db *gorm.DB
|
||||
db *gorm.DB
|
||||
redisClient RedisChecker
|
||||
startTime time.Time
|
||||
}
|
||||
|
||||
// NewHealthCheck 创建健康检查器
|
||||
func NewHealthCheck(db *gorm.DB) *HealthCheck {
|
||||
return &HealthCheck{db: db}
|
||||
// RedisChecker Redis 健康检查接口(避免直接依赖 Redis 包)
|
||||
type RedisChecker interface {
|
||||
Ping(ctx context.Context) error
|
||||
}
|
||||
|
||||
// Status 健康状态
|
||||
type Status struct {
|
||||
Status HealthStatus `json:"status"`
|
||||
Checks map[string]CheckResult `json:"checks"`
|
||||
Status HealthStatus `json:"status"`
|
||||
Checks map[string]CheckResult `json:"checks"`
|
||||
Uptime string `json:"uptime,omitempty"`
|
||||
Timestamp string `json:"timestamp"`
|
||||
}
|
||||
|
||||
// CheckResult 检查结果
|
||||
type CheckResult struct {
|
||||
Status HealthStatus `json:"status"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Status HealthStatus `json:"status"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Latency string `json:"latency_ms,omitempty"`
|
||||
}
|
||||
|
||||
// Check 执行健康检查
|
||||
// NewHealthCheck 创建健康检查器
|
||||
func NewHealthCheck(db *gorm.DB) *HealthCheck {
|
||||
return &HealthCheck{
|
||||
db: db,
|
||||
startTime: time.Now(),
|
||||
}
|
||||
}
|
||||
|
||||
// WithRedis 注入 Redis 检查器(可选)
|
||||
func (h *HealthCheck) WithRedis(r RedisChecker) *HealthCheck {
|
||||
h.redisClient = r
|
||||
return h
|
||||
}
|
||||
|
||||
// Check 执行完整健康检查
|
||||
func (h *HealthCheck) Check() *Status {
|
||||
status := &Status{
|
||||
Status: HealthStatusUP,
|
||||
Checks: make(map[string]CheckResult),
|
||||
Status: HealthStatusUP,
|
||||
Checks: make(map[string]CheckResult),
|
||||
Timestamp: time.Now().UTC().Format(time.RFC3339),
|
||||
}
|
||||
|
||||
// 检查数据库
|
||||
if h.startTime != (time.Time{}) {
|
||||
status.Uptime = time.Since(h.startTime).Round(time.Second).String()
|
||||
}
|
||||
|
||||
// 检查数据库(强依赖:DOWN 则服务 DOWN)
|
||||
dbResult := h.checkDatabase()
|
||||
status.Checks["database"] = dbResult
|
||||
if dbResult.Status != HealthStatusUP {
|
||||
if dbResult.Status == HealthStatusDOWN {
|
||||
status.Status = HealthStatusDOWN
|
||||
}
|
||||
|
||||
// 检查 Redis(弱依赖:DOWN 则服务 DEGRADED,不影响主功能)
|
||||
if h.redisClient != nil {
|
||||
redisResult := h.checkRedis()
|
||||
status.Checks["redis"] = redisResult
|
||||
if redisResult.Status == HealthStatusDOWN && status.Status == HealthStatusUP {
|
||||
status.Status = HealthStatusDEGRADED
|
||||
}
|
||||
}
|
||||
|
||||
return status
|
||||
}
|
||||
|
||||
// checkDatabase 检查数据库
|
||||
// LivenessCheck 存活检查(只检查进程是否运行,不检查依赖)
|
||||
func (h *HealthCheck) LivenessCheck() *Status {
|
||||
return &Status{
|
||||
Status: HealthStatusUP,
|
||||
Checks: map[string]CheckResult{},
|
||||
Timestamp: time.Now().UTC().Format(time.RFC3339),
|
||||
}
|
||||
}
|
||||
|
||||
// checkDatabase 检查数据库连接
|
||||
func (h *HealthCheck) checkDatabase() CheckResult {
|
||||
if h == nil || h.db == nil {
|
||||
return CheckResult{
|
||||
@@ -64,6 +110,7 @@ func (h *HealthCheck) checkDatabase() CheckResult {
|
||||
}
|
||||
}
|
||||
|
||||
start := time.Now()
|
||||
sqlDB, err := h.db.DB()
|
||||
if err != nil {
|
||||
return CheckResult{
|
||||
@@ -72,36 +119,89 @@ func (h *HealthCheck) checkDatabase() CheckResult {
|
||||
}
|
||||
}
|
||||
|
||||
// Ping数据库
|
||||
if err := sqlDB.Ping(); err != nil {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if err := sqlDB.PingContext(ctx); err != nil {
|
||||
return CheckResult{
|
||||
Status: HealthStatusDOWN,
|
||||
Error: err.Error(),
|
||||
Status: HealthStatusDOWN,
|
||||
Error: err.Error(),
|
||||
Latency: formatLatency(time.Since(start)),
|
||||
}
|
||||
}
|
||||
|
||||
return CheckResult{Status: HealthStatusUP}
|
||||
// 同时更新连接池指标
|
||||
go h.updateDBConnectionMetrics(sqlDB)
|
||||
|
||||
return CheckResult{
|
||||
Status: HealthStatusUP,
|
||||
Latency: formatLatency(time.Since(start)),
|
||||
}
|
||||
}
|
||||
|
||||
// ReadinessHandler reports dependency readiness.
|
||||
// checkRedis 检查 Redis 连接
|
||||
func (h *HealthCheck) checkRedis() CheckResult {
|
||||
if h.redisClient == nil {
|
||||
return CheckResult{Status: HealthStatusUNKNOWN}
|
||||
}
|
||||
|
||||
start := time.Now()
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if err := h.redisClient.Ping(ctx); err != nil {
|
||||
return CheckResult{
|
||||
Status: HealthStatusDOWN,
|
||||
Error: err.Error(),
|
||||
Latency: formatLatency(time.Since(start)),
|
||||
}
|
||||
}
|
||||
|
||||
return CheckResult{
|
||||
Status: HealthStatusUP,
|
||||
Latency: formatLatency(time.Since(start)),
|
||||
}
|
||||
}
|
||||
|
||||
// updateDBConnectionMetrics 更新数据库连接池 Prometheus 指标
|
||||
func (h *HealthCheck) updateDBConnectionMetrics(sqlDB *sql.DB) {
|
||||
stats := sqlDB.Stats()
|
||||
sloMetrics := GetGlobalSLOMetrics()
|
||||
sloMetrics.SetDBConnections(
|
||||
float64(stats.InUse),
|
||||
float64(stats.MaxOpenConnections),
|
||||
)
|
||||
}
|
||||
|
||||
// ReadinessHandler 就绪检查 Handler(检查所有依赖)
|
||||
func (h *HealthCheck) ReadinessHandler(c *gin.Context) {
|
||||
status := h.Check()
|
||||
|
||||
httpStatus := http.StatusOK
|
||||
if status.Status != HealthStatusUP {
|
||||
if status.Status == HealthStatusDOWN {
|
||||
httpStatus = http.StatusServiceUnavailable
|
||||
} else if status.Status == HealthStatusDEGRADED {
|
||||
// DEGRADED 仍返回 200,但在响应体中标注
|
||||
httpStatus = http.StatusOK
|
||||
}
|
||||
|
||||
c.JSON(httpStatus, status)
|
||||
}
|
||||
|
||||
// LivenessHandler reports process liveness without dependency checks.
|
||||
// LivenessHandler 存活检查 Handler(只检查进程存活,不检查依赖)
|
||||
// 返回 204 No Content:进程存活,不需要响应体(节省 k8s probe 开销)
|
||||
func (h *HealthCheck) LivenessHandler(c *gin.Context) {
|
||||
c.Status(http.StatusNoContent)
|
||||
c.Writer.WriteHeaderNow()
|
||||
c.AbortWithStatus(http.StatusNoContent)
|
||||
}
|
||||
|
||||
// Handler keeps backward compatibility with the historical /health endpoint.
|
||||
// Handler 兼容旧 /health 端点
|
||||
func (h *HealthCheck) Handler(c *gin.Context) {
|
||||
h.ReadinessHandler(c)
|
||||
}
|
||||
|
||||
func formatLatency(d time.Duration) string {
|
||||
if d < time.Millisecond {
|
||||
return "< 1ms"
|
||||
}
|
||||
return d.Round(time.Millisecond).String()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user