From 4b5fa4a0dc665a6eb3ef349cb0119724a87717cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AC=E5=AE=AB=E5=9C=A8=EF=BC=8C=E5=B0=94=E7=AD=89?=
 =?UTF-8?q?=E9=83=BD=E6=98=AF=E5=A6=83?= <1135782208@qq.com>
Date: Mon, 3 Jul 2023 13:47:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6=E6=94=B6=E4=BB=B6=E6=96=B9?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84?=
 =?UTF-8?q?=E5=8F=91=E4=BB=B6=E4=BA=BA=E6=98=B5=E7=A7=B0=20(#327)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notify/email/embedded/DefaultEmailNotifier.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java b/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
index e789171a..0bd2ed10 100755
--- a/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
+++ b/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.web.bean.FastBeanCopier;
 import org.hswebframework.web.exception.BusinessException;
 import org.hswebframework.web.id.IDGenerator;
@@ -66,6 +67,10 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
     @Setter
     private String sender;
 
+    @Getter
+    @Setter
+    private String username;
+
     @Getter
     private final String notifierId;
 
@@ -101,6 +106,7 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
         mailSender.setJavaMailProperties(properties.createJavaMailProperties());
         this.notifierId = id;
         this.sender = properties.getSender();
+        this.username = properties.getUsername();
         this.javaMailSender = mailSender;
         this.fileManager = fileManager;
     }
@@ -136,8 +142,11 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
             .fromCallable(() -> {
                 MimeMessage mimeMessage = this.javaMailSender.createMimeMessage();
                 MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "utf-8");
-
-                helper.setFrom(this.sender);
+                if (StringUtils.isNotBlank(this.username)) {
+                    helper.setFrom(this.sender + '<' + this.username + '>');
+                } else {
+                    helper.setFrom(this.sender);
+                }
                 helper.setTo(template.getSendTo().toArray(new String[0]));
                 helper.setSubject(template.getSubject());
                 helper.setText(new String(template.getText().getBytes(), StandardCharsets.UTF_8), true);