ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
xuxueli 2020-05-21 19:51:59 +08:00
parent 4476fd7e54 9361592211
commit 5ce480cf42
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
xxl-job-admin/src/main/resources/application.properties
View File

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