Merge pull request #292 from yangqinlong/dev (8d9f2f44) · Commits · SUMMER2020 / students / proj-2002251

escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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";

+8 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -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