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 | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 92d20d5..1004513 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -269,30 +269,34 @@
MimeMessage message = this.javaMailSender.createMimeMessage();
try {
- 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 (this.emailSender != null && !this.emailSender.equals("")
+ && this.emailUserName != null && !this.emailUserName.equals("")) {
- if (multipartFiles != null && multipartFiles.size() > 0) {
- for (MultipartFile file : multipartFiles) {
- // �뙆�씪 泥⑤�
- messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
- }
- }
+ 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 (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);
+ 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());
--
Gitblit v1.8.0