Merge branch 'tolag3'

src/main/java/kcc/let/uat/uia/web/SSOValid.java

@@ -14,43 +14,6 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class SSOValid implements Filter {
-	
-	//SSO agent 관련 설정
-	   
-    private static String ssoUri;
-   
-    private static String clientId;
- 
-    private static String clientSecret;
-  
-    private static String scope;
-    
-	@Value("#{globalSettings['Globals.sso.ssoUri']}")
-	public void setSsoUri(String ssoUri) {
-		SSOValid.ssoUri = ssoUri;
-	}
-	@Value("#{globalSettings['Globals.sso.clientId']}")
-	public void setClientId(String clientId) {
-		SSOValid.clientId = clientId;
-	}
-	@Value("#{globalSettings['Globals.sso.clientSecret']}")
-	public void setClientSecret(String clientSecret) {
-		SSOValid.clientSecret = clientSecret;
-	}
-	@Value("#{globalSettings['Globals.sso.scope']}")
-	public void setScope(String scope) {
-		SSOValid.scope = scope;
-	}
-	
-	/*//실서버 적용시 변경
-	// agent 관련 설정
-	private static String ssoUri = "https://devsso.copyright.or.kr/oauth2/token.do";	// 개발서버 URL
-	private static String clientId = "해당 시스템의 클라이언트 아이디";
-	private static String clientId = "30354835c3684ff79e7fb1bfd3a768f6";
-	private static String clientSecret = "해당 시스템의 클라이언트 시크릿";
-	private static String clientSecret = "1ueil5ee05wr0t1gjy1ppt212";
-	private static String scope = "http://sso.copyright.or.kr";						// 고정
-*/	
 	// 초기화 함수
 	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {

src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Oracle.xml

@@ -29,6 +29,9 @@
                  , MEMBER_ID AS memberId
                  , MEMBER_PW AS memberPw
                  , 'USR' AS userSe
+                 , MEMBER_ID AS id
+                 , MEMBER_NAME AS name
+                 , MEMBER_IDX AS uniqId
 			 FROM T_MEMBER a
              WHERE MEMBER_ID = #id#
              AND MEMBER_PW = #password#

src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp

@@ -83,7 +83,9 @@ function modifyMem(uniqId){
 		<div class="user">
 			<i></i>
 			<p><span><c:out value="${LoginVO.name}" /></span>님</p>
+<%-- 			<p><span><c:out value="${LoginVO.memberName}" /></span>님</p> --%>
 			<p class="user_id">(<c:out value="${LoginVO.id}" />)</p>
+<%-- 			<p class="user_id">(<c:out value="${LoginVO.memberId}" />)</p> --%>
 		</div>
 		<button class="alram" onclick="location.href='/uat/uia/actionLogout.do'">
 			<!-- <i></i> -->