From b371109541cc546a09e9cfabaa33ca1920440613 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 21 Dec 2021 17:39:03 +0900 Subject: [PATCH] =?UTF-8?q?properties=20=EC=95=94=ED=98=B8=ED=99=94=20,=20?= =?UTF-8?q?=EC=86=8C=EC=9E=A5=EC=9E=90=EB=A3=8C=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EA=B2=80=EC=83=89=EC=8B=9C=20=EC=83=9D=EC=82=B0=EB=85=84?= =?UTF-8?q?=EB=8F=84=20=EC=A0=81=EC=9A=A9=EB=B2=84=ED=8A=BC=EC=9D=B4=20?= =?UTF-8?q?=EC=95=84=EB=8B=90=EB=96=88=20=EC=A0=81=EC=9A=A9=EC=A0=9C?= =?UTF-8?q?=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nlib/cmm/web/EncryptorConfigTest.java | 14 ++++++++------ .../egovframework/spring/context-common.xml | 2 +- .../jsp/nlib/collection/searchList.jsp | 18 ++++++++++++++++-- src/main/webapp/js/search/reference.js | 19 ++++++++++++++----- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/src/main/java/nlib/cmm/web/EncryptorConfigTest.java b/src/main/java/nlib/cmm/web/EncryptorConfigTest.java index c324d500..4c307f97 100644 --- a/src/main/java/nlib/cmm/web/EncryptorConfigTest.java +++ b/src/main/java/nlib/cmm/web/EncryptorConfigTest.java @@ -6,6 +6,8 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; import nlib.cmm.NlibCommonController; @@ -36,15 +38,15 @@ public class EncryptorConfigTest { private static final Logger log = LoggerFactory.getLogger(EncryptorConfigTest.class); - static void EncryptorTest(String key, List valueList) { + @RequestMapping(value = "/system/EncryptorTest.do") + public String EncryptorTest(String key,String value,ModelMap model) { StandardPBEStringEncryptor pbeEnc = new StandardPBEStringEncryptor(); pbeEnc.setAlgorithm("PBEWithMD5AndDES"); pbeEnc.setPassword(key); // PBE 값(XML PASSWORD설정) + log.info("키값 : "+ key + " 암호화할 값 : " + value + " -> 암호화된 값 : " + pbeEnc.encrypt(value)); - for( int i = 0; i< valueList.size();i++) - { - log.debug(valueList.get(i).toString() +" : " + pbeEnc.encrypt(valueList.get(i).toString())); - } - + model.addAttribute("code", "정상"); + model.addAttribute("message", "정상적으로 처리되었습니다."); + return "nlib/cmm/common"; } } \ No newline at end of file diff --git a/src/main/resources/egovframework/spring/context-common.xml b/src/main/resources/egovframework/spring/context-common.xml index d27d6b8e..dac0d6a4 100644 --- a/src/main/resources/egovframework/spring/context-common.xml +++ b/src/main/resources/egovframework/spring/context-common.xml @@ -74,7 +74,7 @@ - + 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 6dcc98c7..cfec511e 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -192,7 +192,21 @@ function fnTabMoveSch(collection){ $("#pageIndex").val(1); fnFilterSch(); } -function fnFilterSch(){ +function fnFilterSch(creatYn){ + var filter_creatYyyy = ""; + if(!(creatYn == true || filter_creatYyyy == 'date')) + { + $("#m-year-1").prop('checked',true); + $("#creatYyyyStart").val(""); + $("#creatYyyyEnd").val(""); + $("#creatYyyyYn").prop('checked',false); + } + if(!$("#m-year-2").prop('checked')) + { + $("#creatYyyyStart").val(""); + $("#creatYyyyEnd").val(""); + $("#creatYyyyYn").prop('checked',false); + } document.referencelistForm.action="/search/searchList.do"; document.referencelistForm.submit(); } @@ -417,7 +431,7 @@ function fn_search_article(pageIndex) { style="display:none;" placeholder="검색어를 입력하세요." value="" maxlength="50" /> style="display:none;" placeholder="결과내재검색" value="" maxlength="50" /> - + diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js index 84309f7f..6b70de96 100644 --- a/src/main/webapp/js/search/reference.js +++ b/src/main/webapp/js/search/reference.js @@ -90,7 +90,7 @@ function filter_creatYyyyAply(){ $("#filter_mylist").val(filter_mylist); } - fnFilterSch(); + fnFilterSch(true); }); } @@ -235,8 +235,16 @@ function reference_detailFilterDel(){ } } } - }else - { + }else if($(this).attr('name') == "creat_date" || $(this).attr('name') == "creat_all") + { + filter_mylist = filter_mylist.replace($(this).attr('name')+",",''); + + $("#m-year-1").prop('checked',true); + $("#creatYyyyStart").val(""); + $("#creatYyyyEnd").val(""); + $("#creatYyyyYn").prop('checked',false); + } + else{ filter_mylist = filter_mylist.replace($(this).attr('name')+",",''); //생산년도는 input이 2개라 따로처리 @@ -249,6 +257,7 @@ function reference_detailFilterDel(){ } } + $("#filter_mylist").val(filter_mylist); fnFilterSch(); }); @@ -307,10 +316,10 @@ function fnLabel_reference(){ } } else if(mylist_arr[j].indexOf("creat_all") >= 0){ - $("#reference_fillter_append").append("
  • 생산년도 > 전체
    • ").text(); + $("#reference_fillter_append").append("
  • 생산년도 > 전체
    • ").text(); } else if(mylist_arr[j].indexOf("creat_date") >= 0){ - $("#reference_fillter_append").append("
  • 생산년도 > " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"
    • ").text(); + $("#reference_fillter_append").append("
  • 생산년도 > " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"
    • ").text(); }else if(mylist_arr[j].indexOf("agency") >= 0){ var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text();