需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.mail.MessagingException;
+import javax.mail.Session;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -362,9 +363,10 @@ public class AgreementLogic {
         //发送邮箱
 
         //分发邮件
-
+        Session session = emailUtilsNew.loadMailSession();
         for (String s : mailboxSendRecord.getReceiveMailbox().split(",|，")) {
-            emailUtilsNew.send(s, mailbox.getSendMailbox(), "工伤险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
+
+            emailUtilsNew.send(session,s, mailbox.getSendMailbox(), "工伤险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
                     + mailbox.getSendName() + "保险人员名单详情见附件", filePath);
         }
 
@@ -413,9 +415,9 @@ public class AgreementLogic {
 
 
         //分发邮件
-
+        Session session = emailUtilsNew.loadMailSession();
         for (String s : mailboxSendRecord.getReceiveMailbox().split(",|，")) {
-            emailUtilsNew.send(s, mailbox.getSendMailbox(), "雇主险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
+            emailUtilsNew.send(session,s, mailbox.getSendMailbox(), "雇主险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
                     + mailbox.getSendName() + "保险人员名单详情见附件", filePath);
         }
 
@@ -466,9 +468,9 @@ public class AgreementLogic {
 
 
         //分发邮件
-
+        Session session = emailUtilsNew.loadMailSession();
         for (String s : mailboxSendRecord.getReceiveMailbox().split(",|，")) {
-            emailUtilsNew.send(s, mailbox.getSendMailbox(), "意外险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
+            emailUtilsNew.send(session,s, mailbox.getSendMailbox(), "意外险-" + mailboxSendRecord.getSendBatch() + "-" + mailbox.getSendName(), "你好，以下是" + DateUtil.format(new Date(), "yyyy-MM-dd")
                     + mailbox.getSendName() + "保险人员名单详情见附件", filePath);
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/utils/email/EmailUtilsNew.java

@@ -84,8 +84,8 @@ public class EmailUtilsNew {
      * @param content  邮件内容 可以是html内容
      * @param attachPath 附件路径
      */
-    public void send(String toEmail,String emailReceAccount, String subject, String content, String attachPath) {
-        Session session = loadMailSession();
+    public void send(Session session,String toEmail,String emailReceAccount, String subject, String content, String attachPath) {
+       // Session session = loadMailSession();
 
         MimeMessage mm = new MimeMessage(session);
         try {
@@ -117,7 +117,7 @@ public class EmailUtilsNew {
             multipart.addBodyPart(attachPart);
 
             mm.setContent(multipart);
-            Transport.send(mm);
+            //Transport.send(mm);
         } catch (Exception e) {
             String err = e.getMessage();
             // 在这里处理message内容， 格式是固定的
@@ -217,7 +217,7 @@ public class EmailUtilsNew {
 
 
 
-    private Session loadMailSession() {
+    public Session loadMailSession() {
         try {
             // 配置发送邮件的环境属性
             final Properties props = new Properties();

mall-server-api/src/main/java/com/gree/mall/manager/utils/excel/ExcelUtils.java

@@ -202,6 +202,7 @@ public class ExcelUtils {
             build.write(excelData.getRows(),writeSheet).finish();
             // 关闭流
             out.flush();
+            out.close();
         } catch (FileNotFoundException e) {
             throw new RuntimeException(e);
         } catch (IOException e) {