add: parameter config support alarm forward config
This commit is contained in:
@@ -2,7 +2,6 @@ package fm
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
@@ -48,25 +47,25 @@ func AlarmEmailForward(alarmData *Alarm) error {
|
||||
// userName := "smtpext@agrandtech.com"
|
||||
// password := "1000smtp@omc!"
|
||||
|
||||
host := config.GetYamlConfig().Alarm.Email.Smtp
|
||||
port := int(config.GetYamlConfig().Alarm.Email.Port)
|
||||
userName := config.GetYamlConfig().Alarm.Email.User
|
||||
password := config.GetYamlConfig().Alarm.Email.Password
|
||||
host := config.GetYamlConfig().Alarm.EmailForward.SMTP
|
||||
port := int(config.GetYamlConfig().Alarm.EmailForward.Port)
|
||||
userName := config.GetYamlConfig().Alarm.EmailForward.User
|
||||
password := config.GetYamlConfig().Alarm.EmailForward.Password
|
||||
|
||||
m := gomail.NewMessage()
|
||||
m.SetHeader("From", userName) // 发件人
|
||||
//m.SetHeader("From", "alias"+"<"+"aliastest"+">") // 增加发件人别名
|
||||
|
||||
emails, err := dborm.XormGetAlarmForward("Email")
|
||||
if err != nil {
|
||||
log.Error("Failed to XormGetAlarmForward:", err)
|
||||
return err
|
||||
} else if emails == nil || len(*emails) == 0 {
|
||||
err := errors.New("not found forward email list")
|
||||
log.Error(err)
|
||||
return err
|
||||
}
|
||||
|
||||
// emails, err := dborm.XormGetAlarmForward("Email")
|
||||
// if err != nil {
|
||||
// log.Error("Failed to XormGetAlarmForward:", err)
|
||||
// return err
|
||||
// } else if emails == nil || len(*emails) == 0 {
|
||||
// err := errors.New("not found forward email list")
|
||||
// log.Error(err)
|
||||
// return err
|
||||
// }
|
||||
emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
|
||||
forwardLog := &dborm.AlarmForwardLog{
|
||||
NeType: alarmData.NeType,
|
||||
NeID: alarmData.NeId,
|
||||
@@ -74,10 +73,10 @@ func AlarmEmailForward(alarmData *Alarm) error {
|
||||
AlarmTitle: alarmData.AlarmTitle,
|
||||
AlarmSeq: alarmData.AlarmSeq,
|
||||
EventTime: alarmData.EventTime,
|
||||
ToUser: strings.Join(*emails, ","),
|
||||
ToUser: config.GetYamlConfig().Alarm.EmailForward.EmailList,
|
||||
}
|
||||
|
||||
m.SetHeader("To", *emails...) // 收件人,可以多个收件人,但必须使用相同的 SMTP 连接
|
||||
m.SetHeader("To", emails...) // 收件人,可以多个收件人,但必须使用相同的 SMTP 连接
|
||||
//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人,可以多个收件人,但必须使用相同的 SMTP 连接
|
||||
//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人,可以多个收件人,但必须使用相同的 SMTP 连接
|
||||
//m.SetHeader("Cc", "******@qq.com") // 抄送,可以多个
|
||||
@@ -103,7 +102,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
|
||||
)
|
||||
// 关闭SSL协议认证
|
||||
d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
|
||||
if !config.GetYamlConfig().Alarm.Email.TlsSkipVerify {
|
||||
if !config.GetYamlConfig().Alarm.EmailForward.TLSSkipVerify {
|
||||
// 打开SSL协议认证
|
||||
d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user