Merge branch 'main-v2' into lichang

features/fm/email.go

@@ -6,14 +6,14 @@ import (
 	"strings"
 
 	"be.ems/lib/config"
-	"be.ems/lib/log"
+	neService "be.ems/src/modules/network_element/service"
 	systemService "be.ems/src/modules/system/service"
 
 	"gopkg.in/gomail.v2"
 )
 
 func AlarmEmailForward(alarmData *Alarm) error {
-	log.Info("AlarmEmailForward processing... ")
+	neInfo := neService.NewNeInfo.FindByRmuid(alarmData.NeId)
 
 	alarmStatus := "Clear"
 	if alarmData.AlarmStatus == 1 {
@@ -26,11 +26,15 @@ func AlarmEmailForward(alarmData *Alarm) error {
 			severity = v.DataLabel
 		}
 	}
-	subjectTime := fmt.Sprintf("%s-%s-%s", severity, alarmData.NeName, alarmData.AlarmTitle)
+	subjectTitle := config.GetYamlConfig().Alarm.EmailForward.Title
+	if subjectTitle == "" {
+		subjectTitle = fmt.Sprintf("%s-%s-%s", alarmData.OrigSeverity, alarmData.NeName, alarmData.AlarmTitle)
+	}
 	message := fmt.Sprintf(`
 	<p>Alarm information</p>
 		<p style="text-indent:2.5em">Sequence: %d</p>
 		<p style="text-indent:3em">NE Name: %s</p>
+		<p style="text-indent:3em">NE IP: %s</p>
 		<p style="text-indent:4em">Title: %s</p>
 		<p style="text-indent:2.5em">Severity: %s</p>
 		<p style="text-indent:1.5em">Event Time: %s</p>
@@ -39,6 +43,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	`,
 		alarmData.AlarmSeq,
 		alarmData.NeName,
+		neInfo.IP,
 		alarmData.AlarmTitle,
 		severity,
 		alarmData.EventTime,
@@ -93,7 +98,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", subjectTime) // 邮件主题
+	m.SetHeader("Subject", subjectTitle) // 邮件主题
 
 	// text/html 的意思是将文件的 content-type 设置为 text/html 的形式，浏览器在获取到这种文件时会自动调用html的解析器对文件进行相应的处理。
 	// 可以通过 text/html 处理文本格式进行特殊处理，如换行、缩进、加粗等等