From 2ab52d023d0b0864b5b2efdfa9257d0adee9c82c Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Thu, 21 May 2020 20:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=91=8A=E8=AD=A6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B0=86"spring.mail.from"?=
 =?UTF-8?q?=E4=B8=8E"spring.mail.username"=E5=B1=9E=E6=80=A7=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=BC=80=EF=BC=8C=E6=9B=B4=E5=8A=A0=E7=81=B5=E6=B4=BB?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81=E4=B8=80=E4=BA=9B=E6=97=A0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E9=82=AE=E7=AE=B1=E6=9C=8D=E5=8A=A1=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                      | 3 ++-
 .../com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java    | 2 +-
 .../java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 9089bd6e..674b059a 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1963,7 +1963,8 @@ data: post-data
 ### 7.31 版本 v2.2.1 Release Notes[迭代中]
 - 1、Cron编辑器增强：Cron编辑器修改cron时可实时查看最近运行时间;
 - 2、Cron编辑器问题修复：修复小概率情况下cron单个字段修改时导致其他字段被重置问题；
-- 3、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
+- 3、邮箱告警配置优化：将"spring.mail.from"与"spring.mail.username"属性拆分开，更加灵活的支持一些无密码邮箱服务；
+- 4、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
 
 
 ### TODO LIST
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java
index fe16fbdf..e7290d76 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java
@@ -65,7 +65,7 @@ public class EmailJobAlarm implements JobAlarm {
                     MimeMessage mimeMessage = XxlJobAdminConfig.getAdminConfig().getMailSender().createMimeMessage();
 
                     MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
-                    helper.setFrom(XxlJobAdminConfig.getAdminConfig().getEmailUserName(), personal);
+                    helper.setFrom(XxlJobAdminConfig.getAdminConfig().getEmailFrom(), personal);
                     helper.setTo(email);
                     helper.setSubject(title);
                     helper.setText(content, true);
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
index 3042de49..380b8a59 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
@@ -56,7 +56,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
     private String accessToken;
 
     @Value("${spring.mail.from}")
-    private String emailUserName;
+    private String emailFrom;
 
     @Value("${xxl.job.triggerpool.fast.max}")
     private int triggerPoolFastMax;
@@ -98,8 +98,8 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
         return accessToken;
     }
 
-    public String getEmailUserName() {
-        return emailUserName;
+    public String getEmailFrom() {
+        return emailFrom;
     }
 
     public int getTriggerPoolFastMax() {