refactor: 重构更新多个文件中的相关调用

features/fm/email.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"be.ems/lib/config"
-	"be.ems/lib/dborm"
 	"be.ems/lib/log"
 
 	"gopkg.in/gomail.v2"
@@ -66,16 +65,6 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	// 	return err
 	// }
 	emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
-	forwardLog := &dborm.AlarmForwardLog{
-		NeType:     alarmData.NeType,
-		NeID:       alarmData.NeId,
-		AlarmID:    alarmData.AlarmId,
-		AlarmTitle: alarmData.AlarmTitle,
-		AlarmSeq:   alarmData.AlarmSeq,
-		EventTime:  alarmData.EventTime,
-		ToUser:     config.GetYamlConfig().Alarm.EmailForward.EmailList,
-	}
-
 	m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
@@ -107,22 +96,6 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
 	}
 
-	if err := d.DialAndSend(m); err != nil {
-		operResult := fmt.Sprintf("Failed to DialAndSend:%v", err)
-		log.Error(operResult)
-		forwardLog.OperResult = operResult
-		affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-		if err != nil && affected <= 0 {
-			log.Error("Failed to insert data:", err)
-		}
-		return err
-	}
-
-	forwardLog.OperResult = "Email sent successfully!"
-	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-	if err != nil && affected <= 0 {
-		log.Error("Failed to insert data:", err)
-		return err
-	}
-	return nil
+	err := d.DialAndSend(m)
+	return writeLog(alarmData, config.GetYamlConfig().Alarm.EmailForward.EmailList, "EMAIL", err)
 }