From 92c34a108c556f21980fb7061ef0c83a98bd9868 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 24 Jun 2019 10:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dkeyring=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=20CRL=E5=88=97=E3=80=81=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E9=A2=81=E5=8F=91=E6=9C=89=E6=95=88=E6=9C=9F(=E5=A4=A9)?=
 =?UTF-8?q?=E5=8F=AF=E5=A1=AB=E5=86=99=E5=B0=8F=E6=95=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/configuration/PxyObjKeyring.java  | 1 +
 src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
index 0c497c79f..bff34e9ed 100644
--- a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
+++ b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
@@ -25,6 +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)
 	private String crl;
 	@ExcelField(title="issuer",sort=6)
 	private String issuer;
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 0124d844c..b3916ed71 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
@@ -339,7 +339,7 @@ function privateFileValidate(){
 									        <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">
-									            	 <input class="form-control required number" type="text" min="1" name="expireAfter" value="${_cfg.expireAfter}">
+									            	 <input class="form-control required number" type="text" min="1" name="expireAfter" value="${_cfg.expireAfter}" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" oninput="if(this.value>2147483647)this.value=2147483647">
 									            </div>
 											    <div for="expireAfter"></div>
 									        </div>