diff --git a/README.md b/README.md index 14bc8ac..f843be4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,计划任务和在线终端。

diff --git a/cmd/dashboard/controller/member_api.go b/cmd/dashboard/controller/member_api.go index 03c3a02..93865e1 100644 --- a/cmd/dashboard/controller/member_api.go +++ b/cmd/dashboard/controller/member_api.go @@ -395,6 +395,7 @@ type notificationForm struct { RequestHeader string RequestBody string VerifySSL string + SkipCheck string } func (ma *memberAPI) addOrEditNotification(c *gin.Context) { @@ -416,7 +417,10 @@ func (ma *memberAPI) addOrEditNotification(c *gin.Context) { Notification: &n, Server: nil, } - err = ns.Send("这是测试消息") + // 勾选了跳过检查 + if nf.SkipCheck != "on" { + err = ns.Send("这是测试消息") + } } if err == nil { // 保证Tag不为空 diff --git a/resource/static/main.css b/resource/static/main.css index 0153942..a8fb509 100644 --- a/resource/static/main.css +++ b/resource/static/main.css @@ -4,6 +4,11 @@ } } +td { + word-wrap: break-word; + word-break: break-all; +} + .nb-container { padding-top: 75px; min-height: 100vh; diff --git a/resource/static/main.js b/resource/static/main.js index 55be2a3..5f19527 100644 --- a/resource/static/main.js +++ b/resource/static/main.js @@ -154,6 +154,7 @@ function addOrEditNotification(notification) { } else { modal.find(".ui.nf-ssl.checkbox").checkbox("set unchecked"); } + modal.find(".ui.nf-skip-check.checkbox").checkbox("set unchecked"); showFormModal( ".notification.modal", "#notificationForm", diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html index 12638e5..0f8774f 100644 --- a/resource/template/common/footer.html +++ b/resource/template/common/footer.html @@ -9,7 +9,7 @@ - + diff --git a/resource/template/common/header.html b/resource/template/common/header.html index 45b402d..d4c636c 100644 --- a/resource/template/common/header.html +++ b/resource/template/common/header.html @@ -9,7 +9,7 @@ {{.Title}} - + diff --git a/resource/template/component/notification.html b/resource/template/component/notification.html index f44d26f..4df0923 100644 --- a/resource/template/component/notification.html +++ b/resource/template/component/notification.html @@ -44,6 +44,12 @@ +
+
+ + +
+
diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go index b280dd9..0b4fd44 100644 --- a/service/singleton/singleton.go +++ b/service/singleton/singleton.go @@ -12,7 +12,7 @@ import ( "github.com/naiba/nezha/pkg/utils" ) -var Version = "v0.12.22" // !!记得修改 README 中的 badge 版本!! +var Version = "v0.12.23" // !!记得修改 README 中的 badge 版本!! var ( Conf *model.Config