OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 增加对转发邮箱和手机号码为空的错误处理

Browse Source
This commit is contained in:
TsMask
2025-05-23 14:32:58 +08:00
parent 2f65fb08cf
commit 5c450e5142
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
features/fm/email.go
View File

@@ -85,6 +85,9 @@ func AlarmEmailForward(alarmData *Alarm) error {
// return err // return err
// } // }
emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",") emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
if len(emails) == 0 {
return fmt.Errorf("not found forward email list")
}
m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接 m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接 //m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接 //m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接

29
features/fm/smsforward.go
View File

@@ -52,13 +52,18 @@ func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
if err != nil { if err != nil {
log.Error("Failed to XormGetAlarmForward:", err) log.Error("Failed to XormGetAlarmForward:", err)
return "", err return "", err
} else if toUsers == nil { }
if toUsers == nil {
err := errors.New("not found forward phone number") err := errors.New("not found forward phone number")
log.Error(err) log.Error(err)
return "", err return "", err
} }
userList := strings.Join(*toUsers, ",") userList := strings.Join(*toUsers, ",")
if len(userList) == 0 {
err := errors.New("not found forward phone number")
log.Error(err)
return "", err
}
// 短信相关参数 // 短信相关参数
params := url.Values{} params := url.Values{}
params.Set("PhoneNumbers", userList) params.Set("PhoneNumbers", userList)
@@ -110,6 +115,11 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
return "", err return "", err
} }
userList := smsForward.MobileList userList := smsForward.MobileList
if len(userList) == 0 {
err := errors.New("not found forward phone number")
log.Error(err)
return "", err
}
auth := gosmpp.Auth{ auth := gosmpp.Auth{
SMSC: smsForward.SMSCAddr, SMSC: smsForward.SMSCAddr,
SystemID: smsForward.SystemID, SystemID: smsForward.SystemID,
@@ -140,19 +150,22 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
}, -1) }, -1)
if err != nil { if err != nil {
log.Error("Failed to create SMPP new session:", err) log.Error("Failed to create SMPP new session:", err)
return userList, err return "", err
} }
// defer func() { defer func() {
// if err := trans.Close(); err != nil { if err := trans.Close(); err != nil {
// log.Error(err) log.Error(err)
// } }
// }() }()
message := "Alarm Notification: " + alarmData.AlarmTitle + message := "Alarm Notification: " + alarmData.AlarmTitle +
" from " + alarmData.NeType + "_" + alarmData.NeId + " from " + alarmData.NeType + "_" + alarmData.NeId +
" at " + alarmData.EventTime " at " + alarmData.EventTime
users := strings.Split(userList, ",") users := strings.Split(userList, ",")
for _, user := range users { for _, user := range users {
if user == "" {
continue
}
sm, err := newSubmitSM(user, message) sm, err := newSubmitSM(user, message)
if err != nil { if err != nil {
log.Errorf("Failed to newSubmitSM %s short message: %v", user, err) log.Errorf("Failed to newSubmitSM %s short message: %v", user, err)