From 1ec251b76cef3636c841b90ae9f7ee0df134c067 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 14 Dec 2021 15:10:19 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=98=A8=EB=9D=BC=EC=9D=B8=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=20=EB=8D=94=EB=B3=B4=EA=B8=B0=20csrf=ED=86=A0?= =?UTF-8?q?=ED=81=B0=EA=B4=80=EB=A0=A8=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/sch/web/NlibSearchController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 2d774b3d..d7baca64 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -107,9 +107,11 @@ public class NlibSearchController extends NlibCommonController { if(fromMenu) { String sfield = searchVO.getSfield(); String query = searchVO.getQuery(); + String collection = searchVO.getCollection(); searchVO = new NlibSearchVO(); searchVO.setSfield(sfield); searchVO.setQuery(query); + searchVO.setCollection(collection); } if(!fromMenu && !isValidCsrfToken(request, csrfToken)) From 93313bde75582c9f6abb7283edc9c76227d426e7 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 14 Dec 2021 15:10:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/sch/web/NlibSearchController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index d7baca64..02d3ddfe 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -104,7 +104,7 @@ public class NlibSearchController extends NlibCommonController { boolean fromMenu = request.getServletPath().contains("/search/searchList.do"); - if(fromMenu) { + if(fromMenu) { String sfield = searchVO.getSfield(); String query = searchVO.getQuery(); String collection = searchVO.getCollection(); From 22be739aa98fdbe7d09db8692474818e500c143a Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 14 Dec 2021 16:27:51 +0900 Subject: [PATCH 3/4] =?UTF-8?q?c:foreach=EB=AC=B8=20=EB=82=B4=20c:out?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp | 12 +-- .../webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp | 2 +- .../webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp | 2 +- .../jsp/nlib/bbs/selectAncmntArticle.jsp | 4 +- .../WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp | 4 +- .../WEB-INF/jsp/nlib/cart/listCartItems.jsp | 54 ++++++------- src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 56 ++++++------- .../jsp/nlib/collection/listInterests.jsp | 2 +- .../jsp/nlib/collection/searchItemDetail.jsp | 28 +++---- .../jsp/nlib/collection/searchList.jsp | 34 ++++---- .../WEB-INF/jsp/nlib/read/confirmRead.jsp | 6 +- .../WEB-INF/jsp/nlib/read/insertReadItems.jsp | 16 ++-- .../WEB-INF/jsp/nlib/rent/confirmRent.jsp | 12 +-- .../WEB-INF/jsp/nlib/rent/insertRentItems.jsp | 18 ++--- .../search/getDetailedSearchFormPopup.jsp | 16 ++-- .../WEB-INF/jsp/nlib/userInfo/getMyHome.jsp | 80 +++++++++---------- .../WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp | 2 +- 17 files changed, 174 insertions(+), 174 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp index 48f7a594..d67eb683 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp @@ -90,12 +90,12 @@ $(window.document).ready(function() { var re = /(?:\.([^.]+))?$/; myDropzone.addFile({ - name: '${attachFile.orignlFileNm}', - size:${attachFile.fileSize}, - type:re.exec('${attachFile.orignlFileNm}')[1], - attachFileId: '${attachFile.attachFileId}', - streFileNm: '${attachFile.streFileNm}', - fileSn: '${attachFile.fileSn}', + name: '', + size:, + type:re.exec('')[1], + attachFileId: '', + streFileNm: '', + fileSn: '', fileUploadType: 'uploaded' }); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp index 6ad015cd..385ce468 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp @@ -246,7 +246,7 @@ function fn_changeQuestionType(searchQuestionType) { diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 28fb8c2e..6658d1f9 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -38,7 +38,7 @@ $( document ).ready(function() { - fn_setPageTitle(""); + fn_setPageTitle("Q&A"); // 검색 수행 이벤트 $("#btnSearch").on("click", function(e) { diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp index b2db87b4..1afb343f 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp @@ -111,8 +111,8 @@ function fn_downloadFile(attachFileId, fileSn) {
파일 아이콘 - - + +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp index 338da69a..4bf71d39 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp @@ -136,8 +136,8 @@ function fn_downloadFile(attachFileId, fileSn) {
파일 - - + +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index 09fdf89d..95d555a8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -293,22 +293,22 @@ $(document).ready(function() { -

+

- - - 전체선택 (0/0) + + + 전체선택 (0/0)
자료정보
이용상태
@@ -325,26 +325,26 @@ $(document).ready(function() {
-
+
-
${cart.interestYn } - 썸네일 +
+ 썸네일 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -365,12 +365,12 @@ $(document).ready(function() {
- +
-
poss imposs">

${cart.useStatusNm }

-
${cart.rtnExpctDd }
-
poss imposs">${cart.ableRentNowNm }
-
poss imposs">${cart.ableReadNowNm }
+
poss imposs">

+
+
poss imposs">
+
poss imposs">
@@ -378,8 +378,8 @@ $(document).ready(function() {
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 855e9367..545009b7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -145,17 +145,17 @@ function fn_listPops(typeDivCd) {
  • class="swiper-slide" >
    - +
    -

    ${bannerItem.title }

    -

    ${bannerItem.bannerDesc }

    +

    +

    -

    자세히 보기 >

    +

    자세히 보기 >

  • @@ -215,7 +215,7 @@ function fn_listPops(typeDivCd) {

    어떤 자료들을 소장 중인지 키워드로 살펴보세요!

    @@ -241,11 +241,11 @@ function fn_listPops(typeDivCd) {
    @@ -296,13 +296,13 @@ function fn_listPops(typeDivCd) {
  • -
    ${itemPop.typeDivNm }
    - +
    +
    -

    주제분야-${itemPop.subjectNm }

    -

    생산기관-${itemPop.orgNm }

    -

    생산년도-${itemPop.creatYyyy }

    +

    주제분야-

    +

    생산기관-

    +

    생산년도-

  • @@ -339,18 +339,18 @@ function fn_listPops(typeDivCd) {
    - ${itemOnline.title } 표지 + <c:out value='${itemOnline.title }'/> 표지
    - ${itemOnline.title } +
      -
    • 자료유형-${itemOnline.typeDivNm }
    • -
    • 주제분야-${itemOnline.subjectNmUp }
    • -
    • 생산기관-${itemOnline.orgNm }
    • -
    • 생산년도-${itemOnline.creatYyyy }
    • +
    • 자료유형-
    • +
    • 주제분야-
    • +
    • 생산기관-
    • +
    • 생산년도-
    @@ -383,10 +383,10 @@ function fn_listPops(typeDivCd) {
    - -

    ${fn:substring(itemAncmnt.regDd,8,10) }

    ${fn:substring(itemAncmnt.regDd,2,4) }.${fn:substring(itemAncmnt.regDd,5,7) }

    +
    +

    .

    -

    [공지]${itemAncmnt.title} +

    [공지] 파일 아이콘

    @@ -400,10 +400,10 @@ function fn_listPops(typeDivCd) {
    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 bca7e596..5adb95c5 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -413,15 +413,15 @@ function goList(){
    -
    +
    -
    ${result.title }
    +
    -

    자료유형- ${result.typeDivNm } >${result.dtlsTypeDivNm}

    -

    주제분야- ${result.subjectNm } >${result.subjectNm}

    -

    생산기관-${result.orgNm }

    -

    생산년도-${result.creatYyyy }

    +

    자료유형- >

    +

    주제분야- >

    +

    생산기관-

    +

    생산년도-

    @@ -448,7 +448,7 @@ function goList(){

    이 자료와 유사한자료

    -

    ,${list } 에 있습니다

    +

    , 에 있습니다

    @@ -456,17 +456,17 @@ function goList(){
    -
    +
    - +
    - ${result.title } +
      -
    • 주제유형-${result.typeDivNm }
    • -
    • 주제분야-${result.subjectNmUp }
    • -
    • 생산기관-${result.orgNm }
    • -
    • 생산년도-${result.creatYyyy }
    • +
    • 주제유형-
    • +
    • 주제분야-
    • +
    • 생산기관-
    • +
    • 생산년도-
    diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 557e6743..65b5d4b0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -270,16 +270,16 @@ function fn_search_article(pageIndex) {
  • on">
    - checked="checked" /> - + checked="checked" /> +
    • -
      checked="checked" /> - +
      checked="checked" /> +
    • @@ -303,12 +303,12 @@ function fn_search_article(pageIndex) {
    • on"> -
      checked="checked"/>
      +
      checked="checked"/>
        -
      • checked="checked"/>
      • +
      • checked="checked"/>
      @@ -351,7 +351,7 @@ function fn_search_article(pageIndex) {
    • -
      checked="checked"/>
      +
      checked="checked"/>
    • @@ -432,15 +432,15 @@ function fn_search_article(pageIndex) {
      -
      ${result.title} +
      <c:out value='${result.title}'/> - - @@ -460,13 +460,13 @@ function fn_search_article(pageIndex) { 기타
      -
      +
      - 자료유형 : - ${result.typeCodeNm} > ${result.dtlsTypeDivNm} - 주제분야 : - ${result.subjectNmUp} > ${result.subjectNm } - 생산기관 : -${result.orgNm } - 생산년도 : -${result.creatYyyy } + 자료유형 : - > + 주제분야 : - > + 생산기관 : - + 생산년도 : -
      @@ -489,9 +489,9 @@ function fn_search_article(pageIndex) {

      - + - +
      diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index c5e45d15..fc19b3e8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -296,7 +296,7 @@ $(document).ready(function() {
      에서 @@ -304,9 +304,9 @@ $(document).ready(function() {
      사이 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index e46a59ae..d81178e9 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -99,15 +99,15 @@ function fn_listReadItems() {
      -
      썸네일 +
      썸네일 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -125,13 +125,13 @@ function fn_listReadItems() { 방문열람
      - +
      -

      ${read.useStatusNm }

      -
      ${read.rtnExpctDd }
      -
      ${read.bookLtRvStatusNm } +

      +
      +
      - (${read.rsrvDd }) + ()
      diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp index 069b6bed..20e41cff 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp @@ -223,15 +223,15 @@ $(document).ready(function() {
      -
      썸네일 +
      썸네일 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -250,10 +250,10 @@ $(document).ready(function() { 방문열람
      - +
      -
      poss imposs">

      ${rent.useStatusNm }

      -
      ${rent.rtnExpctDd }
      +
      poss imposs">

      +
      신청 불가 대출신청 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 58e46330..58e460ca 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp @@ -187,15 +187,15 @@ $(document).ready(function() {
      -
      썸네일 +
      썸네일 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -213,13 +213,13 @@ $(document).ready(function() { 방문열람
      - +
      -

      ${rent.useStatusNm }

      -
      ${rent.rtnExpctDd }
      -
      ${rent.rsrvDivNm }
      +

      +
      +

      - (${rent.rsrvDd }) + ()
      @@ -233,7 +233,7 @@ $(document).ready(function() { - ${rent.resultMessage } + 잘못된 접근이거나, 정상처리되지 않았습니다. diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp index 985493f0..a821d6c8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -468,13 +468,13 @@ function detailPopClose(){
      -
      - +
      +
        -
      • +
      @@ -502,17 +502,17 @@ function detailPopClose(){
      - - - + + +
      • - - + +
      • diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp index 5d4147b5..c598a76b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp @@ -135,7 +135,7 @@ $( document ).ready(function() {

        소장자료관 접속현황

      @@ -157,23 +157,23 @@ $( document ).ready(function() {
      - ${item.title } + <c:out value='${item.title }'/>
      - +
      -

      자료유형 :${item.typeDivNm } - > ${item.dtlsTypeDivNm } +

      자료유형 : + > -

      -

      주제분야 :${item.subjectNmUp } - > ${item.subjectNm } +

      주제분야 : + > -

      -

      생산기관 :${item.orgNm } +

      생산기관 : -

      -

      생산년도 :${item.creatYyyy } +

      생산년도 : -

      @@ -198,32 +198,32 @@ $( document ).ready(function() {
      -

      [${item.mngOrgNm }]

      +

      []

      -

      ${item.title }

      +

      - 자료유형 : ${item.typeDivNm } - > ${item.dtlsTypeDivNm } + 자료유형 : + > - - 주제분야 : ${item.subjectNmUp } - > ${item.subjectNm } + 주제분야 : + > - - 생산기관 : ${item.orgNm } - - 생산년도 : ${item.creatYyyy } - + 생산기관 : - + 생산년도 : -

      - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} - ${item.bookLtRvStatusNm} + + + + + + + +
      @@ -245,31 +245,31 @@ $( document ).ready(function() {
      -

      [${item.mngOrgNm }]

      +

      []

      -

      ${item.title }

      +

      - 자료유형 : ${item.typeDivNm } - > ${item.dtlsTypeDivNm } + 자료유형 : + > - - 주제분야 : ${item.subjectNmUp } - > ${item.subjectNm } + 주제분야 : + > - - 생산기관 : ${item.orgNm } - - 생산년도 : ${item.creatYyyy } - + 생산기관 : - + 생산년도 : -

      - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} - ${item.reqStatusDivNm} + + + + + + +
      diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp index 87234755..fd54ca45 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp @@ -736,7 +736,7 @@ function snsUnlink(snsId){
      "> -
      로고 연결완료
      +
      로고 연결완료
      From 31a3eedc585400db0a6b7d244cb375d26dd0ffcb Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 14 Dec 2021 17:34:10 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=83=81=EC=84=B8=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=ED=83=80=EC=9D=B4=ED=8B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp index 1afb343f..fe65de30 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp @@ -31,7 +31,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -공지사항 - 상세조회 +