Merge branch 'fix/mailSmtp' into 'master'

增加smtp发送是tls设置

See merge request o2oa/o2oa!1070

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java

@@ -289,6 +289,7 @@ public class Message extends GsonPropertyObject {
 			o.host = DEFAULT_HOST;
 			o.port = DEFAULT_PORT;
 			o.sslEnable = DEFAULT_SSLENABLE;
+			o.startTlsEnable = DEFAULT_STARTTLSENABLE;
 			o.auth = DEFAULT_AUTH;
 			o.from = DEFAULT_FROM;
 			o.password = DEFAULT_PASSWORD;
@@ -304,6 +305,7 @@ public class Message extends GsonPropertyObject {
 		private static final String DEFAULT_HOST = "";
 		private static final Integer DEFAULT_PORT = 465;
 		private static final Boolean DEFAULT_SSLENABLE = true;
+		private static final Boolean DEFAULT_STARTTLSENABLE = false;
 		private static final Boolean DEFAULT_AUTH = true;
 		private static final String DEFAULT_FROM = "admin@o2oa.net";
 		private static final String DEFAULT_PASSWORD = "password";
@@ -317,6 +319,9 @@ public class Message extends GsonPropertyObject {
 		@FieldDescribe("smtp 使用ssl加密.")
 		private Boolean sslEnable;
 
+		@FieldDescribe("smtp 启用升级到加密链接.")
+		private Boolean startTlsEnable;
+
 		@FieldDescribe("stmp启用认证.")
 		private Boolean auth;
 
@@ -338,6 +343,10 @@ public class Message extends GsonPropertyObject {
 			return null == sslEnable ? DEFAULT_SSLENABLE : this.sslEnable;
 		}
 
+		public Boolean getStartTlsEnable() {
+			return null == startTlsEnable ? DEFAULT_STARTTLSENABLE : this.startTlsEnable;
+		}
+
 		public Boolean getAuth() {
 			return null == auth ? DEFAULT_AUTH : this.auth;
 		}

o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java

@@ -97,6 +97,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
 		properties.put("mail.smtp.host", consumer.getHost());
 		properties.put("mail.smtp.port", consumer.getPort());
 		properties.put("mail.smtp.ssl.enable", consumer.getSslEnable());
+		properties.put("mail.smtp.starttls.enable", consumer.getStartTlsEnable());
 		properties.put("mail.smtp.auth", consumer.getAuth());
 		Session session = Session.getInstance(properties, new javax.mail.Authenticator() {
 			@Override