From bab9adce240108d4291eedc67e04abc4a01019e0 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 16 Feb 2026 23:38:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=8F=91=E4=BB=B6=E4=BA=BA=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=9A=E5=90=8D=E7=A7=B0<=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/certd-client/src/locales/langs/en-US/certd.ts  | 1 +
 packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts  | 1 +
 .../ui/certd-client/src/views/sys/settings/email/index.vue | 1 +
 .../src/modules/basic/service/email-service.ts             | 7 +++++--
 4 files changed, 8 insertions(+), 2 deletions(-)

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<Email> to set the sender name, e.g.: autossl<certd@example.com>",
   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<certd@example.com>",
   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 @@
               </a-form-item>
               <a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
                 <a-input v-model:value="formState.sender" />
+                <div class="helper">{{ t("certd.senderEmailHelper") }}</div>
               </a-form-item>
               <a-form-item :label="t('certd.useSsl')" name="secure">
                 <a-switch v-model:checked="formState.secure" />
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,