From 71633c3448c77515625b5e17f4f3fb25b1480ee9 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 19 Mar 2018 15:54:15 +0800
Subject: [PATCH] =?UTF-8?q?0000013:=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E7=99=BD=E5=90=8D=E5=8D=95/=E7=81=B0=E5=90=8D=E5=8D=95=20?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E7=81=B0=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=88=97=E8=A1=A8=EF=BC=8C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=B0=86=E4=B8=8D=E5=BA=94=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=85=A8=E9=83=A8=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/form/complexInfo.jsp      |  92 +++----
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 184 +++++++-------
 .../WEB-INF/include/form/stringInfo.jsp       | 186 +++++++-------
 .../WEB-INF/views/cfg/complexCfgForm.jsp      |  15 +-
 .../WEB-INF/views/cfg/complexCfgList.jsp      |  10 +-
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    |  34 +--
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 228 ++++++++++--------
 .../WEB-INF/views/cfg/stringCfgForm.jsp       |  31 +--
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 156 ++++++------
 9 files changed, 473 insertions(+), 463 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index f4d9ef5de..c0c328a9a 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -32,6 +32,52 @@
     </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="expression_type"/></label>
+            <div class="col-md-6">
+            	<label class="radio-inline">
+            		<input type="radio" name="exprType" value="1"
+            			<c:if test="${_cfg.exprType==1}">checked</c:if>
+            		><spring:message code="and"/>
+            	</label>
+            	<label class="radio-inline">
+            		<input type="radio" name="exprType" value="0"
+            			<c:if test="${_cfg.exprType==0}">checked</c:if>
+            		><spring:message code="null"/>
+            	</label>
+            </div>
+            <div for="isAreaEffective"></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="match_method"/></label>
+            <div class="col-md-6">
+            	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
+					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
+				</select>
+            </div>
+            <div for="matchMethod"></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="whether_hexbinary"/></label>
+            <div class="col-md-6">
+            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
+				</select>
+            </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="whether_area_block"/></label>
@@ -51,52 +97,6 @@
             <div for="isAreaEffective"></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="expression_type"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="1"
-            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		><spring:message code="and"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="0"
-            			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		><spring:message code="null"/>
-            	</label>
-            </div>
-            <div for="isAreaEffective"></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="match_method"/></label>
-            <div class="col-md-6">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
-				</select>
-            </div>
-            <div for="matchMethod"></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="whether_hexbinary"/></label>
-            <div class="col-md-6">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
-				</select>
-            </div>
-        </div>
-    </div>
 </div>
 <div class="row">
     <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 7886da9a8..d7a425267 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -105,89 +105,103 @@
         </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="direction"/></label>
-            <div class="col-md-6">
-            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
-                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
-                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
-                 </select>
-                <%-- <input class="form-control" type="text" name="direction" value="${_cfg.direction}"> --%>
-            </div>
-            <div for="direction"></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="protocol"/></label>
-            <div class="col-md-6">
-            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
-                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
-                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
-                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
-                </select>
-                <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
-            </div>
-            <div for="protocol"></div>
-        </div>
-    </div>
-</div>
-<%-- <div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3">协议ID</label>
-            <div class="col-md-6">
-                <input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
-            </div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3">管控类型</div>
-            <div class="col-md-6">
-            	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
-            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
-            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
-            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
-            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
-            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
-            	 </select>
-                 <input class="form-control" type="hidden" name="action" value="${_cfg.action}">
-            </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="whether_area_block"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="1"
-            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		><spring:message code="yes"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="0"
-            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		><spring:message code="no"/>
-            	</label>
-                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
-            </div>
-            <div for="isAreaEffective"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
-            <div class="col-md-6">
-                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-            </div>
-            <div for="areaEffectiveIds"></div>
-        </div>
-    </div>
-</div>
+<c:choose>
+	<c:when test="${action==5}">
+		<input type="hidden" name="protocol" value="0">
+		<input type="hidden" name="direction" value="0">
+		<input type="hidden" name="isAreaEffective" value="0">
+	</c:when>
+	<c:when test="${action==8}">
+		<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="direction"/></label>
+		            <div class="col-md-6">
+		            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </select>
+		            </div>
+		            <div for="direction"></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="protocol"/></label>
+		            <div class="col-md-6">
+		            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
+		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
+		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
+		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
+		                </select>
+		                <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
+		            </div>
+		            <div for="protocol"></div>
+		        </div>
+		    </div>
+		</div>
+		<input type="hidden" name="isAreaEffective" value="0">
+		<input type="hidden" name="areaEffectiveIds" value="">
+	</c:when>
+	<c:otherwise>
+		<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" title=<spring:message code="select"/>>
+		                   <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
+		                   <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
+		                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
+		                </select>
+		                <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
+		            </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" title=<spring:message code="select"/>>
+		                   <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </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="whether_area_block"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="1"
+		            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
+		            		><spring:message code="yes"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="0"
+		            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+		            		><spring:message code="no"/>
+		            	</label>
+		                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
+		            </div>
+		            <div for="isAreaEffective"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
+		            <div class="col-md-6">
+		                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		            </div>
+		            <div for="areaEffectiveIds"></div>
+		        </div>
+		    </div>
+		</div>
+	</c:otherwise>
+</c:choose>
 <!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 90684fdd8..ec8061d3b 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -21,101 +21,93 @@
         </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="block_type"/></label>
