From 210ba71901f6375672c7debb0d3aaaeb1d74df57 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@nismail.iie.ac.cn>
Date: Sat, 6 Oct 2018 15:01:10 +0800
Subject: [PATCH] =?UTF-8?q?domainSub=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8D=81?=
 =?UTF-8?q?=E5=85=AD=E8=BF=9B=E5=88=B6=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E6=91=98=E8=A6=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5bug=E6=9B=B4=E6=94=B9=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E7=AD=96=E7=95=A5=E8=A1=A8=E5=8D=95=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=20dnat?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E5=9C=B0=E5=9D=80=E6=B1=A0=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E5=B1=9E=E6=80=A7=20snat=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B1=A0=E9=9A=90=E8=97=8F=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/FileTransferCfgService.java |  3 -
 .../views/cfg/intercept/strateagy/form.jsp    |  2 +-
 .../cfg/maintenance/ipMultiplexPool/form.jsp  |  2 +-
 .../maintenance/ipMultiplexPool/snatform.jsp  |  4 +-
 .../views/cfg/whitelist/domianSubList.jsp     | 72 ++++++++++++++++---
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 5004caeb5..6a193fb89 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -556,9 +556,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		if(isAudit==1){
-				
-				entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
-				
 				Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
 				groupRelationList=map.get("groupList");
 				digestRegionList=map.get("dstList");
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 9a08cff0a..db6801544 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
@@ -154,7 +154,7 @@ var switchKeyringType=function(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="keyring_type"/></label>
 								            <div class="col-md-6">
-								                 <select name="keyringType" class="selectpicker show-tick form-control">
+								                 <select name="keyringType" class="selectpicker show-tick form-control required">
 													<option value="" <c:if test="${empty cfg.keyringType}">selected</c:if>><spring:message code="select"/></option>
 													<c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE')}" var="keyringType">
 															<option value="${keyringType.itemCode}" <c:if test="${_cfg.keyringType==keyringType.itemCode}">selected</c:if> ><spring:message code="${keyringType.itemValue}"/></option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index b1a0d8865..4902775a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -174,7 +174,7 @@ $(function(){
 											    <div for="port"></div>
 									        </div>
 									    </div>
-									   <div class="col-md-6">
+									   <div class="col-md-6 hidden">
 											<div class="form-group ">
 												<label class="control-label col-md-3"><font color="red">*</font>
 													<spring:message code="direction" /></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
index 35adc225e..dd870e5e8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
@@ -150,8 +150,8 @@ $(function(){
 											</div>
 										</div>
 									</div>
-									<div class="row">
-									    <div class="col-md-6 hidden">
+									<div class="row hidden">
+									    <div class="col-md-6 ">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
 									            <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
index 232fb4b7c..1a1b5ab7e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -159,18 +159,72 @@
 							</div>
 						</div>
 						</div>
+						<c:if test="${cfg.isHexbin==0 }">
 						<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label><spring:message code='whether_hexbinary' />:</label>
-								<label>
-									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
-									</c:forEach>
-								</label>
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
 							</div>
 						</div>
-					</div> 
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
 				</div>
 			</c:if>
 		</c:forEach>