From a97c2b51c05cb8b006447a73ce3cd743c2c40ae6 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 24 Jun 2019 13:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DResponsePage=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=AD=9B=E9=80=89=E6=97=A0=E6=95=88bug=E3=80=81?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/domain/configuration/PxyObjKeyring.java | 2 +-
 .../WEB-INF/views/cfg/intercept/strateagy/list.jsp       | 2 +-
 .../WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp    | 9 ++++++++-
 .../WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp   | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
index bff34e9ed..bd293de29 100644
--- a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
+++ b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
@@ -25,7 +25,7 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
 	@ExcelField(title="expire_after",sort=5)
 	private Integer expireAfter;
 	private String publicKeyAlgo;
-	@ExcelField(title="crl",sort=5)
+	@ExcelField(title="CRL",sort=5)
 	private String crl;
 	@ExcelField(title="issuer",sort=6)
 	private String issuer;
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index aae4162aa..eedee2188 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -314,7 +314,7 @@
 									<th column="private_key_file" ><spring:message code="private_key_file"/></th>
 									<th column="public_key_file" ><spring:message code="public_key_file"/></th>
 									<th column="expire_after" ><spring:message code="expire_after"/></th>
-									<th column="crl" ><spring:message code="CRL"/></th>
+									<th column="CRL" ><spring:message code="CRL"/></th>
 									<th column="issuer" ><spring:message code="issuer"/></th>
 									<th column="certificate_subject" ><spring:message code="certificate_subject"/></th>
 									<th column="not_before_time" ><spring:message code="not_before_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp
index 3fb6f4381..07f49890c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileResponsePage/list.jsp
@@ -42,7 +42,12 @@
 			$("#"+closeId).hide();
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
-		}); 
+		});
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 
 </script>
@@ -72,6 +77,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/fileResponsePage/list" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp
index 86fd4ae2b..b9d93115a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileTrafficMirror/list.jsp
@@ -93,7 +93,7 @@
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
-												<form:option value="cfgDesc"><spring:message code="profile_name"></spring:message></form:option>
+												<form:option value="cfgDesc"><spring:message code="address_name"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 												<form:option value="addrType"><spring:message code="mirror_addr_type"></spring:message></form:option>
 												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>