From af7259682ac621c724dc8cb4a6f2b1cd28f91a40 Mon Sep 17 00:00:00 2001 From: mhf Date: Wed, 22 Mar 2023 20:30:45 +0800 Subject: [PATCH] fix(notify): fix notify email double send --- pkg/notify/sender/email.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/notify/sender/email.go b/pkg/notify/sender/email.go index 66a2f4ce31..6915242ba5 100644 --- a/pkg/notify/sender/email.go +++ b/pkg/notify/sender/email.go @@ -127,18 +127,19 @@ func (emailSender *SEmailSender) Send(args api.SendParams) error { if len(retErr) > 0 { log.Errorf("send email error:%v", jsonutils.Marshal(retErr)) } + } else { + // 构造email发送请求 + gmsg := gomail.NewMessage() + gmsg.SetHeader("From", models.ConfigMap[api.EMAIL].Content.SenderAddress) + gmsg.SetHeader("To", args.Receivers.Contact) + gmsg.SetHeader("Subject", args.Title) + gmsg.SetBody("text/html", args.Message) + dialer.StartTLSPolicy = gomail.MandatoryStartTLS + if err := dialer.DialAndSend(gmsg); err != nil { + return errors.Wrap(err, "send email") + } } - // 构造email发送请求 - gmsg := gomail.NewMessage() - gmsg.SetHeader("From", models.ConfigMap[api.EMAIL].Content.SenderAddress) - gmsg.SetHeader("To", args.Receivers.Contact) - gmsg.SetHeader("Subject", args.Title) - gmsg.SetBody("text/html", args.Message) - dialer.StartTLSPolicy = gomail.MandatoryStartTLS - if err := dialer.DialAndSend(gmsg); err != nil { - return errors.Wrap(err, "send email") - } return nil }