From 79dc4da700b4e49a6f41a4d453feaec0f33e53ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=B6=E8=BF=87=E6=99=AF=E8=BF=81?= <1010622112@qq.com> Date: Mon, 25 Nov 2024 01:28:28 +0000 Subject: [PATCH] =?UTF-8?q?!92=20=E9=82=AE=E7=AE=B1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=9A=84=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B1=9E=E6=80=A7=20*=20=E9=82=AE=E7=AE=B1=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/alarm/email/SnailJobMailProperties.java | 7 +++++++ .../snailjob/common/core/alarm/strategy/EmailAlarm.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/SnailJobMailProperties.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/SnailJobMailProperties.java index 12ce89736..aac4f40a7 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/SnailJobMailProperties.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/SnailJobMailProperties.java @@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; import java.io.Serializable; +import java.util.Map; /** * @author: opensnail @@ -71,4 +72,10 @@ public class SnailJobMailProperties implements Serializable { */ private Long connectionTimeout; + /** + * 额外的会话属性 + * eg: mail.smtp.ssl.trust + */ + private Map properties; + } diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/EmailAlarm.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/EmailAlarm.java index 812a09ff0..046e77386 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/EmailAlarm.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/EmailAlarm.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.alarm.strategy; +import cn.hutool.core.util.ObjUtil; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.attribute.EmailAttribute; import com.aizuda.snailjob.common.core.alarm.email.MailAccount; @@ -85,6 +86,11 @@ public class EmailAlarm extends AbstractAlarm { account.setSslEnable(Optional.ofNullable(snailJobMailProperties.getSslEnable()).orElse(Boolean.FALSE)); account.setTimeout(Optional.ofNullable(snailJobMailProperties.getTimeout()).orElse(0L)); account.setConnectionTimeout(Optional.ofNullable(snailJobMailProperties.getConnectionTimeout()).orElse(0L)); + + if (ObjUtil.isNotEmpty(snailJobMailProperties.getProperties())) { + snailJobMailProperties.getProperties().forEach(account::setCustomProperty); + } + return account; } }