From 6a916b069c73ad7def95ad72ae848125544bc309 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 15:40:08 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
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..6850762 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -172,6 +172,9 @@
@Value("${total.statistics.email}")
private String totalStatisticsEmail; // �봽濡쒖젥�듃, �씠�뒋, �궗�슜�옄�닔 �븣由�
+ @Value("${email.joinEmail}")
+ private boolean bJoinEmail;
+
@Autowired
private ExcelView excelView;
@@ -292,8 +295,9 @@
userMap.put("registerDate", DateUtil.convertDateToYYYYMMDD(user.getRegisterDate()));
// �쉶�썝 媛��엯 �븣由� 硫붿씪 �쟾�넚
- this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
-
+ if(bJoinEmail) {
+ this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
+ }
return user;
}
@@ -1373,15 +1377,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 +1405,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