From 8b48aa4a50fd09acb086cbbbcd9279a4e369b338 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 30 Aug 2018 09:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=A6=E6=88=AA=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E7=AD=96=E7=95=A5=E6=A8=A1=E5=9D=97=20=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?bug=20=E6=B8=85=E8=A1=A8sql=E5=A2=9E=E5=8A=A0=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E8=A1=A8=E6=B8=85=E6=A5=9A=20ip=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E5=8E=BB=E6=8E=89=E6=96=B9?=
 =?UTF-8?q?=E5=90=91=E5=92=8C=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/proxy/PxyObjKeyringController.java      | 2 +-
 .../com/nis/web/dao/configuration/PxyObjKeyringDao.xml    | 3 +++
 src/main/resources/messages/message_en.properties         | 4 ++--
 src/main/resources/sql/truncate_tables.sql                | 3 ++-
 .../webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp | 8 ++++----
 6 files changed, 14 insertions(+), 10 deletions(-)

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 a31e3418f..6ebeb7d02 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
@@ -78,7 +78,7 @@ public class PxyObjKeyringController extends BaseController  {
 			MultipartFile privateKeyFileI,
 			MultipartFile publicKeyFileI,
 			RedirectAttributes redirectAttributes){
-		File file = null;
+ 		File file = null;
 		try{
 			if(publicKeyFileI != null) {
 				// 获取公钥信息
diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
index bfc5eff4b..fa9e45fa3 100644
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
@@ -247,6 +247,9 @@
       <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
+      <if test="cfgType != null and cfgDesc != ''" >
+        cfg_type = #{cfgType,jdbcType=VARCHAR},
+      </if>
       <if test="compileId != null " >
         compile_Id = #{compileId,jdbcType=VARCHAR},
       </if>
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 034e5ddbd..93faa095e 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1118,8 +1118,8 @@ public_key_file=Public Key File
 expire_after=Expire After
 issuer=Certificate Issuer
 certificate_subject=Certificate Subject
-not_Before_Time=Certificate Start Time
-not_After_Time=Certificate End Time
+not_before_time=Certificate Start Time
+not_after_time=Certificate End Time
 certificate_validity=Certificate Validity Period
 end_entity=End-entity Certificate
 header=Header
diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql
index c20906246..be594f2cf 100644
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -48,4 +48,5 @@ DELETE FROM p2p_keyword_cfg;
 DELETE FROM policy_group_info;
 DELETE FROM pptp_url_cfg;
 DELETE FROM proxy_file_strategy_cfg;
-DELETE FROM ssl_keyword_cfg;
\ No newline at end of file
+DELETE FROM ssl_keyword_cfg;
+DELETE FROM pxy_obj_keyring;
\ No newline at end of file
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 770518ed7..eb8e83681 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
@@ -237,14 +237,14 @@ var switchKeyringType=function(){
 									        <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" name="expireAfter" value="${_cfg.expireAfter}">
+									            	 <input class="form-control required number" type="text" min="1" name="expireAfter" value="${_cfg.expireAfter}">
 									            </div>
 											    <div for="expireAfter"></div>
 									        </div>
 								    </div>
 								    <div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
 									        <div class="form-group">
-									            <label class="control-label col-md-3"><spring:message code="certificate_subject"/></label>
+									            <label class="control-label col-md-3"><spring:message code="issuer"/></label>
 									            <div class="col-md-6">
 									            	<label style="padding-top:7px">${_cfg.subject}</label>
 									            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
index 79296b282..46d7897ca 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
@@ -92,7 +92,7 @@
 							</div>
 						</div>
 						</div>
-						<div class="row">
+						<%-- <div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -103,8 +103,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+						</div> --%>
+						<%-- <div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -115,7 +115,7 @@
 								</label>
 							</div>
 						</div>
-					</div>
+					</div> --%>
 				</div>
 			</c:if>
 			</c:forEach>