diff --git a/src/main/resources/sql/20180910/update_function_region_dict-20180910.sql b/src/main/resources/sql/20180910/update_function_region_dict-20180910.sql
new file mode 100644
index 000000000..7d8fca9a5
--- /dev/null
+++ b/src/main/resources/sql/20180910/update_function_region_dict-20180910.sql
@@ -0,0 +1,3 @@
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '196', '630', '1', 'MM_SPEAKER_RECOGNIZATION', null, '说话人识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '197', '631', '1', 'MM_LOGO_DETECTION', null, '台标识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');
+INSERT INTO `function_region_dict` VALUES ('', '', '', '', '', '198', '632', '1', 'MM_FACE_RECOGNIZATION', null, '人脸识别配置', '1', null, null, null, null, '2', '5', null, null, null, null, null, null, '1');
diff --git a/src/main/resources/sql/20180910/update_function_service_dict-20180910.sql b/src/main/resources/sql/20180910/update_function_service_dict-20180910.sql
new file mode 100644
index 000000000..66aa77faf
--- /dev/null
+++ b/src/main/resources/sql/20180910/update_function_service_dict-20180910.sql
@@ -0,0 +1,6 @@
+INSERT INTO `function_service_dict` VALUES ('121', '630', '0', '1', 'reject', '267', 'mm_speaker_recognization_reject', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('122', '630', '0', '16', 'monit', '395', 'mm_speaker_recognization_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('123', '631', '0', '1', 'monit', '396', 'mm_logo_detection_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('124', '631', '0', '16', 'reject', '268', 'mm_logo_detection_reject', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('125', '632', '0', '1', 'monit', '397', 'mm_face_recognization_monit', null, '1', null, null, null, null, '');
+INSERT INTO `function_service_dict` VALUES ('126', '632', '0', '16', 'reject', '269', 'mm_face_recognization_reject', null, '1', null, null, null, null, '');
diff --git a/src/main/resources/sql/20180910/update_sys_menu-20180910.sql b/src/main/resources/sql/20180910/update_sys_menu-20180910.sql
new file mode 100644
index 000000000..a414900fb
--- /dev/null
+++ b/src/main/resources/sql/20180910/update_sys_menu-20180910.sql
@@ -0,0 +1,9 @@
+INSERT INTO `sys_menu` VALUES ('1056', '932', '0,1,86,932,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '85', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 18:56:37', '1', '2018-09-10 14:24:05', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1058', '932', '0,1,86,932,', 'MM_LOGO_DETECTION', '台标识别', '86', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 19:01:25', '1', '2018-09-10 14:25:01', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1059', '932', '0,1,86,932,', 'MM_FACE_RECOGNIZATION', '人脸识别', '87', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avFileSample:config', '1', '2018-09-08 19:03:54', '1', '2018-09-10 14:25:17', '', '1', null, '0', '0', '632');
+INSERT INTO `sys_menu` VALUES ('1060', '935', '0,1,150,935,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '85', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:17:32', '1', '2018-09-10 14:25:59', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1061', '935', '0,1,150,935,', 'MM_LOGO_DETECTION', '台标识别', '86', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:23:27', '1', '2018-09-10 14:23:27', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1062', '935', '0,1,150,935,', 'MM_FACE_RECOGNIZATION', '人脸识别', '87', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avSignSample:confirm', '1', '2018-09-10 14:27:13', '1', '2018-09-10 14:27:13', '', '1', null, '0', '0', '632');
+INSERT INTO `sys_menu` VALUES ('1063', '938', '0,1,151,938,', 'MM_SPEAKER_RECOGNIZATION', '说话人识别', '153', '/ntc/av/sample/fileSampleSpeakerList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:28:46', '1', '2018-09-10 14:29:24', '', '1', null, '0', '0', '630');
+INSERT INTO `sys_menu` VALUES ('1064', '938', '0,1,151,938,', 'MM_LOGO_DETECTION', '台标识别', '154', '/ntc/av/sample/fileSampleLogoList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:30:27', '1', '2018-09-10 14:30:27', '', '1', null, '0', '0', '631');
+INSERT INTO `sys_menu` VALUES ('1065', '938', '0,1,151,938,', 'MM_FACE_RECOGNIZATION', '人脸识别', '155', '/ntc/av/sample/fileSampleFaceList', '', '', '1', 'avFileSample:audit', '1', '2018-09-10 14:31:09', '1', '2018-09-10 14:31:09', '', '1', null, '0', '0', '632');
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index a6e1376c1..954b93242 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -59,6 +59,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												keywords=keywords.replace("***and***","")
 												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 9596ac4b3..bbdf68da6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -192,7 +192,6 @@
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
 							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							<input type="hidden" name="doLog" value="0">
 							<input type="hidden" id="regionSize" name="regionSize"
 								value="${fn:length(regionList)}">
 
@@ -237,6 +236,30 @@
 										</div>
 									</div>
 								</div>
+								<!-- dolog begin-->
+								<div class="row">
+									<div class="col-md-6">
+										<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="${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>
+								<!-- dolog end-->
 								<%--   action 为1 监测时 可以选择证书--%>
 								<div class="row monitAction hidden">
 									<div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 0035d5bd8..6e9012955 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -338,7 +338,7 @@
 							    		<th><spring:message code="replace_content"/></th>
 							    	</c:if>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
-									<%-- <th><spring:message code="do_log"/></th> --%>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -408,13 +408,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td>
+									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
+									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 7a3e7c84d..aaaabcf72 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -48,8 +48,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,8 +68,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -84,8 +80,6 @@
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
@@ -103,8 +97,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
index beb064486..8cb372623 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
@@ -48,8 +48,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,8 +68,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -84,8 +80,6 @@
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
@@ -103,8 +97,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 4bb634b8a..41853fa9e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 33907f8b8..61e7d069d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -43,7 +43,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index b717a2958..2f47305ea 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 0d5de2b66..1441790e1 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index 183ca4a1e..b2c418e8c 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -50,7 +50,7 @@ $(document).ready(function() {
 	});
 	
 	// 添加由配置界面跳转到日志查询界面后的返回按钮
-	var cfgId = $("#cfgId").val();
+	var cfgId = $("input[name=cfgId]").val();
 	if(cfgId != undefined && cfgId != ''){
 		$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
 	}