feat: 配置版本历史/对比/回滚、国内 IM 通知渠道、阈值告警与 API Token(v1.2.9)
- 配置版本:fsutil 版本化备份(内容相同自动去重),主 nginx.conf 与 VPS vhost 的版本列表/逐行差异/一键回滚,回滚先校验语法与 nginx -t 再写回 - agent 0.12.2:写 vhost 前留版本;nginx -t 校验失败改为恢复上一个可用版本(此前直接删文件),新增域名 vhost 版本端点,双架构二进制已重编 - 通知:补企业微信 / 钉钉 / 飞书机器人,切换预设时服务地址跟随该预设默认值 - 阈值告警:新增 internal/monitor 巡检(CPU/内存/磁盘持续超阈值、隧道连续 N 次未注册),默认关闭,带静默期与恢复通知 - API Token:api_tokens 表 + Authorization Bearer 认证,只读/读写两种范围;令牌管理与改密/退出仅限登录会话
This commit is contained in:
@@ -25,11 +25,11 @@ type RuleNginxView struct {
|
||||
}
|
||||
|
||||
type GlobalNginxView struct {
|
||||
Mode string `json:"mode"`
|
||||
GeneratedFramework string `json:"generated_framework"`
|
||||
GeneratedSnippet string `json:"generated_snippet"`
|
||||
Content string `json:"content"`
|
||||
Backups []NginxBackupInfo `json:"backups"`
|
||||
Mode string `json:"mode"`
|
||||
GeneratedFramework string `json:"generated_framework"`
|
||||
GeneratedSnippet string `json:"generated_snippet"`
|
||||
Content string `json:"content"`
|
||||
Backups []NginxBackupInfo `json:"backups"`
|
||||
}
|
||||
|
||||
type SaveRuleNginxInput struct {
|
||||
@@ -351,3 +351,68 @@ func mapBackups(entries []nginx.BackupEntry) []NginxBackupInfo {
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// NginxConfigVersionInfo 描述主配置(nginx.conf)的一个历史版本。
|
||||
type NginxConfigVersionInfo struct {
|
||||
Name string `json:"name"`
|
||||
Size int64 `json:"size"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
type NginxConfigVersionsView struct {
|
||||
Message string `json:"message,omitempty"`
|
||||
Content string `json:"content"`
|
||||
Versions []NginxConfigVersionInfo `json:"versions"`
|
||||
}
|
||||
|
||||
type NginxConfigVersionView struct {
|
||||
Name string `json:"name"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
// GetNginxConfigVersions 返回当前主配置与其历史版本,前端拿两者做差异对比。
|
||||
func (s *ProxyService) GetNginxConfigVersions() (NginxConfigVersionsView, error) {
|
||||
content, err := s.nginx.ReadConfig()
|
||||
if err != nil {
|
||||
return NginxConfigVersionsView{}, err
|
||||
}
|
||||
versions, err := s.nginx.ListConfigVersions()
|
||||
if err != nil {
|
||||
return NginxConfigVersionsView{}, err
|
||||
}
|
||||
return NginxConfigVersionsView{Content: content, Versions: mapConfigVersions(versions)}, nil
|
||||
}
|
||||
|
||||
func (s *ProxyService) ReadNginxConfigVersion(name string) (NginxConfigVersionView, error) {
|
||||
content, err := s.nginx.ReadConfigVersion(name)
|
||||
if err != nil {
|
||||
return NginxConfigVersionView{}, err
|
||||
}
|
||||
return NginxConfigVersionView{Name: name, Content: content}, nil
|
||||
}
|
||||
|
||||
// RollbackNginxConfigVersion 回滚主配置;校验不过时 nginx 层不会动磁盘上的当前配置。
|
||||
func (s *ProxyService) RollbackNginxConfigVersion(ctx context.Context, name string) (NginxConfigVersionsView, error) {
|
||||
result, err := s.nginx.RollbackConfigVersion(ctx, name)
|
||||
if err != nil {
|
||||
return NginxConfigVersionsView{}, err
|
||||
}
|
||||
view, err := s.GetNginxConfigVersions()
|
||||
if err != nil {
|
||||
return NginxConfigVersionsView{}, err
|
||||
}
|
||||
view.Message = result.Message
|
||||
return view, nil
|
||||
}
|
||||
|
||||
func mapConfigVersions(entries []nginx.ConfigVersion) []NginxConfigVersionInfo {
|
||||
out := make([]NginxConfigVersionInfo, 0, len(entries))
|
||||
for _, entry := range entries {
|
||||
out = append(out, NginxConfigVersionInfo{
|
||||
Name: entry.Name,
|
||||
Size: entry.Size,
|
||||
CreatedAt: entry.CreatedAt.Format("2006-01-02T15:04:05Z"),
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user