From 3e5a41a7e7c99d7199c5663d0362b116c5a16683 Mon Sep 17 00:00:00 2001 From: v-me-50 Date: Thu, 17 Jul 2025 16:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=20=E3=80=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91=E9=94=99=E8=AF=AF=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=20=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9Emonitor=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/monitor/monitor.go | 1 + backend/internal/setting/setting.go | 2 +- backend/migrations/init.go | 2 ++ backend/route/route.go | 1 + backend/scheduler/monitor.go | 6 +++++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/internal/monitor/monitor.go b/backend/internal/monitor/monitor.go index c1410d1..cd384f3 100644 --- a/backend/internal/monitor/monitor.go +++ b/backend/internal/monitor/monitor.go @@ -87,6 +87,7 @@ func GetInfo(id string) (map[string]any, error) { "target": dataMap["target"], "monitor_type": dataMap["monitor_type"], "valid": dataMap["valid"], + "last_time": dataMap["last_time"], } info, ok := dataMap["info"].(string) diff --git a/backend/internal/setting/setting.go b/backend/internal/setting/setting.go index 6a6fe7c..033ed37 100644 --- a/backend/internal/setting/setting.go +++ b/backend/internal/setting/setting.go @@ -188,7 +188,7 @@ func Restart() { } func GetVersion() (map[string]string, error) { - version := "v1.0.6" + version := "v1.0.7" update := "0" newVersionObj, err := http.Get("https://download.allinssl.com/version.json") if err != nil { diff --git a/backend/migrations/init.go b/backend/migrations/init.go index ecd57ef..3f30f78 100644 --- a/backend/migrations/init.go +++ b/backend/migrations/init.go @@ -366,6 +366,8 @@ create table monitor info TEXT not null, msg TEXT not null ); + create index if not exists err_record_monitor_id_index + on err_record (monitor_id); `) } diff --git a/backend/route/route.go b/backend/route/route.go index 579e383..3a3feac 100644 --- a/backend/route/route.go +++ b/backend/route/route.go @@ -108,6 +108,7 @@ func Register(r *gin.Engine) { staticFS, _ := fs.Sub(static.BuildFS, "build/static") r.StaticFS("/static", http.FS(staticFS)) r.StaticFS("/auto-deploy/static", http.FS(staticFS)) + r.StaticFS("/monitor/static", http.FS(staticFS)) // favicon.ico r.GET("/favicon.ico", func(c *gin.Context) { diff --git a/backend/scheduler/monitor.go b/backend/scheduler/monitor.go index b7d3f70..2aa6c4b 100644 --- a/backend/scheduler/monitor.go +++ b/backend/scheduler/monitor.go @@ -118,11 +118,15 @@ func Monitor() { // 此处应该发送错误邮件 if checkErr != "" { // 更新监控记录 + valid := -1 // 状态为异常 + if certInfo != nil && certInfo.Valid { + valid = 1 // 状态为正常 + } gs.Where("id=?", []interface{}{id}).Update(map[string]any{ "last_time": now.Format("2006-01-02 15:04:05"), "except_end_time": now.Format("2006-01-02 15:04:05"), "info": certJson, - "valid": -1, // 状态为异常 + "valid": valid, // 状态为异常 }) // 新增错误记录 if certInfo == nil || !certInfo.Valid {