Quellcode durchsuchen

Merge pull request #360 from caryyu/master

许雪里 vor 8 Jahren
Ursprung
Commit
efe0ed918d
Es ist kein Account mit dieser Commiter-Email verbunden

+ 7 - 0
xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java Datei anzeigen

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

+ 8 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java Datei anzeigen

35
 			//email.setSSL(true);
35
 			//email.setSSL(true);
36
 
36
 
37
 			email.setHostName(XxlJobAdminConfig.getAdminConfig().getMailHost());
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
 			email.setAuthenticator(new DefaultAuthenticator(XxlJobAdminConfig.getAdminConfig().getMailUsername(), XxlJobAdminConfig.getAdminConfig().getMailPassword()));
46
 			email.setAuthenticator(new DefaultAuthenticator(XxlJobAdminConfig.getAdminConfig().getMailUsername(), XxlJobAdminConfig.getAdminConfig().getMailPassword()));
41
 			email.setCharset(Charset.defaultCharset().name());
47
 			email.setCharset(Charset.defaultCharset().name());
42
 
48
 

+ 1 - 0
xxl-job-admin/src/main/resources/xxl-job-admin.properties Datei anzeigen

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