diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java
index de302a7ac..6c5987c3c 100644
--- a/src/main/java/com/nis/domain/log/BaseLogEntity.java
+++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java
@@ -47,8 +47,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected String serverLocate;// 服务端地址定位信息
 	@ExcelField(title="client_locate",sort=68)
 	protected String clientLocate;// 客户端地址定位信息
-	@ExcelField(title="user_region",sort=76)
-	protected String userRegion; //用户自定义
+//	@ExcelField(title="user_region",sort=76)
+//	protected String userRegion; //用户自定义
 	@ExcelField(title="s_asn",sort=70)
 	protected String sAsn;//客户端ASN
 	@ExcelField(title="d_asn",sort=71)
@@ -211,12 +211,12 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	public void setAddrList(String addrList) {
 		this.addrList = addrList;
 	}
-	public String getUserRegion() {
+	/*public String getUserRegion() {
 		return userRegion;
 	}
 	public void setUserRegion(String userRegion) {
 		this.userRegion = userRegion;
-	}
+	}*/
 	public Integer getFunctionId() {
 		return functionId;
 	}
@@ -307,8 +307,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 				+ transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
 				+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
 				+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
-				+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion="
-				+ userRegion + ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId
+				+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + /*", userRegion="
+				+ userRegion +*/ ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId
 				+ ", dSubscribeId=" + dSubscribeId + ", sceneFile=" + sceneFile + ", functionId=" + functionId
 				+ ", action=" + action + ", date=" + date + ", seltype=" + seltype + ", searchFoundStartTime="
 				+ searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + ", isLogTotalSearch="
diff --git a/src/main/java/com/nis/domain/log/NtcDdosLog.java b/src/main/java/com/nis/domain/log/NtcDdosLog.java
index bce7b82ea..a4cc496be 100644
--- a/src/main/java/com/nis/domain/log/NtcDdosLog.java
+++ b/src/main/java/com/nis/domain/log/NtcDdosLog.java
@@ -33,7 +33,7 @@ public class NtcDdosLog extends BaseLogEntity<NtcDdosLog> {
 	@ExcelField(title="attack_total_byte",sort=14)
     @ApiModelProperty(value = "攻击累积字节数", required = true)
     protected String attackTotalByte;
-	@ExcelField(title="is_block ",dictType="SYS_YES_NO",sort=15)
+	@ExcelField(title="is_block",dictType="SYS_YES_NO",sort=15)
     @ApiModelProperty(value = "攻击流量是否被丢弃", required = true)
     protected Integer isBlock;
     
diff --git a/src/main/java/com/nis/domain/log/PxyHttpLog.java b/src/main/java/com/nis/domain/log/PxyHttpLog.java
index 6fa37de16..6242b2787 100644
--- a/src/main/java/com/nis/domain/log/PxyHttpLog.java
+++ b/src/main/java/com/nis/domain/log/PxyHttpLog.java
@@ -24,13 +24,13 @@ public class PxyHttpLog extends BaseLogEntity<NtcIpLog> {
 	private String contentType;
 	@ExcelField(title="set_cookie",sort=16)
 	private String setCookie;
-	@ExcelField(title="req_header",sort=17)
+//	@ExcelField(title="req_header",sort=17)
 	private String reqHeader;
-	@ExcelField(title="resp_header",sort=18)
+//	@ExcelField(title="resp_header",sort=18)
 	private String respHeader;
-
+	@ExcelField(title="req_body",sort=17)
 	private String reqBody;
-
+	@ExcelField(title="resp_body",sort=18)
 	private String resBody;
 	@ExcelField(title="website",sort=19)
 	private String website;
diff --git a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
index 9a8d6a7d1..df5490fae 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
@@ -245,13 +245,13 @@ public class CollectVoipLogController extends BaseController {
 			String jsonString = HttpClientUtil.getMsg(url, params, request);
 
 			GsonBuilder builder = new GsonBuilder();
-			builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
-
-				public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
-						JsonDeserializationContext context) throws JsonParseException {
-					return new Date(json.getAsJsonPrimitive().getAsLong());
-				}
-			});
+//			builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
+//
+//				public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
+//						JsonDeserializationContext context) throws JsonParseException {
+//					return new Date(json.getAsJsonPrimitive().getAsLong());
+//				}
+//			});
 			Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
 			// gson泛型支持
 			LogRecvData<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString,
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
index 19137f428..36c137117 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
@@ -133,6 +133,8 @@ public class MmPornAvSampleController extends BaseController {
 					//---------------------------
 					
 					PageLog<MmAvIpLog> page = new PageLog<MmAvIpLog>(request, response);
+					page.setPageNo(1);
+					page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
 					Map<String, Object> params=new HashMap<>();
 					params.put("pageSize", page.getPageSize());
 					params.put("pageNo", page.getPageNo());
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
index 8945e4e49..d697295df 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
@@ -100,7 +100,7 @@ public class MmSampleAudioController extends BaseController{
 						System.out.print(log.getFunctionId());
 						model.addAttribute("serviceList", serviceList);
 
-						String url = Constants.LOG_BASE_URL + Constants.NTC_DDOS_LOG;
+						String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG;
 						String recv = HttpClientUtil.getMsg(url, params, request);
 						List<MmSampleAudioLog> list = new ArrayList<MmSampleAudioLog>();
 						if (StringUtils.isNotBlank(recv)) {
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
index de9b96ca8..ed3c9d764 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
@@ -89,6 +89,8 @@ public class MmSamplePicController extends BaseController{
 					Map<String, String> noExportMap = new HashMap<String, String>();
 					
 					PageLog<MmSamplePicLog> page = new PageLog<MmSamplePicLog>(request,response);
+					page.setPageNo(1);
+					page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
 					Map<String, Object> params = new HashMap<String,Object>();
 					params.put("pageSize", page.getPageSize());
 					params.put("pageNo", page.getPageNo());
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
index 431db7c9c..e038d91a0 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
@@ -96,7 +96,7 @@ public class MmSampleVideoController extends BaseController{
 					System.out.print(log.getFunctionId());
 					model.addAttribute("serviceList", serviceList);
 
-					String url = Constants.LOG_BASE_URL + Constants.NTC_DDOS_LOG;
+					String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG;
 					String recv = HttpClientUtil.getMsg(url, params, request);
 					List<MmSampleVideoLog> list = new ArrayList<MmSampleVideoLog>();
 					if (StringUtils.isNotBlank(recv)) {
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
index 7eb385a2c..2374dfeb9 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
@@ -95,6 +95,8 @@ public class MmSampleVoipLogController extends BaseController {
 			//---------------------------
 			
 			PageLog<MmVoipLog> page = new PageLog<MmVoipLog>(request, response);
+			page.setPageNo(1);
+			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
 			Map<String, Object> params=new HashMap<>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
index 3f0d4d2ad..0a262ebf4 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
@@ -104,6 +104,7 @@ public class OpenVpnLogController extends BaseController{
 	//radius配置导出
 		@RequestMapping(value = "exportNtcOpenvpnLogs")
 		public void exportRadius(@ModelAttribute("log") NtcOpenVpnLog log, Model model,String hColumns,String type, HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes){
+			String name="";
 			try {
 				//export data info
 				List<String> titleList=new ArrayList<String>();
@@ -142,9 +143,14 @@ public class OpenVpnLogController extends BaseController{
 						l.setFunctionId(log.getFunctionId());
 						setLogAction(l, serviceList);
 					}
+				}	
+				if(log.getFunctionId()==214){
+					name="spoofing_ip_policy";
+				}else if(log.getFunctionId()==212){
+					name="ip_payload";
 				}
-					titleList.add("spoofing_ip_policy");
-					classMap.put("spoofing_ip_policy", NtcOpenVpnLog.class);
+					titleList.add(name);
+					classMap.put(name, NtcOpenVpnLog.class);
 					SysUser user =UserUtils.getUser();
 					if (!user.isAdmin()){
 						hColumns+=",scene_file,";
@@ -152,18 +158,18 @@ public class OpenVpnLogController extends BaseController{
 						hColumns+=",";
 					}
 					String cfgIndexInfoNoExport=","+hColumns;
-					noExportMap.put("spoofing_ip_policy",cfgIndexInfoNoExport);
-					dataMap.put("spoofing_ip_policy",list);
-					String timeRange= initLogMap(log,"spoofing_ip_policy");
+					noExportMap.put(name,cfgIndexInfoNoExport);
+					dataMap.put(name,list);
+					String timeRange= initLogMap(log,name);
 					noExportMap.put("timeRange", timeRange);
 				/*}*/
 				if("csv".equals(type)){
-					this._exportCsv(model, request, response, redirectAttributes,"spoofing_ip_policy",titleList,classMap,dataMap,noExportMap);
+					this._exportCsv(model, request, response, redirectAttributes,name,titleList,classMap,dataMap,noExportMap);
 				}else{
-					this._export(model, request, response, redirectAttributes,"spoofing_ip_policy",titleList,classMap,dataMap,noExportMap);
+					this._export(model, request, response, redirectAttributes,name,titleList,classMap,dataMap,noExportMap);
 				}
 			} catch (Exception e) {
-				logger.error("openVpn export failed",e);
+				logger.error(name+" export failed",e);
 				addMessage(redirectAttributes,"error","export_failed");
 			}
 		}
diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
index 6b7742694..700b0e13c 100644
--- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
@@ -175,7 +175,7 @@ public class PxyHttpLogController extends BaseController {
 			} else {
 				hColumns += ",";
 			}
-			String cfgIndexInfoNoExport = "," + hColumns;
+			String cfgIndexInfoNoExport = ",inner_smac,inner_dmac,nest_addr_list," + hColumns;
 			noExportMap.put(pxyName, cfgIndexInfoNoExport);
 			dataMap.put(pxyName, list);
 			String timeRange= initLogMap(log,pxyName);
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 7f17d7c8f..fe013ce79 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -244,7 +244,7 @@ $(document).ready(function(){
  								<th class="sort-column is_block" column="is_block" ><spring:message code='is_block'/></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="protocol_type" ><spring:message code="protocol_type"/></th>
+ 								<th class="sort-column trans_proto" column="transport_layer_protocol" ><spring:message code="transport_layer_protocol"/></th>
 								<th class="sort-column addr_type" column="addr_type" ><spring:message code='addr_type'/></th>
 								<th class="sort-column d_ip" column="server_ip" ><spring:message code="server_ip"/></th>
 								<th class="sort-column s_ip" column="client_ip" ><spring:message code="client_ip"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index 453cc9c66..fa8b05727 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -110,8 +110,10 @@ $(document).ready(function(){
                                 	<div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
                                    	</div>
-                                   	<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
+                                   	<%-- <input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/> --%>
+									<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 							<div class="pull-left">
@@ -119,8 +121,10 @@ $(document).ready(function(){
                                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
                                    	</div>
-                                    <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/>
+                                    <%-- <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/> --%>
+									<input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 	                               
@@ -141,6 +145,25 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 										<label><spring:message code="transport_layer_protocol"/>：</label>
@@ -165,38 +188,26 @@ $(document).ready(function(){
 	                                    	</form:select>
 										</div>
 									</div> --%>
-									<div class="col-md-2">
-									<div class="form-group">
-										<label><spring:message code="entrance"/>：</label>
-										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
-												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-	                                        <label><spring:message code="clj_ip"/>：</label>
-	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                    </div>
+											<label><spring:message code="serverip"/>：</label>
+											<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="clientip"/>：</label>
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+										</div>
 									</div>
-									</div>
+								</div>
+								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
-									</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 }"/>
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index 34fb3f011..aac06889c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -110,8 +110,10 @@ $(document).ready(function(){
                                 	<div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
                                    	</div>
-                                   	<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
+                                   	<%-- <input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/> --%>
+									<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 							<div class="pull-left">
@@ -119,8 +121,10 @@ $(document).ready(function(){
                                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
                                    	</div>
-                                    <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/>
+                                    <%-- <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/> --%>
+									<input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 	                               
@@ -141,6 +145,25 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 										<label><spring:message code="transport_layer_protocol"/>：</label>
@@ -165,38 +188,26 @@ $(document).ready(function(){
 	                                    	</form:select>
 										</div>
 									</div> --%>
-									<div class="col-md-2">
-									<div class="form-group">
-										<label><spring:message code="entrance"/>：</label>
-										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
-												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-	                                        <label><spring:message code="clj_ip"/>：</label>
-	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                    </div>
+											<label><spring:message code="serverip"/>：</label>
+											<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="clientip"/>：</label>
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+										</div>
 									</div>
-									</div>
+								</div>
+								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
-									</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 }"/>
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index a57d3c474..40624cefb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -110,8 +110,10 @@ $(document).ready(function(){
                                 	<div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
                                    	</div>
-                                   	<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/>
+                                   	<%-- <input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:setTimee,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchFoundEndTime\')}'});"/> --%>
+									<input name="searchFoundStartTime" id="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 							<div class="pull-left">
@@ -119,8 +121,10 @@ $(document).ready(function(){
                                     <div class="input-group-btn">
 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
                                    	</div>
-                                    <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/>
+                                    <%-- <input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchFoundStartTime\')}',maxDate:'#F{$dp.$D(\'searchFoundStartTime\',{d:1})}'});"/> --%>
+									<input name="searchFoundEndTime" id="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                           		</div> 
                             </div>
 	                               
@@ -141,6 +145,25 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+	                                        <label><spring:message code="clj_ip"/>：</label>
+	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                    </div>
+									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 										<label><spring:message code="transport_layer_protocol"/>：</label>
@@ -165,38 +188,26 @@ $(document).ready(function(){
 	                                    	</form:select>
 										</div>
 									</div> --%>
-									<div class="col-md-2">
-									<div class="form-group">
-										<label><spring:message code="entrance"/>：</label>
-										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
-												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-	                                        <label><spring:message code="clj_ip"/>：</label>
-	                                        <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                    </div>
+											<label><spring:message code="serverip"/>：</label>
+											<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="clientip"/>：</label>
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+										</div>
 									</div>
-									</div>
+								</div>
+								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
-									</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 }"/>
+											<label><spring:message code="cfg_id"></spring:message>：</label>
+											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										</div>
 									</div>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 2044b4ca7..489083104 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -232,7 +232,7 @@ $(document).ready(function(){
 								<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
 								<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
 								<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
-								<th class="sort-column action_detail" isVisible="false" column="action_detail"><spring:message code='action_detail'/></th>
+								<%-- <th class="sort-column action_detail" isVisible="false" column="action_detail"><spring:message code='action_detail'/></th> --%>
 								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
 							</tr>
 						</thead>
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 2d5dfa0c4..de42880d1 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -228,7 +228,7 @@
 								
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id" ><spring:message code="entrance_id"/></th>
 								
-								<th class="sort-column url"> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+								<th class="sort-column url" column="URL"> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 								<th class="sort-column website" column="website" ><spring:message code="website"/></th>
 								<c:if test="${fns:getUser().isAdmin()}">
 								<th class="sort-column req_line" column="req_line" ><spring:message code="req_line"/></th>