parent
							
								
									d8b7c53c8f
								
							
						
					
					
						commit
						79dc4da700
					
				@ -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;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -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;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user