From 2b8edce48f4b28e35273cca44ad53e75521fa0bc Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 30 Jul 2018 19:28:43 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2u?=
 =?UTF-8?q?rl=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0http=E5=89=8D=E7=BC=80.?=
 =?UTF-8?q?=20=202=E3=80=81=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA5min.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/httpclient/HttpClientUtil.java     | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp    | 9 +++++++--
 src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp   | 9 +++++++--
 .../webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp   | 9 +++++++--
 .../webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp     | 9 +++++++--
 .../webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp   | 9 +++++++--
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
index 62131d522..4097dfe72 100644
--- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
+++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
@@ -175,7 +175,7 @@ public class HttpClientUtil {
 	}
 	private static CloseableHttpClient httpClient = null;
 	private static  RequestConfig requestConfig;
-	public static final int  HTTP_SOCKET_TIMEOUT= 30000;
+	public static final int  HTTP_SOCKET_TIMEOUT= 300000;
 	public static final int  HTTP_CONNECT_TIMEOUT= 10000;
 	public static final int HTTP_CONNECT_REQUEST_TIMEOUT = 50000;
 	public static final int HTTP_CONNECT_RETRY_TIMES = 3;
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 088ae977b..6eeac9a49 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -210,8 +210,13 @@ $(document).ready(function(){
 				               			</c:forEach>
 									</td>
 									<td>${log.pid}</td>
-									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>http://${log.url}</td>
+									<td>
+										<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>
+									</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index a6b674148..4f1ea2873 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -209,8 +209,13 @@ $(document).ready(function(){
 				               			</c:forEach>
 									</td>
 									<td>${log.pid}</td>
-									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>http://${log.url}</td>
+									<td>
+										<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>
+									</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index ac932371c..407b682ac 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -281,8 +281,13 @@
 													</c:if>
 												</c:forEach></td>
 											<td>${log.pid}</td>
-											<td>${log.url}</td>
-											<td>${log.logUri}</td>
+											<td>http://${log.url}</td>
+											<td>
+												<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 		class="tooltips" data-flag="false" data-html="true" data-placement="top">
+													http://${fn:substring(log.logUri,0,20) }
+												</a>
+											</td>
 											<td>${log.refer}</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index c165879e6..8298ab069 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -210,8 +210,13 @@ $(document).ready(function(){
 				               			</c:forEach>
 									</td>
 									<td>${log.pid}</td>
-									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>http://${log.url}</td>
+									<td>
+										<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>
+									</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 536c62b7e..958a8ae80 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -210,8 +210,13 @@ $(document).ready(function(){
 				               			</c:forEach>
 									</td>
 									<td>${log.pid}</td>
-									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>http://${log.url}</td>
+									<td>
+										<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>
+									</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<td>