marge: 合并代码

features/fm/email.go

@@ -16,11 +16,27 @@ import (
 func AlarmEmailForward(alarmData *Alarm) error {
 	log.Info("AlarmEmailForward processing... ")
 
-	message := `
-    <p> Hello information,</p>
-		test, test	
-		<p style="text-indent:2em">Best Wishes!</p>
-	`
+	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:5em">Title: %s</p>
+		<p style="text-indent:3em">Severity: %s</p>
+		<p style="text-indent:2em">Event Time: %s</p>
+		<p style="text-indent:2em">Automatic send by OMC, don't reply!</p>
+	`, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime)
+
+	// message := fmt.Sprintf(`
+	// Alarm information
+
+	//       Sequence: %d
+	// 	   NE name: %s
+	//          Title: %s
+	//       Severity: %s
+	//     Event Time: %s
+
+	//    Automatic send by OMC, don't reply!
+	// `, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime)
 
 	// QQ 邮箱：
 	// SMTP 服务器地址：smtp.qq.com（SSL协议端口：465/994 | 非SSL协议端口：25）
@@ -74,7 +90,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	m.SetBody("text/html", message)
 
 	// text/plain的意思是将文件设置为纯文本的形式，浏览器在获取到这种文件时并不会对其进行处理
-	// m.SetBody("text/plain", "纯文本")
+	//m.SetBody("text/plain", message)
 	// m.Attach("test.sh")   // 附件文件，可以是文件，照片，视频等等
 	// m.Attach("lolcatVideo.mp4") // 视频
 	// m.Attach("lolcat.jpg") // 照片
@@ -87,6 +103,10 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	)
 	// 关闭SSL协议认证
 	d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
+	if !config.GetYamlConfig().Alarm.Email.TlsSkipVerify {
+		// 打开SSL协议认证
+		d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
+	}
 
 	if err := d.DialAndSend(m); err != nil {
 		operResult := fmt.Sprintf("Failed to DialAndSend:%v", err)
@@ -99,9 +119,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		return err
 	}
 
-	operResult := fmt.Sprintf("Email sent successfully!:", err)
-	log.Error(operResult)
-	forwardLog.OperResult = operResult
+	forwardLog.OperResult = "Email sent successfully!"
 	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert data:", err)