From 0c59c029c3908506ff506153d6a37057cf675e44 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 15 Sep 2021 14:01:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A0=84?= =?UTF-8?q?=EC=86=A1=EC=8B=9C=20=EB=B3=80=EC=88=98(=EB=B3=B4=EB=82=B4?= =?UTF-8?q?=EB=8A=94=EC=82=AC=EB=9E=8C,=EB=B3=B4=EB=82=B4=EB=8A=94?= =?UTF-8?q?=EC=82=AC=EB=9E=8C=EC=A3=BC=EC=86=8C)=20global.properties?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/mail/EmailSender.java | 23 +++++++++++++------ .../egovProps/globals.properties | 7 +++++- .../egovframework/spring/context-mail.xml | 12 ++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/main/java/nlib/mail/EmailSender.java b/src/main/java/nlib/mail/EmailSender.java index cf814ec9..b2bb03a1 100644 --- a/src/main/java/nlib/mail/EmailSender.java +++ b/src/main/java/nlib/mail/EmailSender.java @@ -1,10 +1,15 @@ package nlib.mail; +import java.io.Reader; +import java.util.Properties; + import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage.RecipientType; - + +import org.apache.ibatis.io.Resources; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Component; @@ -19,18 +24,22 @@ public class EmailSender { protected JavaMailSender mailSender; public void SendEmail(EmailVO email) throws Exception { + String resource = "egovframework/egovProps/globals.properties"; + Properties properties = new Properties(); + + Reader reader = Resources.getResourceAsReader(resource); + properties.load(reader); + + String senderName = properties.getProperty("system.notification.email.sender.name"); + String sender = properties.getProperty("system.notification.email.sender"); + MimeMessage msg = mailSender.createMimeMessage(); MimeMessageHelper helper = new MimeMessageHelper(msg, true, "utf-8"); helper.setText(email.getContent(), true); //***HTML 적용 helper.setTo(email.getReciver()); helper.setSubject(email.getSubject()); - helper.setFrom("teachteam02@gmail.com","한국문화원연합회"); + helper.setFrom(sender,senderName); - /* msg.setSubject(email.getSubject()); - msg.setText(email.getContent(),"text/html"); - msg.setText - msg.setRecipient(RecipientType.TO , new InternetAddress(email.getReciver())); - */ mailSender.send(msg); } } \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 979b15f7..552975c2 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -149,4 +149,9 @@ ldap.username = uid=admin,ou=system ldap.password = secret #\uc57d\ub3c4\uad00\ub9ac Kakao \uac1c\ubc1c\uc790 appkey \ubc1c\uae09 \ubc1b\uc544 \ub4f1\ub85d\ud574\uc11c \uae30\uc785 (\uce74\uce74\uc624\uac1c\ubc1c Dev \uc571\uad00\ub9ac \ub0b4\uc5d0\uc11c \ub3c4\uba54\uc778 \ub4f1\ub85d \ud544\uc694) -roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987 \ No newline at end of file +roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987 + +#\uba54\uc77c \uacc4\uc815 \uc815\ubcf4 +system.notification.email.sender = teachteam02@gmail.com +system.notification.email.sender.password = wltlrtkdjq11$$ +system.notification.email.sender.name = \ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c diff --git a/src/main/resources/egovframework/spring/context-mail.xml b/src/main/resources/egovframework/spring/context-mail.xml index ec88685b..6c9911da 100644 --- a/src/main/resources/egovframework/spring/context-mail.xml +++ b/src/main/resources/egovframework/spring/context-mail.xml @@ -3,13 +3,21 @@ xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> + + p:username="${system.notification.email.sender}" + p:password="${system.notification.email.sender.password}"> true From 448188b0f870d7b474daf5a451893a34252ddc90 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Wed, 15 Sep 2021 15:24:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20restful=20api=20VO=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=ED=95=9C=20=ED=95=A8=EC=88=98=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/web/RentController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index 7458c6b4..de542fa2 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -100,7 +100,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("searchKeyword", searchKeyword); @@ -161,7 +160,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("searchKeyword", searchKeyword); @@ -222,7 +220,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("searchKeyword", searchKeyword); @@ -287,7 +284,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("searchKeyword", searchKeyword); @@ -354,7 +350,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("searchKeyword", searchKeyword); @@ -404,7 +399,6 @@ public class RentController extends NlibCommonController // REQ VO 구성 //------------------------------- DataApiReqVO reqVO = new DataApiReqVO(); - reqVO.setAuthKey(createAuthKey(req, authentication)); reqVO.setPageIndex(pageIndex); reqVO.setPageSize(pageSize); reqVO.addInfoItem("boardNo", "QNA"); // 게시판ID