oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: support Azure Comm Service SMTP

Browse Source
This commit is contained in:
wzxjohn
2024-12-07 00:14:46 +08:00
parent 3eca58093f
commit 568d4e3f71
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/email.go
View File

@@ -10,22 +10,22 @@ import (
) )
func generateMessageID() (string, error) { func generateMessageID() (string, error) {
split := strings.Split(SMTPAccount, "@") split := strings.Split(SMTPFrom, "@")
if len(split) < 2 { if len(split) < 2 {
return "", fmt.Errorf("invalid SMTP account") return "", fmt.Errorf("invalid SMTP account")
} }
domain := strings.Split(SMTPAccount, "@")[1] domain := strings.Split(SMTPFrom, "@")[1]
return fmt.Sprintf("<%d.%s@%s>", time.Now().UnixNano(), GetRandomString(12), domain), nil return fmt.Sprintf("<%d.%s@%s>", time.Now().UnixNano(), GetRandomString(12), domain), nil
} }
func SendEmail(subject string, receiver string, content string) error { func SendEmail(subject string, receiver string, content string) error {
if SMTPFrom == "" { // for compatibility
SMTPFrom = SMTPAccount
}
id, err2 := generateMessageID() id, err2 := generateMessageID()
if err2 != nil { if err2 != nil {
return err2 return err2
} }
if SMTPFrom == "" { // for compatibility
SMTPFrom = SMTPAccount
}
if SMTPServer == "" && SMTPAccount == "" { if SMTPServer == "" && SMTPAccount == "" {
return fmt.Errorf("SMTP 服务器未配置") return fmt.Errorf("SMTP 服务器未配置")
} }
@@ -79,11 +79,11 @@ func SendEmail(subject string, receiver string, content string) error {
if err != nil { if err != nil {
return err return err
} }
} else if isOutlookServer(SMTPAccount) { } else if isOutlookServer(SMTPAccount) || SMTPServer == "smtp.azurecomm.net" {
auth = LoginAuth(SMTPAccount, SMTPToken) auth = LoginAuth(SMTPAccount, SMTPToken)
err = smtp.SendMail(addr, auth, SMTPAccount, to, mail) err = smtp.SendMail(addr, auth, SMTPFrom, to, mail)
} else { } else {
err = smtp.SendMail(addr, auth, SMTPAccount, to, mail) err = smtp.SendMail(addr, auth, SMTPFrom, to, mail)
} }
return err return err
} }