diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index 824a809a..c2ff6b2e 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -82,16 +82,6 @@ public class ReadController extends NlibCommonController { return retJsp; } - if(!isValidCsrfToken(request, csrfToken)) { - if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { - // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 - return "redirect:/cart/listCartItems.do?cartTypeCd=2"; - } else { - model.addAttribute("message", "잘못된 접근입니다."); - return retJsp; - } - } - if(readVO == null || StringUtil.isEmpty(readVO.getSelItems())) { if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index a47f1c8f..c0a95858 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -238,16 +238,6 @@ public class RentController extends NlibCommonController return "nlib/rent/confirmRent"; } - if(!isValidCsrfToken(request, csrfToken)) { - if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { - // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 - return "redirect:/cart/listCartItems.do"; - } else { - model.addAttribute("message", "잘못된 접근입니다."); - return "nlib/rent/confirmRent"; - } - } - if(rentVO == null || StringUtil.isEmpty(rentVO.getSelItems())) { if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index a0fadd97..c4d27087 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -225,7 +225,7 @@ public class NlibSearchController extends NlibCommonController { } secondClassList.get(i).put("cnt", Integer.toString(count)); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); @@ -374,10 +374,6 @@ public class NlibSearchController extends NlibCommonController { imagePath = StringUtil.getString(vo.getRprsThumbUrl(),""); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) - String token = generateCsrfToken(request); - model.addAttribute("csrfToken", token); - model.addAttribute("imageType",imageType); model.addAttribute("imagePath",imagePath); model.addAttribute("keywordList",keywordList); @@ -473,7 +469,7 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); return "nlib/search/getDetailedSearchFormPopup"; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 9eddf7b5..d6f70077 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -322,10 +322,10 @@ function goList(){
- - + + - + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp index 1c8e6b4b..d8173659 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp @@ -110,10 +110,6 @@ function fn_insertRentItems() { } -function fn_gotoDetail(masterId) { - alert("상세보기 준비중 : " + masterId); -} - function fn_searchHome() { location.href = "/search/searchList.do"; } @@ -191,7 +187,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 @@ -217,7 +213,7 @@ $(document).ready(function() { 방문열람
-
${rent.title }
+
${rent.title }

${rent.useStatusNm }

${rent.rtnExpctDd }
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index 09d75d92..25b41881 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -520,37 +520,27 @@ function gfn_getDetail(masterId, host) { return; } -function gfn_rentItem(mngOrgCd, masterId, token) { +function gfn_rentItem(mngOrgCd, masterId) { if(gfn_isEmpty(masterId)) { alert("자료ID 정보가 없습니다."); return; } - - if(gfn_isEmpty(token)) { - alert("잘못된 접근입니다."); - return; - } - var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token; + var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId; gfn_openNewWindow(url); return; } -function gfn_reserveReadItem(mngOrgCd, masterId, token) { +function gfn_reserveReadItem(mngOrgCd, masterId) { if(gfn_isEmpty(masterId)) { alert("자료ID 정보가 없습니다."); return; } - if(gfn_isEmpty(token)) { - alert("잘못된 접근입니다."); - return; - } - - var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token; + var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId; gfn_openNewWindow(url); return;