diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 92a98b976..b997a574c 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1045,7 +1045,7 @@ keyring_name=Key Pair Name
 keyring_type=Certificate Type
 private_key_file=Private Key File
 public_key_file=Public Key File
-expire_after=Expire After
+expire_after=Expire After(Days)
 issuer=Certificate Issuer
 certificate_subject=Certificate Subject
 not_before_time=Certificate Start Time
@@ -1470,4 +1470,5 @@ history=History
 all_columns_hidden=All columns are hidden!
 no_log=No Log
 all_log=Meta And File Log
-framework_log=Meta Log
\ No newline at end of file
+framework_log=Meta Log
+block_drop=Block(Drop)
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 98ba3fbb7..fbafbef22 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -342,10 +342,10 @@ expression_type=\u0422\u0438\u043f \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0
 null_expression=\u041d\u0435\u0442 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u044f
 and_expression=&
 match_method=\u041c\u0435\u0442\u043e\u0434\u044b \u0441\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
-substring_match=\u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435 \u041F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u043E\u0439
-right_match= \u0421\u0443\u0444\u0444\u0438\u043A\u0441 \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
-left_match=\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
-exactly_match=\u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C\u044E \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
+substring_match=\u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435 \u041F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u043E\u0439
+right_match= \u0421\u0443\u0444\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
+left_match=\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
+exactly_match=\u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C\u044E \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
 whether_hexbinary=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443 \u0438\u043b\u0438 \u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c, \u0438\u043b\u0438 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 HEX
 hex_binary=HEX \u0444\u043e\u0440\u043c\u0430\u0442
 case_insensitive_nohex=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443, \u0438 \u043d\u0435 HEX
@@ -1045,7 +1045,7 @@ keyring_name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u0440
 keyring_type=\u0422\u0438\u043f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 private_key_file=\u0424\u0430\u0439\u043b \u0441 \u0437\u0430\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
 public_key_file=\u0424\u0430\u0439\u043b \u0441 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
-expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435
+expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435(\u0414\u043D\u0438)
 issuer=\u042d\u043c\u0438\u0442\u0435\u043d\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 certificate_subject=\u041f\u0440\u0435\u0434\u043c\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 not_before_time=\u0412\u0440\u0435\u043c\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
@@ -1474,4 +1474,5 @@ history=History
 all_columns_hidden=All columns are hidden!
 no_log=\u041D\u0435\u0442 \u0416\u0443\u0440\u043D\u0430\u043B\u043E\u0432
 all_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B \u0438 \u0416\u0443\u0440\u043D\u0430\u043B-\u0444\u0430\u0439\u043B
-framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B
\ No newline at end of file
+framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B
+block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 8437f71f0..87e167a26 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1044,7 +1044,7 @@ keyring_name=\u79d8\u94a5\u5bf9\u540d\u79f0
 keyring_type=\u8bc1\u4e66\u7c7b\u578b
 private_key_file=\u79c1\u94a5\u6587\u4ef6
 public_key_file=\u516c\u94a5\u6587\u4ef6
-expire_after=\u518d\u6b21\u9881\u53d1\u6709\u6548\u671f
+expire_after=\u518d\u6b21\u9881\u53d1\u6709\u6548\u671f(\u5929)
 issuer=\u8bc1\u4e66\u9881\u53d1\u8005
 certificate_subject=\u8bc1\u4e66\u62e5\u6709\u8005
 not_before_time=\u8bc1\u4e66\u8d77\u59cb\u65f6\u95f4
@@ -1470,4 +1470,5 @@ history=\u5386\u53f2
 all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01
 no_log=\u4E0D\u8BB0\u5F55
 all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
-framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
\ No newline at end of file
+framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
+block_drop=\u5C01\u5835(\u4E22\u5F03)
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appCommonFeature.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appCommonFeature.jsp
new file mode 100644
index 000000000..a67c1ec60
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appCommonFeature.jsp
@@ -0,0 +1,490 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title></title>
+
+</head>
+<%-- <c:forEach items="${regionList}" var="regionDistrict">
+	<c:if
+		test="${cfg.functionId eq regionDistrict.functionId 
+		and regionDistrict.regionType eq 3 
+		and regionValue eq regionDistrict.configRegionValue}"> --%>
+		<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
+		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
+		<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
+		<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
+<%-- 	</c:if>
+</c:forEach> --%>
+
+<div class="row">
+	<div class="pull-right">
+		<span class="glyphicon glyphicon-remove pull-right" title="remove"
+			onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
+	</div>
+</div>
+<br>
+<c:if test="${!empty region.configDistrict }">
+	<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="district" /></label>
+				<div class="col-md-6">
+					<select name="${cfgName}.district"
+						class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
+							<c:forEach items="${fn:split(region.configDistrict,',')}"
+								var="_district">
+								<option value="${_district }"
+									<c:if test="${cfg.district==_district}">selected</c:if>>${_district }</option>
+							</c:forEach>
+					</select>
+					<input type="hidden" name="${cfgName}.districtShowName"  maxlength="64"  placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control invisibleChar" value="${cfg.district}"/>
+				</div>
+				<div for="${cfgName}.districtShowName"></div>
+				<div for="${cfgName}.district"></div>
+			</div>
+		</div>
+	</div>
+</c:if>
+<div class="row keywords">
+	<c:if test="${isP2pHashCfg}">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
+			<div class="col-md-6">
+				<select name="userRegion1" class="selectpicker show-tick form-control">
+				<option value=""><spring:message code="select"/></option>
+				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
+						<option value="${hashType.itemCode}" <c:if test="${_cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
+				</c:forEach>
+				</select>
+			</div>
+			<div for="userRegion1"></div>
+		</div>
+	</div>
+	</c:if>
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><font color="red">*</font>
+			<c:choose>
+				<c:when test="${fn:containsIgnoreCase(region.configServiceType,'domain') }">
+					<spring:message code="domain" /> 
+				</c:when>
+				<c:when test="${fn:containsIgnoreCase(region.configServiceType,'url') }">
+					<spring:message code="URL" />
+				</c:when>
+				<c:otherwise>
+					<spring:message code="keywords" />
+				</c:otherwise>
+			</c:choose>
+			</label>
+			
+			<!-- 此配置的关键词可以输入多个关键词 -->
+			<c:if test="${region.configMultiKeywords eq 1}">
+				<div class="col-md-6">
+					<input class="form-control required tags" type="text" id="tags_${tabName}${status.index}"
+						name="${cfgName}.cfgKeywords"
+						value="${cfg.cfgKeywords}">
+				</div>
+			</c:if>
+			<!-- 此配置的关键词不允许输入多个关键词 -->
+			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+				<div class="col-md-6">
+					
+					<input class="form-control required invisibleChar
+						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
+						" 
+							type="text"
+						name="${cfgName}.cfgKeywords"
+						value="${cfg.cfgKeywords}">
+				</div>
+			</c:if>
+			
+			<div for="${cfgName}.cfgKeywords"></div>
+		</div>
+	</div>
+	 <c:if test="${serviceId eq 1025}">
+		<div class="col-md-6 offsetFeature hidden">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+					<spring:message code="offset" /></label>
+				<div class="col-md-6">
+					<input class="form-control required digest" type="text" max="1460"
+						name="${cfgName}.payloadOffset"
+						value="${cfg.payloadOffset}">
+				</div>
+				<div for="${cfgName}.payloadOffset"></div>
+			</div>
+		</div>
+	</c:if>
+	<!-- 域名拦截增加拦截强度 -->
+	<c:if test="${_cfg.functionId eq 200}">
+		<div class="col-md-6 hidden intensity">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+						<spring:message code="intercept_intensity" />
+				</label>
+				<div class="col-md-6">
+					<select name="userRegion5"
+					class="selectpicker show-tick form-control required">
+						<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+							<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+						</c:forEach>
+					</select>
+				</div>
+				<div for="userRegion5"></div>
+			</div>
+		</div>
+	</c:if>
+</div>
+<c:if test="${serviceId eq 1025}">
+	<%-- <div class="row col-md-6 offsetFeature hidden">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+					<spring:message code="offset" /></label>
+				<div class="col-md-6">
+					<input class="form-control required digest" type="text" max="1460"
+						name="${cfgName}.payloadOffset"
+						value="${cfg.payloadOffset}">
+				</div>
+				<div for="${cfgName}.payloadOffset"></div>
+			</div>
+		</div> --%>
+	<%-- <div class="row offsetFeature hidden">
+		<div class="col-md-6">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+					<spring:message code="keywords" /></label>
+				<div class="col-md-6">
+					<input class="form-control required" type="text"
+						name="${cfgName}.cfgKeywords"
+						value="${cfg.cfgKeywords}">
+				</div>
+				<div for="${cfgName}.cfgKeywords"></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="offset" /></label>
+				<div class="col-md-6">
+					<input class="form-control required digest" type="text" maxlength="1460"
+						name="${cfgName}.payloadOffset"
+						value="${cfg.payloadOffset}">
+				</div>
+				<div for="${cfgName}.payloadOffset"></div>
+			</div>
+		</div>
+	</div> --%>
+	
+	<div class="l3_header_tips"></div>
+	<div class="row L3_header">
+		<input class="form-control headerType" type="hidden" name="${cfgName}.headerType" value="${cfg.headerType}">
+	</div>
+	
+	<%-- <div class="row IP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="VER" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ver" value="${cfg.ver}">
+				</div>
+				<div for="${cfgName}.ver"></div>
+			</div>	
+		</div>
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="IHL" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ihl" value="${cfg.ihl}">
+				</div>
+				<div for="${cfgName}.ihl"></div>
+			</div>	
+		</div>
+	</div> --%>
+	<div class="row IP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="TOS" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.tos" value="${cfg.tos}">
+				</div>
+				<div for="${cfgName}.tos"></div>
+			</div>	
+		</div>
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="Total Length" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.totalLength" value="${cfg.totalLength}">
+				</div>
+				<div for="${cfgName}.totalLength"></div>
+			</div>	
+		</div>
+	</div>
+	<div class="row IP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="Protocol" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.protocol" value="${cfg.protocol}">
+				</div>
+				<div for="${cfgName}.protocol"></div>
+			</div>	
+		</div>
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="client_ip" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8"  type="text" name="${cfgName}.fragmentOffset" value="${cfg.fragmentOffset}">
+				</div>
+				<div for="${cfgName}.fragmentOffset"></div>
+			</div>	
+		</div>
+	</div>
+	<div class="row IP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="server_ip" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8"  type="text" name="${cfgName}.flags" value="${cfg.flags}">
+				</div>
+				<div for="${cfgName}.flags"></div>
+			</div>	
+		</div>
+	</div>
+	<div class="row ICMP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="ICMP type" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.icmpType" value="${cfg.icmpType}">
+				</div>
+				<div for="${cfgName}.icmpType"></div>
+			</div>	
+		</div>
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="ICMP code" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="2" maxlength="2" type="text" name="${cfgName}.icmpCode" value="${cfg.icmpCode}">
+				</div>
+				<div for="${cfgName}.icmpCode"></div>
+			</div>	
+		</div>
+	</div>
+	<div class="row ICMP_header hidden">
+		<div class="col-md-6">
+			<div class="form-group ">
+				<label class="control-label col-md-3"><spring:message code="ICMP identifier" /> </label>
+				<div class="col-md-6">
+					<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="32"  type="text" name="${cfgName}.icmpIdentifier" value="${cfg.icmpIdentifier}">
+				</div>
+				<div for="${cfgName}.icmpIdentifier"></div>
+			</div>	
+		</div>
+	</div>
+</c:if>
+<div class="row">
+		<div class="col-md-6 exprType">
+			<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">
+					<c:if test="${!empty region.configExprType}">
+						<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
+							<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
+								<c:if test="${exprTypeC.itemCode eq exprType}">
+									<label class="radio-inline"> 
+										<input type="radio"
+											name="${cfgName}.exprType" value="${exprType }"
+											class="required"
+											<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
+											<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
+												checked
+											</c:if>
+										> 
+										<spring:message	code="${exprTypeC.itemValue }" />
+									</label>
+								</c:if>
+							</c:forEach>
+						</c:forEach>
+					</c:if>
+					<c:if test="${empty region.configExprType}">
+						<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+								<c:if test="${exprTypeC.itemCode eq 0}">
+									<label class="radio-inline"> 
+										<input type="radio"
+											name="${cfgName}.exprType" value="${exprTypeC.itemCode }"
+											class="required" checked > 
+										<spring:message	code="${exprTypeC.itemValue }" />
+									</label>
+								</c:if>
+							</c:forEach>
+					</c:if>
+				</div>
+				<div for="${cfgName}.exprType"></div>
+				
+			</div>
+		</div>
+	
+		<div class="col-md-6 matchMethod">
+			<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="${cfgName}.matchMethod"
+						class="selectpicker select2 form-control required ">
+						<c:if test="${!empty region.configMatchMethod}">
+							<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+								<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+									<c:if test="${matchMethodC.itemCode eq matchMethod}">
+										<option value="${matchMethodC.itemCode}" 
+										<c:if test="${cfg.matchMethod eq matchMethod || (empty cfg.matchMethod && matchMethod eq 0)}">
+										selected
+										</c:if>
+										>
+										<spring:message code="${matchMethodC.itemValue}"/>
+										</option>
+									</c:if>
+								
+								</c:forEach> 
+							</c:forEach>
+						</c:if>
+						<c:if test="${empty region.configMatchMethod}">
+							<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+									<c:if test="${matchMethodC.itemCode eq 0}">
+										<option value="${matchMethodC.itemCode}" 
+										selected
+										>
+										<spring:message code="${matchMethodC.itemValue}"/>
+										</option>
+									</c:if>
+								
+								</c:forEach> 
+						</c:if>
+					</select>
+				</div>
+				<div for="${cfgName}.matchMethod"></div>
+			</div>
+		</div>
+</div>
+<div class="row <c:if test="${fn:length(fn:split(region.configHex,',')) ==1}">hidden</c:if>">
+		<c:if test="${!empty region.configHex}">
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+		            <div class="col-md-6">
+		            	<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
+		            		><spring:message code="hex"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
+		            		><spring:message code="not_hex"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isHex"></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="is_case_insenstive"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isCaseSenstive" value="1" class="required"
+		            		><spring:message code="case_senstive"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+		            		><spring:message code="case_insenstive"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isCaseInsenstive"></div>
+		        </div>
+		    </div>
+  	</c:if>
+  	<c:if test="${empty region.configHex}"> 
+		<div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required" checked
+		            		><spring:message code="not_hex"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isHex"></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="is_case_insenstive"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+		            			checked
+		            		><spring:message code="case_insenstive"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isCaseInsenstive"></div>
+		        </div>
+		    </div>
+	</c:if>
+</div>
+<div class="row hidden">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><font color="red">*</font>
+				<spring:message code="whether_hexbinary" /></label>
+			<div class="col-md-6">
+				<select name="${cfgName}.isHexbin"
+					class="selectpicker select2 form-control required">
+					<c:if test="${!empty region.configHex}">
+						<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
+								<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+									<c:if test="${isHexbinC.itemCode eq isHexbin}">
+										<option value="${isHexbinC.itemCode}" 
+										<c:if test="${cfg.isHexbin eq isHexbin || (empty isHexbin && isHexbin eq 0)}">
+										selected
+										</c:if>
+										>
+										<spring:message code="${isHexbinC.itemValue}"/>
+										</option>
+									</c:if>
+								
+								</c:forEach> 
+						</c:forEach>
+					</c:if>
+					<c:if test="${empty region.configHex}"> 
+					
+						<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+							<c:if test="${isHexbinC.itemCode eq 0}">
+								<option value="${isHexbinC.itemCode}"  selected >
+								<spring:message code="${isHexbinC.itemValue}"/>
+								</option>
+							</c:if>
+						</c:forEach> 
+					
+					</c:if>
+				</select>
+			</div>
+			<div for="${cfgName}.isHexbin"></div>
+		</div>
+	</div>
+</div>
+</html>
+<script type="text/javascript">
+function changeDistrict(obj){
+	if("others"==obj.val()){
+		obj.parent().siblings(".otherValue").prop("type","text");
+	}else{
+		obj.parent().siblings(".otherValue").prop("type","hidden");
+	}
+}
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index d87764e0d..9c977be73 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -296,7 +296,14 @@ var delContent = function(contentClassName, addBtnClassName) {
 																		<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">
 																			<c:if test="${dict.itemCode eq service.action }">
-																				<spring:message code="${dict.itemValue }"/>
+																				<c:choose>
+																					<c:when test="${service.action eq 16}">
+																						<spring:message code="block_drop"/>
+																					</c:when>
+																					<c:otherwise>
+																						<spring:message code="${dict.itemValue }"/>
+																					</c:otherwise>
+																				</c:choose>
 																			</c:if>
 																		</c:forEach>
 																</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index ee76ee2d5..3e99e112a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -423,7 +423,14 @@
 								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
+												<c:choose>
+													<c:when test="${cfg.action eq 16}">
+														<spring:message code="block_drop"/>
+													</c:when>
+													<c:otherwise>
+														<spring:message code="${dict.itemValue }"/>
+													</c:otherwise>
+												</c:choose>
 											</c:if>
 										</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 9a3360851..e5a078a4d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -250,7 +250,14 @@ var switchRateLimitType=function(){
 																		<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">
 																			<c:if test="${dict.itemCode eq service.action }">
-																				<spring:message code="${dict.itemValue }"/>
+																				<c:choose>
+																					<c:when test="${service.action eq 16}">
+																						<spring:message code="block_drop"/>
+																					</c:when>
+																					<c:otherwise>
+																						<spring:message code="${dict.itemValue }"/>
+																					</c:otherwise>
+																				</c:choose>
 																			</c:if>
 																		</c:forEach>
 																</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 58bb67dc9..5858baaef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -425,7 +425,14 @@
 								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
+												<c:choose>
+													<c:when test="${cfg.action eq 16}">
+														<spring:message code="block_drop"/>
+													</c:when>
+													<c:otherwise>
+														<spring:message code="${dict.itemValue }"/>
+													</c:otherwise>
+												</c:choose>
 											</c:if>
 										</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index 93237770e..ca66ac2d9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -278,7 +278,14 @@ var switchRateLimitType=function(){
 																		<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">
 																			<c:if test="${dict.itemCode eq service.action }">
-																				<spring:message code="${dict.itemValue }"/>
+																				<c:choose>
+																					<c:when test="${service.action eq 16}">
+																						<spring:message code="block_drop"/>
+																					</c:when>
+																					<c:otherwise>
+																						<spring:message code="${dict.itemValue }"/>
+																					</c:otherwise>
+																				</c:choose>
 																			</c:if>
 																		</c:forEach>
 																</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 5d58920d4..f81660b64 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -423,7 +423,14 @@
 								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
-												<spring:message code="${dict.itemValue }"/>
+												<c:choose>
+													<c:when test="${cfg.action eq 16}">
+														<spring:message code="block_drop"/>
+													</c:when>
+													<c:otherwise>
+														<spring:message code="${dict.itemValue }"/>
+													</c:otherwise>
+												</c:choose>
 											</c:if>
 										</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/help.jsp b/src/main/webapp/WEB-INF/views/help.jsp
index 7faea12a9..cd35fa574 100644
--- a/src/main/webapp/WEB-INF/views/help.jsp
+++ b/src/main/webapp/WEB-INF/views/help.jsp
@@ -60,16 +60,12 @@ function showHelp(helpHref) {
 			<spring:message code="${online_help }"></spring:message>
 		</h3>
 		<div class="row">
-			<div class="portlet-body">
-				<div class="col-md-4">
+			<div class="col-md-2">
 					<div id="menuTree" class="ztree" style="margin-top:3px;float:left;"></div>
 				</div>
-				<div class="col-md-8 help">
+				<div class="col-md-10 help">
 
 				</div>
-				
-				
-			</div>
 		</div>
 	</div>
 </body>