-	        <div class="col-md-6">
-            	<select name="action" class="selectpicker select2 form-control" readonly="readonly">
-            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>                       
-            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>                     
-            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>            
-            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>          
-            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>                   
-            	</select>
-                 <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
-            </div>
-            <div for="action"></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="whether_area_block"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="1"
-            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		><spring:message code="yes"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="0"
-            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		><spring:message code="no"/>
-            	</label>
-                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
-            </div>
-            <div for="isAreaEffective"></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="expression_type"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="1"
-            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		><spring:message code="and"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="0"
-            			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		><spring:message code="null"/>
-            	</label>
-            </div>
-            <div for="exprType"></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="match_method"/></label>
-            <div class="col-md-6">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
-				</select>
-            </div>
-            <div for="matchMethod"></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="whether_hexbinary"/></label>
-            <div class="col-md-6">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
-				</select>
-            </div>
-            <div for="isHexbin"></div>
-        </div>
-        
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-            <div class="col-md-6">
-                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-            </div>
-            <div for="areaEffectiveIds"></div>
-        </div>
-    </div>
-</div>
+<c:choose>
+	<c:when test="${action ==5}">
+		<input type="hidden" name="isAreaEffective" value="0">
+		<input type="hidden" name="exprType" value="0">
+		<input type="hidden" name="matchMethod" value="0">
+		<input type="hidden" name="isHexbin" value="0">
+	</c:when>
+	<c:otherwise>
+		<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="expression_type"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="exprType" value="1"
+		            			<c:if test="${_cfg.exprType==1}">checked</c:if>
+		            		><spring:message code="and"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="exprType" value="0"
+		            			<c:if test="${_cfg.exprType==0}">checked</c:if>
+		            		><spring:message code="null"/>
+		            	</label>
+		            </div>
+		            <div for="exprType"></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="match_method"/></label>
+		            <div class="col-md-6">
+		            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
+							<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+							<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
+							<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
+							<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
+						</select>
+		            </div>
+		            <div for="matchMethod"></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="whether_hexbinary"/></label>
+		            <div class="col-md-6">
+		            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+							<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
+							<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
+							<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
+						</select>
+		            </div>
+		            <div for="isHexbin"></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="whether_area_block"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="1"
+		            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
+		            		><spring:message code="yes"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isAreaEffective" value="0"
+		            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+		            		><spring:message code="no"/>
+		            	</label>
+		                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
+		            </div>
+		            <div for="isAreaEffective"></div>
+		        </div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
+		            <div class="col-md-6">
+		                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		            </div>
+		            <div for="areaEffectiveIds"></div>
+		        </div>
+		    </div>
+		</div>
+	</c:otherwise>
+</c:choose>
 <!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index b6f9a1caa..94cd96562 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -117,11 +117,16 @@ $(function(){
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
-                            <input type="hidden" name="action" value="${_cfg.action}">  
-                            <input type="hidden" name="district" value="${_cfg.district}">  
-                              <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
-                              
-                            
+                            <input type="hidden" name="action" value="${action}">  
+                            <input type="hidden" name="district" value="${_cfg.district}"> 
+                            <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index a58ee1528..d14fef3eb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -227,17 +227,13 @@
 								<tr>
 									<th><spring:message code="seq"/></th>
 									<th><spring:message code="config_describe"/></th>
-									<%-- <th><spring:message code="match_area"/></th> --%>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
 									<th><spring:message code="type"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -264,13 +260,11 @@
 										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
 										<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
 									</td>
-									<%-- <td>${cfg.serviceId }</td> --%>
-									<td>${cfg.requestName }</td>
-									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
+									<td>${cfg.requestName }</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
 										<c:forEach items="${fls}" var="fl">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 6734475d6..b948752d9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -221,12 +221,6 @@ $(function(){
                         <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
 						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
-                      <!-- <div class="tools">
-                          <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
-                          <a href="#portlet-config" data-toggle="modal" class="config" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="reload" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="remove" data-original-title="" title=""> </a>
-                      </div> -->
                   </div>
                   <div class="portlet-body form">
                       <!-- BEGIN FORM-->
@@ -241,26 +235,14 @@ $(function(){
                             <input type="hidden" name="cfgName" value="${cfgName}">  
                             <input type="hidden" name="action" value="${action}">
                             <input type="hidden" name="protocolId" value="${_cfg.protocolId}">
-                            <!--  <div class="row">
-							    <div class="col-md-6">
-							        <div class="form-group">
-							            <label class="control-label col-md-3">IP地址</label>
-							            <div class="col-md-8">
-							                <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							    <div class="col-md-6">
-							        <div class="form-group ">
-							            <label class="control-label col-md-3">配置名称</label>
-							            <div class="col-md-8">
-							                 <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							</div>
-                               -->
-                              <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                             <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                               
                             
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index fff8f1377..49dc14f13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -55,9 +55,7 @@
 			<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
 		</c:if>
-		
 	</div>
-
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -89,38 +87,46 @@
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
-								<div class="pull-left">
-									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${fls}" var="fl" >
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
+								<c:choose>
+									<c:when test="${action==5}">
+									</c:when>
+									<c:when test="${action==8}">
+									</c:when>
+									<c:otherwise>
+										<div class="pull-left">
+											<c:set var="request_number"><spring:message code='request_number'/></c:set>
+											<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${requestInfos}" var="requestInfo" >
+													<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="flI18n"><spring:message code='type'/></c:set>
+											<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+											<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${xzs}" var="xz" >
+													<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="labelI18n"><spring:message code='label'/></c:set>
+											<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${lables}" var="lable" >
+													<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+									</c:otherwise>
+								</c:choose>
 								<!-- <div class="pull-right">
                                         <button type="button" class="btn btn-default">
                                             <i class="fa fa-edit"></i> 编辑</button>
@@ -171,23 +177,21 @@
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-								
 									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code="config_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											
+										<div class="pull-left">
+											<label><spring:message code="config_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
 									</div>
 							
 									<div class="col-md-6">
@@ -254,18 +258,24 @@
 									<th><spring:message code="server_address_mask"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="server_port_mask"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
-									<!-- <th>协议ID</th> -->
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:when test="${action==8}">
+											<th><spring:message code="direction"/></th>
+											<th><spring:message code="protocol"/></th>
+										</c:when>
+										<c:otherwise>
+											<th><spring:message code="direction"/></th>
+											<th><spring:message code="protocol"/></th>
+											<th><spring:message code="whether_area_block"/></th>
+											<th><spring:message code="letter"/></th>
+											<th><spring:message code="type"/></th>
+											<th><spring:message code="attribute"/></th>
+											<th><spring:message code="label"/></th>
+										</c:otherwise>
+									</c:choose>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -291,16 +301,6 @@
 									<td>${ipCfg.dstIpMask }</td>
 									<td>${ipCfg.dstPort }</td>
 									<td>${ipCfg.dstPortMask }</td>
-									<td>
-									<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
-									<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
-									</td>
-									<td>
-									<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>	
-									<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>	
-									<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>	
-									</td>
-									<%-- <td>${ipCfg.protocolId }</td> --%>
 									<td>
 										<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>                   
 										<c:if test="${2 eq ipCfg.action }"><spring:message code="monitor"/></c:if>                 
@@ -309,37 +309,61 @@
 										<c:if test="${7 eq ipCfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
 										<c:if test="${8 eq ipCfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
-									<%-- <td>${ipCfg.serviceId }</td> --%>
-									<td>${ipCfg.requestName }</td>
-									<%-- <td>${ipCfg.compileId }</td> --%>
-									<td>
-										<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
-										<c:forEach items="${fls}" var="fl">
-											<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
-											${fl.itemValue},
-											</c:if>
-										</c:forEach>
-									</c:forEach>
-									${classifyName[status]}
-									</td>
-									<td>
-									<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
-										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
-										<c:forEach items="${lables}" var="lable">
-											<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:when test="${action==8}">
+											<td>
+												<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
+												<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
+											</td>
+											<td>
+												<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>	
+												<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>	
+												<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>	
+											</td>
+										</c:when>
+										<c:otherwise>
+											<td>
+												<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
+												<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
+											</td>
+											<td>
+												<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>	
+												<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>	
+												<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>	
+											</td>
+											<td>
+												<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+												<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+											</td>
+											<td>${ipCfg.requestName }</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
+												<c:forEach items="${fls}" var="fl">
+													<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
+													${fl.itemValue},
+													</c:if>
+												</c:forEach>
+											</c:forEach>
+											${classifyName[status]}
+											</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
+												<c:forEach items="${xzs}" var="xz">
+													<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
+												<c:forEach items="${lables}" var="lable">
+													<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+										</c:otherwise>
+									</c:choose>
 									<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${ipCfg.isValid==0}"><spring:message code="no"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 8b7fa64ce..f1d474229 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -123,31 +123,18 @@ $(function(){
                             	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             </c:if>
                             <input id="audit" name="audit" type="hidden" value="${audit}"/>
+                            <input id="action" name="action" type="hidden" value="${action}"/>
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
-                            <!--  <div class="row">
-							    <div class="col-md-6">
-							        <div class="form-group">
-							            <label class="control-label col-md-3">IP地址</label>
-							            <div class="col-md-8">
-							                <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							    <div class="col-md-6">
-							        <div class="form-group ">
-							            <label class="control-label col-md-3">配置名称</label>
-							            <div class="col-md-8">
-							                 <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							</div>
-                               -->
-                              <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
-                              
-                            
+                            <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 287103211..7dc68282c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -89,38 +89,44 @@
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
-								<div class="pull-left">
-									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${fls}" var="fl" >
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
+								<c:choose>
+									<c:when test="${action==5}">
+									</c:when>
+									<c:otherwise>
+										<div class="pull-left">
+											<c:set var="request_number"><spring:message code='request_number'/></c:set>
+											<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${requestInfos}" var="requestInfo" >
+													<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="flI18n"><spring:message code='type'/></c:set>
+											<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+											<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${xzs}" var="xz" >
+													<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="labelI18n"><spring:message code='label'/></c:set>
+											<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${lables}" var="lable" >
+													<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+									</c:otherwise>
+								</c:choose>
 								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
@@ -229,14 +235,17 @@
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:otherwise>
+											<th><spring:message code="whether_area_block"/></th>
+											<th><spring:message code="letter"/></th>
+											<th><spring:message code="type"/></th>
+											<th><spring:message code="attribute"/></th>
+											<th><spring:message code="label"/></th>
+										</c:otherwise>
+									</c:choose>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -262,38 +271,41 @@
 										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
 										<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
-									<%-- <td>${cfg.serviceId }</td> --%>
-									<td>${cfg.requestName }</td>
-									<%-- <td>${cfg.compileId }</td> --%>
-									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
-										<c:forEach items="${fls}" var="fl">
-											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
-											</c:if>
-										</c:forEach>
-									</c:forEach>
-									${classifyName[status]}
-									</td>
-									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
-										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
-										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:otherwise>
+											<td>
+												<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+												<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+											</td>
+											<td>${cfg.requestName }</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+												<c:forEach items="${fls}" var="fl">
+													<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+													${fl.itemValue},
+													</c:if>
+												</c:forEach>
+											</c:forEach>
+											${classifyName[status]}
+											</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+												<c:forEach items="${xzs}" var="xz">
+													<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+												<c:forEach items="${lables}" var="lable">
+													<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+										</c:otherwise>
+									</c:choose>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>