properties 암호화 , 소장자료리스트 검색시 생산년도 적용버튼이 아닐떈 적용제외

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<String> 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++)
+        model.addAttribute("code", "정상");
-        {
+        model.addAttribute("message", "정상적으로 처리되었습니다.");
-        	log.debug(valueList.get(i).toString() +" : " + pbeEnc.encrypt(valueList.get(i).toString()));
+        return "nlib/cmm/common";
-        }
-        
 	}
 }

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 = "<c:out value='${searchVO.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) {
                                         <input type="text" name="query" id="query" title="검색어" <c:if test="${!(searchVO.reQueryChk eq 'query') }">style="display:none;"</c:if> placeholder="검색어를 입력하세요." value="<c:out value='${searchVO.query}'/>" maxlength="50" />
                                         <label for="reQuery" class="blind">재검색</label>
                                          <input type="text" name="reQuery" id="reQuery" title="재검색" <c:if test="${!(searchVO.reQueryChk eq 'reQuery') }">style="display:none;"</c:if> placeholder="결과내재검색" value="<c:out value='${searchVO.reQuery}'/>" maxlength="50" />
-                                        <button type="submit">검색</button>
+                                        <button type="button" onclick="fnFilterSch();">검색</button>
                                         <button type="button" class="filter-btn">필터</button>    
                                     </div>
                                 </div>

src/main/webapp/js/search/reference.js

@@ -90,7 +90,7 @@ function filter_creatYyyyAply(){
 			$("#filter_mylist").val(filter_mylist);
 		}
 		
-		fnFilterSch();
+		fnFilterSch(true);
 	});
 	
 }
@@ -235,10 +235,18 @@ 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개라 따로처리
 		     if(deleteFilterId != "era"){
 		    	 $("#" + deleteFilterId).val($("#" + deleteFilterId).val().replace($(this).val(),''));
@@ -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("<li>생산년도 &#62; 전체<button type=\"button\" class=\"btn-del-filter\"  id=\""+second_cate_id+"\">삭제</button></li>").text();
+        	$("#reference_fillter_append").append("<li>생산년도 &#62; 전체<button type=\"button\" class=\"btn-del-filter detailFilter\"  name=\"creat_all\">삭제</button></li>").text();
         }
         else if(mylist_arr[j].indexOf("creat_date") >= 0){ 
-        	$("#reference_fillter_append").append("<li>생산년도 &#62; " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"<button type=\"button\" class=\"btn-del-filter\"  id=\""+second_cate_id+"\">삭제</button></li>").text();
+        	$("#reference_fillter_append").append("<li>생산년도 &#62; " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"<button type=\"button\" class=\"btn-del-filter detailFilter\"  name=\"creat_date\">삭제</button></li>").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("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"" + second_cate_nm + "\" name=\"first_agency_del\" >삭제</button></li>").text();