|
|
@@ -35,8 +35,14 @@ public class MailUtil {
|
|
35
|
35
|
//email.setSSL(true);
|
|
36
|
36
|
|
|
37
|
37
|
email.setHostName(XxlJobAdminConfig.getAdminConfig().getMailHost());
|
|
38
|
|
- email.setSmtpPort(Integer.valueOf(XxlJobAdminConfig.getAdminConfig().getMailPort()));
|
|
39
|
|
- //email.setSslSmtpPort(port);
|
|
|
38
|
+
|
|
|
39
|
+ if (XxlJobAdminConfig.getAdminConfig().isMailSSL()) {
|
|
|
40
|
+ email.setSslSmtpPort(XxlJobAdminConfig.getAdminConfig().getMailPort());
|
|
|
41
|
+ email.setSSLOnConnect(true);
|
|
|
42
|
+ } else {
|
|
|
43
|
+ email.setSmtpPort(Integer.valueOf(XxlJobAdminConfig.getAdminConfig().getMailPort()));
|
|
|
44
|
+ }
|
|
|
45
|
+
|
|
40
|
46
|
email.setAuthenticator(new DefaultAuthenticator(XxlJobAdminConfig.getAdminConfig().getMailUsername(), XxlJobAdminConfig.getAdminConfig().getMailPassword()));
|
|
41
|
47
|
email.setCharset(Charset.defaultCharset().name());
|
|
42
|
48
|
|