From 406841634fbdf1c1fcbe78cab7a029ea2ea06979 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 27 Aug 2025 15:22:10 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=9B=B8=E5=85=B3=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third/email/service/ITEmailService.java | 62 +++--- .../email/service/impl/TEmailServiceImpl.java | 180 +++++++++--------- bd-third/src/main/resources/bootstrap.yml | 40 ++-- 3 files changed, 141 insertions(+), 141 deletions(-) diff --git a/bd-third/src/main/java/com/hzs/third/email/service/ITEmailService.java b/bd-third/src/main/java/com/hzs/third/email/service/ITEmailService.java index c03d36e..129b446 100644 --- a/bd-third/src/main/java/com/hzs/third/email/service/ITEmailService.java +++ b/bd-third/src/main/java/com/hzs/third/email/service/ITEmailService.java @@ -10,35 +10,35 @@ import java.io.File; */ public interface ITEmailService extends IService { - /** - * - * @param mail 邮件账号 - * @param title 邮件标题 - * @param content 邮件内容 - * @param isRecordLog 是否记录日志 true 记录 false 不记录 - * @param emailType 邮件类型 EmailType 枚举 - * @return - */ - Boolean sendMail(String mail,String title,String content,Boolean isRecordLog,Integer emailType); - - /** - * 发送带附件的邮件信息 - * @param to 接收方 - * @param subject 邮件主题 - * @param content 邮件内容 - * @param files 多个附件集合 - * @return - */ - Boolean sendMessageCarryFiles(String to, String subject, String content, File[] files); - - /** - * 发送带附件的邮件信息 - * - * @param to 接收方 - * @param subject 邮件主题 - * @param content 邮件内容（发送内容） - * @param file 单个文件 - * @return - */ - Boolean sendMessageCarryFile(String to, String subject, String content, File file); +// /** +// * +// * @param mail 邮件账号 +// * @param title 邮件标题 +// * @param content 邮件内容 +// * @param isRecordLog 是否记录日志 true 记录 false 不记录 +// * @param emailType 邮件类型 EmailType 枚举 +// * @return +// */ +// Boolean sendMail(String mail,String title,String content,Boolean isRecordLog,Integer emailType); +// +// /** +// * 发送带附件的邮件信息 +// * @param to 接收方 +// * @param subject 邮件主题 +// * @param content 邮件内容 +// * @param files 多个附件集合 +// * @return +// */ +// Boolean sendMessageCarryFiles(String to, String subject, String content, File[] files); +// +// /** +// * 发送带附件的邮件信息 +// * +// * @param to 接收方 +// * @param subject 邮件主题 +// * @param content 邮件内容（发送内容） +// * @param file 单个文件 +// * @return +// */ +// Boolean sendMessageCarryFile(String to, String subject, String content, File file); } diff --git a/bd-third/src/main/java/com/hzs/third/email/service/impl/TEmailServiceImpl.java b/bd-third/src/main/java/com/hzs/third/email/service/impl/TEmailServiceImpl.java index 061253c..e6e8d79 100644 --- a/bd-third/src/main/java/com/hzs/third/email/service/impl/TEmailServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/email/service/impl/TEmailServiceImpl.java @@ -7,6 +7,7 @@ import com.hzs.third.email.config.EmailConfig; import com.hzs.third.email.service.ITEmailService; import com.hzs.third.email.mapper.TEmailMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; @@ -24,95 +25,94 @@ import java.util.Date; public class TEmailServiceImpl extends ServiceImpl implements ITEmailService { // @Value("${spring.mail.from}") -// private String from; // 发送发邮箱地址 - @Autowired - private EmailConfig emailConfig; - @Autowired - private JavaMailSender mailSender; - - /** - * 发送邮件 - * @param mail 邮件账号 - * @param title 邮件标题 - * @param content 邮件内容 - * @param isRecordLog 是否记录日志 true 记录 false 不记录 - * @param emailType 邮件类型 EmailType 枚举 - * @return - */ - @Override - public Boolean sendMail(String mail,String title,String content,Boolean isRecordLog,Integer emailType) { - String from = emailConfig.getFrom(); - try { - // 创建一个邮件对象 - SimpleMailMessage msg = new SimpleMailMessage(); - msg.setFrom(from); // 设置发送发 - msg.setTo(mail); // 设置接收方 - msg.setSubject(title); // 设置邮件主题 - msg.setText(content); // 设置邮件内容 - // 发送邮件 - mailSender.send(msg); - if (isRecordLog){ - // 记录邮箱日志 - TEmail tEmail = new TEmail(); - tEmail.setSender(from); - tEmail.setReceiver(mail); - tEmail.setSubject(title); - tEmail.setContent(content); - tEmail.setPkCreator(SecurityUtils.getUserId()); - tEmail.setCreationTime(new Date()); - tEmail.setEmailType(emailType); - baseMapper.insert(tEmail); - } - return true; - }catch (Exception e){ - e.printStackTrace(); - } - return false; - } - - @Override - public Boolean sendMessageCarryFiles(String to, String subject, String content, File[] files) { - MimeMessage mimeMessage = mailSender.createMimeMessage(); - String from = emailConfig.getFrom(); - try { - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage,true); - helper.setFrom(from); // 设置发送发 - helper.setTo(to); // 设置接收方 - helper.setSubject(subject); // 设置邮件主题 - helper.setText(content); // 设置邮件内容 - if (files != null && files.length > 0) { // 添加附件（多个） - for (File file : files) { - helper.addAttachment(file.getName(), file); - } - } - // 发送邮件 - mailSender.send(mimeMessage); - return true; - } catch (MessagingException e) { - e.printStackTrace(); - } - return false; - } - - @Override - public Boolean sendMessageCarryFile(String to, String subject, String content, File file) { - MimeMessage mimeMessage = mailSender.createMimeMessage(); - String from = emailConfig.getFrom(); - try { - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage,true); - helper.setFrom(from); // 设置发送发 - helper.setTo(to); // 设置接收方 - helper.setSubject(subject); // 设置邮件主题 - helper.setText(content); // 设置邮件内容 - helper.addAttachment(file.getName(), file); // 单个附件 - // 发送邮件 - mailSender.send(mimeMessage); - return true; - } catch (MessagingException e) { - e.printStackTrace(); - } - return false; - } - +// private String from; +// @Autowired +// private EmailConfig emailConfig; +// @Autowired +// private JavaMailSender mailSender; +// +// /** +// * 发送邮件 +// * @param mail 邮件账号 +// * @param title 邮件标题 +// * @param content 邮件内容 +// * @param isRecordLog 是否记录日志 true 记录 false 不记录 +// * @param emailType 邮件类型 EmailType 枚举 +// * @return +// */ +// @Override +// public Boolean sendMail(String mail,String title,String content,Boolean isRecordLog,Integer emailType) { +// String from = emailConfig.getFrom(); +// try { +// // 创建一个邮件对象 +// SimpleMailMessage msg = new SimpleMailMessage(); +// msg.setFrom(from); // 设置发送发 +// msg.setTo(mail); // 设置接收方 +// msg.setSubject(title); // 设置邮件主题 +// msg.setText(content); // 设置邮件内容 +// // 发送邮件 +// mailSender.send(msg); +// if (isRecordLog){ +// // 记录邮箱日志 +// TEmail tEmail = new TEmail(); +// tEmail.setSender(from); +// tEmail.setReceiver(mail); +// tEmail.setSubject(title); +// tEmail.setContent(content); +// tEmail.setPkCreator(SecurityUtils.getUserId()); +// tEmail.setCreationTime(new Date()); +// tEmail.setEmailType(emailType); +// baseMapper.insert(tEmail); +// } +// return true; +// }catch (Exception e){ +// e.printStackTrace(); +// } +// return false; +// } +// +// @Override +// public Boolean sendMessageCarryFiles(String to, String subject, String content, File[] files) { +// MimeMessage mimeMessage = mailSender.createMimeMessage(); +// String from = emailConfig.getFrom(); +// try { +// MimeMessageHelper helper = new MimeMessageHelper(mimeMessage,true); +// helper.setFrom(from); // 设置发送发 +// helper.setTo(to); // 设置接收方 +// helper.setSubject(subject); // 设置邮件主题 +// helper.setText(content); // 设置邮件内容 +// if (files != null && files.length > 0) { // 添加附件（多个） +// for (File file : files) { +// helper.addAttachment(file.getName(), file); +// } +// } +// // 发送邮件 +// mailSender.send(mimeMessage); +// return true; +// } catch (MessagingException e) { +// e.printStackTrace(); +// } +// return false; +// } +// +// @Override +// public Boolean sendMessageCarryFile(String to, String subject, String content, File file) { +// MimeMessage mimeMessage = mailSender.createMimeMessage(); +// String from = emailConfig.getFrom(); +// try { +// MimeMessageHelper helper = new MimeMessageHelper(mimeMessage,true); +// helper.setFrom(from); // 设置发送发 +// helper.setTo(to); // 设置接收方 +// helper.setSubject(subject); // 设置邮件主题 +// helper.setText(content); // 设置邮件内容 +// helper.addAttachment(file.getName(), file); // 单个附件 +// // 发送邮件 +// mailSender.send(mimeMessage); +// return true; +// } catch (MessagingException e) { +// e.printStackTrace(); +// } +// return false; +// } } diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index 1aedc8c..0430bc8 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -41,26 +41,26 @@ spring: allow-bean-definition-overriding: true ## true 表示控制台不会打印循环依赖异常 allow-circular-references: true - # 邮件配置 - mail: - host: smtp.office365.com # 配置 smtp 服务器地址 - port: 587 # smtp 服务器的端口 - username: welcome_xhzs@outlook.com # 配置邮箱用户名(你的邮箱地址) - password: ffjeiitbxhadgvrj # 配置申请到的授权码 - default-encoding: UTF-8 # 配置邮件编码 - properties: - mail: - smtp: - auth: true - ssl: - socketFactory: - class: com.sun.mail.util.MailSSLSocketFactory - fallback: false - starttls: - enable: true - socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂 - debug: true - from: welcome_xhzs@outlook.com # 发送方邮件，陪在yml中可方便更改 +# # 邮件配置 +# mail: +# host: smtp.office365.com # 配置 smtp 服务器地址 +# port: 587 # smtp 服务器的端口 +# username: welcome_xhzs@outlook.com # 配置邮箱用户名(你的邮箱地址) +# password: ffjeiitbxhadgvrj # 配置申请到的授权码 +# default-encoding: UTF-8 # 配置邮件编码 +# properties: +# mail: +# smtp: +# auth: true +# ssl: +# socketFactory: +# class: com.sun.mail.util.MailSSLSocketFactory +# fallback: false +# starttls: +# enable: true +# socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂 +# debug: true +# from: welcome_xhzs@outlook.com # 发送方邮件，陪在yml中可方便更改 dubbo: registry: