From 77a24ca6a2a6ddf93851b1c45484fbea13305762 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Thu, 16 Dec 2021 14:34:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/user/web/LoginController.java |  7 +++----
 src/main/resources/nlib/nlib.properties          |  7 ++++++-
 src/main/webapp/WEB-INF/tiles/tiles-layout.xml   | 16 ++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java
index 2941d8e9..be04bfbe 100644
--- a/src/main/java/nlib/user/web/LoginController.java
+++ b/src/main/java/nlib/user/web/LoginController.java
@@ -352,7 +352,7 @@ public class LoginController extends NlibCommonController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = {"/{callType}/{oauthServiceName}/callback.do"}) // /login/{oauthServiceName}/callback.do, /member/{oauthServiceName}/callback.do
-	public String loginOauthCallback(
+	public String callbackOauth(
 			HttpServletRequest req, 
 			@PathVariable String callType,
 			@PathVariable String oauthServiceName,
@@ -403,9 +403,8 @@ public class LoginController extends NlibCommonController {
 			} 
 		}
 		
-		log.debug("loginOauthCallback > sessionid=" + session.getId());
-		
-		log.debug("oauthLoginCallback: code = ", code);
+		log.debug("callbackOauth > sessionid = " + session.getId());
+		log.debug("callbackOauth > code = ", code);
 		
 		// SNS 클라이언트 설정 정보 할당 
 		OAuthVO oauthVO = null;
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index fcc72abd..ef7d5aa7 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -35,9 +35,14 @@ login.back.url = /login/loginGuide.do
 login.dormant.url = /login/activateDormantAccForm.do
 
 # \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 URL \uc815\ubcf4 
-nculture.login.redirect.uri = /login/loginForm.do  
+nculture.login.redirect.uri = /login/loginForm.do
+
+# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ub85c\uadf8\uc778\uc6a9   
 nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do
+
+# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ud68c\uc6d0\uac00\uc785\uc6a9 
 nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do
+
 nculture.login.preset.redirect.url = https://nlib-dev.nculture.org/login/loginPreSet.do
 nculture.member.redirect.uri = /login/memberSnsForm.do
 
diff --git a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml
index af867b45..8291b561 100644
--- a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml
+++ b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml
@@ -5,20 +5,20 @@
  
 <tiles-definitions>
 
-    <!-- 자료상세조회 -->
-    <definition name="searchDetail"    template="/WEB-INF/tiles/tiles-layout-detail.jsp">
-        <put-attribute name="header"    value="/WEB-INF/tiles/inc/header.jsp" />
-        <put-attribute name="menu"      value="/WEB-INF/tiles/inc/menu.jsp" />
-        <put-attribute name="footer"    value="/WEB-INF/tiles/inc/footer.jsp" />
-    </definition>
-    
     <!-- 일반화면용 -->
     <definition name="template"         template="/WEB-INF/tiles/tiles-layout.jsp">
         <put-attribute name="header"    value="/WEB-INF/tiles/inc/header.jsp" />
         <put-attribute name="menu"      value="/WEB-INF/tiles/inc/menu.jsp" />
         <put-attribute name="footer"    value="/WEB-INF/tiles/inc/footer.jsp" />
     </definition>
-    
+
+    <!-- 자료상세조회 -->
+    <definition name="searchDetail"    template="/WEB-INF/tiles/tiles-layout-detail.jsp">
+        <put-attribute name="header"    value="/WEB-INF/tiles/inc/header.jsp" />
+        <put-attribute name="menu"      value="/WEB-INF/tiles/inc/menu.jsp" />
+        <put-attribute name="footer"    value="/WEB-INF/tiles/inc/footer.jsp" />
+    </definition>
+        
     <!-- 레이어팝업용 -->
     <definition name="popup"         template="/WEB-INF/tiles/tiles-layout-popup.jsp">
         <put-attribute name="header"    value="/WEB-INF/tiles/inc-popup/header-popup.jsp" />