From 549d45240ee3a078c5d276d6bf7b3936d6fc8c5b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 24 Oct 2023 11:18:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95(?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=9D=80=20e=EB=B0=B0=EC=9B=80=ED=84=B0=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=EB=A1=9C=20=EC=9D=B4=EB=8F=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/uat/uia/web/APILoginContoller.java | 12 ++++++++++-- .../kcc/let/uat/uia/web/EgovLoginController.java | 12 +++++++++--- .../egovframework/egovProps/globals_svr.properties | 1 + .../sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml | 2 +- .../webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 10 ++++++---- .../WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp | 5 +++++ 6 files changed, 32 insertions(+), 10 deletions(-) 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 a0aa4e30..1e661b01 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -229,7 +229,7 @@ public class APILoginContoller { * @throws Exception */ @RequestMapping(value = "/web/chkloginKeyForEEdu.do", method = RequestMethod.POST) - public ResponseEntity> loginKeytoOffedu(@RequestBody LoginVO loginVO) throws Exception{ + public ResponseEntity> loginKeytoOffedu(LoginVO loginVO) throws Exception{ System.out.println("@@@@@@@@@찾교API시작 ID:"+loginVO.getUser_id()+"key:"+loginVO.getKey()+"@@@@@@@@@@"); Map response = new HashMap<>(); try { @@ -237,17 +237,25 @@ public class APILoginContoller { if(loginVO != null) { response.put("result_code", "1"); response.put("message", ""); - System.out.println("@@@찾교api - ID :"+loginVO.getId()+"key:"+loginVO.getKey()); + System.out.println("@@@찾교api - ID :"+loginVO.getUser_id()+"key:"+loginVO.getKey()); loginService.updateMberSeqKeyNull(loginVO); }else { response.put("result_code", "-1"); response.put("message", "인증오류입니다."); + System.out.println("@@@@@@+인증오류 -1@@@@@@"); } //찾교 mber_seq key 값 파기 System.out.println("@@@@@찾교 key 파기@@@@@@@@@@"); + System.out.println("@@@@@@response@@@@@@"+response); + System.out.println("@@@@@@code@@@@@@"+response.get("result_code")); + System.out.println("@@@@@@message@@@@@@"+response.get("message")); return ResponseEntity.ok(response); }catch (Exception e) { + System.out.println("@@@@@@@에러발생@@@@@@"); response.put("result_code", "error"); + System.out.println("@@@@@@response@@@@@@"+response); + System.out.println("@@@@@@code@@@@@@"+response.get("result_code")); + System.out.println("@@@@@@message@@@@@@"+response.get("message")); //response.put("message", "Internal Server Error: " + e.getMessage()); response.put("message", "오류발생"); return ResponseEntity.ok(response); diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 61bf3c36..bb3b671d 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -188,6 +188,10 @@ public class EgovLoginController { //암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + + /** 구동 환경 */ + @Value("#{property['Globals.prod.islocal']}") + private String environment; /* @@ -360,6 +364,7 @@ public class EgovLoginController { model.addAttribute("beforeUrl", beforeUrl); model.addAttribute("message", message); + model.addAttribute("environment", environment); // initRsa(request); if (test != null && test.equals("test")) { return "web/kccadr/login/SsoLoginUsr3"; @@ -1651,19 +1656,20 @@ public class EgovLoginController { // SsoLoginVO 세션 정보 취득 SsoLoginVO ssoLoginVO = new SsoLoginVO(); HttpSession session = request.getSession(); - ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO"); + /*ssologin에서 e배움터 API 로그인으로 변경*/ + /*ssoLoginVO = (SsoLoginVO) session.getAttribute("SSOLoginVO"); if (ssoLoginVO != null) { if (!"USRCNFRM_00000002940".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002941".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002942".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002943".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002944".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002550".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002542".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002541".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002540".equals(ssoLoginVO.getMembId()) || !"USRCNFRM_00000002533".equals(ssoLoginVO.getMembId())) { - /*BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope);*/ + BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope); BandiSSOAgent agent = new BandiSSOAgent(ssoagentinfo.getSsoUri(), ssoagentinfo.getClientId(), ssoagentinfo.getClientSecret(), ssoagentinfo.getScope()); // sso 로그아웃 agent.logout(ssoLoginVO.getAccess_token(), client_ip); } - } + }*/ } // Spring Security 로그아웃 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 771dd450..1f5ceaaf 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -151,6 +151,7 @@ Globals.pdf.webpath=/pdf/out/ #Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 Globals.prod.islocal=real +#Globals.prod.islocal=svr #\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 e57b2ed5..6bed7ed1 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 @@ -425,7 +425,7 @@