|
|
@ -1,5 +1,6 @@
|
|
|
|
package com.xjs.server;
|
|
|
|
package com.xjs.server;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import com.ruoyi.common.redis.service.RedisService;
|
|
|
|
import com.ruoyi.common.redis.service.RedisService;
|
|
|
|
import com.xjs.annotation.MailLog;
|
|
|
|
import com.xjs.annotation.MailLog;
|
|
|
|
import com.xjs.domain.mall.MailBean;
|
|
|
|
import com.xjs.domain.mall.MailBean;
|
|
|
@ -120,8 +121,13 @@ public class MailServer {
|
|
|
|
mimeMessageHelper.setFrom(MAIL_SENDER);
|
|
|
|
mimeMessageHelper.setFrom(MAIL_SENDER);
|
|
|
|
mimeMessageHelper.setTo(mailBean.getRecipient());
|
|
|
|
mimeMessageHelper.setTo(mailBean.getRecipient());
|
|
|
|
mimeMessageHelper.setSubject(mailBean.getSubject());
|
|
|
|
mimeMessageHelper.setSubject(mailBean.getSubject());
|
|
|
|
|
|
|
|
|
|
|
|
//邮件抄送
|
|
|
|
//邮件抄送
|
|
|
|
//mimeMessageHelper.addCc("抄送人");
|
|
|
|
if (CollUtil.isNotEmpty(mailBean.getCc())) {
|
|
|
|
|
|
|
|
for (String c : mailBean.getCc()) {
|
|
|
|
|
|
|
|
mimeMessageHelper.addCc(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
mimeMessageHelper.setText(mailBean.getContent(), true);
|
|
|
|
mimeMessageHelper.setText(mailBean.getContent(), true);
|
|
|
|
javaMailSender.send(mimeMailMessage);
|
|
|
|
javaMailSender.send(mimeMailMessage);
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
@ -147,19 +153,20 @@ public class MailServer {
|
|
|
|
mimeMessageHelper.setSubject(mailBean.getSubject());
|
|
|
|
mimeMessageHelper.setSubject(mailBean.getSubject());
|
|
|
|
mimeMessageHelper.setText(mailBean.getContent(), true);
|
|
|
|
mimeMessageHelper.setText(mailBean.getContent(), true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//邮件抄送
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(mailBean.getCc())) {
|
|
|
|
|
|
|
|
for (String c : mailBean.getCc()) {
|
|
|
|
|
|
|
|
mimeMessageHelper.addCc(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//发送附件
|
|
|
|
//发送附件
|
|
|
|
if (mailBean.getFileList() != null && mailBean.getFileList().length > 0) {
|
|
|
|
if (mailBean.getFileList() != null && mailBean.getFileList().length > 0) {
|
|
|
|
for (MultipartFile multipartFile : mailBean.getFileList()) {
|
|
|
|
for (MultipartFile multipartFile : mailBean.getFileList()) {
|
|
|
|
InputStream inputStream = null;
|
|
|
|
try (InputStream inputStream = multipartFile.getInputStream()) {
|
|
|
|
try {
|
|
|
|
|
|
|
|
inputStream = multipartFile.getInputStream();
|
|
|
|
|
|
|
|
byte[] bytes = inputStream.readAllBytes();
|
|
|
|
byte[] bytes = inputStream.readAllBytes();
|
|
|
|
ByteArrayResource bar = new ByteArrayResource(bytes);
|
|
|
|
ByteArrayResource bar = new ByteArrayResource(bytes);
|
|
|
|
mimeMessageHelper.addAttachment(Objects.requireNonNull(multipartFile.getOriginalFilename()), bar);
|
|
|
|
mimeMessageHelper.addAttachment(Objects.requireNonNull(multipartFile.getOriginalFilename()), bar);
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
if (inputStream != null) {
|
|
|
|
|
|
|
|
inputStream.close();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|