Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
368260a4
authored
Apr 20, 2018
by
caryyu
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Solve this:
https://github.com/xuxueli/xxl-job/issues/359
parent
a793954c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
xxl-job-admin/src/main/resources/xxl-job-admin.properties
xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java
View file @
368260a4
...
@@ -27,6 +27,9 @@ public class XxlJobAdminConfig implements InitializingBean{
...
@@ -27,6 +27,9 @@ public class XxlJobAdminConfig implements InitializingBean{
@Value
(
"${xxl.job.mail.port}"
)
@Value
(
"${xxl.job.mail.port}"
)
private
String
mailPort
;
private
String
mailPort
;
@Value
(
"${xxl.job.mail.ssl}"
)
private
boolean
mailSSL
;
@Value
(
"${xxl.job.mail.username}"
)
@Value
(
"${xxl.job.mail.username}"
)
private
String
mailUsername
;
private
String
mailUsername
;
...
@@ -54,6 +57,10 @@ public class XxlJobAdminConfig implements InitializingBean{
...
@@ -54,6 +57,10 @@ public class XxlJobAdminConfig implements InitializingBean{
return
mailPort
;
return
mailPort
;
}
}
public
boolean
isMailSSL
()
{
return
mailSSL
;
}
public
String
getMailUsername
()
{
public
String
getMailUsername
()
{
return
mailUsername
;
return
mailUsername
;
}
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
View file @
368260a4
...
@@ -35,8 +35,14 @@ public class MailUtil {
...
@@ -35,8 +35,14 @@ public class MailUtil {
//email.setSSL(true);
//email.setSSL(true);
email
.
setHostName
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailHost
());
email
.
setHostName
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailHost
());
email
.
setSmtpPort
(
Integer
.
valueOf
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailPort
()));
//email.setSslSmtpPort(port);
if
(
XxlJobAdminConfig
.
getAdminConfig
().
isMailSSL
())
{
email
.
setSslSmtpPort
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailPort
());
email
.
setSSLOnConnect
(
true
);
}
else
{
email
.
setSmtpPort
(
Integer
.
valueOf
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailPort
()));
}
email
.
setAuthenticator
(
new
DefaultAuthenticator
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailUsername
(),
XxlJobAdminConfig
.
getAdminConfig
().
getMailPassword
()));
email
.
setAuthenticator
(
new
DefaultAuthenticator
(
XxlJobAdminConfig
.
getAdminConfig
().
getMailUsername
(),
XxlJobAdminConfig
.
getAdminConfig
().
getMailPassword
()));
email
.
setCharset
(
Charset
.
defaultCharset
().
name
());
email
.
setCharset
(
Charset
.
defaultCharset
().
name
());
...
...
xxl-job-admin/src/main/resources/xxl-job-admin.properties
View file @
368260a4
...
@@ -7,6 +7,7 @@ xxl.job.db.password=root_pwd
...
@@ -7,6 +7,7 @@ xxl.job.db.password=root_pwd
### xxl-job email
### xxl-job email
xxl.job.mail.host
=
smtp.163.com
xxl.job.mail.host
=
smtp.163.com
xxl.job.mail.port
=
25
xxl.job.mail.port
=
25
xxl.job.mail.ssl
=
false
xxl.job.mail.username
=
ovono802302@163.com
xxl.job.mail.username
=
ovono802302@163.com
xxl.job.mail.password
=
asdfzxcv
xxl.job.mail.password
=
asdfzxcv
xxl.job.mail.sendNick
=
《任务调度平台XXL-JOB》
xxl.job.mail.sendNick
=
《任务调度平台XXL-JOB》
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment