优化配置逻辑

4dkankan-utils-email/src/main/java/com/fdkankan/emai/config/SpringMailConfig.java

@@ -1,46 +0,0 @@
-package com.fdkankan.emai.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-
-import java.util.Properties;
-
-@Configuration
-public class SpringMailConfig {
-
-    // 发送邮件服务器
-    @Value("${spring.mail.host}")
-    private String host;
-    @Value("${spring.mail.port}")
-    private Integer port;
-    // 邮箱
-    @Value("${spring.mail.username}")
-    private String username;
-    // 客户端授权码
-    @Value("${spring.mail.password}")
-    private String password;
-
-    private String PROPERTY_MAIL_SMTP_AUTH = "true";
-    private String PROPERTY_mail_smtp_starttls_enable = "true";
-    private String PROPERTY_mail_smtp_starttls_required = "true";
-
-    @Bean
-    public JavaMailSenderImpl mailSender() {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        // 设置参数
-        mailSender.setHost(host);
-        mailSender.setUsername(username);
-        mailSender.setPassword(password);
-        mailSender.setPort(port);
-        Properties properties = mailSender.getJavaMailProperties();
-        properties.setProperty("mail.smtp.auth", PROPERTY_MAIL_SMTP_AUTH);
-        properties.setProperty("mail.smtp.starttls.enable", PROPERTY_mail_smtp_starttls_enable);
-        properties.setProperty("mail.smtp.starttls.required", PROPERTY_mail_smtp_starttls_required);
-        properties.setProperty("mail.smtp.socketFactory.port", Integer.toString(port));
-        properties.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
-        mailSender.setJavaMailProperties(properties);
-        return mailSender;
-    }
-}

4dkankan-utils-email/src/main/java/com/fdkankan/email/MailService.java

@@ -2,9 +2,10 @@ package com.fdkankan.email;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 import org.thymeleaf.TemplateEngine;
@@ -18,8 +19,14 @@ import java.util.Map;
 
 @Component
 public class MailService {
+
+    // 邮箱
+    @Value("${spring.mail.username}")
+    private String username;
+
     @Autowired
-    private JavaMailSenderImpl javaMailSenderImpl;
+    private JavaMailSender javaMailSender;
+
     @Autowired
     private TemplateEngine templateEngine;
 
@@ -33,14 +40,14 @@ public class MailService {
     public String sendSimpleEmail(String to, String subject, String content) {
         try {
             SimpleMailMessage message = new SimpleMailMessage();
-            message.setFrom(javaMailSenderImpl.getUsername());
+            message.setFrom(username);
             message.setTo(to);
             // 接收地址
             message.setSubject(subject);
             // 标题
             message.setText(content);
             // 内容
-            javaMailSenderImpl.send(message);
+            javaMailSender.send(message);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();
@@ -56,14 +63,14 @@ public class MailService {
      */
     public String sendHtmlMail(String to, String subject, String html) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             messageHelper.setText(html, true);
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();
@@ -83,10 +90,10 @@ public class MailService {
      */
     public String sendFileMail(String to, String subject, String content, boolean isHtml, String fileName, String filePath) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             messageHelper.setText(content, isHtml);
@@ -96,7 +103,7 @@ public class MailService {
                 fileName = file.getFilename();
             }
             messageHelper.addAttachment(fileName, file);
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();
@@ -115,10 +122,10 @@ public class MailService {
      */
     public String sendFilesMail(String to, String subject, String content, boolean isHtml, List<Map<String, String>> list) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             messageHelper.setText(content, isHtml);
@@ -132,7 +139,7 @@ public class MailService {
                 }
                 messageHelper.addAttachment(fileName, file);
             }
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (
                 Exception e) {
@@ -151,10 +158,10 @@ public class MailService {
      */
     public String sendTemplateMail(String to, String subject, String tplStr, Map<String, Object> map) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, StandardCharsets.UTF_8.toString());
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             // 设置模板参数
@@ -163,7 +170,7 @@ public class MailService {
             // 将参数 绑定到模板中
             String tempContent = templateEngine.process(tplStr, context);
             messageHelper.setText(tempContent, Boolean.TRUE);
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();
@@ -183,10 +190,10 @@ public class MailService {
      */
     public String sendTemplateFileMail(String to, String subject, String tplStr, Map<String, Object> map, String fileName, String filePath) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8或GBK编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             // 设置模板参数
@@ -201,7 +208,7 @@ public class MailService {
                 fileName = file.getFilename();
             }
             messageHelper.addAttachment(fileName, file);
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();
@@ -220,10 +227,10 @@ public class MailService {
      */
     public String sendTemplateFilesMail(String to, String subject, String tplStr, Map<String, Object> map, List<Map<String, String>> list) {
         try {
-            MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             // 设置utf-8编码，否则邮件会有乱码
             MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
-            messageHelper.setFrom(javaMailSenderImpl.getUsername());
+            messageHelper.setFrom(username);
             messageHelper.setTo(to);
             messageHelper.setSubject(subject);
             // 设置模板参数
@@ -241,7 +248,7 @@ public class MailService {
                 }
                 messageHelper.addAttachment(fileName, file);
             }
-            javaMailSenderImpl.send(mimeMessage);
+            javaMailSender.send(mimeMessage);
             return "发送成功";
         } catch (Exception e) {
             e.printStackTrace();