From ecb139bd9a83cfe56869319d3a8a0c837cc34ffc Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 7 Sep 2018 16:38:29 +0800
Subject: [PATCH] =?UTF-8?q?(1)IP=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=EF=BC=8Cip=E5=A4=8D=E7=94=A8=E5=9C=B0=E5=9D=80=E6=B1=A0?=
 =?UTF-8?q?=EF=BC=8Cdns=E6=AC=BA=E9=AA=97ip,asn=20ip=20ip=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=87=87=E7=94=A8=E6=A0=B9=E6=8D=AEfunction=5Fregion?=
 =?UTF-8?q?=5Fdict=E5=88=A4=E6=96=AD=20(2)=E7=94=B1=E4=BA=8E=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4APP=5FBUSINESS=5FTYPE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=85=B1=E7=94=A8app=E4=B8=8E=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=E4=BA=86=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=A4=E4=B8=AA=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SpecificServiceCfgController.java         |   2 +-
 .../sql/20180907/update_ip_region.sql         |   3 +
 .../WEB-INF/views/basics/asnIpCfgFormAdd.jsp  | 127 +++++++++---
 .../views/basics/asnIpCfgFormUpdate.jsp       |  92 +++++++--
 .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp |  97 ++++++++--
 .../cfg/maintenance/ipMultiplexPool/form.jsp  | 180 +++++++++---------
 .../cfg/manipulation/ipmulitiplex/form.jsp    | 135 ++++++++++++-
 .../WEB-INF/views/cfg/whitelist/ipCfgForm.jsp |  16 --
 .../views/specific/specificServiceCfgForm.jsp |   5 +-
 .../views/specific/specificServiceCfgList.jsp |   4 +-
 10 files changed, 490 insertions(+), 171 deletions(-)
 create mode 100644 src/main/resources/sql/20180907/update_ip_region.sql

diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
index 8d81b1874..2f7c9e44d 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -220,7 +220,7 @@ public class SpecificServiceCfgController extends BaseController {
 			if(cfgType==1) {
 				businessTypeList=DictUtils.getDictList("APP_BUSINESS_TYPE");
 			}else if(cfgType==3) {
-				businessTypeList=DictUtils.getDictList("APP_BUSINESS_TYPE");
+				businessTypeList=DictUtils.getDictList("BASIC_PROTOCOL_BUSINESS_TYPE");
 			}
 			List<Map<String, Object>> businessList = Lists.newArrayList();
 			//对业务分类进行排序
diff --git a/src/main/resources/sql/20180907/update_ip_region.sql b/src/main/resources/sql/20180907/update_ip_region.sql
new file mode 100644
index 000000000..edd109a05
--- /dev/null
+++ b/src/main/resources/sql/20180907/update_ip_region.sql
@@ -0,0 +1,3 @@
+UPDATE function_region_dict SET CONFIG_DIRECTION='0',config_protocol='0' WHERE function_id=300;
+UPDATE function_region_dict SET config_ip_type='4,6',config_port_pattern='1',config_direction='0',config_protocol='0',config_ip_port_show='2' WHERE function_id=401;
+UPDATE function_region_dict SET region_type=1, config_ip_type='4,6',config_port_pattern='1',config_direction='0',config_protocol='0',config_ip_port_show='1' WHERE function_id=406;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
index 9da997676..2a41c4ff5 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
@@ -6,6 +6,10 @@
 <script type="text/javascript">
 var defaultIpInfo;
 $(function(){
+	$("input[name$='destPort']").parents(".form-group").addClass("hidden");
+	$("select[name$='portPattern']").parents(".form-group").addClass("hidden");
+	$("select[name$='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name$='direction']").parents(".form-group").addClass("hidden");
 	defaultIpInfo=$(".ipInfo").clone();
 	$(".asnIpAdd").click();
 	$("#cfgFrom").validate({
@@ -36,6 +40,7 @@ var addContent = function(obj, contentClassName) {
 		reSort($(this),index);
 		index++;
 	});
+	$(".selectpicker").selectpicker("render");
 	//$(obj).addClass("hidden");
 	$("select[name$='ipType']").on("change",function(){
 		switchIpInfo(this);
@@ -104,7 +109,17 @@ var reSort=function(obj,index){
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -141,6 +156,7 @@ var reSort=function(obj,index){
 									onClick="addContent(this,'ipInfo')" title="add"></span></small>
 							</h4>
                            <div class="row ipInfo boxSolid asnIp hidden disabled">
+                           		<input type="hidden" name="asnIpCfgs[0].protocolId" value="0">
                            		<div class="row">
 									<div class="pull-right">
 										<span class="glyphicon glyphicon-remove pull-right" title="remove"
@@ -153,7 +169,7 @@ var reSort=function(obj,index){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 								            <div class="col-md-6">
 								            	 <select name="asnIpCfgs[0].ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('WHITELIST_IPTYPE')}" var="ipTypeC">
+								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 														<option value="${ipTypeC.itemCode}" 
 																<c:if test="${_cfg.asnIpCfgs[0].ipType==ipTypeC.itemCode 
 																	|| (_cfg.asnIpCfgs[0].ipType==null && ipTypeC.itemCode==4)}">
@@ -169,7 +185,7 @@ var reSort=function(obj,index){
 								        </div>
 								    </div>
 								</div>
-								<div class="row">
+								<div class="row ip">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
@@ -185,45 +201,96 @@ var reSort=function(obj,index){
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].srcIpAddress" value="${_cfg.asnIpCfgs[0].srcIpAddress}">
+								            </div>
+								            <div for="asnIpCfgs[0].srcIpAddress"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  port">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+								            <div class="col-md-6">
+								            	 <select name="asnIpCfgs[0].portPattern" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].portPattern==portPatternC.itemCode || (_cfg.asnIpCfgs[0].portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+							              			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="asnIpCfgs[0].portPattern"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].srcPort" value="${_cfg.asnIpCfgs[0].srcPort}">
+								            </div>
+								            <div for="asnIpCfgs[0].srcPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  destPort">
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
 								            <div class="col-md-6">
 								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].destIpAddress" value="${_cfg.asnIpCfgs[0].destIpAddress}">
 								            </div>
 								            <div for="asnIpCfgs[0].destIpAddress"></div>
 								        </div>
 								    </div>
-								</div>
-								<%-- <div class="row port">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="portPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="portPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
+								     <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>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
+								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].destPort" value="${_cfg.asnIpCfgs[0].destPort}">
 								            </div>
-								            <div for="destPort"></div>
+								            <div for="asnIpCfgs[0].destPort"></div>
 								        </div>
 								    </div>
+								</div>
+								<div class="row  protocol">
+									<div class="col-md-6">
+										<div class="form-group ">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="protocol" /></label>
+											<div class="col-md-6">
+												<select name="asnIpCfgs[0].protocol"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+														<option value="${protocolC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].protocol==protocolC.itemCode || (_cfg.asnIpCfgs[0].protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="asnIpCfgs[0].protocol"></div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="direction" /></label>
+											<div class="col-md-6">
+												<select name="asnIpCfgs[0].direction"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+														<option value="${directionC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].direction==directionC.itemCode || (_cfg.asnIpCfgs[0].direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="asnIpCfgs[0].direction"></div>
+										</div>
+									</div>
+								</div>
+								<%-- <div class="row">
+									<button type="button" class="btn btn-red-hollow center-block"
+										onClick="more(this);" data-click-times="0">
+										<spring:message code="show_more" />
+									</button>
 								</div> --%>
-								<input type="hidden" name="asnIpCfgs[0].portPattern" value="1">
-								<input type="hidden" name="asnIpCfgs[0].srcPort" value="0">
-								<input type="hidden" name="asnIpCfgs[0].destPort" value="0">
-								<input type="hidden" name="asnIpCfgs[0].srcIpAddress" value="0.0.0.0">
-								<input type="hidden" name="asnIpCfgs[0].direction" value="0">
-								<input type="hidden" name="asnIpCfgs[0].protocolId" value="0">
-								<input type="hidden" name="asnIpCfgs[0].protocol" value="0">
 							</div>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
index 6e5d1a72e..38d0edddd 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
@@ -5,6 +5,10 @@
 <title><spring:message code="asn_ip_configuration"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	$("input[name='destPort']").parents(".form-group").addClass("hidden");
+	$("select[name='portPattern']").parents(".form-group").addClass("hidden");
+	$("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	$("#cfgFrom").validate({
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
@@ -44,11 +48,22 @@ $(function(){
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                    		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
                    		<input type="hidden" id="requestId" name="requestId" value="${_cfg.requestId}">
+                   		<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="cfgRegionCode"
+                   				 isMaat="${region.isMaat}"
+						   		 serviceType="${region.configServiceType}"
+						   		 ipPortShow="${region.configIpPortShow}"
+						   		 ipType="${region.configIpType}"
+						   		 ipPattern="${region.configIpPattern}"
+						   		 portPattern="${region.configPortPattern}"
+						   		 direction="${region.configDirection}"
+						   		 protocol="${region.configProtocol}"
+						   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -142,15 +157,15 @@ $(function(){
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
 								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
 								            </div>
-								            <div for="destIpAddress"></div>
+								            <div for="srcIpAddress"></div>
 								        </div>
 								    </div>
 								</div>
-								<%-- <div class="row port">
+								<div class="row  port">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
@@ -166,21 +181,72 @@ $(function(){
 								    </div>
 								    <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>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+								            </div>
+								            <div for="srcPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  destPort">
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								            </div>
+								            <div for="destIpAddress"></div>
+								        </div>
+								    </div>
+								     <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 								            <div class="col-md-6">
 								                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
 								            </div>
 								            <div for="destPort"></div>
 								        </div>
 								    </div>
+								</div>
+								<div class="row  protocol">
+									<div class="col-md-6">
+										<div class="form-group ">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="protocol" /></label>
+											<div class="col-md-6">
+												<select name="protocol"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+														<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="protocol"></div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="direction" /></label>
+											<div class="col-md-6">
+												<select name="direction"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+														<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="direction"></div>
+										</div>
+									</div>
+								</div>
+								<%-- <div class="row">
+									<button type="button" class="btn btn-red-hollow center-block"
+										onClick="more(this);" data-click-times="0">
+										<spring:message code="show_more" />
+									</button>
 								</div> --%>
-								<input type="hidden" name="portPattern" value="${_cfg.portPattern}">
-								<input type="hidden" name="srcPort" value="${_cfg.srcPort}">
-								<input type="hidden" name="destPort" value="${_cfg.destPort}">
-								<input type="hidden" name="srcIpAddress" value="${_cfg.srcIpAddress}">
-								<input type="hidden" name="direction" value="${_cfg.direction}">
-								<input type="hidden" name="protocolId" value="${_cfg.protocolId}">
-								<input type="hidden" name="protocol" value="${_cfg.protocol}">
 							</div>
                            <%--  <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> --%>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index f63d58057..22a32567c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -5,6 +5,10 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	$("input[name='destPort']").parents(".form-group").addClass("hidden");
+	$("select[name='portPattern']").parents(".form-group").addClass("hidden");
+	$("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
@@ -48,13 +52,24 @@ $(function(){
                       	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" name="protocolId" value="0">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                    		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				isMaat="${region.isMaat}"
+						   		 serviceType="${region.configServiceType}"
+						   		 ipPortShow="${region.configIpPortShow}"
+						   		 ipType="${region.configIpType}"
+						   		 ipPattern="${region.configIpPattern}"
+						   		 portPattern="${region.configPortPattern}"
+						   		 direction="${region.configDirection}"
+						   		 protocol="${region.configProtocol}"
+						   		 regionType="${region.regionType}"
+                   				value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -92,6 +107,7 @@ $(function(){
 																				<input type="radio" name="action"
 																					serviceId="${service.serviceId }"
 																					protocolId="${service.protocolId }"
+																					regionCode="${service.regionCode }"
 																					value="${service.action }" class="required action"
 																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -116,7 +132,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 								            <div class="col-md-6">
 								            	 <select name="ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('WHITELIST_IPTYPE')}" var="ipTypeC">
+								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 														<option value="${ipTypeC.itemCode}" 
 																<c:if test="${_cfg.ipType==ipTypeC.itemCode 
 																	|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
@@ -132,7 +148,7 @@ $(function(){
 								        </div>
 								    </div>
 								</div>
-								<div class="row">
+								<div class="row ip">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
@@ -148,15 +164,15 @@ $(function(){
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
 								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
 								            </div>
-								            <div for="destIpAddress"></div>
+								            <div for="srcIpAddress"></div>
 								        </div>
 								    </div>
 								</div>
-								<%-- <div class="row port">
+								<div class="row  port">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
@@ -172,21 +188,72 @@ $(function(){
 								    </div>
 								    <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>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+								            </div>
+								            <div for="srcPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  destPort">
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+								            </div>
+								            <div for="destIpAddress"></div>
+								        </div>
+								    </div>
+								     <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 								            <div class="col-md-6">
 								                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
 								            </div>
 								            <div for="destPort"></div>
 								        </div>
 								    </div>
+								</div>
+								<div class="row  protocol">
+									<div class="col-md-6">
+										<div class="form-group ">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="protocol" /></label>
+											<div class="col-md-6">
+												<select name="protocol"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+														<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="protocol"></div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="direction" /></label>
+											<div class="col-md-6">
+												<select name="direction"
+													class="selectpicker show-tick form-control required">
+													<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+														<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="direction"></div>
+										</div>
+									</div>
+								</div>
+								<%-- <div class="row">
+									<button type="button" class="btn btn-red-hollow center-block"
+										onClick="more(this);" data-click-times="0">
+										<spring:message code="show_more" />
+									</button>
 								</div> --%>
-								<input type="hidden" name="portPattern" value="1">
-								<input type="hidden" name="srcPort" value="0">
-								<input type="hidden" name="destPort" value="0">
-								<input type="hidden" name="srcIpAddress" value="0.0.0.0">
-								<input type="hidden" name="direction" value="1">
-								<input type="hidden" name="protocolId" value="0">
-								<input type="hidden" name="protocol" value="0">
 							</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
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 1d75997ce..e40be5c15 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
@@ -5,6 +5,8 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	$("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -51,13 +53,21 @@ $(function(){
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                        	<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                       	<input type="hidden" name="direction" value="0">
-                       	<input type="hidden" name="protocol" value="0">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="cfgRegionCode"
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -84,7 +94,6 @@ $(function(){
 								            </div>
 								              <div for="policyGroup"></div>
 								        </div>
-								        
 								    </div>
 								    <div class="col-md-6 hidden">
 								        <div class="form-group"> 
@@ -113,107 +122,94 @@ $(function(){
 								   </div>
 								</div>
 								<div class="row ipInfo">
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
-								            <div class="col-md-6">
-								                <select name="ipType"
-													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="ipTypeC">
-														<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-								            </div>
-										    <div for="ipType"></div>
-								        </div>
-								    </div>
-								   <div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="ip" /></label>
-											<div class="col-md-6">
-												<input class="form-control required ipCheck" type="text"
-													name="srcIpAddress"
-													value="${_cfg.srcIpAddress}">
+									<div class="row">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
+									            <div class="col-md-6">
+									                <select name="ipType"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+															<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+									            </div>
+											    <div for="ipType"></div>
+									        </div>
+									    </div>
+									   <div class="col-md-6">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="ip" /></label>
+												<div class="col-md-6">
+													<input class="form-control required ipCheck" type="text"
+														name="srcIpAddress"
+														value="${_cfg.srcIpAddress}">
+												</div>
+												<div for="srcIpAddress"></div>
 											</div>
-											<div for="srcIpAddress"></div>
 										</div>
 									</div>
-								</div>
-								<div class="row">
-								    <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">
-								               <input class="form-control required digits" name="port" range="[0,65535]" type="text" value="${_cfg.port }">
-								            </div>
-										    <div for="port"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="location" /></label>
-												<div class="col-md-6">
-													<select name="location"
-														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
-															<option value="${locationC.itemCode}" <c:if test="${_cfg.location==locationC.itemCode || (_cfg.location==null && locationC.itemCode==0)}">selected</c:if>><spring:message code="${locationC.itemValue}"/></option>
-														</c:forEach>
-													</select>
-												</div>
-											<div for="location"></div>
+									<div class="row">
+									    <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">
+									               <input class="form-control required digits" name="port" range="[0,65535]" type="text" value="${_cfg.port }">
+									            </div>
+											    <div for="port"></div>
+									        </div>
+									    </div>
+									   <div class="col-md-6">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="direction" /></label>
+													<div class="col-md-6">
+														<select name="direction"
+															class="selectpicker show-tick form-control required">
+															<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+																<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+															</c:forEach>
+														</select>
+													</div>
+												<div for="direction"></div>
+											</div>
 										</div>
 									</div>
-								   <%-- <div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="direction" /></label>
-												<div class="col-md-6">
-													<select name="direction"
+									 <div class="row">
+									     <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+									            <div class="col-md-6">
+									               <select name="protocol"
 														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-															<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
 														</c:forEach>
 													</select>
-												</div>
-											<div for="direction"></div>
-										</div>
-									</div> --%>
-								</div>
-								 <%-- <div class="row">
-								     <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
-								            <div class="col-md-6">
-								               <select name="protocol"
+									            </div>
+											    <div for="protocol"></div>
+									        </div>
+									    </div> 
+									</div>
+							</div>
+							<div class="row">
+								<div class="col-md-6">
+									<div class="form-group ">
+										<label class="control-label col-md-3"><font color="red">*</font>
+											<spring:message code="location" /></label>
+											<div class="col-md-6">
+												<select name="location"
 													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-														<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+													<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
+														<option value="${locationC.itemCode}" <c:if test="${_cfg.location==locationC.itemCode || (_cfg.location==null && locationC.itemCode==0)}">selected</c:if>><spring:message code="${locationC.itemValue}"/></option>
 													</c:forEach>
 												</select>
-								            </div>
-										    <div for="protocol"></div>
-								        </div>
-								    </div> 
-								   <div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="location" /></label>
-												<div class="col-md-6">
-													<select name="location"
-														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
-															<option value="${locationC.itemCode}" <c:if test="${_cfg.location==locationC.itemCode || (_cfg.location==null && locationC.itemCode==0)}">selected</c:if>><spring:message code="${locationC.itemValue}"/></option>
-														</c:forEach>
-													</select>
-												</div>
-											<div for="location"></div>
-										</div>
+											</div>
+										<div for="location"></div>
 									</div>
-								</div>--%>
 								</div>
+							</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp
index 06464a712..bce08e4bc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp
@@ -5,6 +5,8 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	$("select[name='protocol']").parents(".form-group").addClass("hidden");
+	$("select[name='direction']").parents(".form-group").addClass("hidden");
 	if('${fn:length(serviceList)}'>1){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -117,7 +119,138 @@ $(function(){
 									   </div>
 								   </c:if>
 								</div>
-	               				<%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
+	               				<%--@include file="/WEB-INF/include/form/complexIpInfo.jsp" --%>
+	               				<div class="row ipInfo">
+									<div class="row">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipType" class="selectpicker show-tick form-control required">
+									                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+															<option value="${ipTypeC.itemCode}" 
+																	<c:if test="${_cfg.ipType==ipTypeC.itemCode 
+																		|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
+																		selected
+																	</c:if>
+																	>
+															<spring:message code="${ipTypeC.itemValue}"/>
+															</option>
+								               			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipType"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row ip">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
+									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+															<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipPattern"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+									            </div>
+									            <div for="srcIpAddress"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row hidden port">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="portPattern" class="selectpicker show-tick form-control required">
+									                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+															<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="portPattern"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
+									            </div>
+									            <div for="srcPort"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row hidden destPort">
+									    <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
+									            </div>
+									            <div for="destIpAddress"></div>
+									        </div>
+									    </div>
+									     <div class="col-md-6">
+									        <div class="form-group ">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
+									            </div>
+									            <div for="destPort"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row hidden protocol">
+										<div class="col-md-6">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="protocol" /></label>
+												<div class="col-md-6">
+													<select name="protocol"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+															<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="protocol"></div>
+											</div>
+										</div>
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="direction" /></label>
+												<div class="col-md-6">
+													<select name="direction"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+															<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="direction"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row">
+										<button type="button" class="btn btn-red-hollow center-block"
+											onClick="more(this);" data-click-times="0">
+											<spring:message code="show_more" />
+										</button>
+									</div>
+									<br>
+								</div>
 	           			   		<div class="row ipmulitiplex">
 								    <div class="col-md-6">
 								        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
index 2c1113912..04fcb1836 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
@@ -47,22 +47,6 @@
 			<div for="${cfgName}.ipType"></div>
 		</div>
 	</div>
-	<c:if test="${region.configRegionValue eq 'NTC_P2P_IP'}">
-	<div class="col-md-6">
-		<div class="form-group">
-			<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
-			<div class="col-md-6">
-				<select name=userRegion1 class="selectpicker show-tick form-control required">
-				<option value=""><spring:message code="select"/></option>
-				<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
-						<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
-				</c:forEach>
-				</select>
-			</div>
-			<div for="userRegion1"></div>
-		 </div>
-	</div>
-	</c:if>
 </div>
 <div class="row ip">
 	<div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index e16d8c780..8a16d6375 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -7,6 +7,9 @@
 .tabbable-custom > .tab-content { 
 	margin-top:-121px;
 } 
+.dropdown-menu{
+	margin-bottom:150px;
+}
 </style>
 	<script type="text/javascript">
 	var validateForm;
@@ -265,7 +268,7 @@
 																<div class="col-md-4">
 																<select id="businessType3" name="businessType"  class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
 					                                                <option value=""><spring:message code="select"/></option>
-					                                                <c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict">
+					                                                <c:forEach items="${fns:getDictList('BASIC_PROTOCOL_BUSINESS_TYPE')}" var="dict">
 																	  <option value="${dict.itemCode}"
 																	  <c:if test="${dict.itemCode==specificServiceCfg.businessType}">selected</c:if>
 																	  ><spring:message code="${dict.itemValue}"/></option>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index c1996c84e..d8f4c15cd 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -251,7 +251,7 @@
 			                       				 	</c:forEach>
 	                                          	</c:if>
 	                                          	<c:if test="${specificServiceCfg.cfgType==3}">
-	                                          		<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE') }" var="dict">
+	                                          		<c:forEach items="${fns:getDictList('BASIC_PROTOCOL_BUSINESS_TYPE') }" var="dict">
 			                       				 	<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}'/></form:option>
 			                       				 	</c:forEach>
 	                                          	</c:if>
@@ -339,7 +339,7 @@
 													</c:forEach>
 												</c:if>
 												<c:if test="${specificServiceCfg.cfgType==3}">
-													<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE') }" var="dict">
+													<c:forEach items="${fns:getDictList('BASIC_PROTOCOL_BUSINESS_TYPE') }" var="dict">
 														<c:if test="${specificServiceCfg.businessType==dict.itemCode}">
 																<spring:message code="${dict.itemValue}"/>
 														</c:if>