ip、dns、http日志查询

src/main/java/com/nis/domain/log/NtcDnsLog.java

@@ -0,0 +1,109 @@
+package com.nis.domain.log;
+
+public class NtcDnsLog extends BaseLogEntity<NtcDnsLog> {
+
+	private static final long serialVersionUID = -3763888115864065019L;
+
+	private Integer qr;
+	private Integer rd;
+	private Integer ra;
+	private String rr;
+	private Integer qType;
+	private Integer qClass;
+	private Integer opCode;
+	private String qName;
+	private String cName;
+	private Integer dnsSub;
+	
+	/*以下字段无需反馈到界面*/
+	private String cheatType;
+	private Integer cheatRcode;
+	private String cheatStrategy;
+	private String cheatRr;
+	
+	
+	public String getCheatType() {
+		return cheatType;
+	}
+	public void setCheatType(String cheatType) {
+		this.cheatType = cheatType;
+	}
+	public Integer getCheatRcode() {
+		return cheatRcode;
+	}
+	public void setCheatRcode(Integer cheatRcode) {
+		this.cheatRcode = cheatRcode;
+	}
+	public String getCheatStrategy() {
+		return cheatStrategy;
+	}
+	public void setCheatStrategy(String cheatStrategy) {
+		this.cheatStrategy = cheatStrategy;
+	}
+	public String getCheatRr() {
+		return cheatRr;
+	}
+	public void setCheatRr(String cheatRr) {
+		this.cheatRr = cheatRr;
+	}
+	public Integer getQr() {
+		return qr;
+	}
+	public void setQr(Integer qr) {
+		this.qr = qr;
+	}
+	public Integer getRd() {
+		return rd;
+	}
+	public void setRd(Integer rd) {
+		this.rd = rd;
+	}
+	public Integer getRa() {
+		return ra;
+	}
+	public void setRa(Integer ra) {
+		this.ra = ra;
+	}
+	public String getRr() {
+		return rr;
+	}
+	public void setRr(String rr) {
+		this.rr = rr;
+	}
+	public Integer getqType() {
+		return qType;
+	}
+	public void setqType(Integer qType) {
+		this.qType = qType;
+	}
+	public Integer getqClass() {
+		return qClass;
+	}
+	public void setqClass(Integer qClass) {
+		this.qClass = qClass;
+	}
+	public Integer getOpCode() {
+		return opCode;
+	}
+	public void setOpCode(Integer opCode) {
+		this.opCode = opCode;
+	}
+	public String getqName() {
+		return qName;
+	}
+	public void setqName(String qName) {
+		this.qName = qName;
+	}
+	public String getcName() {
+		return cName;
+	}
+	public void setcName(String cName) {
+		this.cName = cName;
+	}
+	public Integer getDnsSub() {
+		return dnsSub;
+	}
+	public void setDnsSub(Integer dnsSub) {
+		this.dnsSub = dnsSub;
+	}
+}

src/main/java/com/nis/domain/log/NtcHttpLog.java

