From 32eaa9d4d818d7a084b605016421ed18d9cf3154 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 13 Aug 2018 18:03:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9http=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/controller/log/ntc/HttpLogController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
index fde832adc..f8a47d442 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
@@ -16,7 +16,6 @@ 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.PageLog;
@@ -50,7 +49,8 @@ public class HttpLogController extends BaseController {
 		
 			LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
 			if (fromJson.getStatus().intValue() == 200) {
-				BeanUtils.copyProperties(fromJson.getData(), page);
+				Page<NtcHttpLog> data = fromJson.getData();
+				page.setList(data.getList());
 				List<NtcHttpLog> list = page.getList();
 				for (NtcHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());

From d42b1616020d47e729eff6202335805c08c39147 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 13 Aug 2018 18:11:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2URL?=
 =?UTF-8?q?=E5=88=97=E5=8A=A0=E5=AE=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/pages/scripts/pageLogs.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index c7c18cd8c..f698abf5f 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -11,6 +11,15 @@ $(document).ready(function() {
 		// 设置界面标题宽度（不包括第一列）
 		var px = getPixelsCount($(this).text(),fontSize)+32;
 		this.setAttribute('width',px+'px');
+		// URL列加宽
+		var th = this;
+		var thText = this.innerText;
+		$("table.logTb td").each(function(){
+			var tdText = this.innerText;
+			if((tdText.trim().length > thText.trim().length) && (thText == "URL" || thText == "Log URI")){
+				th.setAttribute('width','110px');
+			}
+		});
 	});
 	
 	var tdString = "";