From ee411339c82af74b0216555c76e8118120b51b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= Date: Tue, 22 Jan 2019 17:26:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E4=BB=A3=E7=90=86->HTTP(S)=20=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20=E5=8E=9F=E5=A7=8B=E8=AF=B7=E6=B1=82=E4=BD=93?= =?UTF-8?q?=E5=92=8C=E5=8E=9F=E5=A7=8B=E5=BA=94=E7=AD=94=E4=BD=93=20?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=8D=AE=20=E5=A2=9E=E5=8A=A0=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD=202.=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E8=A1=A8->=E6=B5=81=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1->=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=BB=9F=E8=AE=A1=20=E7=95=8C=E9=9D=A2=20"?= =?UTF-8?q?=E6=96=B9=E5=90=91"=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0"=E8=AF=B7=E9=80=89=E6=8B=A9"=E9=80=89?= =?UTF-8?q?=E9=A1=B9(=E9=BB=98=E8=AE=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficStatisticsInfoController.java | 9 +++-- .../views/dashboard/trafficBandwidthList.jsp | 1 + .../dashboard/trafficProtocolTypeList.jsp | 1 + .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 33 +++++++++++++++++-- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index b3e32c032..c643b11a2 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -271,7 +271,10 @@ public class TrafficStatisticsInfoController extends BaseController { try { url=urlAddDate(url,beginDate,endDate); url=url+"&searchQuotaType="+searchQuotaType; - url=url+"&searchDirection="+searchDirection; + + if (!StringUtil.isEmpty(searchDirection)) { + url=url+"&searchDirection="+searchDirection; + } String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); @@ -321,7 +324,9 @@ public class TrafficStatisticsInfoController extends BaseController { if(entranceId!=null){ url=url+"&entranceId="+entranceId; } - url=url+"&searchDirection="+searchDirection; + if (!StringUtil.isEmpty(searchDirection)) { + url=url+"&searchDirection="+searchDirection; + } String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp index 715393710..0f1b35524 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp @@ -54,6 +54,7 @@ <%-- --%> + diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 51d9a3323..fcbfbf920 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -408,8 +408,37 @@ ${log.dSubscribeId} <%-- ${log.userRegion} --%> ${log.sceneFile} - ${log.reqBody} - ${log.respBody} +<%-- ${log.reqBody} --%> +<%-- ${log.respBody} --%> + + + + ${fn:substring(log.reqBody,0,20) } + + + + + http://${fn:substring(log.reqBody,0,20) } + + + + + + + + ${fn:substring(log.respBody,0,20) } + + + + + http://${fn:substring(log.respBody,0,20) } + + +