From d4d3caa25cc5f37e1785c2db88c8c32bb436e7f0 Mon Sep 17 00:00:00 2001 From: zhangchenhao Date: Thu, 8 May 2025 17:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=8F=91=E9=80=81=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E7=9A=84=E7=9F=AD=E5=93=8D=E5=BA=94=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/report/report.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/backend/internal/report/report.go b/backend/internal/report/report.go index d70bf5c..e037c95 100644 --- a/backend/internal/report/report.go +++ b/backend/internal/report/report.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/jordan-wright/email" "net/smtp" + "strings" "time" ) @@ -182,18 +183,24 @@ func NotifyMail(params map[string]any) error { ServerName: config["smtpHost"], } err = e.SendWithTLS(addr, auth, tlsConfig) - if err != nil && (err.Error() == "EOF" || err.Error() == "short response" || err.Error() == "server response incomplete") { + if err != nil { + if err.Error() == "EOF" || strings.Contains(err.Error(), "short response") || err.Error() == "server response incomplete" { + // 忽略短响应错误 + return nil + } + return err + } + return nil + } + + // 普通明文发送（25端口，非推荐） + err = e.Send(addr, auth) + if err != nil { + if err.Error() == "EOF" || strings.Contains(err.Error(), "short response") || err.Error() == "server response incomplete" { // 忽略短响应错误 return nil } return err } - - // 普通明文发送（25端口，非推荐） - err = e.Send(addr, auth) - if err != nil && (err.Error() == "EOF" || err.Error() == "short response" || err.Error() == "server response incomplete") { - // 忽略短响应错误 - return nil - } - return err + return nil }