From 119fa7abadba1c74b277821a3254e72903890175 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Sun, 13 Jan 2019 11:18:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE-HTTP-Advanced=E6=B7=BB=E5=8A=A0URL=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=202.?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2-=E5=9B=BD=E5=AE=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BA=E5=88=97?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/PxyHttpLog.java       | 10 +++++-----
 .../web/controller/log/pxy/PxyHttpLogController.java   |  2 +-
 src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/PxyHttpLog.java b/src/main/java/com/nis/domain/log/PxyHttpLog.java
index 6242b2787..ee87a1b78 100644
--- a/src/main/java/com/nis/domain/log/PxyHttpLog.java
+++ b/src/main/java/com/nis/domain/log/PxyHttpLog.java
@@ -24,15 +24,15 @@ 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)
+	@ExcelField(title="req_body",sort=78)
 	private String reqBody;
-	@ExcelField(title="resp_body",sort=18)
+	@ExcelField(title="resp_body",sort=79)
 	private String resBody;
-	@ExcelField(title="website",sort=19)
+	@ExcelField(title="website",sort=8)
 	private String website;
 	
 	
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 700b0e13c..37e65c618 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 = ",inner_smac,inner_dmac,nest_addr_list," + hColumns;
+			String cfgIndexInfoNoExport = ",req_header,resp_header,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/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 5496e3900..fba077474 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -318,6 +318,7 @@
 												<c:if test="${cfg.functionId eq 8}">
 													<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 													<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+													<form:option value="httpUrl.cfgKeywords">URL&nbsp;<spring:message code="key_word"></spring:message></form:option>
 													<form:option value="httpReqHdr.cfgKeywords"><spring:message code="http_req_hdr_keywords"></spring:message></form:option>
 												</c:if>
 												<form:option value="httpReqBody.cfgKeywords"><spring:message code="http_req_body_keywords"></spring:message></form:option>