From 15fb5ce02c159e88059b95aa62db1e037f358fdf Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 01 12월 2021 18:28:58 +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 | 7 +++---- 1 files changed, 3 insertions(+), 4 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..5d35f1e 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); -- Gitblit v1.8.0