diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index 4d7c4cdb..01423dd0 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/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> loginKeytoOffedu(@RequestBody LoginVO loginVO){ + public ResponseEntity> loginKeytoOffedu(@RequestBody LoginVO loginVO) throws Exception{ Map 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); + 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); + } } } diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 65acdee2..353b19ed 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/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"; diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 6357fc51..73c33510 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/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 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index c7ce3d87..49744402 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/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 diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml index 78c6b6aa..708e905c 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml @@ -400,6 +400,7 @@ WHERE EMPLYR_ID = #id# - + /* 임시.*NOT_SQL_LOG.* loginDAO.selectOffeduMberChk */ SELECT mber_id AS id , ESNTL_ID AS uniqId FROM lettngnrlmber a diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml index f0711dbf..883b48b7 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml @@ -872,46 +872,15 @@ - + /* 임시.*NOT_SQL_LOG.* userManageDAO.insertOffeduUser */ INSERT INTO lettngnrlmber ( diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index a1acc145..37a3899c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -148,8 +148,22 @@ function usrJoin(){ GO
- - + + + + + + + + + + + + + + + +
@@ -218,8 +232,18 @@ function usrJoin(){ + + + + + + + + + +