From d438f9c81cffd2e2cbec48150b43a5a89c9ab749 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 16 2월 2022 15:56:56 +0900
Subject: [PATCH] - 하위이슈 직접 생성 시 프로젝트 변경 못하도록 수정 - 연관이슈 직접 생성 시 프로젝트 변경 할 경우 이슈타입도 변경 되도록 수정

---
 src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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..92d20d5 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,16 +265,23 @@
     //  �씠硫붿씪�쓣 諛쒖넚�븳�떎.
     @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");
+            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) {
@@ -413,7 +423,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 +454,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