Merge branch 'JIWOO' into advc

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

@@ -67,11 +67,10 @@ public class APILoginContoller {
 		
 		//테스트를 위한 값 선언
 		userId = "std02@forwiz.com";
-		key = "std02@forwiz.comF6764400E2B796448959148711DCC45C";
+		key = "std02@forwiz.com1106490137E234AF19E376481D60C0A7";
 		returnUrl = "/web/main/mainPage.do";
 		
 		if(userId == null || key == null) {
-		    redirectAttributes.addFlashAttribute("message", "로그인 실패");
 		    return "redirect:/web/main/mainPage.do";
 		}
 		
@@ -206,21 +205,22 @@ public class APILoginContoller {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/web/chkloginKeyForEEdu.do", method = RequestMethod.POST)
-	public ResponseEntity<Map<String, String>> loginKeytoOffedu(@RequestBody LoginVO loginVO){
+	public ResponseEntity<Map<String, String>> loginKeytoOffedu(@RequestBody LoginVO loginVO) throws Exception{
 		Map<String, String> response = new HashMap<>();
 		try {
 			loginVO = loginService.selectOffeduMberChk(loginVO);
 			if(loginVO != null) {
-				response.put("result_code", HttpStatus.UNAUTHORIZED.toString());
+				response.put("result_code", "1");
 				response.put("message", "");
-				
 			}else {
-				response.put("result_code", "-101");
+				response.put("result_code", "-1");
 				response.put("message", "인증오류입니다.");			
 			}
-		}catch(Exception e){
-			return ResponseEntity.notFound().build();
-		}
 			return ResponseEntity.ok(response);
+		}catch (Exception e) {
+			response.put("result_code", "error");
+			response.put("message", "Internal Server Error: " + e.getMessage());
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+	    }
 	}
 }

src/main/java/kcc/web/MainController.java

@@ -216,6 +216,10 @@ public class MainController {
     @Value("#{globalSettings['Globals.sso.pwFindUrl']}")
     private String pwFindUrl_Global;
 	
+    /** 구동 환경 */
+	@Value("#{globalSettings['Globals.prod.islocal']}")
+	private String environment;
+	
 	@RequestMapping(value = "/{siteId}/web/main/mainPage_keri.do")
 	public String siteMainPage_keri(@PathVariable("siteId") String siteId , HttpServletRequest request, ModelMap model) throws Exception{
 		//메인이미지
@@ -376,7 +380,6 @@ public class MainController {
 	@RequestMapping(value = "/web/main/mainPage.do")
 	public String siteMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{
 		//메인이미지
-		LoginVO testVO = (LoginVO)request.getSession().getAttribute("APILoginVO");
 		String referer = (String)request.getHeader("REFERER");
 		
 		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
@@ -599,6 +602,7 @@ public class MainController {
 		model.addAttribute("returnSiteCode", returnSiteCode);
 		model.addAttribute("joinUrl", joinUrl);
 		model.addAttribute("modifyUrl", modifyUrl);
+		model.addAttribute("environment", environment); //로그인, 회원가입 URL 환경에 따른 구분 ex) local, dev, svr
 		
 		
 		return "web/com/webCommonHeader";

src/main/resources/egovframework/egovProps/globals_dev.properties

@@ -148,7 +148,7 @@ Globals.pdf.webpath=/pdf/out/
 
 #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12
 #\uac1c\ubc1c\uc11c\ubc84
-Globals.prod.islocal=local
+Globals.prod.islocal=dev
 #\uc2e4\uc11c\ubc84
 #Globals.prod.islocal=real
 

src/main/resources/egovframework/egovProps/globals_svr.properties

@@ -148,9 +148,9 @@ Globals.pdf.webpath=/pdf/out/
 
 #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12
 #\uac1c\ubc1c\uc11c\ubc84
-Globals.prod.islocal=local
+#Globals.prod.islocal=local
 #\uc2e4\uc11c\ubc84
-#Globals.prod.islocal=real
+Globals.prod.islocal=real
 
 
 #\ub300\uc6a9\ub7c9 innorix license

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

@@ -400,6 +400,7 @@
 			 WHERE EMPLYR_ID = #id#
 	</update>
 	<select id="loginDAO.APIActionLogin" resultMap="login">
+		/* 임시.*NOT_SQL_LOG.* loginDAO.APIActionLogin */
 			SELECT mber_id AS id
 				, mber_nm AS name
 				, password AS password
@@ -420,7 +421,8 @@
 				AND mber_sttus = 'P'
 			</isEmpty>
 	</select>
-	<select id="loginDAO.selectOffeduMberChk" resultMap="login">
+	<select id="loginDAO.selectOffeduMberChk" resultClass="loginVO">
+		/* 임시.*NOT_SQL_LOG.* loginDAO.selectOffeduMberChk */
 			SELECT mber_id AS id
 				, ESNTL_ID AS uniqId
 			FROM lettngnrlmber a

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml

@@ -872,46 +872,15 @@
     </update>
     
     <select id="userManageDAO.selectOffeduUser" parameterClass="userVO" resultClass="userVO">
+   	 /* 임시.*NOT_SQL_LOG.* userManageDAO.selectOffeduUser */
     	SELECT a.mber_id AS mberId,
 		       a.esntl_Id AS esntlId
 		FROM   lettngnrlmber a
 		WHERE a.mber_id = #mberId#
     </select>
     
-	<!-- <insert id="userManageDAO.insertOffeduUser">
-    	INSERT
-		INTO   lettngnrlmber
-		       (
-		              mber_id,
-		              password,
-		              mber_nm,
-		              mber_sttus,
-		              mbtlnum,
-		              group_id,
-		              sbscrb_de,
-		              esntl_id,
-		              dept,
-		              mber_seq,
-		              frst_regist_pnttm,
-		              last_updt_pnttm
-		       )
-		       VALUES
-		       (		
-		       			'12323'
-		              , '1'
-		              , #emplyrNm#
-		              , #emplyrSttusCode#
-		              , #moblphonNo#
-		              , NULL
-		              ,	SYSDATE
-		              ,	#uniqId#
-		              , NULL
-		              , #mberSeq#
-		              , SYSDATE
-		              , SYSDATE
-		       )
-	</insert> -->
 <insert id="userManageDAO.insertOffeduUser" parameterClass="userVO">
+	/* 임시.*NOT_SQL_LOG.* userManageDAO.insertOffeduUser */
     	INSERT
     	INTO lettngnrlmber
     	(

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -148,8 +148,22 @@ function usrJoin(){
 						<span>GO</span>
 					</button>
 					<div class="area_right">
+						<!-- local -->
+						<c:if test="${environment eq 'local' }">
 							<p class="login_info header_login_wrap"><a href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do" class="header_login"><i></i>로그인</a></p>
 							<p class="login_info"><a href="#" onclick="usrJoin();" class="header_join" target="blank" title="새창열림"><i></i>회원가입</a></p>
+						</c:if>
+						<!-- dev -->
+						<c:if test="${environment eq 'dev' }">
+							<p class="login_info header_login_wrap"><a href="http://223.255.205.7/user/member/loginForm.do&eduOff=Y" class="header_login"><i></i>로그인</a></p> <!-- e-배움터 개발서버 -->
+							<p class="login_info"><a href="http://223.255.205.7/user/usrservice/selectUserSeView.do&eduOff=Y" class="header_join" title="새창열림"><i></i>회원가입</a></p> <!-- e-배움터 개발서버 -->
+						</c:if>
+						<!-- svr -->
+						<c:if test="${environment eq 'svr' }">
+							<p class="login_info header_login_wrap"><a href="https://edu-copyright.or.kr/user/member/loginForm.do&eduOff=Y" class="header_login"><i></i>로그인</a></p> <!-- e-배움터 운영서버 -->
+							<p class="login_info"><a href="https://edu-copyright.or.kr/user/usrservice/selectUserSeView.do&eduOff=Y" class="header_join"  title="새창열림"><i></i>회원가입</a></p> <!-- e-배움터 운영서버 -->
+						</c:if>
+						
 						<div class="btn_util">
 							<button class="btn_minus" onClick="zoomOut();" title="글자 확대"></button>
 							<button class="btn_plus" onClick="zoomIn();" title="글자 축소"></button>
@@ -218,8 +232,18 @@ function usrJoin(){
 					<!-- 로그인 관련 모바일 화면 -->
 					<c:choose>
 						<c:when test="${empty LoginVO or empty ssoLoginVO}">
+						<c:if test="${environment eq 'local' }">
 							<button type="button" class="btn_mobile btn_login" onclick="location.href='${pageContext.request.contextPath}/web/user/login/ssoLogin.do'" title="로그인"></button>
 							<button type="button" class="btn_mobile btn_join" onclick="javascript:usrJoin();" title="회원가입"></button>
+						</c:if>
+						<c:if test="${environment eq 'dev' }">
+							<button type="button" class="btn_mobile btn_login" onclick="location.href='http://223.255.205.7/user/member/loginForm.do&eduOff=Y'" title="로그인"></button>
+							<button type="button" class="btn_mobile btn_join" onclick="location.href='http://223.255.205.7/user/usrservice/selectUserSeView.do&eduOff=Y'" title="회원가입"></button>
+						</c:if>
+						<c:if test="${environment eq 'svr' }">
+							<button type="button" class="btn_mobile btn_login" onclick="location.href='https://edu-copyright.or.kr/user/member/loginForm.do&eduOff=Y'" title="로그인"></button>
+							<button type="button" class="btn_mobile btn_join" onclick="location.href='https://edu-copyright.or.kr/user/usrservice/selectUserSeView.do&eduOff=Y'" title="회원가입"></button>
+						</c:if>
 						</c:when>
 						<c:when test="${!empty LoginVO and !empty ssoLoginVO}">
 							<button type="button" class="btn_mobile btn_logout" onclick="location.href='${pageContext.request.contextPath}/web/uat/uia/actionLogout.do'" title="로그아웃"></button>