From f7d1a18f889a572149c8a68dec294eb8bb0e3dd6 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 14 Oct 2021 09:03:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=EC=9D=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0,=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/user/web/LoginController.java | 32 +++++---- .../WEB-INF/jsp/nlib/login/loginPreSet.jsp | 66 +++++++++++++++++++ src/main/webapp/WEB-INF/tiles/inc/header.jsp | 6 +- src/main/webapp/WEB-INF/tiles/inc/menu.jsp | 43 +++++------- 4 files changed, 106 insertions(+), 41 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java index 498ec0ee..e1631ba1 100644 --- a/src/main/java/nlib/user/web/LoginController.java +++ b/src/main/java/nlib/user/web/LoginController.java @@ -146,16 +146,17 @@ public class LoginController { log.debug("loginCouncil > councilNm = " + councilNm); log.debug("loginCouncil > callType = " + callType); - String params = "councilJsessionId=" + session.getId() + - "&councilDnsHost=" + councilDnsHost + - "&councilCd=" + councilCd + - "&councilNm=" + StringUtil.encodeBase64(councilNm) + - "&councilHomeUrl=" + StringUtil.encodeBase64(councilHomeUrl) + - "&councilReturnUrl=" + StringUtil.encodeBase64(councilReturnUrl) + - "&logout=" + StringUtil.getString(logout, "") + - "&callType=" + StringUtil.getString(callType, "") ; + model.addAttribute("url" , NlibProperty.getString("nculture.login.preset.redirect.url")); + model.addAttribute("councilJsessionId", session.getId()); + model.addAttribute("councilDnsHost" , councilDnsHost); + model.addAttribute("councilCd" , councilCd); + model.addAttribute("councilNm" , StringUtil.encodeBase64(councilNm)); + model.addAttribute("councilHomeUrl" , StringUtil.encodeBase64(councilHomeUrl)); + model.addAttribute("councilReturnUrl" , StringUtil.encodeBase64(councilReturnUrl)); + model.addAttribute("logout" , StringUtil.getString(logout, "")); + model.addAttribute("callType" , StringUtil.getString(callType, "")); - return "redirect:" + NlibProperty.getString("nculture.login.preset.redirect.url") + "?" + params; + return "nlib/login/loginPreSet"; } /** @@ -317,8 +318,9 @@ public class LoginController { // 회원가입인 경우 redirectUrl = councilHomeUrl + NlibProperty.getString("nculture.login.post.member.redirect.uri"); } - redirectUrl = StringUtil.addWebParamOfUrl(redirectUrl, "message", "서비스를 이용하시려면 정보제공 동의가 필요합니다."); - return "redirect:" + redirectUrl; + model.addAttribute("url", redirectUrl); + model.addAttribute("message", StringUtil.encodeUrl("서비스를 이용하시려면 정보제공 동의가 필요합니다.")); + return "nlib/login/loginPreSet"; } } @@ -348,9 +350,10 @@ public class LoginController { // oAuth를 통한 SNS연동이 실패한 경우 if(oauthUser == null || !oauthUser.isValid()) { - model.addAttribute("message", "먼저 회원가입하신 후, 이용하여 주시기 바랍니다."); redirectUrl = NlibProperty.getString("member.new.url"); // "/member/insertMemberInfoForm.do" - return "redirect:" + redirectUrl; + model.addAttribute("url", redirectUrl); + model.addAttribute("message", StringUtil.encodeUrl("먼저 회원가입하신 후, 이용하여 주시기 바랍니다.")); + return "nlib/login/loginPreSet"; } //----------------------------------------------- // 해당 처리기로 전환 @@ -365,7 +368,8 @@ public class LoginController { redirectUrl = councilHomeUrl + NlibProperty.getString("nculture.login.post.member.redirect.uri"); } - return "redirect:" + redirectUrl; + model.addAttribute("url", redirectUrl); + return "nlib/login/loginPreSet"; } /** diff --git a/src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp b/src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp new file mode 100644 index 00000000..dc94f591 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp @@ -0,0 +1,66 @@ +<% +/** + * 
+ * @Class Name : loginPreSet.jsp
+ * 
+ * @Description : 로그인폼 사전 처리 페이지 이동 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 10.13. KNKIM 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP KNKIM + * @since 2021. 10.13. + * @version 1.0 + * + */ + %> +<%@ page language="java" contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> +서비스 이동중입니다. + + + + +서비스 이동중 + + + +
+ +-------------------
+ +
+url : ${url}
+
+ +
+councilJsessionId :
+councilDnsHost :
+councilCd :
+councilNm :
+councilHomeUrl :
+councilReturnUrl :
+logout :
+callType :
+message :
+ +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/inc/header.jsp b/src/main/webapp/WEB-INF/tiles/inc/header.jsp index 4a349cc9..1e627edc 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/header.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/header.jsp @@ -26,9 +26,11 @@ String councilNm = (String)session.getAttribute("councilCd"); -
  • 내 정보
    • -
  • 회원증
  • 로그아웃
    • +
  • 회원증
    • +
  • 알림
    • +
  • 회원정보관리
    • +
  • ID/PW찾기
    • diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index b19a97fa..7b2d5ef8 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -3,36 +3,29 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> From 264ef11e8eb4ad40fe179b4d6844c309979535e5 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 14 Oct 2021 09:14:48 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=9D=B4=EB=8F=99=20=EB=B0=8F=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=84=9C=EB=B2=84=EC=9A=A9=20nlib.properties=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 16 +++++++++++----- .../template}/mail/mail_template.html | 0 .../template}/mail/pwd_mail_template.html | 0 3 files changed, 11 insertions(+), 5 deletions(-) rename src/main/webapp/{ => WEB-INF/template}/mail/mail_template.html (100%) rename src/main/webapp/{ => WEB-INF/template}/mail/pwd_mail_template.html (100%) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 324e3d38..88377c87 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -80,8 +80,11 @@ list.paging.page.size = 10 #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 #---------------------------------------- -# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 -fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 +# \ub85c\uceec +#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +# \uac1c\ubc1c\uc11c\ubc84 +fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 fileupload.temp.subpath = /temp @@ -91,9 +94,12 @@ fileupload.bbs.qna.subpath = /bbs/qna fileupload.bbs.ancmnt.subpath = /bbs/ancmnt # \uba54\uc77c \uacbd\ub85c -mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail/mail_template.html - -mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/mail/pwd_mail_template.html +# \ub85c\uceec +#mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/mail_template.html +#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html +# \uac1c\ubc1c\uc11c\ubc84 +mailing.sender.membership.template = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/WEB-INF/template/mail/mail_template.html +mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/WEB-INF/template/mail/pwd_mail_template.html #\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c mailing.sender.membership.email = no-reply@nlib.org diff --git a/src/main/webapp/mail/mail_template.html b/src/main/webapp/WEB-INF/template/mail/mail_template.html similarity index 100% rename from src/main/webapp/mail/mail_template.html rename to src/main/webapp/WEB-INF/template/mail/mail_template.html diff --git a/src/main/webapp/mail/pwd_mail_template.html b/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html similarity index 100% rename from src/main/webapp/mail/pwd_mail_template.html rename to src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html From 10841309ebcf47de4d4deee532582443e6f8d3ef Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 14 Oct 2021 09:36:40 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 88377c87..e6d1f059 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -81,10 +81,10 @@ list.paging.page.size = 10 # \ucca8\ubd80\ud30c\uc77c \uacbd\ub85c \uc815\ubcf4 #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 -# \ub85c\uceec -#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +# \ub85c\uceec LLLLLLLLLLLLLLL +fileupload.base.path = C:/iams/workspace/nlib/data/fileupload # \uac1c\ubc1c\uc11c\ubc84 -fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload +#fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 fileupload.temp.subpath = /temp @@ -94,12 +94,12 @@ fileupload.bbs.qna.subpath = /bbs/qna fileupload.bbs.ancmnt.subpath = /bbs/ancmnt # \uba54\uc77c \uacbd\ub85c -# \ub85c\uceec -#mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/mail_template.html -#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html +# \ub85c\uceec LLLLLLLLLLLLLLL +mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/mail_template.html +mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html # \uac1c\ubc1c\uc11c\ubc84 -mailing.sender.membership.template = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/WEB-INF/template/mail/mail_template.html -mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/WEB-INF/template/mail/pwd_mail_template.html +#mailing.sender.membership.template = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/mail_template.html +#mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html #\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c mailing.sender.membership.email = no-reply@nlib.org From 138891ebe1617e1c4db216bdd934ae351b829b5a Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 14 Oct 2021 09:46:11 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=ED=94=84=EB=9D=BC=ED=8D=BC=ED=8B=B0=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index e6d1f059..a75303c3 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -51,7 +51,7 @@ nlib.council.dns.host = nlib #---------------------------------------- # \uac1c\ubc1c \uc11c\ubc84 dataapi.server.ip = 210.181.197.70 -dataapi.server.port = 8080 +dataapi.server.port = 80 dataapi.server.protocol = http # \uc784\uc2dc PC \uac1c\ubc1c \uc11c\ubc84 From efb8681af77f289c8b72cbc865a146ebdbfe9cb9 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 14 Oct 2021 09:49:46 +0900 Subject: [PATCH 5/5] =?UTF-8?q?dataapi.server.port=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index a75303c3..e6d1f059 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -51,7 +51,7 @@ nlib.council.dns.host = nlib #---------------------------------------- # \uac1c\ubc1c \uc11c\ubc84 dataapi.server.ip = 210.181.197.70 -dataapi.server.port = 80 +dataapi.server.port = 8080 dataapi.server.protocol = http # \uc784\uc2dc PC \uac1c\ubc1c \uc11c\ubc84