From b72b273a02ad077c1df6593828cb0318dcb93db1 Mon Sep 17 00:00:00 2001 From: zhourui Date: Thu, 22 Sep 2022 13:06:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0smtp=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=98=AFtls=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/x/base/core/project/config/Message.java | 9 +++++++++ .../x/message/assemble/communicate/MailConsumeQueue.java | 1 + 2 files changed, 10 insertions(+) diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java index fe931c9437..0b62d4f0ea 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java +++ b/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; } diff --git a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java index 91d5b65cc0..f45bb88f34 100644 --- a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java +++ b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java @@ -97,6 +97,7 @@ public class MailConsumeQueue extends AbstractQueue { 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 -- GitLab