From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java |   54 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 992923b..1004513 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -22,6 +22,7 @@
 import kr.wisestone.owl.service.UserService;
 import kr.wisestone.owl.util.*;
 import org.apache.commons.io.FilenameUtils;
+import org.flywaydb.core.internal.util.scanner.filesystem.FileSystemResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +39,11 @@
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
 import javax.mail.SendFailedException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
+import javax.mail.internet.*;
 import java.io.IOException;
 import java.util.*;
 
+import org.springframework.web.multipart.MultipartFile;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring5.SpringTemplateEngine;
 
@@ -77,6 +77,9 @@
 
     @Value("${email.userName}")
     private String emailUserName;
+
+    @Value("${email.sender}")
+    private String emailSender;
 
     //  �씠硫붿씪 利됱떆 �쟾�넚
     @Async
@@ -224,7 +227,7 @@
                 break;
         }
 
-        this.sendEmail(this.messageAccessor.message(mailConstants.getTitle(), locale), content, sendUsers, filePaths);
+        this.sendEmail(this.messageAccessor.message(mailConstants.getTitle(), locale), content, sendUsers, filePaths, null);
     }
 
     //  �씠硫붿씪 �뀥�뵆由� 李얘린
@@ -262,27 +265,38 @@
     //  �씠硫붿씪�쓣 諛쒖넚�븳�떎.
     @Override
     @Transactional(readOnly = true)
-    public void sendEmail(String subject, String content, String[] to, String[] filePaths) {
+    public void sendEmail(String subject, String content, String[] to, String[] filePaths, List<MultipartFile> multipartFiles) {
         MimeMessage message = this.javaMailSender.createMimeMessage();
 
         try {
-            InternetAddress from = new InternetAddress(this.emailUserName, "OWL-ITS");
-            MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
-            messageHelper.setSubject(subject);
-            messageHelper.setText(content, true);
-            messageHelper.setFrom(from);
-            messageHelper.setTo(to);
+            if (this.emailSender != null && !this.emailSender.equals("")
+                && this.emailUserName != null && !this.emailUserName.equals("")) {
 
-            if (filePaths != null && filePaths.length > 0) {
-                for (String filePath : filePaths) {
-                    if (!StringUtils.isEmpty(filePath)) {
-                        DataSource dataSource = new FileDataSource(filePath);
-                        messageHelper.addAttachment(MimeUtility.encodeText(
-                                FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+                InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
+                MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
+                messageHelper.setSubject(subject);
+                messageHelper.setText(content, true);
+                messageHelper.setFrom(from);
+                messageHelper.setTo(to);
+
+                if (multipartFiles != null && multipartFiles.size() > 0) {
+                    for (MultipartFile file : multipartFiles) {
+                        // �뙆�씪 泥⑤�
+                        messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
                     }
                 }
+
+                if (filePaths != null && filePaths.length > 0) {
+                    for (String filePath : filePaths) {
+                        if (!StringUtils.isEmpty(filePath)) {
+                            DataSource dataSource = new FileDataSource(filePath);
+                            messageHelper.addAttachment(MimeUtility.encodeText(
+                                    FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+                        }
+                    }
+                }
+                this.javaMailSender.send(message);
             }
-            this.javaMailSender.send(message);
 
         } catch (MailSendException e) {
             log.error(e.getMessage());
@@ -413,7 +427,7 @@
                 //  �궡�슜�씠 �엳�쑝硫� 諛쒖넚
                 if (!StringUtils.isEmpty(emailBuilder.toString())) {
                     //  �씠硫붿씪�쓣 諛쒖넚�븳�떎.
-                    this.sendEmail(this.messageAccessor.message(MsgConstants.RESERVATION_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null);
+                    this.sendEmail(this.messageAccessor.message(MsgConstants.RESERVATION_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null, null);
                     this.systemEmailRepository.saveAll(systemEmails);
                 }
             }
@@ -444,7 +458,7 @@
                 //  �궡�슜�씠 �엳�쑝硫� 諛쒖넚
                 if (!StringUtils.isEmpty(emailBuilder.toString())) {
                     //  �씠硫붿씪�쓣 諛쒖넚�븳�떎.
-                    this.sendEmail(this.messageAccessor.message(MsgConstants.REALTIME_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null);
+                    this.sendEmail(this.messageAccessor.message(MsgConstants.REALTIME_EMAIL_TITLE, locale), emailBuilder.toString(), new String[]{CommonUtil.decryptAES128(sendUser)}, null, null);
                     this.systemEmailRepository.saveAll(systemEmails);
                 }
             }

--
Gitblit v1.8.0