From 268d646d7156901f17c2aae06a1cc3b08bf444f8 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Wed, 27 Nov 2024 11:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/tool.go  |  6 ++++++
 worker/myMail.go | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/handler/tool.go b/handler/tool.go
index 73084e7..582d74b 100644
--- a/handler/tool.go
+++ b/handler/tool.go
@@ -247,6 +247,12 @@ func ScanDeviceStatus() {
 }
 
 func SendMail(title, content string) {
+	//捕获异常
+	defer func() {
+		if err := recover(); err != nil {
+			fmt.Errorf("tool send mail error: %s", err)
+		}
+	}()
 	// TODO
 	// 发送邮件
 	// 邮件内容
diff --git a/worker/myMail.go b/worker/myMail.go
index 797516f..b531acd 100644
--- a/worker/myMail.go
+++ b/worker/myMail.go
@@ -2,7 +2,6 @@ package worker
 
 import (
 	"fmt"
-	"log"
 	"net/smtp"
 )
 
@@ -15,6 +14,13 @@ type MyEmail struct {
 }
 
 func (e *MyEmail) Send(title, content string, toEmail []string) error {
+	//捕获异常
+	defer func() {
+		if err := recover(); err != nil {
+			fmt.Errorf("MyEmail send mail error: %s", err)
+		}
+	}()
+
 	// 设置邮件头部
 	header := make(map[string]string)
 	header["From"] = e.SmtpUserName
@@ -31,7 +37,8 @@ func (e *MyEmail) Send(title, content string, toEmail []string) error {
 	// 发送邮件
 	err := smtp.SendMail(e.SmtpHost, smtp.PlainAuth("", e.SmtpUserName, e.SmtpPassword, "pop.qq.com"), e.SmtpUserName, toEmail, []byte(message))
 	if err != nil {
-		log.Fatalf("smtp error: %s", err)
+		//log.Fatalf("smtp error: %s", err)
+		fmt.Errorf("send mail error: %s", err)
 	}
 
 	return nil