From 23d60a212862cf51e13531029c3ce77cd207a5cb Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 31 Oct 2023 14:16:41 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=84=9C=EB=B2=84=20=EA=B8=B0=EC=A4=80=20=ED=97=A4?= =?UTF-8?q?=EB=8D=94=EC=97=90=20=EA=B0=9C=EB=B0=9C=EC=9E=90=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 37 ++++++----- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 1 + .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 6 +- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 66 +++++++++++-------- 4 files changed, 63 insertions(+), 47 deletions(-) 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 1d5acbbf..04ec0601 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -231,10 +231,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); @@ -270,22 +271,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); @@ -294,6 +296,7 @@ public class FndtnEnhanceTrnController { model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("loginVO", loginVO); 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 742f28fa..c8cff4d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -203,6 +203,7 @@ function usrJoin(){ + diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index b951d311..ed4b322e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -258,19 +258,19 @@ function instrChk(){ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 0dae3fc3..676ba635 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -17,7 +17,6 @@ $(document).ready(function(){ - $('.tab_button').click(function(){ var type = $(this).data('info'); // list 타입이면 return; @@ -337,14 +336,16 @@ $(document).ready(function(){
- + + +
@@ -373,8 +374,10 @@ $(document).ready(function(){ - - + + + + @@ -384,8 +387,10 @@ $(document).ready(function(){ 신청기간 교육기간 신청자/정원 - 상태 - 교육신청 + + 상태 + 교육신청 + @@ -409,23 +414,30 @@ $(document).ready(function(){ / - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + From 0ddf1c232d3f9501bd1da3e209da74742bf0bf0e Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 31 Oct 2023 14:26:37 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=84=9C=EB=B2=84=20=EA=B0=9C=EB=B0=9C=EC=9E=90?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=9D=84=20=EC=9C=84=ED=95=9C=20sso?= =?UTF-8?q?DevLogin.do=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/EgovLoginController.java | 57 +++++++++++++++++++ .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 2 +- 2 files changed, 58 insertions(+), 1 deletion(-) 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..16fadacc 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 { 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 c8cff4d6..2dcd0578 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -203,7 +203,7 @@ function usrJoin(){ - + From 48e67d18d7657668f4527361742f8c112b493999 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 31 Oct 2023 15:05:50 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=9E=90=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/let/uat/uia/web/EgovLoginController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 16fadacc..089a2dad 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -953,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); From abf2de2f6812120fb225157708b201d0ad38c151 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 31 Oct 2023 15:13:51 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 089a2dad..1430702e 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -774,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"); From 4e91991a4fcbf2fa22f69e3fe33b05dde7f677bf Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 31 Oct 2023 15:32:11 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=B6=84=EC=84=9D=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java | 5 +++++ .../sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml | 5 ++--- .../oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp | 2 +- .../oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) 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 @@ - + @@ -518,7 +518,7 @@
-

한국저작권위원회 저작권 교육 시스템

+

한국저작권위원회 저작권 교육 시스템

진주 [52852] 경상남도 진주시 충의로 19, 1/2/5층 ☎ 대표번호 055.792.0000

서울 [04323] 서울특별시 용산구 후암로 107, 5/16층 ☎ 대표번호 02.2669.0010

diff --git a/src/main/webapp/visitEdu/usr/publish/login.html b/src/main/webapp/visitEdu/usr/publish/login.html index d24b241d..3d3d7337 100644 --- a/src/main/webapp/visitEdu/usr/publish/login.html +++ b/src/main/webapp/visitEdu/usr/publish/login.html @@ -6,17 +6,17 @@ 로그인 > 한국저작권위원회 저작권 교육 시스템 - - - - - + + + + + - - - - + + + + @@ -29,7 +29,7 @@
@@ -47,7 +47,7 @@
-

한국저작권위원회 저작권 교육 시스템

+

한국저작권위원회 저작권 교육 시스템

-

한국저작권위원회 저작권 교육 시스템

진주 [52852] 경상남도 진주시 충의로 19, 1/2/5층 ☎ 대표번호 055.792.0000

diff --git a/src/main/webapp/visitEdu/usr/publish/sub02.html b/src/main/webapp/visitEdu/usr/publish/sub02.html index 951fea12..9b99aea5 100644 --- a/src/main/webapp/visitEdu/usr/publish/sub02.html +++ b/src/main/webapp/visitEdu/usr/publish/sub02.html @@ -6,23 +6,23 @@ 교육신청 > 일정확인 > 청소년 대상 > 한국저작권위원회 저작권 교육 시스템 - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + @@ -35,7 +35,7 @@
@@ -53,7 +53,7 @@
-

한국저작권위원회 저작권 교육 시스템

+

한국저작권위원회 저작권 교육 시스템