From 58f7308d634e99bf7cf4a88bef75a97c7325454f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 11:10:29 +0900
Subject: [PATCH] - 각종 메일 메일 주소 안썼을 경우 테스트(메일주소 없을 경우 예외처리)
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 30 ++++++++------
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 42 +++++++++++---------
2 files changed, 40 insertions(+), 32 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());
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 721537c..c0041f5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -1373,15 +1373,17 @@
userMap.put("newUserCount", joinUsers.size());
userMap.put("joinUsers", userVos);
- String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
- List<String> encryptSendEmail = Lists.newArrayList();
+ if (this.userJoinStatisticsEmail != null && !this.userJoinStatisticsEmail.equals("")) {
+ String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
+ List<String> encryptSendEmail = Lists.newArrayList();
- for (String sendEmail : sendEmails) {
- encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ for (String sendEmail : sendEmails) {
+ encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ }
+ // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
+ this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
}
- // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
- this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
}
// �쟾泥� �궗�슜�옄, �봽濡쒖젥�듃 �닔, �씠�뒋 �닔瑜� �씠硫붿씪濡� 蹂대궦�떎.
@@ -1399,15 +1401,17 @@
userMap.put("projectCount", CommonUtil.getDecimalFormat(projectCount));
userMap.put("userCount", CommonUtil.getDecimalFormat(activeUsers.size()));
- String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
- List<String> encryptSendEmail = Lists.newArrayList();
+ if (this.totalStatisticsEmail != null && !this.totalStatisticsEmail.equals("")) {
+ String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
+ List<String> encryptSendEmail = Lists.newArrayList();
- for (String sendEmail : sendEmails) {
- encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ for (String sendEmail : sendEmails) {
+ encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ }
+
+ // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
+ this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
}
-
- // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
- this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
}
--
Gitblit v1.8.0