Merge branch 'master' of https://github.com/xuxueli/xxl-job

xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java

@@ -55,7 +55,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
     @Value("${xxl.job.accessToken}")
     private String accessToken;
 
-    @Value("${spring.mail.username}")
+    @Value("${spring.mail.from}")
     private String emailUserName;
 
     @Value("${xxl.job.triggerpool.fast.max}")

xxl-job-admin/src/main/resources/application.properties

@@ -43,6 +43,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 spring.mail.host=smtp.qq.com
 spring.mail.port=25
 spring.mail.username=xxx@qq.com
+spring.mail.from=xxx@qq.com
 spring.mail.password=xxx
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true