diff --git a/common/src/main/java/com/jeesite/common/msg/EmailUtils.java b/common/src/main/java/com/jeesite/common/msg/EmailUtils.java index 918cf1e4..a03022c5 100644 --- a/common/src/main/java/com/jeesite/common/msg/EmailUtils.java +++ b/common/src/main/java/com/jeesite/common/msg/EmailUtils.java @@ -15,9 +15,24 @@ import com.jeesite.common.io.PropertiesUtils; * 发送电子邮件 */ public class EmailUtils { - + private final static Logger logger = LoggerFactory.getLogger(EmailUtils.class); + /** + * 发送邮件 + * @return + */ + public static boolean send(String toAddress, String subject, String content) { + PropertiesUtils props = PropertiesUtils.getInstance(); + String fromAddress = props.getProperty("msg.email.fromAddress"); + String fromPassword = props.getProperty("msg.email.fromPassword"); + String fromHostName = props.getProperty("msg.email.fromHostName"); + Integer smtpPort = props.getPropertyToInteger("msg.email.smtpPort", "25"); + String sslOnConnect = props.getProperty("msg.email.sslOnConnect", "false"); + String sslSmtpPort = props.getProperty("msg.email.sslSmtpPort"); + return send(fromAddress, fromPassword, fromHostName, smtpPort, sslOnConnect, sslSmtpPort, toAddress, subject, content); + } + /** * 发送邮件 * @param toAddress 接收地址 @@ -25,16 +40,12 @@ public class EmailUtils { * @param content 内容 * @return */ - public static boolean send(String toAddress, String subject, String content) { - PropertiesUtils props = PropertiesUtils.getInstance(); - String fromAddress = props.getProperty("msg.email.fromAddress"); - String fromPassword = props.getProperty("msg.email.fromPassword"); - String fromHostName = props.getProperty("msg.email.fromHostName"); - String sslOnConnect = props.getProperty("msg.email.sslOnConnect", "false"); - String sslSmtpPort = props.getProperty("msg.email.sslSmtpPort"); - return send(fromAddress, fromPassword, fromHostName, sslOnConnect, sslSmtpPort, toAddress, subject, content); + @Deprecated + public static boolean send(String fromAddress, String fromPassword, String fromHostName, + String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) { + return send(fromAddress, fromPassword, fromHostName, 25, sslOnConnect, sslSmtpPort, toAddress, subject, content); } - + /** * 发送邮件 * @param toAddress 接收地址 @@ -42,16 +53,18 @@ public class EmailUtils { * @param content 内容 * @return */ - public static boolean send(String fromAddress, String fromPassword, String fromHostName, - String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) { + public static boolean send(String fromAddress, String fromPassword, String fromHostName, Integer smtpPort, + String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) { try { HtmlEmail htmlEmail = new HtmlEmail(); // 发送地址 htmlEmail.setFrom(fromAddress); // 密码校验 htmlEmail.setAuthentication(fromAddress, fromPassword); - // 发送服务器协议 + // 发送服务器主机名 htmlEmail.setHostName(fromHostName); + // 发送服务器端口 + htmlEmail.setSmtpPort(smtpPort); // SSL if ("true".equals(sslOnConnect)) { @@ -69,7 +82,7 @@ public class EmailUtils { // 其他信息 htmlEmail.setCharset(EncodeUtils.UTF_8); - + // 发送 htmlEmail.send(); return true; @@ -78,10 +91,10 @@ public class EmailUtils { } return false; } - + // public static void main(String[] args) { // EmailUtils.send("jeesite_demo@163.com", "jeesitedemo1234", "smtp.163.com", // "false", "465", "jeesite_demo@163.com", "测试邮件", "测试邮件的内容"); // } - + } \ No newline at end of file