diff --git a/README.md b/README.md index 7d92ecb..39f24e7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 哪吒监控 -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=管理面板%20v0.4.10&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.7-brightgreen?style=for-the-badge&logo=linux) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=管理面板%20v0.4.11&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.7-brightgreen?style=for-the-badge&logo=linux) :trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,命令批量执行和计划任务。 diff --git a/model/server.go b/model/server.go index f759d96..9dc5bf9 100644 --- a/model/server.go +++ b/model/server.go @@ -1,6 +1,7 @@ package model import ( + "encoding/json" "fmt" "html/template" "time" @@ -25,5 +26,10 @@ type Server struct { } func (s Server) Marshal() template.JS { - return template.JS(fmt.Sprintf(`{"ID":%d,"Name":"%s","Secret":"%s","DisplayIndex":%d,"Tag":"%s","Note":"%s"}`, s.ID, s.Name, s.Secret, s.DisplayIndex, s.Tag, s.Note)) + name, _ := json.Marshal(s.Name) + tag, _ := json.Marshal(s.Tag) + note, _ := json.Marshal(s.Note) + secret, _ := json.Marshal(s.Secret) + return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s}`, + s.ID, name, secret, s.DisplayIndex, tag, note)) } diff --git a/model/server_test.go b/model/server_test.go new file mode 100644 index 0000000..6fa5abd --- /dev/null +++ b/model/server_test.go @@ -0,0 +1,27 @@ +package model + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestServerMarshal(t *testing.T) { + patterns := []string{ + "asd > asd", + "asd \" asd", + "asd } asd", + } + + for i := 0; i < len(patterns); i++ { + server := Server{ + Name: patterns[i], + Tag: patterns[i], + } + serverStr := string(server.Marshal()) + var serverRestore Server + assert.Nil(t, json.Unmarshal([]byte(serverStr), &serverRestore)) + assert.Equal(t, server, serverRestore) + } +} diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html index 373eb81..063463d 100644 --- a/resource/template/common/menu.html +++ b/resource/template/common/menu.html @@ -40,7 +40,7 @@ {{else}} - 登录 + 登录 {{end}} diff --git a/service/dao/dao.go b/service/dao/dao.go index 9ae7b39..41d9a9b 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -13,7 +13,7 @@ import ( pb "github.com/naiba/nezha/proto" ) -var Version = "v0.4.10" // !!记得修改 README 重的 badge 版本!! +var Version = "v0.4.11" // !!记得修改 README 重的 badge 版本!! const ( SnapshotDelay = 3 diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go index f6b4316..2546ae5 100644 --- a/service/rpc/nezha.go +++ b/service/rpc/nezha.go @@ -26,7 +26,7 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece var errMsg string if strings.HasPrefix(r.GetData(), "SSL证书错误:") { // 排除超时错误 - if !strings.HasSuffix(r.GetData(), "i/o timeout") { + if !strings.HasSuffix(r.GetData(), "timeout") { errMsg = r.GetData() } } else {