From 12a77173ca0c37dd935e4558434878640fcf5c7c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Fri, 19 Jul 2019 10:31:58 +0800
Subject: [PATCH] =?UTF-8?q?expireAfter=E4=BB=8E=20form=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2,=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAExcel=EF=BC=8C=E5=AE=A1=E6=A0=B8=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=88=E9=9A=90=E8=97=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/callback/ProxyObjKeyring.java  | 2 +-
 .../configuration/proxy/PxyObjKeyringController.java        | 3 +--
 .../webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp   | 6 +++---
 .../webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp   | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java b/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java
index 7e12c56d6..6128c64dd 100644
--- a/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java
+++ b/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java
@@ -26,7 +26,7 @@ public class ProxyObjKeyring {
 	private String privateKeyFile;
 	@Expose
 	private String publicKeyFile;
-	@Expose
+	//@Expose
 	private Integer expireAfter;
 	@Expose
 	private String publicKeyAlgo;
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
index 69bd8a4ca..7a77c10ae 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
@@ -231,7 +231,6 @@ public class PxyObjKeyringController extends BaseController {
 						ResponseData data = result.getData();
 						publicKeyFileAccessUrl = data.getAccessUrl();
 						cfg.setPublicKeyFile(publicKeyFileAccessUrl);
-						;
 					}
 				}
 				if (privateKeyFileI != null) {
@@ -510,7 +509,7 @@ public class PxyObjKeyringController extends BaseController {
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), PxyObjKeyring.class);
-			String cfgIndexInfoNoExport = ",config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+			String cfgIndexInfoNoExport = ",expire_after,config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 
 			// 时间过滤
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index ae161cbf3..1c900b2b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -96,12 +96,12 @@ var switchKeyringType=function(){
 	
 	if(keyringType =='end-entity'){ //实体证书不允许输入，并且默认0
 		$("input[name=expireAfter]").val(0);
-		$(".expireAfter").addClass("hidden");
+		//$(".expireAfter").addClass("hidden");
 	}else{
 		if(expireAfter == ''){
 			$("input[name=expireAfter]").val(30);
 		}
-		$(".expireAfter").removeClass("hidden");
+		//$(".expireAfter").removeClass("hidden");
 	}
 }
 
@@ -335,7 +335,7 @@ function privateFileValidate(){
 									</div>
 								</div>
 								<div class="row ">
-									<div class="col-md-6 expireAfter">
+									<div class="col-md-6 expireAfter hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expire_after"/></label>
 									            <div class="col-md-6">
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 eedee2188..b8dcab425 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
@@ -313,7 +313,7 @@
 									<th column="keyring_type" ><spring:message code="keyring_type"/></th>
 									<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="expire_after" ><spring:message code="expire_after"/></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>
@@ -362,7 +362,7 @@
 											${fn:substring(cfg.publicKeyFile,0,20) }
 										</a>
 									</td>
-									<td>${cfg.expireAfter }</td>
+									<%--<td>${cfg.expireAfter }</td>--%>
 									<td>
 										<a href="${cfg.crl }" target="_blank" data-original-title="${cfg.crl }"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">