fix: 增加对转发邮箱和手机号码为空的错误处理
This commit is contained in:
@@ -52,13 +52,18 @@ func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
|
||||
if err != nil {
|
||||
log.Error("Failed to XormGetAlarmForward:", err)
|
||||
return "", err
|
||||
} else if toUsers == nil {
|
||||
}
|
||||
if toUsers == nil {
|
||||
err := errors.New("not found forward phone number")
|
||||
log.Error(err)
|
||||
return "", err
|
||||
}
|
||||
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.Set("PhoneNumbers", userList)
|
||||
@@ -110,6 +115,11 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
userList := smsForward.MobileList
|
||||
if len(userList) == 0 {
|
||||
err := errors.New("not found forward phone number")
|
||||
log.Error(err)
|
||||
return "", err
|
||||
}
|
||||
auth := gosmpp.Auth{
|
||||
SMSC: smsForward.SMSCAddr,
|
||||
SystemID: smsForward.SystemID,
|
||||
@@ -140,19 +150,22 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
|
||||
}, -1)
|
||||
if err != nil {
|
||||
log.Error("Failed to create SMPP new session:", err)
|
||||
return userList, err
|
||||
return "", err
|
||||
}
|
||||
// defer func() {
|
||||
// if err := trans.Close(); err != nil {
|
||||
// log.Error(err)
|
||||
// }
|
||||
// }()
|
||||
defer func() {
|
||||
if err := trans.Close(); err != nil {
|
||||
log.Error(err)
|
||||
}
|
||||
}()
|
||||
|
||||
message := "Alarm Notification: " + alarmData.AlarmTitle +
|
||||
" from " + alarmData.NeType + "_" + alarmData.NeId +
|
||||
" at " + alarmData.EventTime
|
||||
users := strings.Split(userList, ",")
|
||||
for _, user := range users {
|
||||
if user == "" {
|
||||
continue
|
||||
}
|
||||
sm, err := newSubmitSM(user, message)
|
||||
if err != nil {
|
||||
log.Errorf("Failed to newSubmitSM %s short message: %v", user, err)
|
||||
|
||||
Reference in New Issue
Block a user