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"%>
+서비스 이동중입니다.
+
+
+
+
+서비스 이동중
+
+
+
+
+
+-------------------
+
+
+
+
+
+
+
\ 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"%>