修改拦截证书策略模块 拦截类型修改失败bug

清表sql增加证书表清楚
ip白名单列表详情去掉方向和协议

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) {
 				// 获取公钥信息

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>

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_before_time=Certificate Start Time
-not_After_Time=Certificate End Time
+not_after_time=Certificate End Time
 certificate_validity=Certificate Validity Period
 end_entity=End-entity Certificate
 header=Header

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;
+DELETE FROM ssl_keyword_cfg;
+DELETE FROM pxy_obj_keyring;

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>

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> --%>
-						<div class="row">
+						<%-- <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>