diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
index df3c3dc4f..b37152e50 100644
--- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
+++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
@@ -70,7 +70,12 @@ public class DkBehaviorLogController extends BaseController{
 			params.put("pageNo", page.getPageNo());
 			//查询值判断
 			initLogSearchValue(entry,params);
-			
+			if(entry.getLabelAppId()!=null){
+				params.put("searchLabelAppId", entry.getLabelAppId());
+			}
+			if(entry.getLabelProtoId()!=null){
+				params.put("searchLabelProtoId", entry.getLabelProtoId());
+			}
 			//获取字典信息
 			List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
 			List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
@@ -137,7 +142,12 @@ public class DkBehaviorLogController extends BaseController{
 				params.put("pageNo", page.getPageNo());
 				//查询值判断
 				initLogSearchValue(entry,params);
-				
+				if(entry.getLabelAppId()!=null){
+					params.put("searchLabelAppId", entry.getLabelAppId());
+				}
+				if(entry.getLabelProtoId()!=null){
+					params.put("searchLabelProtoId", entry.getLabelProtoId());
+				}
 				//获取字典信息
 				List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
 				List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
index 5c0d5c205..92f135aa0 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
@@ -46,6 +46,9 @@ public class BgpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
+			if(log.getAsNum()!=null){
+				params.put("searchAsNum", log.getAsNum());
+			}
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
@@ -97,7 +100,9 @@ public class BgpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(log.getAsNum()!=null){
+				params.put("searchAsNum", log.getAsNum());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
index 09379299c..ab3e82e58 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
@@ -69,6 +69,9 @@ public class DdosLogController extends BaseController{
 			}*/
 			//查询值判断
 			initLogSearchValue(entry,params);
+			if(entry.getAttackType()!=null){
+				params.put("searchAttackType", entry.getAttackType());
+			}
 			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
@@ -128,7 +131,9 @@ public class DdosLogController extends BaseController{
 				params.put("pageSize", page.getPageSize());
 				params.put("pageNo", page.getPageNo());
 				initLogSearchValue(log, params);
-
+				if(log.getAttackType()!=null){
+					params.put("searchAttackType", log.getAttackType());
+				}
 				List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 				System.out.print(log.getFunctionId());
 				model.addAttribute("serviceList", serviceList);
diff --git a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
index 5da87e518..2b386e2b8 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
@@ -61,6 +61,9 @@ public class FtpLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			// 查询值判断
 			initLogSearchValue(entry, params);
+			if(StringUtils.isNotBlank(entry.getFtpUrl())){
+				params.put("searchFtpUrl", entry.getFtpUrl());
+			}
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
@@ -113,7 +116,9 @@ public class FtpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(StringUtils.isNotBlank(log.getFtpUrl())){
+				params.put("searchFtpUrl", log.getFtpUrl());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
index 586959fc3..907e4525a 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
@@ -62,7 +62,9 @@ public class MmAvUrlLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			// 查询值判断
 			initLogSearchValue(entry, params);
-
+			if(StringUtils.isNotBlank(entry.getUrl())){
+				params.put("searchUrl", entry.getUrl());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
@@ -115,7 +117,9 @@ public class MmAvUrlLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(StringUtils.isNotBlank(log.getUrl())){
+				params.put("searchUrl", log.getUrl());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
index f2e391558..1dbdf1e0c 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,12 @@ public class MmVoipAccountLogController extends BaseController{
 			params.put("pageNo", page.getPageNo());
 			//查询值判断
 			initLogSearchValue(entry,params);
-			
+			if(StringUtils.isNotBlank(entry.getCallingAccount())){
+				params.put("searchCallingAccount", entry.getCallingAccount());
+			}
+			if(StringUtils.isNotBlank(entry.getCalledAccount())){
+				params.put("searchCalledAccount", entry.getCalledAccount());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
index eb7ab0876..92c57d072 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
@@ -59,7 +59,12 @@ public class MmVoipIpLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			// 查询值判断
 			initLogSearchValue(entry, params);
-
+			if(StringUtils.isNotBlank(entry.getCallingAccount())){
+				params.put("searchCallingAccount", entry.getCallingAccount());
+			}
+			if(StringUtils.isNotBlank(entry.getCalledAccount())){
+				params.put("searchCalledAccount", entry.getCalledAccount());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
@@ -111,7 +116,12 @@ public class MmVoipIpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(StringUtils.isNotBlank(log.getCallingAccount())){
+				params.put("searchCallingAccount", log.getCallingAccount());
+			}
+			if(StringUtils.isNotBlank(log.getCalledAccount())){
+				params.put("searchCalledAccount", log.getCalledAccount());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
index 55f38c9cd..7bc588402 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
@@ -46,7 +46,12 @@ public class P2pLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(StringUtils.isNotBlank(log.getP2pFileId())){
+				params.put("searchP2pFileId", log.getP2pFileId());
+			}
+			if(StringUtils.isNotBlank(log.getP2pKeyword())){
+				params.put("searchP2pKeyword", log.getP2pKeyword());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
@@ -97,7 +102,12 @@ public class P2pLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if(StringUtils.isNotBlank(log.getP2pFileId())){
+				params.put("searchP2pFileId", log.getP2pFileId());
+			}
+			if(StringUtils.isNotBlank(log.getP2pKeyword())){
+				params.put("searchP2pKeyword", log.getP2pKeyword());
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 40b8eb5c4..b596f50f3 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -636,7 +636,7 @@ dns_response=Response
 entrance=Entrance
 mail_proto=Mail Protocol 
 mail_from=Sender
-mail_to=Recipient
+mail_to=Receiver
 subject=Subject
 eml_file=EML File
 eml_key=EML File Key
@@ -664,8 +664,8 @@ voip_recv_time=VoIP Receive Time
 voip_protocol=VoIP
 av_protocol=AV Protocol
 duation=Duation(S)
-calling_account=Calling Account
-called_account=Called Account
+calling_account=Caller
+called_account=Receiver 
 calling_number=Calling Number
 called_number=Called Number
 from_to_store_ip=Calling VoIP Voice File Server IP
@@ -719,7 +719,7 @@ app_features_config=APP Policy Object
 cfg_type=Configuration Type
 encrypted_tunnel_behavior=Behavior Identify
 behaviour_type=Behavior Type
-basic_protocol=Protocol Identify
+basic_protocol=L7 Protocol
 ip_Reuse_pool_config=IP Reusing Pool
 dns_res_strategy=DNS Response Profiles
 policy_number=Policy No.
@@ -1080,7 +1080,7 @@ ip_must_select=IP Configuration must select
 av_voip_account_reject=VoIP Account Block
 av_voip_account_monit=VoIP Account Monitor
 p2p_proto=P2P Protocol
-p2p_file_id=File Marking
+p2p_file_id=File ID
 p2p_keyword=Emule Search Keyword
 APP_PAYLOAD=App PayLoad Feature
 APP_DNS=App Dns Feature
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 2504648ba..a0d9cdb0d 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -717,7 +717,7 @@ app_features_config=APP\u7279\u5f81
 cfg_type=\u914d\u7f6e\u7c7b\u578b
 encrypted_tunnel_behavior=\u52a0\u5bc6\u96a7\u9053\u884c\u4e3a
 behaviour_type=\u884c\u4e3a\u7c7b\u578b
-basic_protocol=\u57fa\u7840\u534f\u8bae
+basic_protocol=L7\u534F\u8BAE
 ip_Reuse_pool_config=IP \u590d\u7528\u5730\u5740\u6c60
 dns_res_strategy=DNS\u54cd\u5e94\u7b56\u7565
 policy_number=\u7b56\u7565\u53f7
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 6d2694252..56f489a57 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -527,8 +527,8 @@ log_time_start=2018-08-01 00:00:00
 log_time_end=2018-10-01 00:00:00
 area_tag=location
 isp_tag=isp
-mmFileDigestLog=mmFileDigestLogs
-ntcStreamMediaLog=ntcStreamMediaLogs
+mmFileDigestLog=v1/mmFileDigestLogs
+ntcStreamMediaLog=v1/ntcStreamMediaLogs
 #\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2
 av_duration_limit=120
 video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame
@@ -571,8 +571,8 @@ allIpGet=AllIpGet
 #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5
 trafficBandwidthTrans=v1/trafficBandwidthTrans
 trafficProtocolList=v1/trafficProtocolList
-irSnatLog=irSnatLogs
-irDnatLog=irDnatLogs
+irSnatLog=v1/irSnatLogs
+irDnatLog=v1/irDnatLogs
 trafficBandwidthTrans=v1/trafficBandwidthTrans
 trafficProtocolList=v1/trafficProtocolList
 trafficAppList=v1/trafficAppList
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index ef4319389..c886859ef 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -75,7 +75,7 @@ $(document).ready(function(){
 	</div>
 	<h3 class="page-title">
 		<c:if test="${log.functionId == 407}">
-	     <spring:message code="basic_protocol"/>
+	     <spring:message code="protocol_identify"/>
 	   </c:if>
 	   <c:if test="${log.functionId == 408}">
 	      <spring:message code="encrypted_tunnel_behavior"/>
@@ -205,21 +205,34 @@ $(document).ready(function(){
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
+											<label><spring:message code="social_app"/>：</label>
+											<form:select path="labelAppId" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+	                                        <c:forEach items="${appList}" var="dict">
+											 	<form:option value="${dict.code}"><spring:message code="${dict.item}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
+										</div>
 									</div>
-									</div>
-								</div>
-							<div class="row">
+									<c:if test="${log.functionId eq 63 or log.functionId eq 408}">
+										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="basic_protocol"/>：</label>
+												<form:select path="labelProtoId" class="selectpicker select2 form-control">
+		                                        <form:option value=""><spring:message code="select"/></form:option>
+		                                        <c:forEach items="${protocolList}" var="dict">
+												 	<form:option value="${dict.code}"><spring:message code="${dict.item}"/></form:option>
+									             </c:forEach>
+		                                    	</form:select>
+											</div>
+										</div>
+									</c:if>
+									
+								
 								<div class="col-md-2">
 								<div class="form-group">
 									<label><spring:message code="cfg_id"></spring:message>：</label>
@@ -246,11 +259,12 @@ $(document).ready(function(){
 								
 								<th class="sort-column label_proto_id" column="basic_protocol" ><spring:message code='basic_protocol'/></th>
 								<%-- <th class="sort-column label_proto_source" isVisible="false"><spring:message code='label_proto_source'/></th> --%>
+								<th class="sort-column label_app_id" column="social_app" ><spring:message code='social_app'/></th>
 								<c:if test="${functionID ne 407}">
 								<th class="sort-column label_behav_id" column="behaviour_type" ><spring:message code='behaviour_type'/></th>
 								</c:if>
 								<%-- <th class="sort-column label_behav_source" isVisible="false"><spring:message code='label_behav_source'/></th>  --%>
-								<th class="sort-column label_app_id" column="social_app" ><spring:message code='social_app'/></th>
+								
 								<%-- <th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> --%> 
 								<th class="sort-column cap_ip" isVisible="false" column="clj_ip" ><spring:message code="clj_ip"/></th>
 								<th class="sort-column trans_proto" column="transport_layer_protocol" ><spring:message code="transport_layer_protocol"/></th>
@@ -320,6 +334,15 @@ $(document).ready(function(){
 									<%-- <td>
 												${log.labelProtoSource}
 									</td> --%>
+									<td>
+									<c:set var="labelAppIds">${log.labelAppId }</c:set>
+										<c:forEach items="${appList}" var="dict">
+											<c:if test="${dict.code eq log.labelAppId}">
+												<c:set var="labelAppIds">${dict.item}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${labelAppIds}"/>
+									</td>
 									<c:if test="${functionID ne 407}">
 									<td>
 									<c:set var="labelBehavIds">${log.labelBehavId }</c:set>
@@ -334,15 +357,7 @@ $(document).ready(function(){
 									<%-- <td>
 												${log.labelBehavSource}
 									</td> --%>
-									<td>
-									<c:set var="labelAppIds">${log.labelAppId }</c:set>
-										<c:forEach items="${appList}" var="dict">
-											<c:if test="${dict.code eq log.labelAppId}">
-												<c:set var="labelAppIds">${dict.item}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${labelAppIds}"/>
-									</td>
+									
 									<%-- <td>
 												${log.labelAppSource}
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index 6c5592ac8..bc160e112 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -199,13 +199,8 @@
 								
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
+                                		<label class="control-label"><spring:message code="as"/>：</label>
+                                       	<input name="asNum" type="text" class="form-control" value="${log.asNum }"/>
 									</div>
                                 </div>
 							</div>
@@ -230,6 +225,9 @@
 								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th>
 								<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
+								<th class="sort-column type" column="message_type"><spring:message code='message_type'/></th>
+								<th class="sort-column as_num" column="as"><spring:message code='as'/></th>
+								<th class="sort-column route" column="route"><spring:message code='route'/></th>
 								<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
 								
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
@@ -258,9 +256,7 @@
 								<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
 								<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
 								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
-								<th class="sort-column type" column="message_type"><spring:message code='message_type'/></th>
-								<th class="sort-column as_num" column="as"><spring:message code='as'/></th>
-								<th class="sort-column route" column="route"><spring:message code='route'/></th>
+								
 							</tr>
 						</thead>
 						<tbody>
@@ -281,6 +277,17 @@
 										<spring:message code="${actions}"/>
 									</td>
 									<td>${log.foundTime }</td>
+									<td>
+									<c:set var="types">${log.type }</c:set>
+										<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
+											<c:if test="${type.itemCode eq log.type}">
+											<c:set var="types">${type.itemValue}</c:set>
+											</c:if>
+					                	</c:forEach>
+					                	<spring:message code="${types}"/>
+									</td>
+									<td>${log.asNum}</td>
+									<td>${log.route}</td>
 									<td>${log.recvTime }</td>
 									
 									<td>
@@ -371,17 +378,7 @@
 									<td>${log.dSubscribeId}</td>
 									<%-- <td>${log.userRegion}</td> --%>
 									<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
-									<td>
-									<c:set var="types">${log.type }</c:set>
-										<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
-											<c:if test="${type.itemCode eq log.type}">
-											<c:set var="types">${type.itemValue}</c:set>
-											</c:if>
-					                	</c:forEach>
-					                	<spring:message code="${types}"/>
-									</td>
-									<td>${log.asNum}</td>
-									<td>${log.route}</td>
+									
 								</tr>
 							</c:forEach>
 						</tbody>
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 2b98a6716..7f17d7c8f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -200,10 +200,10 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
+											<label><spring:message code="attack_type"/>：</label>
+											<form:select path="attackType" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('ATTACK_TYPE')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index d65a4d7a0..9392000d6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -200,16 +200,10 @@ $(document).ready(function(){
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
 										</div>
 									</div>
-									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
+											<label><spring:message code="ftp_url"/>：</label>
+											<input id="ftpUrl" name="ftpUrl" class="form-control" type="text" value="${log.ftpUrl}"/>
 										</div>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index ec4dcfde4..863b09b06 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -196,18 +196,6 @@
 										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
 									</div>
 								</div>
-								
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
 							</div>
 							<div class="row">
 								<div class="col-md-2">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index c53cc8e4f..b82158f3d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -153,6 +153,18 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 										</div>
 									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="calling_account"/>：</label>
+											<input id="callingAccount" name="callingAccount" class="form-control" type="text" value="${log.callingAccount}"/>
+										</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="called_account"/>：</label>
+											<input id="calledAccount" name="calledAccount" class="form-control" type="text" value="${log.calledAccount}"/>
+										</div>
+									</div>
 									<div class="col-md-2">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 3ae5ad9a4..1528d6fb8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -212,8 +212,21 @@ $(document).ready(function(){
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
 										</div>
 									</div>
+									
 								</div>
 								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="calling_account"/>：</label>
+											<input id="callingAccount" name="callingAccount" class="form-control" type="text" value="${log.callingAccount}"/>
+										</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="called_account"/>：</label>
+											<input id="calledAccount" name="calledAccount" class="form-control" type="text" value="${log.calledAccount}"/>
+										</div>
+									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
index bade0bf5e..9aceaf92e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -211,6 +211,12 @@ $(document).ready(function(){
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
 										</div>
 									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="access_url"/>：</label>
+											<input id="url" name="url" class="form-control" type="text" value="${log.url}"/>
+										</div>
+									</div>
 								</div>
 								<div class="row">
 									<div class="col-md-2">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index 2ec66a1f9..63cb0badb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -197,19 +197,20 @@
 									</div>
 								</div>
 								
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
 							</div>
 								<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="p2p_file_id"></spring:message>：</label>
+										<input name="p2pFileId" type="text" class="form-control" value="${log.p2pFileId }"/>
+									</div>
+								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="p2p_keyword"></spring:message>：</label>
+										<input name="p2pKeyword" type="text" class="form-control" value="${log.p2pKeyword }"/>
+									</div>
+								</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>