From 32630fbb4adee93d03d35697ec4aaf1512bea10c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 4 Mar 2025 14:51:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/fm/email.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/features/fm/email.go b/features/fm/email.go index bd4d0c3a..cae7550f 100644 --- a/features/fm/email.go +++ b/features/fm/email.go @@ -15,6 +15,13 @@ import ( func AlarmEmailForward(alarmData *Alarm) error { log.Info("AlarmEmailForward processing... ") + alarmStatus := "Clear" + if alarmData.AlarmStatus == 1 { + alarmStatus = "Active" + } + severity := alarmData.OrigSeverity + subjectTime := fmt.Sprintf("%s-%s-%s", severity, alarmData.NeName, alarmData.AlarmTitle) + message := fmt.Sprintf(`
Alarm information
Sequence: %d
@@ -22,9 +29,9 @@ func AlarmEmailForward(alarmData *Alarm) error {Title: %s
Severity: %s
Event Time: %s
-Alarm Status: %d
+Alarm Status: %s
Automatic sent by OMC, please do not reply!
- `, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime, alarmData.AlarmStatus) + `, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime, alarmStatus) // message := fmt.Sprintf(` // Alarm information @@ -81,7 +88,7 @@ func AlarmEmailForward(alarmData *Alarm) error { //m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人,可以多个收件人,但必须使用相同的 SMTP 连接 //m.SetHeader("Cc", "******@qq.com") // 抄送,可以多个 //m.SetHeader("Bcc", "******@qq.com") // 暗送,可以多个 - m.SetHeader("Subject", "Alarm from OMC!") // 邮件主题 + m.SetHeader("Subject", subjectTime) // 邮件主题 // text/html 的意思是将文件的 content-type 设置为 text/html 的形式,浏览器在获取到这种文件时会自动调用html的解析器对文件进行相应的处理。 // 可以通过 text/html 处理文本格式进行特殊处理,如换行、缩进、加粗等等