diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
index 1bba0ecb..c37a9295 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java
@@ -25,14 +25,12 @@ public class MailUtil {
private static String port;
private static String username;
private static String password;
- private static String sendFrom;
private static String sendNick;
static{
host = PropertiesUtil.getString("xxl.job.mail.host");
port = PropertiesUtil.getString("xxl.job.mail.port");
username = PropertiesUtil.getString("xxl.job.mail.username");
password = PropertiesUtil.getString("xxl.job.mail.password");
- sendFrom = PropertiesUtil.getString("xxl.job.mail.sendFrom");
sendNick = PropertiesUtil.getString("xxl.job.mail.sendNick");
}
@@ -70,8 +68,9 @@ public class MailUtil {
try {
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, ArrayUtils.isNotEmpty(attachments), "UTF-8"); // 设置utf-8或GBK编码，否则邮件会有乱码;multipart,true表示文件上传
-
- helper.setFrom(sendFrom, sendNick);
+
+
+ helper.setFrom(username, sendNick);
helper.setTo(toAddress);
// 设置收件人抄送的名片和地址(相当于群发了)
@@ -111,38 +110,45 @@ public class MailUtil {
public static boolean sendMail (String toAddress, String mailSubject, String mailBody,
boolean mailBodyIsHtml, File[] attachments){
try {
- // 创建邮件发送类 JavaMailSender (用于发送多元化邮件，包括附件，图片，html 等 )
+ // 创建邮件发送类 JavaMailSender (用于发送多元化邮件，包括附件，图片，html 等)
JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
mailSender.setHost(host); // 设置邮件服务主机
mailSender.setUsername(username); // 发送者邮箱的用户名
mailSender.setPassword(password); // 发送者邮箱的密码
- //配置文件，用于实例化java.mail.session
+ // 配置文件，用于实例化java.mail.session
Properties pro = new Properties();
+ pro.put("mail.transport.protocol", "smtp");
pro.put("mail.smtp.auth", "true"); // 登录SMTP服务器,需要获得授权 (网易163邮箱新近注册的邮箱均不能授权,测试 sohu 的邮箱可以获得授权)
pro.put("mail.smtp.socketFactory.port", port);
pro.put("mail.smtp.socketFactory.fallback", "false");
mailSender.setJavaMailProperties(pro);
- //创建多元化邮件 (创建 mimeMessage 帮助类，用于封装信息至 mimeMessage)
+ // 创建多元化邮件 (创建 mimeMessage 帮助类，用于封装信息至 mimeMessage)
MimeMessage mimeMessage = mailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, ArrayUtils.isNotEmpty(attachments), "UTF-8");
- helper.setFrom(sendFrom, sendNick);
+ helper.setFrom(username, sendNick);
helper.setTo(toAddress);
helper.setSubject(mailSubject);
helper.setText(mailBody, mailBodyIsHtml);
- // 添加内嵌文件，第1个参数为cid标识这个文件,第2个参数为资源
- //helper.addInline(MimeUtility.encodeText(inLineFile.getName()), inLineFile);
+ // 设置收件人抄送的名片和地址(相当于群发)
+ //helper.setCc(InternetAddress.parse(MimeUtility.encodeText("邮箱001") + " <@163.com>," + MimeUtility.encodeText("邮箱002") + " <@foxmail.com>"));
+
+ // 内嵌文件，第1个参数为cid标识这个文件,第2个参数为资源
+ //helper.addInline(MimeUtility.encodeText(inLineFile.getName()), inLineFile);
- // 添加附件
- if (ArrayUtils.isNotEmpty(attachments)) {
+ // 添加附件
+ /*if (ArrayUtils.isNotEmpty(attachments)) {
for (File file : attachments) {
helper.addAttachment(MimeUtility.encodeText(file.getName()), file);
}
- }
+ }*/
+
+ // 群发
+ //MimeMessage[] mailMessages = { mimeMessage };
mailSender.send(mimeMessage);
return true;
@@ -156,11 +162,11 @@ public class MailUtil {
public static void main(String[] args) {
ExecutorService exec = Executors.newCachedThreadPool();
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < 1; i++) {
exec.execute(new Thread(new Runnable() {
@Override
public void run() {
- while(total < 10){
+ while(total < 1){
String mailBody = "新书快递通知
你的新书快递申请已推送新书，请到空间"
+ "中查看";
- sendMail("ovono802302@163.com", "测试邮件", mailBody, false, null);
+ sendMail("931591021@qq.com", "测试邮件", mailBody, true, null);
System.out.println(total);
total++;
}
diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
index ac5576f7..9c425aba 100644
--- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties
+++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties
@@ -9,7 +9,6 @@ xxl.job.mail.host=smtp.163.com
xxl.job.mail.port=25
xxl.job.mail.username=ovono802302@163.com
xxl.job.mail.password=asdfzxcv
-xxl.job.mail.sendFrom=ovono802302@163.com
xxl.job.mail.sendNick=《任务调度平台XXL-JOB》
### xxl-job login