manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加smtpPort

Browse Source
This commit is contained in:
thinkgem
2022-05-31 11:24:06 +08:00
parent a65abc3457
commit 9c640a6433
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/main/java/com/jeesite/common/msg/EmailUtils.java
View File

@@ -20,9 +20,6 @@ public class EmailUtils {
/** /**
* 发送邮件 * 发送邮件
* @param toAddress 接收地址
* @param subject 标题
* @param content 内容
* @return * @return
*/ */
public static boolean send(String toAddress, String subject, String content) { public static boolean send(String toAddress, String subject, String content) {
@@ -30,9 +27,10 @@ public class EmailUtils {
String fromAddress = props.getProperty("msg.email.fromAddress"); String fromAddress = props.getProperty("msg.email.fromAddress");
String fromPassword = props.getProperty("msg.email.fromPassword"); String fromPassword = props.getProperty("msg.email.fromPassword");
String fromHostName = props.getProperty("msg.email.fromHostName"); String fromHostName = props.getProperty("msg.email.fromHostName");
Integer smtpPort = props.getPropertyToInteger("msg.email.smtpPort", "25");
String sslOnConnect = props.getProperty("msg.email.sslOnConnect", "false"); String sslOnConnect = props.getProperty("msg.email.sslOnConnect", "false");
String sslSmtpPort = props.getProperty("msg.email.sslSmtpPort"); String sslSmtpPort = props.getProperty("msg.email.sslSmtpPort");
return send(fromAddress, fromPassword, fromHostName, sslOnConnect, sslSmtpPort, toAddress, subject, content); return send(fromAddress, fromPassword, fromHostName, smtpPort, sslOnConnect, sslSmtpPort, toAddress, subject, content);
} }
/** /**
@@ -42,16 +40,31 @@ public class EmailUtils {
* @param content 内容 * @param content 内容
* @return * @return
*/ */
@Deprecated
public static boolean send(String fromAddress, String fromPassword, String fromHostName, public static boolean send(String fromAddress, String fromPassword, String fromHostName,
String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) { String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) {
return send(fromAddress, fromPassword, fromHostName, 25, sslOnConnect, sslSmtpPort, toAddress, subject, content);
}
/**
* 发送邮件
* @param toAddress 接收地址
* @param subject 标题
* @param content 内容
* @return
*/
public static boolean send(String fromAddress, String fromPassword, String fromHostName, Integer smtpPort,
String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) {
try { try {
HtmlEmail htmlEmail = new HtmlEmail(); HtmlEmail htmlEmail = new HtmlEmail();
// 发送地址 // 发送地址
htmlEmail.setFrom(fromAddress); htmlEmail.setFrom(fromAddress);
// 密码校验 // 密码校验
htmlEmail.setAuthentication(fromAddress, fromPassword); htmlEmail.setAuthentication(fromAddress, fromPassword);
// 发送服务器协议 // 发送服务器主机名
htmlEmail.setHostName(fromHostName); htmlEmail.setHostName(fromHostName);
// 发送服务器端口
htmlEmail.setSmtpPort(smtpPort);
// SSL // SSL
if ("true".equals(sslOnConnect)) { if ("true".equals(sslOnConnect)) {