From 6d5368824f8cfc049df5e956cf83d22a07462466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=92=A6=E9=BE=99?= <qinlong.yang@databurning.com>
Date: Wed, 15 May 2019 11:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8SSL=E7=9A=84=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/escheduler/alert/utils/Constants.java   | 2 ++
 .../main/java/cn/escheduler/alert/utils/MailUtils.java   | 9 ++++++++-
 escheduler-alert/src/main/resources/alert.properties     | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java
index 07d1866a5d..1e1a7671e8 100644
--- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java
+++ b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java
@@ -59,6 +59,8 @@ public class Constants {
 
     public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
 
+    public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
+
     public static final String TEXT_HTML_CHARSET_UTF_8 = "text/html;charset=utf-8";
 
     public static final String STRING_TRUE = "true";
diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
index 0e514ffee6..4ebdd80522 100644
--- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
+++ b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
@@ -35,6 +35,7 @@ import javax.mail.internet.*;
 import java.io.*;
 import java.util.*;
 
+import static cn.escheduler.alert.utils.PropertyUtils.getBoolean;
 import static cn.escheduler.alert.utils.PropertyUtils.getInt;
 import static cn.escheduler.alert.utils.PropertyUtils.getString;
 
@@ -56,6 +57,10 @@ public class MailUtils {
 
     public static final String mailPasswd = getString(Constants.MAIL_PASSWD);
 
+    public static final Boolean mailUseStartTLS = getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE);
+
+    public static final Boolean mailUseSSL = getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
+
     public static final String xlsFilePath = getString(Constants.XLS_FILE_PATH);
 
     private static Template MAIL_TEMPLATE;
@@ -122,7 +127,9 @@ public class MailUtils {
                 //set charset
                 email.setCharset(Constants.UTF_8);
                 // TLS verification
-                email.setTLS(true);
+                email.setTLS(mailUseStartTLS);
+                // SSL verification
+                email.setSSL(mailUseSSL);
                 if (CollectionUtils.isNotEmpty(receivers)){
                     // receivers mail
                     for (String receiver : receivers) {
diff --git a/escheduler-alert/src/main/resources/alert.properties b/escheduler-alert/src/main/resources/alert.properties
index e2cba1160d..0be0dc2974 100644
--- a/escheduler-alert/src/main/resources/alert.properties
+++ b/escheduler-alert/src/main/resources/alert.properties
@@ -8,6 +8,9 @@ mail.server.port=25
 mail.sender=xxxxxxx
 mail.passwd=xxxxxxx
 
+mail.smtp.starttls.enable=false
+mail.smtp.ssl.enable=true
+
 #xls file path,need create if not exist
 xls.file.path=/opt/xls