Selaa lähdekoodia

Solve this: https://github.com/xuxueli/xxl-job/issues/359

caryyu 7 vuotta sitten
vanhempi
commit
368260a4b3

+ 7 - 0
xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java Näytä tiedosto

@@ -27,6 +27,9 @@ public class XxlJobAdminConfig implements InitializingBean{
27 27
     @Value("${xxl.job.mail.port}")
28 28
     private String mailPort;
29 29
 
30
+    @Value("${xxl.job.mail.ssl}")
31
+    private boolean mailSSL;
32
+
30 33
     @Value("${xxl.job.mail.username}")
31 34
     private String mailUsername;
32 35
 
@@ -54,6 +57,10 @@ public class XxlJobAdminConfig implements InitializingBean{
54 57
         return mailPort;
55 58
     }
56 59
 
60
+    public boolean isMailSSL() {
61
+        return mailSSL;
62
+    }
63
+
57 64
     public String getMailUsername() {
58 65
         return mailUsername;
59 66
     }

+ 8 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java Näytä tiedosto

@@ -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
 

+ 1 - 0
xxl-job-admin/src/main/resources/xxl-job-admin.properties Näytä tiedosto

@@ -7,6 +7,7 @@ xxl.job.db.password=root_pwd
7 7
 ### xxl-job email
8 8
 xxl.job.mail.host=smtp.163.com
9 9
 xxl.job.mail.port=25
10
+xxl.job.mail.ssl=false
10 11
 xxl.job.mail.username=ovono802302@163.com
11 12
 xxl.job.mail.password=asdfzxcv
12 13
 xxl.job.mail.sendNick=《任务调度平台XXL-JOB》