From cb207580cf64beb1fa0c051a25a30532b5d39a22 Mon Sep 17 00:00:00 2001 From: naiba Date: Sat, 16 Jan 2021 15:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E6=8A=A5=E8=AD=A6SSL=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ service/dao/dao.go | 2 +- service/rpc/nezha.go | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 598ebbff86..7c51151797 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,12 @@ URL 里面也可放置占位符,请求时会进行简单的字符串替换。 ## 变更日志 +`dashboard 0.2.2` `agent 0.2.2` + +- `dashboard 0.2.2` + + - 修复一直报警SSL证书问题 + - `agent 0.2.2` - 修复双栈IP只能获取到v6的问题 #61 diff --git a/service/dao/dao.go b/service/dao/dao.go index 2873b1f164..622dc4b591 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -26,7 +26,7 @@ var SortedServerList []*model.Server var ServerLock sync.RWMutex -var Version = "v0.2.1" +var Version = "v0.2.2" func ReSortServer() { SortedServerList = []*model.Server{} diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go index da1147e307..f377217138 100644 --- a/service/rpc/nezha.go +++ b/service/rpc/nezha.go @@ -30,9 +30,10 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece // 证书错误提醒 errMsg = r.GetData() } else { + var oldSSLCert = strings.Split(last.Data, "|") var splits = strings.Split(r.GetData(), "|") // 证书变更提醒 - if last.Data != "" && last.Data != splits[0] { + if last.Data != "" && oldSSLCert[0] != splits[0] { errMsg = fmt.Sprintf( "SSL证书变更,旧:%s,新:%s。", last.Data, splits[0])