Merge branch 'refs/heads/master' into release

handler/tool.go

@@ -60,7 +60,7 @@ func SetDeviceStatusV2(c *gin.Context) {
 		for _, v := range devices {
 			if v == req.ID {
 				// 继续处理请求
-				worker.SetRedisWithExpire(req.ID, "1", 300)
+				worker.SetRedisWithExpire(req.ID, "1", time.Second*300)
 				c.JSON(200, gin.H{"code": 0, "message": "success"})
 				return
 			}
@@ -231,13 +231,10 @@ func ScanDeviceStatus() {
 	devices := worker.GetRedisSetMembers("627gyf3488h")
 	offline := ""
 	for _, v := range devices {
-		res := worker.GetRedis(v)
+		c := worker.IsContainKey("monitor_" + v)
-		if res == "" {
+		if c == false {
-			c := worker.IsContainKey("monitor_" + v)
+			worker.SetRedisWithExpire("monitor_"+v, "1", time.Hour*24)
-			if c == false {
+			offline += v + ","
-				worker.SetRedisWithExpire("monitor_"+v, "1", time.Hour*12)
-				offline += v + ","
-			}
 		}
 	}
 
@@ -250,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
 	// 发送邮件
 	// 邮件内容

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