diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index 1dae3f4bc..8be43e612 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -690,6 +690,7 @@ export default { password: "Password", pleaseEnterPassword: "Please enter password", qqEmailAuthCodeHelper: "If using QQ email, get an authorization code in QQ email settings as the password", + senderEmailHelper: "You can use the format: Name to set the sender name, e.g.: autossl", senderEmail: "Sender Email", pleaseEnterSenderEmail: "Please enter sender email", useSsl: "Use SSL", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 8141a89f0..d71404bd0 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -701,6 +701,7 @@ export default { password: "密码", pleaseEnterPassword: "请输入密码", qqEmailAuthCodeHelper: "如果是qq邮箱,需要到qq邮箱的设置里面申请授权码作为密码", + senderEmailHelper: "您可以使用 名称<邮箱> 的格式,来修改发件人名称,例如: autossl", senderEmail: "发件邮箱", pleaseEnterSenderEmail: "请输入发件邮箱", useSsl: "是否ssl", diff --git a/packages/ui/certd-client/src/views/sys/settings/email/index.vue b/packages/ui/certd-client/src/views/sys/settings/email/index.vue index 012432e40..5d11025da 100644 --- a/packages/ui/certd-client/src/views/sys/settings/email/index.vue +++ b/packages/ui/certd-client/src/views/sys/settings/email/index.vue @@ -30,6 +30,7 @@ +
{{ t("certd.senderEmailHelper") }}
diff --git a/packages/ui/certd-server/src/modules/basic/service/email-service.ts b/packages/ui/certd-server/src/modules/basic/service/email-service.ts index a7c2641e9..703858f34 100644 --- a/packages/ui/certd-server/src/modules/basic/service/email-service.ts +++ b/packages/ui/certd-server/src/modules/basic/service/email-service.ts @@ -110,9 +110,12 @@ export class EmailService implements IEmailService { private async sendByCustom(emailConfig: EmailConfig, email: EmailSend, sysTitle: string) { const transporter = nodemailer.createTransport(emailConfig); - + let from = `${sysTitle} <${emailConfig.sender}>`; + if (emailConfig.sender.includes('<')) { + from = emailConfig.sender; + } const mailOptions = { - from: `${sysTitle} <${emailConfig.sender}>`, + from: from, to: email.receivers.join(', '), // list of receivers subject: email.subject, text: email.content,