Merge remote-tracking branch 'origin/master'

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() + 
+		model.addAttribute("url"              , NlibProperty.getString("nculture.login.preset.redirect.url"));
-				"&councilDnsHost=" + councilDnsHost + 
+		model.addAttribute("councilJsessionId", session.getId());
-				"&councilCd=" + councilCd +
+		model.addAttribute("councilDnsHost"   , councilDnsHost);
-				"&councilNm=" + StringUtil.encodeBase64(councilNm) +
+		model.addAttribute("councilCd"        , councilCd);
-				"&councilHomeUrl="   + StringUtil.encodeBase64(councilHomeUrl) +
+		model.addAttribute("councilNm"        , StringUtil.encodeBase64(councilNm));
-				"&councilReturnUrl=" + StringUtil.encodeBase64(councilReturnUrl) +
+		model.addAttribute("councilHomeUrl"   , StringUtil.encodeBase64(councilHomeUrl));
-				"&logout=" + StringUtil.getString(logout, "") +
+		model.addAttribute("councilReturnUrl" , StringUtil.encodeBase64(councilReturnUrl));
-				"&callType=" + StringUtil.getString(callType, "") ;
+		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", "서비스를 이용하시려면 정보제공 동의가 필요합니다.");
+				model.addAttribute("url", redirectUrl);
-				return "redirect:" + 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";
 	}
 
 	/**

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
+# \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/mail/pwd_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

src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp

@@ -0,0 +1,66 @@
+<%
+/**
+ * <pre>
+ * @Class Name : loginPreSet.jsp
+ * 
+ * @Description : 로그인폼 사전 처리 페이지 이동 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 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"%>
+<c:set var="pageTitle">서비스 이동중입니다.</c:set>
+
+<!DOCTYPE html>
+<html>
+<head>
+<title>서비스 이동중</title>
+<script>
+$(document).ready(function() {
+	$("#frm").submit();
+});
+</script>
+</head>
+<body>
+<br>
+
+-------------------<br />
+
+<form id="frmView" name="frmView"">
+url : ${url}<br />
+</form>
+
+<form id="frm" name="frm" action="${url}" method="POST">
+councilJsessionId : <input type="text" name="councilJsessionId" id="councilJsessionId" value="${councilJsessionId }" /><br/>
+councilDnsHost : <input type="text" name="councilDnsHost" id="councilDnsHost" value="${councilDnsHost }" /><br/>
+councilCd : <input type="text" name="councilCd" id="councilCd" value="${councilCd }" /><br/>
+councilNm : <input type="text" name="councilNm" id="councilNm" value="${councilNm }" /><br/>
+councilHomeUrl : <input type="text" name="councilHomeUrl" id="councilHomeUrl" value="${councilHomeUrl }" /><br/>
+councilReturnUrl : <input type="text" name="councilReturnUrl" id="councilReturnUrl" value="${councilReturnUrl }" /><br/>
+logout : <input type="text" name="logout" id="logout" value="${logout }" /><br/>
+callType : <input type="text" name="callType" id="callType" value="${callType }" /><br/>
+message : <input type="text" name="message" id="message" value="${message }" /><br/>
+<input type="submit" value="계속" />
+</form>
+
+</body>
+</html>

src/main/webapp/WEB-INF/tiles/inc/header.jsp

@@ -26,9 +26,11 @@ String councilNm = (String)session.getAttribute("councilCd");
      </sec:authorize>
      
      <sec:authorize access="isAuthenticated()">
-        <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/userInfo/getMyInfo.do';">내 정보</a></li>
-        <li><a href="javascript:void(0)" onclick="javascript:fn_layerPop('${pageContext.request.contextPath}/userInfo/getMemberQrcodeFormPopup.do');">회원증</a></li>
         <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/logout';">로그아웃</a></li>
+        <li><a href="javascript:void(0)" onclick="javascript:fn_layerPop('${pageContext.request.contextPath}/userInfo/getMemberQrcodeFormPopup.do');">회원증</a></li>
+        <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/cmm/listNotifications.do';">알림</a></li>
+        <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/userInfo/pwCertMyInfo.do';">회원정보관리</a></li>
+        
      </sec:authorize>
      <sec:authorize access="not isAuthenticated()">
         <li><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/user/member/searchIdForm.do';">ID/PW찾기</a></li>