gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Pre Merge pull request !92 from 时过景迁/1.3.0-beta1

Browse Source
This commit is contained in:
时过景迁 2024-11-25 01:06:52 +00:00 committed by Gitee
commit cb00f37d66
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/SnailJobMailProperties.java
View File

@ -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<String,String> properties;
}

6
snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/strategy/EmailAlarm.java
View File

@ -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<AlarmContext> {
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;
}
}