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 c09195f9..1430702e 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -382,6 +382,63 @@ public class EgovLoginController { } } + + /** + * 임시사용 - 개발서버에서 select방식 로그인을 유지하기 위한 + * + * @return String + * @exception Exception + */ + @RequestMapping(value = "/web/user/login/ssoDevLogin.do") + public String ssoDevLogin(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map commandMap, HttpSession session) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + if ("".equals(s_userCheckNInfo)) return "redirect:/web/main/mainPage.do"; + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + + /* + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (isAuthenticated) + return "redirect:/web/main/mainPage.do"; + */ + + // 로그인필요 URL 호출하여 온경우 + String beforeUrl = (String) commandMap.get("beforeUrl"); + String message = (String) commandMap.get("message"); + String test = (String) commandMap.get("test"); + + // 실서버 적용시 바꾸기 + String returnSiteUrl = returnSiteUrlGlobal; + String returnSiteCode = returnSiteCodeGlobal; + String idFindUrl = idFindUrl_Global; + String pwFindUrl = pwFindUrl_Global; + String joinUrl = joinUrl_Global; + + model.addAttribute("returnSiteUrl", (URLEncoder.encode(returnSiteUrl))); + model.addAttribute("returnSiteCode", returnSiteCode); + model.addAttribute("idFindUrl", idFindUrl); + model.addAttribute("pwFindUrl", pwFindUrl); + model.addAttribute("joinUrl", joinUrl); + + model.addAttribute("beforeUrl", beforeUrl); + model.addAttribute("message", message); + model.addAttribute("environment", environment); + //로컬은 셀렉트박스 로그인 + //개발은 e배움터 개발서버 로그인 + //운영은 e배움터 운영서버 로그인 +// initRsa(request); + if (test != null && test.equals("test")) { + return "web/kccadr/login/SsoLoginUsr3"; + } else { + return "web/kccadr/login/SsoLoginUsr"; + } + } + @RequestMapping(value = "/web/user/oraSms/sendSms.do") public String oraSmsSend() throws Exception { @@ -717,7 +774,7 @@ public class EgovLoginController { SsoLoginVO ssologinVO = new SsoLoginVO(); - if ((ProfileUtil.isLocal() || ProfileUtil.isTLocal()) && "Y".equals(loginVO.getIsSelect())) { //비 sso login + if ((ProfileUtil.isLocal() || ProfileUtil.isTLocal() || ProfileUtil.isDev()) && "Y".equals(loginVO.getIsSelect())) { //비 sso login loginVO.setPassword("1"); loginVO.setStatusAll("N"); @@ -896,23 +953,39 @@ public class EgovLoginController { System.out.println("==13=="); // LoginVO세션에 사용자 정보 넣기 resultVO.setMembSeq(ssologinVO.getMembSeq()); + System.out.println("==131=="); resultVO.setMembId(ssologinVO.getMembId()); + System.out.println("==132=="); resultVO.setMembName(ssologinVO.getMembName()); + System.out.println("==133=="); resultVO.setMembSeq(ssologinVO.getMembSeq()); + System.out.println("==134=="); resultVO.setMembCi(ssologinVO.getMembCi()); + System.out.println("==135=="); resultVO.setMembEmail(ssologinVO.getMembEmail()); + System.out.println("==136=="); resultVO.setMembCelnum(ssologinVO.getMembCelnum()); + System.out.println("==137=="); resultVO.setMembBirth(ssologinVO.getMembBirth()); + System.out.println("==138=="); resultVO.setMembSmsRecpYn(ssologinVO.getMembSmsRecpYn()); + System.out.println("==139=="); resultVO.setMembEmailRecpYn(ssologinVO.getMembEmailRecpYn()); + System.out.println("==1311=="); resultVO.setSexCode(ssologinVO.getSexCode()); + System.out.println("==1312=="); resultVO.setDispsettMembDivisCode(ssologinVO.getDispsettMembDivisCode()); + System.out.println("==1313=="); resultVO.setCorpnum(ssologinVO.getCorpnum()); + System.out.println("==1314=="); resultVO.setBuisnRegnum(ssologinVO.getBuisnRegnum()); + System.out.println("==1315=="); resultVO.setCompTitle(ssologinVO.getCompTitle()); + System.out.println("==1316=="); // 2. spring security 연동 request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성 + System.out.println("@@@@로그인VO:"+resultVO+"@@@@@@"); UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index fefa0276..f0cb3d43 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -236,10 +236,11 @@ public class FndtnEnhanceTrnController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - if (loginVO == null || ssoLoginVO == null) { + // 231031 비로그인으로 강의 목록 조회 가능하게 요청 + /*if (loginVO == null || ssoLoginVO == null) { //이전 url 처리(beforeSiteUrl)_이준호_220228추가 return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. - } + } */ //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); @@ -275,22 +276,23 @@ public class FndtnEnhanceTrnController { } List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); - + // 231031 비로그인으로 강의 목록 조회 가능하게 요청 // 리스트 row마다 신청 확인하기 - vEPrcsDetailVOList.stream().forEach(t->{ - VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); - vEEduAplctReqVO.setUserId(loginVO.getUniqId()); - vEEduAplctReqVO.setLctrDivCd(t.getLctrDivCd()); - vEEduAplctReqVO.setPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd()); - vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); - VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); - // VO를 먼저 null 체크 후 진행해야 에러안남 - // vEEduAplctVO != null && - if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { - t.setAprvlCd(vEEduAplctVO.getAprvlCd()); - } - }); - + if(loginVO != null) { + vEPrcsDetailVOList.stream().forEach(t->{ + VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); + vEEduAplctReqVO.setUserId(loginVO.getUniqId()); + vEEduAplctReqVO.setLctrDivCd(t.getLctrDivCd()); + vEEduAplctReqVO.setPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd()); + vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); + VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); + // VO를 먼저 null 체크 후 진행해야 에러안남 + // vEEduAplctVO != null && + if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { + t.setAprvlCd(vEEduAplctVO.getAprvlCd()); + } + }); + } //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); @@ -299,6 +301,7 @@ public class FndtnEnhanceTrnController { model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("loginVO", loginVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index fb89a983..09075b59 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -128,11 +128,16 @@ public class CndtnTrgtMngController { public String trgtList( @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO , ModelMap model + , HttpServletRequest request ) throws Exception { //로그인 처리==================================== //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + System.out.println("loginVO.getAuthority() :: "+ loginVO.getAuthority()); + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; diff --git a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml index c237f5f7..0181e419 100644 --- a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml @@ -90,12 +90,11 @@ - - - - - - - + + +
@@ -373,8 +374,10 @@ $(document).ready(function(){ - - + + + + @@ -384,8 +387,10 @@ $(document).ready(function(){ 신청기간 교육기간 신청자/정원 - 상태 - 교육신청 + + 상태 + 교육신청 + @@ -409,23 +414,30 @@ $(document).ready(function(){ / - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + diff --git a/src/main/webapp/visitEdu/adm/publish/00_guide.html b/src/main/webapp/visitEdu/adm/publish/00_guide.html index 36c5ecd4..42428492 100644 --- a/src/main/webapp/visitEdu/adm/publish/00_guide.html +++ b/src/main/webapp/visitEdu/adm/publish/00_guide.html @@ -36,8 +36,8 @@ @@ -48,28 +48,28 @@

남은내역

diff --git a/src/main/webapp/visitEdu/adm/publish/list01.html b/src/main/webapp/visitEdu/adm/publish/list01.html index 5753054b..64b7e435 100644 --- a/src/main/webapp/visitEdu/adm/publish/list01.html +++ b/src/main/webapp/visitEdu/adm/publish/list01.html @@ -8,21 +8,21 @@ 강사 목록 < 강사관리 < 청소년 찾아가는 저작권 교육 - - - - - - + + + + + + - - - - - - - + + + + + + + @@ -31,7 +31,7 @@
-

한국저작권위원회 KOREA COPYRIGHT COMMISSION

diff --git a/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup01.html b/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup01.html index cf9d5eec..ba7295da 100644 --- a/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup01.html +++ b/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup01.html @@ -7,11 +7,11 @@ 반려사유 - - - - - + + + + +
diff --git a/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup02.html b/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup02.html index 83fca8be..1ef5a884 100644 --- a/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup02.html +++ b/src/main/webapp/visitEdu/adm/publish/list01_detail01_popup02.html @@ -7,11 +7,11 @@ 거주지 선택 - - - - - + + + + +
@@ -33,14 +33,14 @@
  • 대전광역시
    • - 다음 + 다음

    ·시/군/구 선택

    - 다음 + 다음

    ·읍/면/동 선택

      diff --git a/src/main/webapp/visitEdu/adm/publish/list02.html b/src/main/webapp/visitEdu/adm/publish/list02.html index 6cc66dc9..e7410839 100644 --- a/src/main/webapp/visitEdu/adm/publish/list02.html +++ b/src/main/webapp/visitEdu/adm/publish/list02.html @@ -8,21 +8,21 @@ 강사신청 목록 < 강사신청관리 < 청소년 찾아가는 저작권 교육 - - - - - - + + + + + + - - - - - - - + + + + + + + @@ -31,7 +31,7 @@
      -

      한국저작권위원회 KOREA COPYRIGHT COMMISSION