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/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 324e3d38..e6d1f059 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 +# \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 +# \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 # \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 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/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 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"%> +