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 760ecc762..4ff850e4b 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -451,8 +451,7 @@ public class TrafficStatisticsInfoController extends BaseController { Map fromJsonList = new HashMap(); List list = new ArrayList(); try { -// String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_IPACTIVE_ONEHOUR; - String url = "http://localhost:8088/galaxy-service/service/log/v1/trafficDomainTrans"; + String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_DOMAIN_TRANS; url=urlAddDate(url, beginDate, endDate); if(domain!=null){ url=url+"&domain="+domain; @@ -482,7 +481,6 @@ public class TrafficStatisticsInfoController extends BaseController { Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_WEBSITELIST_NOTIME; -// String url = "http://192.168.11.87:8088/galaxy-service/service/log/v1/"+Constants.TRAFFIC_WEBSITELIST; try { if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){ Calendar cal = Calendar. getInstance (); @@ -579,8 +577,6 @@ public class TrafficStatisticsInfoController extends BaseController { Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_TOPICLIST; - //String url = "http://192.168.11.87:8088/galaxy-service/service/log/v1/"+Constants.TRAFFIC_TOPIC_AND_DOMAIN_CHART; - //String url = "http://192.168.11.87:8088/galaxy-service/service/log/v1/"+Constants.TRAFFIC_TOPICLIST; Map map=new HashMap(); try { url=urlAddDate(url,beginDate,endDate); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 495bd3c9a..4b93862f6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1409,4 +1409,5 @@ asn=asn Unique_num=Unique ip=IP country=Country -desc=Desc \ No newline at end of file +desc=Desc +unique_num=Unique \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 2c5d7f7f2..210a0017e 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1413,4 +1413,5 @@ asn=asn Unique_num=Unique ip=IP country=Country -desc=Desc \ No newline at end of file +desc=Desc +unique_num=Unique \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 698960518..247dd407b 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1409,4 +1409,5 @@ asn=asn Unique_num=Unique ip=IP country=Country -desc=Desc \ No newline at end of file +desc=Desc +unique_num=Unique \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index 02c89f945..842f4b052 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -84,7 +84,7 @@ @@ -341,7 +341,7 @@ var html = ''; html += "" + data.website + ""; html += "" + data.uniqueNum + ""; - html += "" + data.entranceId + ""; + html += "" + (((data.entranceId)==1) ? "Astana":"Alamty") + ""; html += "" + data.pktCount + ""; html += "" + data.perPackets + ""; html += "" + data.Gbyte + "";