SMTP 邮件通知支持收发分离、支持多收件人

This commit is contained in:
Cp0204 2024-11-28 21:12:53 +08:00
parent a1501705c1
commit b1cf6c9761
2 changed files with 44 additions and 15 deletions

View File

@ -79,9 +79,11 @@ const push_config = {
AIBOTK_NAME: '', // 智能微秘书 发送群名 或者好友昵称和type要对应好
SMTP_SERVICE: '', // 邮箱服务名称,比如 126、163、Gmail、QQ 等,支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
SMTP_EMAIL: '', // SMTP 发件邮箱,通知将会由自己发给自己
SMTP_EMAIL: '', // SMTP 发件邮箱
SMTP_PASSWORD: '', // SMTP 登录密码,也可能为特殊口令,视具体邮件服务商说明而定
SMTP_NAME: '', // SMTP 收发件人姓名,可随意填写
SMTP_NAME: '', // SMTP 发件人姓名,可随意填写
SMTP_EMAIL_TO: '', //SMTP 收件邮箱,可选,缺省时将自己发给自己,多个收件邮箱逗号间隔
SMTP_NAME_TO: '', //SMTP 收件人姓名,可选,可随意填写,多个收件人逗号间隔,顺序与 SMTP_EMAIL_TO 保持一致
PUSHME_KEY: '', // 官方文档https://push.i-i.mePushMe 酱的 PUSHME_KEY
@ -964,8 +966,8 @@ function fsBotNotify(text, desp) {
}
async function smtpNotify(text, desp) {
const { SMTP_EMAIL, SMTP_PASSWORD, SMTP_SERVICE, SMTP_NAME } = push_config;
if (![SMTP_EMAIL, SMTP_PASSWORD].every(Boolean) || !SMTP_SERVICE) {
const { SMTP_EMAIL, SMTP_PASSWORD, SMTP_SERVICE, SMTP_NAME, SMTP_EMAIL_TO, SMTP_NAME_TO } = push_config;
if (!SMTP_EMAIL || !SMTP_PASSWORD || !SMTP_SERVICE) {
return;
}
@ -979,10 +981,24 @@ async function smtpNotify(text, desp) {
},
});
const addr = SMTP_NAME ? `"${SMTP_NAME}" <${SMTP_EMAIL}>` : SMTP_EMAIL;
const fromAddr = SMTP_NAME ? `"${SMTP_NAME}" <${SMTP_EMAIL}>` : SMTP_EMAIL;
let toAddr;
if (SMTP_EMAIL_TO) {
// 处理多个收件人
const emailTos = SMTP_EMAIL_TO.split(',');
const nameTos = (SMTP_NAME_TO || "").split(',');
toAddr = emailTos.map((email, index) => {
const name = nameTos[index] || "";
return name ? `"${name}" <${email}>` : email;
});
} else {
toAddr = fromAddr;
}
const info = await transporter.sendMail({
from: addr,
to: addr,
from: fromAddr,
to: toAddr,
subject: text,
html: `${desp.replace(/\n/g, '<br/>')}`,
});

View File

@ -101,9 +101,11 @@ push_config = {
'SMTP_SERVER': '', # SMTP 发送邮件服务器,形如 smtp.exmail.qq.com:465
'SMTP_SSL': 'false', # SMTP 发送邮件服务器是否使用 SSL填写 true 或 false
'SMTP_EMAIL': '', # SMTP 发件邮箱,通知将会由自己发给自己
'SMTP_EMAIL': '', # SMTP 发件邮箱
'SMTP_PASSWORD': '', # SMTP 登录密码,也可能为特殊口令,视具体邮件服务商说明而定
'SMTP_NAME': '', # SMTP 收发件人姓名,可随意填写
'SMTP_NAME': '', # SMTP 发件人姓名,可随意填写
'SMTP_EMAIL_TO': '', # SMTP 收件邮箱,可选,缺省时将自己发给自己,多个收件邮箱逗号间隔
'SMTP_NAME_TO': '', # SMTP 收件人姓名,可选,可随意填写,多个收件人逗号间隔,顺序与 SMTP_EMAIL_TO 保持一致
'PUSHME_KEY': '', # PushMe 的 PUSHME_KEY
'PUSHME_URL': '', # PushMe 的 PUSHME_URL
@ -679,12 +681,23 @@ def smtp(title: str, content: str) -> None:
push_config.get("SMTP_EMAIL"),
)
)
if not push_config.get("SMTP_EMAIL_TO"):
smtp_email_to = push_config.get("SMTP_EMAIL")
message["To"] = formataddr(
(
Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
push_config.get("SMTP_EMAIL"),
)
)
else:
smtp_email_to = push_config.get("SMTP_EMAIL_TO").split(",")
smtp_name_to = push_config.get("SMTP_NAME_TO","").split(",")
message["To"] = ",".join([formataddr(
(
Header(smtp_name_to[i] if len(smtp_name_to) > i else "", "utf-8").encode(),
email_to,
)
) for i, email_to in enumerate(smtp_email_to)])
message["Subject"] = Header(title, "utf-8")
try:
@ -698,7 +711,7 @@ def smtp(title: str, content: str) -> None:
)
smtp_server.sendmail(
push_config.get("SMTP_EMAIL"),
push_config.get("SMTP_EMAIL"),
smtp_email_to,
message.as_bytes(),
)
smtp_server.close()