From 0bbd4df64e62a7d79d10940d13a1597842ce6cac Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 10:30:32 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 a51aff3..377b12e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -97,7 +97,6 @@
locale = CommonUtil.getUserLanguage(loginUser.getLanguage());
}
}
-
this.makeDirectContextEmail(emailType, params, locale, new String[]{CommonUtil.decryptAES128(sendUser)});
}
}
@@ -179,19 +178,19 @@
content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
break;
- case ISSUE_SEND_1: // �씠�뒋 �씠硫붿씪濡� ���긽�옄�뿉寃� 諛쒖넚
+ case ISSUE_SEND_1: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�1濡� ���긽�옄�뿉寃� 諛쒖넚
mailConstants = MailConstants.ISSUE_SEND_1;
context = StringTemplateUtil.makeContext(params, locale);
content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
break;
- case ISSUE_SEND_2: // �씠�뒋 �씠硫붿씪濡� ���긽�옄�뿉寃� 諛쒖넚
+ case ISSUE_SEND_2: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�2濡� ���긽�옄�뿉寃� 諛쒖넚
mailConstants = MailConstants.ISSUE_SEND_2;
context = StringTemplateUtil.makeContext(params, locale);
content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
break;
- case ISSUE_SEND_3: // �씠�뒋 �씠硫붿씪濡� ���긽�옄�뿉寃� 諛쒖넚
+ case ISSUE_SEND_3: // �씠�뒋 �씠硫붿씪 �뀥�뵆由�3濡� ���긽�옄�뿉寃� 諛쒖넚
mailConstants = MailConstants.ISSUE_SEND_3;
context = StringTemplateUtil.makeContext(params, locale);
content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
@@ -248,8 +247,8 @@
}
}
}
-
this.javaMailSender.send(message);
+
} catch (MailSendException e) {
log.error(e.getMessage());
Exception[] exceptions = e.getMessageExceptions();
--
Gitblit v1.8.0