From df53980064930754c7ca0ef7a0ac5781d611ef0e Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 24 Oct 2023 18:23:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=97=B0=EB=8F=99=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/let/uat/uia/web/EgovLoginController.java | 4 ++++ .../exprnClsrmAplct/web/ExprnClsrmAplctController.java | 3 +++ src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) 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 bb3b671d..22a450d1 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -365,6 +365,10 @@ public class EgovLoginController { model.addAttribute("beforeUrl", beforeUrl); model.addAttribute("message", message); model.addAttribute("environment", environment); + //운영서버는 sso로그인 화면이 아닌 e배움터 로그인 화면으로 이동. + if(!"local".equals(environment)) { + return "redirect:http://223.255.205.7/user/member/loginForm.do?eduOff=Y"; + } // initRsa(request); if (test != null && test.equals("test")) { return "web/kccadr/login/SsoLoginUsr3"; diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index b4d2b784..38fb91bb 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -489,6 +489,9 @@ public class ExprnClsrmAplctController { public String exprnClsrmAplctDashboard( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { //현재 진행중인 체험교실 운영 조회 LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + if (loginVO == null) { + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } String eduAplctOrd = vEEduAplctService.selectProceedingOrd(loginVO.getUniqId()); if(eduAplctOrd != null) { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp index 5ccdb0e7..6982c80c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp @@ -12,11 +12,6 @@ $(document).ready(function(){ if(${message != null}){ alert('${message}'); } - //로컬이 아닐 시 e배움터 로그인 페이지로 이동 - var environment = '${environment}'; - if(environment != 'local'){ - location.href="http://223.255.205.7/user/member/loginForm.do?eduOff=Y"; - } }); function press(event) { if (event.keyCode == 13) actionLogin(); }