From 1bce4a8b2c466a451d4a858ac12edbdd51298f1f Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac.cn>
Date: Thu, 20 Dec 2018 19:38:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81PXY=20HTTP=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0searchUrl=E5=92=8C?=
 =?UTF-8?q?searchWebsite=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E5=AF=B9=E5=8E=9F=E5=A7=8B=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E8=BF=9B=E8=A1=8C=E8=BD=AC=E6=8D=A2=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/restful/PxyHttpLog.java    | 28 +++++++++++++++++++
 .../com/nis/web/service/LogDataService.java   |  9 +++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/domain/restful/PxyHttpLog.java b/src/main/java/com/nis/domain/restful/PxyHttpLog.java
index 1a13ab4..0bd38b1 100644
--- a/src/main/java/com/nis/domain/restful/PxyHttpLog.java
+++ b/src/main/java/com/nis/domain/restful/PxyHttpLog.java
@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -42,6 +43,8 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
     @ApiModelProperty(value="域名", required=true)
     protected String website;
     
+    protected String searchUrl; //url查询条件a
+    protected String searchWebsite; //website查询条件
 	public String getUrl() {
 		return url;
 	}
@@ -127,4 +130,29 @@ public class PxyHttpLog  extends LogEntity<PxyHttpLog> {
 	public void setWebsite(String website) {
 		this.website = website;
 	}
+	
+	/**
+	 * @return the searchUrl
+	 */
+
+	@JsonIgnore
+	public String getSearchUrl() {
+		return searchUrl;
+	}
+	
+	/**
+	 * @param searchUrl the searchUrl to set
+	 */
+	public void setSearchUrl(String searchUrl) {
+		this.searchUrl = searchUrl;
+	}
+
+	@JsonIgnore
+	public String getSearchWebsite() {
+		return searchWebsite;
+	}
+
+	public void setSearchWebsite(String searchWebsite) {
+		this.searchWebsite = searchWebsite;
+	}
 }
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 5de008f..af8d132 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -250,7 +250,7 @@ public class LogDataService {
 								String field = filedAndColumnMap.get(key).toLowerCase();
 								if (type.equals("java.lang.String")) {
 									if (field.equals("url") || field.equals("website")) {
-										whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
+										whereSB.append(" and " + field + " like '" + StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "%'");
 									} else {
 										whereSB.append(" and " + field + "='"
 												+ StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "'");
@@ -402,10 +402,11 @@ public class LogDataService {
 
 								if (typeName.equals("java.lang.String")) {
 									String field = filedAndColumnMap.get(key);
-									if (field.equals("url")) {
-										whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
+									if (field.equals("url") || field.equals("website")) {
+										whereSB.append(" and " + field + " like '" + StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "%'");
 									} else {
-										whereSB.append(" and " + field + "='" + value.toString().trim() + "'");
+										whereSB.append(" and " + field + "='"
+												+ StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "'");
 									}
 								} else if (typeName.equals("java.lang.Integer") || typeName.equals("int")) {
 									whereSB.append(