diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 1cf5a85b9..46f7267a0 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1069,8 +1069,8 @@ website=\u7F51\u7AD9\u57DF\u540D
 
 p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B
 p2p_hash_type=HASH\u7C7B\u578B
-NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
-WHITE_LIST_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+NTC_SUBSCRIBE_ID=\u8D26\u53F7
+WHITE_LIST_SUBSCRIBE_ID=\u8D26\u53F7
 
 app_header_config=APP\u5C42\u5934\u7279\u5F81
 app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
@@ -1090,7 +1090,7 @@ file_desc=\u6587\u4EF6\u63CF\u8FF0
 content_type=\u5185\u5BB9\u7C7B\u578B
 content_length=\u6587\u4EF6\u957F\u5EA6
 response_file=\u54CD\u5E94\u6587\u4EF6
-APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+APP_SUBSCRIBE_ID=\u8D26\u53F7
 reply_file=\u54CD\u5E94\u6587\u4EF6
 app_topic_domain_cfg=\u4E3B\u9898\u7F51\u7AD9
 #=====================about app Tcp=================================
diff --git a/src/main/resources/sql/20180914/update_function_service_dict.sql b/src/main/resources/sql/20180914/update_function_service_dict.sql
new file mode 100644
index 000000000..c8b2bf348
--- /dev/null
+++ b/src/main/resources/sql/20180914/update_function_service_dict.sql
@@ -0,0 +1,3 @@
+#修改人脸识别阻断和监测的serviceId
+UPDATE `function_service_dict` SET `service_id`='268' , `action`='16'  WHERE `dict_id`='121';
+UPDATE `function_service_dict` SET `service_id`='396' , `action`='1'  WHERE `dict_id`='122';
\ No newline at end of file
diff --git a/src/main/resources/sql/20180917/update_region_dict.sql b/src/main/resources/sql/20180917/update_region_dict.sql
new file mode 100644
index 000000000..97467cc4c
--- /dev/null
+++ b/src/main/resources/sql/20180917/update_region_dict.sql
@@ -0,0 +1,2 @@
+#update account and DNS match_method=0,1,2,3
+update function_region_dict set config_match_method='0,1,2,3' where dict_id in (16,28);
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index a05792247..ccffc862d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -143,7 +143,7 @@ $(function(){
 									<div class="form-group">
 										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq 0}">
+											<c:if test="${dict.itemCode eq 1}">
 												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index bfb1d3f45..044899f34 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -143,7 +143,7 @@ $(function(){
 									<div class="form-group">
 										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq 0}">
+											<c:if test="${dict.itemCode eq 1}">
 												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index 3cbb163c2..cce15f030 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -172,7 +172,7 @@ $(function(){
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-												<c:if test="${dict.itemCode eq 0}">
+												<c:if test="${dict.itemCode eq 1}">
 													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 												</c:if>
 											</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index b766fb286..993adf11b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -171,7 +171,7 @@ $(function(){
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-												<c:if test="${dict.itemCode eq 0}">
+												<c:if test="${dict.itemCode eq 1}">
 													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 												</c:if>
 											</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index 81e14a51e..bad41a0ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -221,7 +221,7 @@ $(function(){
 									<div class="form-group">
 										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq 0}">
+											<c:if test="${dict.itemCode eq 1}">
 												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 40f6b13fc..99d3f9b03 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -172,7 +172,7 @@ $(function(){
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-												<c:if test="${dict.itemCode eq 0}">
+												<c:if test="${dict.itemCode eq 1}">
 													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 												</c:if>
 												<%-- <c:choose>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index f10a02f43..f70f619ea 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -159,26 +159,29 @@ $(function(){
 								</div>
 								<!-- dolog begin-->
 								<div class="row " >
-									<div class="col-md-6" hidden="true">
-									<div class="form-group">
-										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-										<c:choose>
-											<c:when test="${dict.itemCode eq _cfg.doLog}">
-												<label class="radio-inline">
-													<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
-												</label>
-											</c:when>
-											<c:otherwise>
-												<label class="radio-inline">
-													<input type="radio" name="doLog" value="0" ><spring:message code="${dict.itemValue}"/>
-												</label>
-											</c:otherwise>
-										</c:choose>
-										</c:forEach>
+									<div class="col-md-6 hidden">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+												<c:if test="${dict.itemCode eq 1}">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</c:if>
+												<%-- <c:choose>
+													<c:when test="${dict.itemCode eq _cfg.doLog}">
+														<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+														</label>
+													</c:when>
+													<c:otherwise>
+														<label class="radio-inline">
+															<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+														</label>
+													</c:otherwise>
+												</c:choose> --%>
+											</c:forEach>
+										</div>
 									</div>
 								</div>
-								</div>
 								<!-- dolog end-->
 								
 								<c:forEach items="${regionList}" var="region">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
index a51780d00..efaa37535 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
@@ -234,25 +234,28 @@ $(function(){
 										            <div for="action"></div>
 										       </div>
 										</div>
-										<div class="col-md-6" hidden="true">
+										<div class="col-md-6 hidden">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:choose>
-												<c:when test="${dict.itemCode eq _cfg.doLog}">
-													<label class="radio-inline">
-														<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
-													</label>
-												</c:when>
-												<c:otherwise>
-													<label class="radio-inline">
-														<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
-													</label>
-												</c:otherwise>
-											</c:choose>
+												<c:if test="${dict.itemCode eq 1}">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</c:if>
+												<%-- <c:choose>
+													<c:when test="${dict.itemCode eq _cfg.doLog}">
+														<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+														</label>
+													</c:when>
+													<c:otherwise>
+														<label class="radio-inline">
+															<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+														</label>
+													</c:otherwise>
+												</c:choose> --%>
 											</c:forEach>
 										</div>
-										</div>
+									</div>
 										<!-- WEBSITE -->
 										<div class="col-md-6">
 												<div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
index 734459f57..7eb70b40e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
@@ -50,7 +50,6 @@ $(function(){
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                    		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                   		<input type="hidden" id="requestId" name="requestId" value="0">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
@@ -111,6 +110,10 @@ $(function(){
 							<!-- desc and action -->
                            <%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> 
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>--%>
+                            <input type="hidden" name="requestId" value="0"/>
+							<input type="hidden" name="classify" value="0"/>
+							<input type="hidden" name="attribute" value="0"/>
+							<input type="hidden" name="lable" value="0"/>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 2bd43db5b..296bbb996 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -91,7 +91,7 @@ function hiddenlevel(){
 		$("input[name='level']").val(0);
 	}else {
 		$(".leveL").removeClass("hidden");
-		$("input[name='level']").val('');
+// 		$("input[name='level']").val('');
 	}
 }
 </script>
@@ -219,7 +219,7 @@ function hiddenlevel(){
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 							            <div class="col-md-6">
-							            	 <input class="form-control required number" range="[0,100]" type="text" name="level" value="">
+							            	 <input class="form-control required number" range="[0,100]" type="text" name="level" value="${_cfg.level }">
 							            </div>
 							            <div for="level"></div>
 							        </div>