@@ -0,0 +1,137 @@
+package com.nis.domain.log;
+
+public class NtcHttpLog extends BaseLogEntity<NtcHttpLog> {
+
+	private static final long serialVersionUID = -7697668215327123848L;
+
+	private String url;
+	private String reqHdrFile;
+	private String reqBodyFile;
+	private String resHdrFile;
+	private String resBodyFile;
+	
+	/*以下字段无需反馈到界面*/
+	private Integer c2sIsn;
+	private Integer pxyFlag;
+	private Integer httpSeq;
+	private String reqLine;
+	private String resLine;
+	private String cookie;
+	private String refefer;
+	private String userAgent;
+	private String userDefineKey;
+	private String userDefineValue;
+	private String contentLen;
+	private String contentType;
+	private String setCookie;
+	
+	
+	public String getReqHdrFile() {
+		return reqHdrFile;
+	}
+	public void setReqHdrFile(String reqHdrFile) {
+		this.reqHdrFile = reqHdrFile;
+	}
+	public String getReqBodyFile() {
+		return reqBodyFile;
+	}
+	public void setReqBodyFile(String reqBodyFile) {
+		this.reqBodyFile = reqBodyFile;
+	}
+	public String getResHdrFile() {
+		return resHdrFile;
+	}
+	public void setResHdrFile(String resHdrFile) {
+		this.resHdrFile = resHdrFile;
+	}
+	public String getResBodyFile() {
+		return resBodyFile;
+	}
+	public void setResBodyFile(String resBodyFile) {
+		this.resBodyFile = resBodyFile;
+	}
+	public Integer getPxyFlag() {
+		return pxyFlag;
+	}
+	public void setPxyFlag(Integer pxyFlag) {
+		this.pxyFlag = pxyFlag;
+	}
+	public String getCookie() {
+		return cookie;
+	}
+	public void setCookie(String cookie) {
+		this.cookie = cookie;
+	}
+	public String getRefefer() {
+		return refefer;
+	}
+	public void setRefefer(String refefer) {
+		this.refefer = refefer;
+	}
+	public String getUserAgent() {
+		return userAgent;
+	}
+	public void setUserAgent(String userAgent) {
+		this.userAgent = userAgent;
+	}
+	public String getUserDefineKey() {
+		return userDefineKey;
+	}
+	public void setUserDefineKey(String userDefineKey) {
+		this.userDefineKey = userDefineKey;
+	}
+	public String getUserDefineValue() {
+		return userDefineValue;
+	}
+	public void setUserDefineValue(String userDefineValue) {
+		this.userDefineValue = userDefineValue;
+	}
+	public String getContentLen() {
+		return contentLen;
+	}
+	public void setContentLen(String contentLen) {
+		this.contentLen = contentLen;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getSetCookie() {
+		return setCookie;
+	}
+	public void setSetCookie(String setCookie) {
+		this.setCookie = setCookie;
+	}
+	public Integer getC2sIsn() {
+		return c2sIsn;
+	}
+	public void setC2sIsn(Integer c2sIsn) {
+		this.c2sIsn = c2sIsn;
+	}
+	public Integer getHttpSeq() {
+		return httpSeq;
+	}
+	public void setHttpSeq(Integer httpSeq) {
+		this.httpSeq = httpSeq;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getReqLine() {
+		return reqLine;
+	}
+	public void setReqLine(String reqLine) {
+		this.reqLine = reqLine;
+	}
+	public String getResLine() {
+		return resLine;
+	}
+	public void setResLine(String resLine) {
+		this.resLine = resLine;
+	}
+}

src/main/java/com/nis/web/controller/BaseController.java

@@ -486,10 +486,6 @@ public class BaseController {
 	//初始化查询值判断
 	public void initLogSearchValue(BaseLogEntity entry,Map<String, Object> params){
 		
-		params.put("operator", entry.getCurrentUser().getName());
-		params.put("opTime", DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
-		params.put("opAction", 4);
-		
 		if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
 			params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
 			params.put("searchFoundEndTime", entry.getSearchFoundEndTime());

src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java

@@ -0,0 +1,67 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.log.NtcDnsLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/log/ntc/dns")
+public class DnsLogController extends BaseController {
+	
+	@RequestMapping("list")
+	public String list(@ModelAttribute("log") NtcDnsLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+		Page<NtcDnsLog> page = new Page<NtcDnsLog>(request, response);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("pageSize", page.getPageSize());
+		params.put("pageNo", page.getPageNo());
+		if (StringUtils.isNotBlank(log.getqName())) {
+			params.put("searchQName", log.getqName());
+		}
+		initLogSearchValue(log, params);
+		
+		String url = Constants.LOG_BASE_URL + Constants.NTC_DNS_LOG;
+		String recv = HttpClientUtil.getMsg(url, params);
+		logger.info("查询结果:" + recv);
+		
+		Gson gson = new GsonBuilder().create();
+		
+		try {
+			LogRecvData<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>(){}.getType());
+			if (fromJson.getStatus().intValue() == 200) {
+				BeanUtils.copyProperties(fromJson.getData(), page);
+				List<NtcDnsLog> list = page.getList();
+				for (NtcDnsLog l : list) {
+					l.setFunctionId(log.getFunctionId());
+					setLogAction(l);
+				}
+				model.addAttribute("page", page);
+			}
+		} catch (JsonSyntaxException e) {
+			logger.info("查询失败");
+			e.printStackTrace();
+		}
+		
+		return "/log/ntc/dnsList";
+	}
+}

src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java

@@ -0,0 +1,67 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.log.NtcHttpLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/log/ntc/http")
+public class HttpLogController extends BaseController {
+	
+	@RequestMapping("list")
+	public String list(@ModelAttribute("log") NtcHttpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+		Page<NtcHttpLog> page = new Page<NtcHttpLog>(request, response);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("pageSize", page.getPageSize());
+		params.put("pageNo", page.getPageNo());
+		if (StringUtils.isNotBlank(log.getUrl())) {
+			params.put("searchUrl", log.getUrl());
+		}
+		initLogSearchValue(log, params);
+		
+		String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG;
+		String recv = HttpClientUtil.getMsg(url, params);
+		logger.info("查询结果:" + recv);
+		
+		Gson gson = new GsonBuilder().create();
+		
+		try {
+			LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
+			if (fromJson.getStatus().intValue() == 200) {
+				BeanUtils.copyProperties(fromJson.getData(), page);
+				List<NtcHttpLog> list = page.getList();
+				for (NtcHttpLog l : list) {
+					l.setFunctionId(log.getFunctionId());
+					setLogAction(l);
+				}
+				model.addAttribute("page", page);
+			}
+		} catch (JsonSyntaxException e) {
+			logger.info("查询失败");
+			e.printStackTrace();
+		}
+		
+		return "/log/ntc/httpList";
+	}
+}

src/main/java/com/nis/web/controller/log/ntc/IpLogController.java

@@ -41,7 +41,7 @@ public class IpLogController extends BaseController {
 		
 		String url = Constants.LOG_BASE_URL + Constants.NTC_IP_LOG;
 		String recv = HttpClientUtil.getMsg(url, params);
-		
+		logger.info("查询结果:" + recv);
 //		try {
 //			String path = request.getClass().getClassLoader().getResource("").getPath();
 //			recv = FileUtil.readAsString(new File(path + "com/nis/web/test/logTest.txt"));
@@ -69,9 +69,4 @@ public class IpLogController extends BaseController {
 		
 		return "/log/ntc/ipList";
 	}
-	
-	@RequestMapping("form")
-	public String form() {
-		return "";
-	}
 }

src/main/resources/messages/message_en.properties

@@ -636,4 +636,21 @@ host_cookie=host cookie
 mac=mac
 ex_protocol=exchange protocol
 isakmp_mode=ISAKMP mode
+req_hdr_file=request header file
+req_body_file=request body file
+res_hdr_file=response header file
+res_body_file=response body file
+qr=QR
+rd=RD
+ra=RA
+rr=RR
+qtype=QTYPE
+qclass=QCLASS
+opcode=Opcode
+qname=QNAME
+cname=CNAME
+dns_query=query
+dns_response=response
+entrance=entrance
+#dns_sub=DNS_SUB
 #===========log end  =============

src/main/resources/messages/message_ru.properties

@@ -462,4 +462,21 @@ host_cookie=host cookie
 mac=mac
 ex_protocol=exchange protocol
 isakmp_mode=ISAKMP mode
+req_hdr_file=request header file
+req_body_file=request body file
+res_hdr_file=response header file
+res_body_file=response body file
+qr=QR
+rd=RD
+ra=RA
+rr=RR
+qtype=QTYPE
+qclass=QCLASS
+opcode=Opcode
+qname=QNAME
+cname=CNAME
+dns_query=query
+dns_response=response
+entrance=entrance
+#dns_sub=DNS_SUB
 #===========log end  =============

src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp

@@ -0,0 +1,283 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>
+	DNS<spring:message code="log"/>
+</title>
+<script>
+	$(document).ready(function() {
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+		//筛选功能
+		filterActionInit();
+	});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	</div>
+	<h3 class="page-title">
+		DNS<spring:message code="log"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+	<div class="col-md-12">
+		<div class="portlet">
+			<div class="portlet-body">
+				<div class="row" >
+					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/dns/list" method="post" class="form-search">
+						<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="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+						<!-- 搜索内容与操作按钮栏 -->
+						<div class="col-md-12">
+							<div class="pull-left">
+								<form:select path="serviceType" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form:option>
+									<form:option value="16"><spring:message code="action_reject"/></form:option>
+									<form:option value="1"><spring:message code="action_monit"/></form:option>
+								</form:select>
+							</div>
+							<div class="pull-left">
+								<div class="input-group">
+                                	<div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+                                  	</div>
+                            		<input name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                         		</div> 
+                            </div>
+							<div class="pull-left">
+								<div class="input-group">
+                                   	<div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+                                  	</div>
+                                    <input name="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});"/>
+                         		</div> 
+                            </div>
+							<div class="pull-left">
+								<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+								<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+                                <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
+							</div>
+							<div class="pull-right">
+                               	<a class="btn btn-icon-only btn-default setfields tooltips" 
+                                     	data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                    <i class="icon-wrench"></i>
+                                </a>
+                            </div>
+						</div>
+						<!-- 搜索内容与操作按钮栏 -->
+						
+						<!-- 筛选搜索内容栏默认隐藏-->
+						<div class="col-md-12 filter-action-select-panle hide" >
+							<div class="row">
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                       	<form:select path="protocol" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
+                                   
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</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="cljIp" type="text" class="form-control" value="${log.cljIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"/>：</label>
+										<input name="clientIp" type="text" class="form-control" value="${log.clientIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="serverip"/>：</label>
+										<input name="serverIp" type="text" class="form-control" value="${log.serverIp }"/>
+									</div>
+								</div>
+							</div>
+							<div class="row">
+								<div class="col-md-4">
+									<div class="form-group">
+										<label><spring:message code="qname"/>：</label>
+										<input name="qName" type="text" class="form-control" value="${log.qName }"/>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- /筛选搜索内容栏    结束-->
+					</form:form>
+				</div>
+				<div class="table-responsive">
+					<sys:message content="${message}"/>
+					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+						<thead>
+							<tr>
+								<!--<th><input type="checkbox" class="i-checks" id="checkAll"></th>-->
+								<th><spring:message code='cfg_id'/></th>
+								<%-- <th>ip<spring:message code="type"/></th> --%>
+								<th><spring:message code="action"/></th>
+								<th><spring:message code="qr"/></th>
+								<th><spring:message code="rd"/></th>
+								<th><spring:message code="ra"/></th>
+								<th><spring:message code="rr"/></th>
+								<th><spring:message code="qtype"/></th>
+								<th><spring:message code="qclass"/></th>
+								<th><spring:message code="opcode"/></th>
+								<th><spring:message code="qname"/></th>
+								<th><spring:message code="cname"/></th>
+								<th><spring:message code="client_ip"/></th>
+								<th><spring:message code="client_port"/></th>
+								<th><spring:message code="server_ip"/></th>
+								<th><spring:message code="server_port"/></th>
+								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="direction"/></th>
+								<th><spring:message code="found_time"/></th>
+								<th><spring:message code="recv_time"/></th>
+								<th><spring:message code="deviceid"/></th>
+								<th><spring:message code="stream_type"/></th>
+								<th><spring:message code="clj_ip"/></th>
+								<th><spring:message code="nest_addr_list"/></th>
+								<th><spring:message code="user_region"/></th>
+								<%-- <th><spring:message code="dns_sub"/></th> --%>
+							</tr>
+						</thead>
+						<tbody>
+							<c:forEach var="_log" items="${page.list }">
+								<tr>
+									<td>${_log.cfgId }</td>
+									<%-- <td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
+											<c:if test="${ipType.itemCode eq _log.addrType}">${ipType.itemValue}</c:if>
+					                	</c:forEach>
+				                    </td> --%>
+									<td>
+										<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DNS_QR')}" var="qr">
+											<c:if test="${qr.itemCode eq _log.qr}"><spring:message code="${qr.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:if test="${_log.rd eq 0}"><spring:message code="no"/></c:if>
+										<c:if test="${_log.rd eq 1}"><spring:message code="yes"/></c:if>
+									</td>
+									<td>
+										<c:if test="${_log.ra eq 0}"><spring:message code="no"/></c:if>
+										<c:if test="${_log.ra eq 1}"><spring:message code="yes"/></c:if>
+									</td>
+									<td>${_log.rr }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DNS_QTYPE')}" var="qtype">
+											<c:if test="${qtype.itemCode eq _log.qType}">${qtype.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DNS_QCLASS')}" var="qclass">
+											<c:if test="${qclass.itemCode eq _log.qClass}">${qclass.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DNS_OPCODE')}" var="opcode">
+											<c:if test="${opcode.itemCode eq _log.opCode}">${opcode.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td title="${_log.qName }">${fns:abbr(_log.qName, 30)}</td>
+									<td>${_log.cName }</td>
+									<td>${_log.clientIp }</td>
+									<td>${_log.clientPort }</td>
+									<td>${_log.serverIp }</td>
+									<td>${_log.serverPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="logProtocol">
+											<c:if test="${logProtocol.itemCode eq _log.protocol}">${logProtocol.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance">
+											<c:if test="${entrance.itemCode eq _log.entranceId}"><spring:message code="${entrance.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+											<c:if test="${direction.itemCode eq _log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>${_log.foundTime }</td>
+									<td>${_log.recvTime }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq _log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
+											<c:if test="${streamType.itemCode eq _log.streamType}">${streamType.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>${_log.cljIp }</td>
+									<td>${_log.nestAddrList }</td>
+									<td>${_log.userRegion }</td>
+									<%-- <td>${_log.dnsSub }</td> --%>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+					<div class="page">${page}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp

@@ -0,0 +1,252 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>
+	HTTP<spring:message code="log"></spring:message>
+</title>
+<script>
+	$(document).ready(function() {
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+		//筛选功能
+		filterActionInit();
+	});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	</div>
+	<h3 class="page-title">
+		HTTP<spring:message code="log"></spring:message>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+	<div class="col-md-12">
+		<div class="portlet">
+			<div class="portlet-body">
+				<div class="row" >
+					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/http/list" method="post" class="form-search">
+						<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="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+						<!-- 搜索内容与操作按钮栏 -->
+						<div class="col-md-12">
+							<div class="pull-left">
+								<form:select path="serviceType" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form:option>
+									<form:option value="16"><spring:message code="action_reject"/></form:option>
+									<form:option value="1"><spring:message code="action_monit"/></form:option>
+								</form:select>
+							</div>
+							<div class="pull-left">
+								<div class="input-group">
+                                    <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+                                   	</div>
+                                   	<input name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                          		</div> 
+                            </div>
+							<div class="pull-left">
+								<div class="input-group">
+                                	<div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+                                   	</div>
+                                    <input name="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});"/>
+                          		</div> 
+                            </div>
+							<div class="pull-left">
+								<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+								<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+                                <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
+							</div>
+							<div class="pull-right">
+                               	<a class="btn btn-icon-only btn-default setfields tooltips" 
+                                     	data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                    <i class="icon-wrench"></i>
+                                </a>
+                            </div>
+						</div>
+						<!-- 搜索内容与操作按钮栏 -->
+						
+						<!-- 筛选搜索内容栏默认隐藏-->
+						<div class="col-md-12 filter-action-select-panle hide" >
+							<div class="row">
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                       	<form:select path="protocol" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
+                                   
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</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"></spring:message>：</label>
+										<input name="cljIp" type="text" class="form-control" value="${log.cljIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"></spring:message>：</label>
+										<input name="clientIp" type="text" class="form-control" value="${log.clientIp }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="serverip"></spring:message>：</label>
+										<input name="serverIp" type="text" class="form-control" value="${log.serverIp }"/>
+									</div>
+								</div>
+							</div>
+							
+							<div class="row">
+								<div class="col-md-4">
+									<div class="form-group">
+										<label>URL：</label>
+										<input name="url" type="text" class="form-control" value="${log.url }"/>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- /筛选搜索内容栏    结束-->
+					</form:form>
+				</div>
+				<div class="table-responsive">
+					<sys:message content="${message}"/>
+					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+						<thead>
+							<tr>
+								<!--<th><input type="checkbox" class="i-checks" id="checkAll"></th>-->
+								<th><spring:message code='cfg_id'/></th>
+								<%-- <th>ip<spring:message code="type"/></th> --%>
+								<th><spring:message code="action"/></th>
+								<th>URL</th>
+								<th><spring:message code="client_ip"/></th>
+								<th><spring:message code="client_port"/></th>
+								<th><spring:message code="server_ip"/></th>
+								<th><spring:message code="server_port"/></th>
+								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="direction"/></th>
+								<th><spring:message code="found_time"/></th>
+								<th><spring:message code="recv_time"/></th>
+								<th><spring:message code="req_hdr_file"/></th>
+								<th><spring:message code="req_body_file"/></th>
+								<th><spring:message code="res_hdr_file"/></th>
+								<th><spring:message code="res_body_file"/></th>
+								<th><spring:message code="deviceid"/></th>
+								<th><spring:message code="stream_type"/></th>
+								<th><spring:message code="clj_ip"/></th>
+								<th><spring:message code="nest_addr_list"/></th>
+								<th><spring:message code="user_region"/></th>
+							</tr>
+						</thead>
+						<tbody>
+							<c:forEach var="_log" items="${page.list }">
+								<tr>
+									<td>${_log.cfgId }</td>
+									<%-- <td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
+											<c:if test="${ipType.itemCode eq _log.addrType}">${ipType.itemValue}</c:if>
+					                	</c:forEach>
+				                    </td> --%>
+									<td>
+										<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td title="${_log.url }">${fns:abbr(_log.url, 30)}</td>
+									<td>${_log.clientIp }</td>
+									<td>${_log.clientPort }</td>
+									<td>${_log.serverIp }</td>
+									<td>${_log.serverPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="logProtocol">
+											<c:if test="${logProtocol.itemCode eq _log.protocol}">${logProtocol.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance">
+											<c:if test="${entrance.itemCode eq _log.entranceId}"><spring:message code="${entrance.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+											<c:if test="${direction.itemCode eq _log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>${_log.foundTime }</td>
+									<td>${_log.recvTime }</td>
+									<td>${_log.reqHdrFile}</td>
+									<td>${_log.reqBodyFile}</td>
+									<td>${_log.resHdrFile}</td>
+									<td>${_log.resBodyFile}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq _log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
+											<c:if test="${streamType.itemCode eq _log.streamType}">${streamType.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>${_log.cljIp }</td>
+									<td>${_log.nestAddrList }</td>
+									<td>${_log.userRegion }</td>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+					<div class="page">${page}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp

@@ -3,10 +3,7 @@
 <html>
 <head>
 <title>
-	<c:if test="${log.functionId eq 5 }">IP</c:if>
-	<c:if test="${log.functionId eq 7 }">DNS</c:if>
-	<c:if test="${log.functionId eq 8 }">HTTP</c:if>
-	<spring:message code="log"></spring:message>
+	IP<spring:message code="log"></spring:message>
 </title>
 <script>
 	$(document).ready(function() {
@@ -31,28 +28,15 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-		<c:if test="${log.functionId eq 5 }">IP</c:if>
-		<c:if test="${log.functionId eq 7 }">DNS</c:if>
-		<c:if test="${log.functionId eq 8 }">HTTP</c:if>
-		<spring:message code="log"></spring:message>
+		IP<spring:message code="log"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
-	<div class="row">
 	<div class="col-md-12">
 		<div class="portlet">
 			<div class="portlet-body">
 				<div class="row" >
-						<c:if test="${log.functionId eq 5 }">
-							<c:set var="function" value="ip"/>
-						</c:if>
-						<c:if test="${log.functionId eq 7 }">
-							<c:set var="function" value="dns"/>
-						</c:if>
-						<c:if test="${log.functionId eq 8 }">
-							<c:set var="function" value="http"/>
-						</c:if>
-						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/${function}/list" method="post" class="form-search">
+					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/ip/list" method="post" class="form-search">
 						<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}"/>
@@ -60,14 +44,6 @@
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
-								<div class="pull-left">
-									<form:select path="protocol" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="protocol_type"/></form:option>
-										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol">
-								 			<form:option value="${protocol.itemCode}" ><spring:message code="${protocol.itemValue}"/></form:option>
-					             		</c:forEach>
-									</form:select>
-								</div>
 							<div class="pull-left">
 								<form:select path="serviceType" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
@@ -78,29 +54,19 @@
 							<div class="pull-left">
 								<div class="input-group">
                                 	<div class="input-group-btn">
-                                       	<form:select path="direction" class="selectpicker select2 input-small">
-	                                    	<form:option value=""><spring:message code="direct"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								            </c:forEach>
-	                                    </form:select>
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
                                    	</div>
+                                   	<input name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+										value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                           		</div> 
                             </div>
 							<div class="pull-left">
 								<div class="input-group">
                                     <div class="input-group-btn">
-											<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
-                                        </div>
-                                    	<input id="entranceId" name="entranceId" class="form-control input-small" type="text" value="${log.entranceId}"/>
-                           			</div>
-                              	</div>
-								<div class="pull-left">
-									<div class="input-group">
-                                          <div class="input-group-btn">
-											<span class="selectpicker form-control" ><spring:message code="clj_ip"/></span>
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
                                    	</div>
-                                          <input id="cljIp" name="cljIp" class="form-control input-small" type="text" value="${log.cljIp}"/>
+                                    <input name="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});"/>
                           		</div> 
                             </div>
 							<div class="pull-left">
@@ -122,17 +88,44 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-											<label class="form-label"><spring:message code="begin_date"/>：</label>
-											<input name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                       	<form:select path="protocol" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
 									</div>
                                 </div>
                                    
 								<div class="col-md-2">
 									<div class="form-group">
-											<label><spring:message code="end_date"/>：</label>
-											<input name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+                                		<label class="control-label"><spring:message code='direct'/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</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"></spring:message>：</label>
+										<input name="cljIp" type="text" class="form-control" value="${log.cljIp }"/>
 									</div>
 								</div>
 								
@@ -149,15 +142,6 @@
 										<input name="serverIp" type="text" class="form-control" value="${log.serverIp }"/>
 									</div>
 								</div>
-									
-									<c:if test="${log.functionId eq 8 }">
-									<div class="col-md-4">
-										<div class="form-group">
-											<label>URL：</label>
-											<input name="url" type="text" class="form-control" value="${log.url }"/>
-										</div>
-									</div>
-									</c:if>
 							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
@@ -168,10 +152,9 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 						<thead>
 							<tr>
-									<th></th>
+								<th><spring:message code="cfg_id"/></th>
 								<!--<th><input type="checkbox" class="i-checks" id="checkAll"></th>-->
-									<th><spring:message code='cfg_id'/></th>
-									<th>ip<spring:message code="type"/></th>
+								<%-- <th>ip<spring:message code="type"/></th> --%>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="client_ip"/></th>
 								<th><spring:message code="client_port"/></th>
@@ -180,26 +163,24 @@
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code="entrance_id"/></th>
 								<th><spring:message code="direction"/></th>
-									<c:if test="${log.functionId eq 8 }">
-										<th>URL</th>
-									</c:if>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="recv_time"/></th>
-									<th><spring:message code="device_id"/></th>
+								<th><spring:message code="deviceid"/></th>
 								<th><spring:message code="stream_type"/></th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="nest_addr_list"/></th>
 								<th><spring:message code="user_region"/></th>
 							</tr>
-								<c:forEach var="_log" items="${page.list }">
+						</thead>
+						<tbody>
+							<c:forEach var="_log" items="${page.list }" varStatus="status">
 								<tr>
-										<td></td>
 									<td>${_log.cfgId }</td>
-										<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
 											<c:if test="${ipType.itemCode eq _log.addrType}">${ipType.itemValue}</c:if>
 					                	</c:forEach>
-					                    </td>
+				                    </td> --%>
 									<td>
 										<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
 										<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>
@@ -213,18 +194,23 @@
 											<c:if test="${logProtocol.itemCode eq _log.protocol}">${logProtocol.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-										<td>${_log.entranceId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance">
+											<c:if test="${entrance.itemCode eq _log.entranceId}"><spring:message code="${entrance.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
 											<c:if test="${direction.itemCode eq _log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
-										<c:if test="${log.functionId eq 8 }">
-											<td title="${_log.url }">${fns:abbr(_log.url, 20)}</td>
-										</c:if>
 									<td>${_log.foundTime }</td>
 									<td>${_log.recvTime }</td>
-										<td>${_log.deviceId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq _log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
 											<c:if test="${streamType.itemCode eq _log.streamType}">${streamType.itemValue}</c:if>
@@ -235,16 +221,13 @@
 									<td>${_log.userRegion }</td>
 								</tr>
 							</c:forEach>
-							</thead>
-							<tbody>
 						</tbody>
 					</table>
 					<div class="page">${page}</div>
 				</div>
-					
+			</div>
 		</div>
 	</div>
 </div>
-
 </body>
 </html>