From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 2398cb2..92d20d5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -78,6 +78,9 @@
@Value("${email.userName}")
private String emailUserName;
+ @Value("${email.sender}")
+ private String emailSender;
+
// �씠硫붿씪 利됱떆 �쟾�넚
@Async
@Override
@@ -266,7 +269,7 @@
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);
@@ -276,7 +279,7 @@
if (multipartFiles != null && multipartFiles.size() > 0) {
for (MultipartFile file : multipartFiles) {
// �뙆�씪 泥⑤�
- messageHelper.addAttachment(file.getOriginalFilename(), file);
+ messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
}
}
--
Gitblit v1.8.0