diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 79c7af97b..cc17b59ee 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -714,6 +714,7 @@ public final class Constants {
 	public static final String TRAFFIC_WEBSITELIST_NOTIME=Configurations.getStringProperty("trafficWebsiteListNoTime","trafficWebsiteListNoTime");
 	public static final String TRAFFIC_TOPICLIST=Configurations.getStringProperty("trafficTopicList","trafficTopicList");
 	public static final String TRAFFIC_DOMAIN_TRANS=Configurations.getStringProperty("trafficDomainTrans","trafficDomainTrans");
+	public static final String TRAFFIC_PORTACTIVE_FIVEMINUTE=Configurations.getStringProperty("trafficPortActiveFiveMinute","trafficPortActiveFiveMinute");
 	/**
 	 * httpclient 工具超时时间设置
 	 */
diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
index 5332038df..a85f0886a 100644
--- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
@@ -96,6 +96,33 @@ public class DashboardController extends BaseController{
 		}
 		return list;
 	}
+	/**
+	 * 跳转活跃端口详情界面
+	 * @return
+	 */
+	@RequestMapping(value="portActiveChart")
+	@ResponseBody
+	public List portActiveChart(String beginDate,String endDate){
+		Map<String, Object> fromJsonList = new HashMap<String, Object>();
+		List list = new ArrayList();
+		try {
+			String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_PORTACTIVE_FIVEMINUTE;//+Constants.TRAFFIC_IPACTIVE_ONEHOUR;
+			url=urlAddDate(url, beginDate, endDate);
+			String string = HttpClientUtil.get(url);
+			Gson gson = new GsonBuilder().create();
+			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
+			logger.debug("活跃端口从"+beginDate+"到"+endDate+",间隔5分钟数据"+fromJsonList);
+			list = (ArrayList) fromJsonList.get("data");
+			return list;
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			logger.error("活跃端口详情界面数据获取错误"+e);
+		}
+		return list;
+	}
+
 	/**
 	 * 跳转活跃端口详情界面
 	 * @return
@@ -319,19 +346,19 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(list!=null&&!list.isEmpty()){
 			for (Map map : list) {
-				Double value1 = Double.parseDouble(map.get("protoType").toString());
+				Double value1 = Double.parseDouble(map.get("protoType").toString().trim());
 				for (CodeResult code : codeList) {
-					Double value2 = Double.valueOf(code.getCode());
+					Double value2 = Double.valueOf(code.getCode().trim());
 					if(value1.equals(value2)){
-						map.put("protoType", code.getItem());
+						map.put("protoType", code.getItem().trim());
 						break;
 					}
 				}
 				// 协议没匹配的匹配app码表
 				for (CodeResult code : appCodeList) {
-					Double value3 = Double.valueOf(code.getCode());
+					Double value3 = Double.valueOf(code.getCode().trim());
 					if(value1.equals(value3)){
-						map.put("protoType", code.getItem());
+						map.put("protoType", code.getItem().trim());
 						break;
 					}
 				}
@@ -366,11 +393,11 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(list!=null&&!list.isEmpty()){
 			for (Map map : list) {
-				Double value1 = Double.parseDouble(map.get("appType").toString());
+				Double value1 = Double.parseDouble(map.get("appType").toString().trim());
 				for (CodeResult code : codeList) {
-					Double value2 = Double.valueOf(code.getCode());
+					Double value2 = Double.valueOf(code.getCode().trim());
 					if(value1.equals(value2)){
-						map.put("appType", code.getItem());
+						map.put("appType", code.getItem().trim());
 						break;
 					}
 				}
@@ -405,11 +432,11 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(list!=null&&!list.isEmpty()){
 			for (Map map : list) {
-				Double value1 = Double.parseDouble(map.get("osType").toString());
+				Double value1 = Double.parseDouble(map.get("osType").toString().trim());
 				for (CodeResult code : codeList) {
-					Double value2 = Double.valueOf(code.getCode());
+					Double value2 = Double.valueOf(code.getCode().trim());
 					if(value1.equals(value2)){
-						map.put("osType", code.getItem());
+						map.put("osType", code.getItem().trim());
 						break;
 					}
 				}
@@ -439,8 +466,8 @@ public class DashboardController extends BaseController{
 		//将标签文字转为数字
 		Integer os=null;
 		for (CodeResult codeResult : codeList1) {
-			if(osType.equalsIgnoreCase(codeResult.getItem())){
-				os=Integer.parseInt(codeResult.getCode());
+			if(osType.equalsIgnoreCase(codeResult.getItem().trim())){
+				os=Integer.parseInt(codeResult.getCode().trim());
 				break;
 			}
 		}
@@ -457,11 +484,11 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(null!=list&&!list.isEmpty()){
 				for (Map map : list) {
-					Double value1 = Double.parseDouble(map.get("bsType").toString());
+					Double value1 = Double.parseDouble(map.get("bsType").toString().trim());
 					for (CodeResult code : codeList2) {
-						Double value2 = Double.valueOf(code.getCode());
+						Double value2 = Double.valueOf(code.getCode().trim());
 						if(value1.equals(value2)){
-							map.put("bsType", code.getItem());
+							map.put("bsType", code.getItem().trim());
 							break;
 						}
 						//10个域名之外的为others  设为-1外
@@ -501,11 +528,11 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(list!=null&&!list.isEmpty()){
 			for (Map map : list) {
-				Double value1 = Double.parseDouble(map.get("bsType").toString());
+				Double value1 = Double.parseDouble(map.get("bsType").toString().trim());
 				for (CodeResult code : codeList) {
-					Double value2 = Double.valueOf(code.getCode());
+					Double value2 = Double.valueOf(code.getCode().trim());
 					if(value1.equals(value2)){
-						map.put("bsType", code.getItem());
+						map.put("bsType", code.getItem().trim());
 						break;
 					}
 				}
@@ -535,13 +562,13 @@ public class DashboardController extends BaseController{
 		//将标签文字转为数字
 		Integer bs=null;
 		for (CodeResult codeResult : codeList1) {
-			if(bsType.equalsIgnoreCase(codeResult.getItem())){
-				bs=Integer.parseInt(codeResult.getCode());
+			if(bsType.equalsIgnoreCase(codeResult.getItem().trim())){
+				bs=Integer.parseInt(codeResult.getCode().trim());
 				break;
 			}
 		}
 		if(bs==null){
-			bs=Integer.parseInt(bsType);//处理为匹配项编码
+			bs=Integer.parseInt(bsType.trim());//处理为匹配项编码
 		}
 		try {
 			String string = HttpClientUtil.get(Constants.DASHBOARD_URL+Constants.TRAFFIC_SYSTEM_CHART+"?bsType="+bs);
@@ -553,16 +580,16 @@ public class DashboardController extends BaseController{
 			//将数字替换为标签文字
 			if(null!=list&&!list.isEmpty()){
 				for (Map map : list) {
-					Double value1 = Double.parseDouble(map.get("osType").toString());
+					Double value1 = Double.parseDouble(map.get("osType").toString().trim());
 					for (CodeResult code : codeList2) {
-						Double value2 = Double.valueOf(code.getCode());
+						Double value2 = Double.valueOf(code.getCode().trim());
 						//10个域名之外的为others webId设为-1外
 						if(map.get("osType").toString().equals("-1")){
 							map.put("osType", "Others");
 							break;
 						}
 						if(value1.equals(value2)){
-							map.put("osType", code.getItem());
+							map.put("osType", code.getItem().trim());
 							break;
 						}
 					}
@@ -599,15 +626,15 @@ public class DashboardController extends BaseController{
 			if(list!=null&&!list.isEmpty()){
 				for (Map map : list) {
 					Double value1=0d;
-					if(StringUtil.isBlank(map.get("websiteServiceId").toString())){
+					if(StringUtil.isBlank(map.get("websiteServiceId").toString().trim())){
 						value1=268435455d;
 					}else{
-						value1 = Double.parseDouble(map.get("websiteServiceId").toString());
+						value1 = Double.parseDouble(map.get("websiteServiceId").toString().trim());
 					}
 					for (SysDataDictionaryItem code : codeList) {
-						Double value2 = Double.valueOf(code.getItemCode());
+						Double value2 = Double.valueOf(code.getItemCode().trim());
 						if(value1.equals(value2)){
-							map.put("websiteService", code.getItemValue());
+							map.put("websiteService", code.getItemValue().trim());
 							break;
 						}
 					}
@@ -647,7 +674,7 @@ public class DashboardController extends BaseController{
 					if(wdt!=null){
 						String domain = wdt.getDomain();
 						Double domainId = wdt.getId().doubleValue();
-							Double webId = Double.parseDouble(dataMap.get("webId").toString());
+							Double webId = Double.parseDouble(dataMap.get("webId").toString().trim());
 							//10个域名之外的为others webId设为-1外
 							if(dataMap.get("webId").toString().equals("-1")){
 								dataMap.put("domain", "Others");
@@ -697,12 +724,12 @@ public class DashboardController extends BaseController{
 					if(StringUtil.isBlank(map.get("topicId").toString())){
 						value1=268435455d;
 					}else{
-						value1 = Double.parseDouble(map.get("topicId").toString());
+						value1 = Double.parseDouble(map.get("topicId").toString().trim());
 					}
 					for (SysDataDictionaryItem code : codeList) {
-						Double value2 = Double.valueOf(code.getItemCode());
+						Double value2 = Double.valueOf(code.getItemCode().trim());
 						if(value1.equals(value2)){
-							map.put("topic", code.getItemValue());
+							map.put("topic", code.getItemValue().trim());
 							break;
 						}
 					}
@@ -714,7 +741,7 @@ public class DashboardController extends BaseController{
 							if(wdt!=null){
 								String domain = wdt.getDomain();
 								Double domainId = wdt.getId().doubleValue();
-									Double webId = Double.parseDouble(dataMap.get("webId").toString());
+									Double webId = Double.parseDouble(dataMap.get("webId").toString().trim());
 									//10个域名之外的为others webId设为-1
 //									if(dataMap.get("webId").toString().equals("-1")){
 //										dataMap.put("domain", "Others");
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 18c4b640b..dd9089f22 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -1,49 +1,49 @@
-#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
+#\u7BA1\u7406\u57FA\u7840\u8DEF\u5F84, \u9700\u540C\u6B65\u4FEE\u6539\uFF1Aweb.xml
 adminPath=/nis
 
-#Restful\u670d\u52a1\u9ed8\u8ba4\u8def\u5f84\ufffd
+#Restful\u670D\u52A1\u9ED8\u8BA4\u8DEF\u5F84\uFFFD
 servicePath=/service
 
-#\u5206\u9875\u914d\u7f6e
+#\u5206\u9875\u914D\u7F6E
 page.pageSize=20
-#\u5206\u9875\u914d\u7f6e
+#\u5206\u9875\u914D\u7F6E
 page.count=0
 
-#\u7d22\u5f15\u9875\u8def\u5f84
+#\u7D22\u5F15\u9875\u8DEF\u5F84
 web.view.index=/nis/index
 
-#\u7f13\u5b58\u8bbe\u7f6e
+#\u7F13\u5B58\u8BBE\u7F6E
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
 
-#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4F1A\u8BDD\u8D85\u65F6\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
+#\u4F1A\u8BDD\u6E05\u7406\u95F4\u9694\u65F6\u95F4\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#\u9759\u6001\u6587\u4ef6\u540e\u7f00
+#\u9759\u6001\u6587\u4EF6\u540E\u7F00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#\u7f51\u7ad9URL\u540e\u7f00
+#\u7F51\u7AD9URL\u540E\u7F00
 urlSuffix=.jsp
 
-#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
+#\u89C6\u56FE\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
 web.view.prefix=/WEB-INF/views/
 web.view.suffix=.jsp
 
-#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
+#\u662F\u5426\u4E0D\u5141\u8BB8\u5237\u65B0\u4E3B\u9875\uFF0C\u4E0D\u5141\u8BB8\u60C5\u51B5\u4E0B\uFF0C\u5237\u65B0\u4E3B\u9875\u4F1A\u5BFC\u81F4\u91CD\u65B0\u767B\u5F55
 notAllowRefreshIndex=false
 
-#\u524d\u7aef\u57fa\u7840\u8def\u5f84
+#\u524D\u7AEF\u57FA\u7840\u8DEF\u5F84
 frontPath=/f
 
-#\u662f\u5426\u8fd0\u884c\u591a\u8d26\u6237\u540c\u65f6\u767b\u5f55?
+#\u662F\u5426\u8FD0\u884C\u591A\u8D26\u6237\u540C\u65F6\u767B\u5F55?
 user.multiAccountLogin=true
 
-#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
+#\u7855\u6B63\u7EC4\u4EF6\u662F\u5426\u4F7F\u7528\u7F13\u5B58
 supcan.useCache=false
 
-#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
+#\u901A\u77E5\u95F4\u9694\u65F6\u95F4\u8BBE\u7F6E, \u5355\u4F4D\uFF1A\u6BEB\u79D2, 30s=30000ms, 60s=60000ms
 work.notify.remind.interval=60000
 
 
@@ -51,13 +51,13 @@ work.notify.remind.interval=60000
 #===== System settings ======#
 #============================#
 
-#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+#\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
 productName=National Traffic Control System
 copyrightYear=2015
 version=V1.0.0
 
 
-#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
+#\u4E0A\u4F20\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84, \u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8\u5305\u542B\u201Cuserfiles\u201D
 userfiles.basedir=upload
 
 
@@ -65,7 +65,7 @@ userfiles.basedir=upload
 #===== webservice settings ======#
 #============================#
 
-#ESB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u1e69\ufffd\ufffd\u0373\u04bb\ufffd\ufffd\u05b7
+#ESB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u1E69\uFFFD\uFFFD\u0373\u04BB\uFFFD\uFFFD\u05B7
 webservice.esb.endpoint=http://10.55.0.197:7879/TongServiceProxy_doprocess/services/WebService1/
 #webservice RID
 webservice.rid=XFBL
@@ -88,47 +88,47 @@ webservice.data.dict.code.sid=s_2042_0660BD17-35E4-4482-AA3A-556F2C024902
 #webservice request timeout for seconds
 webservice.request.timeout=30
 
-#\ufffd\ufffd\ufffd\ufffd\ufffdURL
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL
 webservice.jg.service.url=http://10.55.0.155:8080/jgService
 
-#\ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffdURL
+#\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL
 webservice.yh.service.url=http://10.55.0.155:8080/ryService
 
-#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffdURL
+#\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFDURL
 webservice.data.dict.service.url=http://10.55.0.155:8080/sjzdService
 
-#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffd\ufffd\ufffd\ufffdURL
+#\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFD\uFFFD\uFFFD\uFFFDURL
 webservice.data.dict.bm.url=http://10.55.0.155:8080/sjzdbmService
 
-#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdURL
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDURL
 webservice.data.code.url=http://10.55.0.155:8080/sjmbService
 
-#webservice\ufffd\u04ff\ufffd\ufffd\ufffd\ufffd\u00ff\u04b3\ufffd\ufffd\ufffd\ufffd
+#webservice\uFFFD\u04FF\uFFFD\uFFFD\uFFFD\uFFFD\u00FF\u04B3\uFFFD\uFFFD\uFFFD\uFFFD
 webservice.data.pagesize = 2000
-#webservice\ufffd\ufffd\u01f0\u012c\ufffd\ufffd\u04b3
+#webservice\uFFFD\uFFFD\u01F0\u012C\uFFFD\uFFFD\u04B3
 webservice.data.currentpage = 1
 
-#webservice \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+#webservice \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 webservice.jgmb.name=CK_T_JC_RY
-#webservice \ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+#webservice \uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 webservice.yhmb.name=CK_T_YH_RY
-#webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u022b\ufffd\ufffd
+#webservice\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \u022B\uFFFD\uFFFD
 webservice.method.name.ql=getData
-# webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd
+# webservice\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD
 webservice.method.name.zl=getDataZL
 
-# redis\u914d\u7f6e\u6587\u4ef6
-#redis \u5404\u4e2a\u5206\u7247\u7684 IP\u7aef\u53e3
+# redis\u914D\u7F6E\u6587\u4EF6
+#redis \u5404\u4E2A\u5206\u7247\u7684 IP\u7AEF\u53E3
 redis.cluster.host_port=10.0.6.32:6379,10.0.6.32:6380,10.0.6.32:6381,10.0.6.33:6379,10.0.6.33:6380,10.0.6.33:6381
 
 
-#\u4e2d\u5fc3\u73b0\u573aredis\u5730\u5740\u548c\u7aef\u53e3
+#\u4E2D\u5FC3\u73B0\u573Aredis\u5730\u5740\u548C\u7AEF\u53E3
 #redis.cluster.host_port=10.174.196.33:6379,10.174.196.33:6380,10.174.196.33:6381,10.174.196.34:6379,10.174.196.34:6380,10.174.196.34:6381,10.174.196.35:6379,10.174.196.35:6380,10.174.196.35:6381,10.174.196.36:6379,10.174.196.36:6380,10.174.196.36:6381,10.174.196.37:6379,10.174.196.37:6380,10.174.196.37:6381,10.174.196.38:6379,10.174.196.38:6380,10.174.196.38:6381,10.174.196.39:6379,10.174.196.39:6380,10.174.196.39:6381
 
 redis.cluster.connectiontimeout=5000
 redis.cluster.sotimeout=5000
 redis.cluster.maxattempts=3
-#redis\u8fde\u63a5\u6c60\u76f8\u5173\u914d\u7f6e
+#redis\u8FDE\u63A5\u6C60\u76F8\u5173\u914D\u7F6E
 
 redis.pool.maxtotal=500
 
@@ -141,31 +141,31 @@ redis.pool.testonreturn=false
 redis.pool.testwhileidle=true
 redis.pool.timebetweenevictionrunsmillis=60000
 redis.pool.minevictableidletimemillis=60000
-#oracle\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba43\u5206\u949f\u5373180s)
+#oracle\u6570\u636Eredis\u5B58\u50A8\u65F6\u95F4(\u79D2\u4E3A\u5355\u4F4D \u9ED8\u8BA43\u5206\u949F\u5373180s)
 oracleExpire=180
-#hive\u6570\u636e\u4e2d\u5fc3\u6570\u636eredis\u5b58\u50a8\u65f6\u95f4(\u79d2\u4e3a\u5355\u4f4d \u9ed8\u8ba420\u5206\u949f\u53731200s)
+#hive\u6570\u636E\u4E2D\u5FC3\u6570\u636Eredis\u5B58\u50A8\u65F6\u95F4(\u79D2\u4E3A\u5355\u4F4D \u9ED8\u8BA420\u5206\u949F\u53731200s)
 hiveExpire=300
-#redis\u5f00\u5173
+#redis\u5F00\u5173
 isOpenRedis=false
-#\u662f\u5426\u5c06\u6570\u636e\u4e2d\u5fc3\u7684\u65e5\u5fd7\u52a0\u5165\u5230redis\u4e2d
+#\u662F\u5426\u5C06\u6570\u636E\u4E2D\u5FC3\u7684\u65E5\u5FD7\u52A0\u5165\u5230redis\u4E2D
 dataCenterOpenRedis=true
-#\u8de8\u57df\u95ee\u9898\u5141\u8bb8 \u7684url Access-Control-Allow-Origin *\u5141\u8bb8\u6240\u6709\uff0c\u8bbe\u7f6e\u6210\u5176\u4ed6url\u53ea\u5141\u8bb8\u8be5url.\u4e0d\u80fd\u8bbe\u7f6e\u591a\u4e2aurl
+#\u8DE8\u57DF\u95EE\u9898\u5141\u8BB8 \u7684url Access-Control-Allow-Origin *\u5141\u8BB8\u6240\u6709\uFF0C\u8BBE\u7F6E\u6210\u5176\u4ED6url\u53EA\u5141\u8BB8\u8BE5url.\u4E0D\u80FD\u8BBE\u7F6E\u591A\u4E2Aurl
 target_url=*
-#\u8de8\u57df\u95ee\u9898 3600\uff1a\u8868\u660e\u57283600\u79d2\u5185\uff0c\u4e0d\u9700\u8981\u518d\u53d1\u9001\u9884\u8bf7\u6c42\uff0c\u53ef\u4ee5\u7f13\u5b58\u8be5\u7ed3\u679c 
+#\u8DE8\u57DF\u95EE\u9898 3600\uFF1A\u8868\u660E\u57283600\u79D2\u5185\uFF0C\u4E0D\u9700\u8981\u518D\u53D1\u9001\u9884\u8BF7\u6C42\uFF0C\u53EF\u4EE5\u7F13\u5B58\u8BE5\u7ED3\u679C 
 ACCESS_CONTROL_MAX_AGE=3600
 ##########HTTPCLIENT POOL START###################
-#\u4ece\u8fde\u63a5\u6c60\u4e2d\u83b7\u53d6\u5230\u8fde\u63a5\u7684\u6700\u957f\u65f6\u95f4  
+#\u4ECE\u8FDE\u63A5\u6C60\u4E2D\u83B7\u53D6\u5230\u8FDE\u63A5\u7684\u6700\u957F\u65F6\u95F4  
 http.request.connectionRequestTimeout=500  
 #5000  
 http.request.connectTimeout=5000  
-#\u6570\u636e\u4f20\u8f93\u7684\u6700\u957f\u65f6\u95f4  
+#\u6570\u636E\u4F20\u8F93\u7684\u6700\u957F\u65F6\u95F4  
 http.request.socketTimeout=30000  
-#\u63d0\u4ea4\u8bf7\u6c42\u524d\u6d4b\u8bd5\u8fde\u63a5\u662f\u5426\u53ef\u7528  
+#\u63D0\u4EA4\u8BF7\u6C42\u524D\u6D4B\u8BD5\u8FDE\u63A5\u662F\u5426\u53EF\u7528  
 http.request.staleConnectionCheckEnabled=true  
   
-#\u8bbe\u7f6e\u8fde\u63a5\u603b\u6570  
+#\u8BBE\u7F6E\u8FDE\u63A5\u603B\u6570  
 http.pool.maxTotal=200  
-#\u8bbe\u7f6e\u6bcf\u4e2a\u5730\u5740\u7684\u5e76\u53d1\u6570  
+#\u8BBE\u7F6E\u6BCF\u4E2A\u5730\u5740\u7684\u5E76\u53D1\u6570  
 http.pool.defaultMaxPerRoute=100 
 ##########HTTPCLIENT POOL END###################
 search.dateformat=yyyy-MM-dd HH:mm:ss
@@ -176,45 +176,45 @@ search.eshostandport_C=10.0.6.115:9200
 #search.eshostandport=10.174.196.135:9200
 
 
-#\u65e5\u5fd7\u662f\u5426\u4ecehive\u4e2d\u67e5\u8be2
+#\u65E5\u5FD7\u662F\u5426\u4ECEhive\u4E2D\u67E5\u8BE2
 selFromHive=false
 
-#\u662f\u5426\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2\u8bb0\u5f55\u7684\u603b\u6761\u6570
+#\u662F\u5426\u83B7\u53D6\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2\u8BB0\u5F55\u7684\u603B\u6761\u6570
 isGetHiveCount=false
 
-#\u6bcf\u6b21\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u591a\u5c11\u6761\u6570\u636e,\u54b1\u4eec\u5728\u5bf9\u83b7\u53d6\u7684\u6570\u636e\u8fdb\u884c\u5206\u9875\u5904\u7406
+#\u6BCF\u6B21\u83B7\u53D6\u6570\u636E\u4E2D\u5FC3\u591A\u5C11\u6761\u6570\u636E,\u54B1\u4EEC\u5728\u5BF9\u83B7\u53D6\u7684\u6570\u636E\u8FDB\u884C\u5206\u9875\u5904\u7406
 everyGetHiveDataNum=10000
 
-#oracle\u6570\u636e\u5e93\u6709\u95ee\u9898\u4e0d\u4eceoracle\u67e5\u8be2\u6570\u636e,\u6240\u6709\u65e5\u5fd7\u6570\u636e\u5747\u4ece\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2
+#oracle\u6570\u636E\u5E93\u6709\u95EE\u9898\u4E0D\u4ECEoracle\u67E5\u8BE2\u6570\u636E,\u6240\u6709\u65E5\u5FD7\u6570\u636E\u5747\u4ECE\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2
 onlySelFromHive=false
 
-#\u662f\u5426\u67e5\u8be2\u795e\u901a\u6570\u636e\u5e93
+#\u662F\u5426\u67E5\u8BE2\u795E\u901A\u6570\u636E\u5E93
 isSelectCluster=true
 
-#\u7528\u6237\u67e5\u8be2\u65e5\u5fd7\u8d85\u8fc7\u591a\u5c11\u5c0f\u65f6\u53bb\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2
+#\u7528\u6237\u67E5\u8BE2\u65E5\u5FD7\u8D85\u8FC7\u591A\u5C11\u5C0F\u65F6\u53BB\u6570\u636E\u4E2D\u5FC3\u67E5\u8BE2
 dataCenterTime=48
 
-#\u662f\u5426\u5f00\u542f\u57fa\u7840\u9a8c\u8bc1
+#\u662F\u5426\u5F00\u542F\u57FA\u7840\u9A8C\u8BC1
 baseValidate=true
 
-#\u662f\u5426\u5f00\u542f\u4e1a\u52a1\u9a8c\u8bc1
+#\u662F\u5426\u5F00\u542F\u4E1A\u52A1\u9A8C\u8BC1
 serviceValidate=true
 
 
 
-#\u65e5\u5fd7\u5b58\u50a8\u672c\u5730\u65f6\u95f4(\u5355\u4f4d\u5c0f\u65f6)
+#\u65E5\u5FD7\u5B58\u50A8\u672C\u5730\u65F6\u95F4(\u5355\u4F4D\u5C0F\u65F6)
 logLocalTime=48
-#\u5b9e\u65f6\u7edf\u8ba1\u9ed8\u8ba4\u67e5\u8be2\u672c\u5730\u4e00\u4e2a\u5c0f\u65f6\u7684\u6570\u636e(\u5355\u4f4d\uff1a\u5c0f\u65f6)
+#\u5B9E\u65F6\u7EDF\u8BA1\u9ED8\u8BA4\u67E5\u8BE2\u672C\u5730\u4E00\u4E2A\u5C0F\u65F6\u7684\u6570\u636E(\u5355\u4F4D\uFF1A\u5C0F\u65F6)
 reportLocalTime=1
 
-#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u65e5\u5fd7\u65f6\u95f4(A\u7248\u6beb\u79d2)
+#\u795E\u901A\u6570\u636E\u5E93\u6700\u65E9\u65E5\u5FD7\u65F6\u95F4(A\u7248\u6BEB\u79D2)
 #2017-08-13 10:07:25
 clusterAStartTime=1503504000725
-#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u7ed3\u675f\u65f6\u95f4(B\u7248\u6beb\u79d2)
+#\u795E\u901A\u6570\u636E\u5E93\u6700\u65E9\u7ED3\u675F\u65F6\u95F4(B\u7248\u6BEB\u79D2)
 #2017-08-13 10:07:25
 clusterBStartTime=1503504000725
 ############################################################################################################################################
-#\u8bbe\u7f6e\u914d\u7f6e\u662f\u5426\u5165\u5e93
+#\u8BBE\u7F6E\u914D\u7F6E\u662F\u5426\u5165\u5E93
 ############################################################################################################################################
 isCommit=true
 ############################################################################################################################################
@@ -272,7 +272,7 @@ trafficAreaStat=trafficAreaStat
 logServiceTopn=logServiceTopn
 blockAndDropStat=blockAndDropStat
 ########################################
-#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
+#\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3
 dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/
 trafficIpActive=trafficIpActive
 trafficProtocol=trafficProtocol
@@ -296,28 +296,28 @@ logsearch_menu_id=152
 #use elasticsearch or not#
 isUseES=false
 
-#httpclient \u5de5\u5177\u8bbe\u7f6e\u8d85\u65f6\u65f6\u95f4
+#httpclient \u5DE5\u5177\u8BBE\u7F6E\u8D85\u65F6\u65F6\u95F4
 http_socket_timeout=300000
 http_connect_timeout=10000
 http_connect_request_timeout=50000
 http_connect_retry_times=3
 
 
-#\u6570\u636e\u4e2d\u5fc3A\u7248\u6570\u636e\u5e93\u540d\u79f0,\u7a0b\u5e8f\u4e2d\u6bcf\u6b21\u67e5\u8be2\u65f6\u4f7f\u7528\u7684\u6570\u636e\u5e93\u540d\u79f0  use dbA
+#\u6570\u636E\u4E2D\u5FC3A\u7248\u6570\u636E\u5E93\u540D\u79F0,\u7A0B\u5E8F\u4E2D\u6BCF\u6B21\u67E5\u8BE2\u65F6\u4F7F\u7528\u7684\u6570\u636E\u5E93\u540D\u79F0  use dbA
 jdbc.hive.AName=xa_dfbhit_hive
-#\u6570\u636e\u4e2d\u5fc3B\u7248\u6570\u636e\u5e93\u540d\u79f0
+#\u6570\u636E\u4E2D\u5FC3B\u7248\u6570\u636E\u5E93\u540D\u79F0
 jdbc.hive.BName=xa_z2_mesalog_hive
 
 maxPageSize=100000
-#\u5bfc\u51fa\u6700\u5927\u6761\u6570
+#\u5BFC\u51FA\u6700\u5927\u6761\u6570
 maxExportSize=5000
-#\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7
+#\u5141\u8BB8\u914D\u7F6E\u6700\u5927\u5C42\u7EA7
 maxLevelNo=4
-#\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26
+#\u4E0A\u4E0B\u7EA7\u663E\u793A\u95F4\u9694\u6807\u8BC6\u7B26
 childrenMark=.
-#\u4e1a\u52a1\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6
+#\u4E1A\u52A1\u5B57\u5178\u5728\u8BCD\u5178\u4E2D\u7684\u6807\u8BC6
 SERVICE_DICT_ITM_TYPE=SERVICE_DICT_ITM_TYPE
-#\u7cfb\u7edf\u5b57\u5178\u5728\u8bcd\u5178\u4e2d\u7684\u6807\u8bc6
+#\u7CFB\u7EDF\u5B57\u5178\u5728\u8BCD\u5178\u4E2D\u7684\u6807\u8BC6
 SYS_DICT_ITM_TYPE=SYS_DICT_ITM_TYPE
 area_region=NTC_IP_RANGE
 protocol_num_region=NTC_UNIVERSAL_PROTO_TYPE
@@ -345,16 +345,16 @@ ssl_ip_region=ssl_ip
 bgp_ip_region=bgp_ip
 behav_id_region=BEHAV_ID
 rate_limit_region=Droprate
-#\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26
+#\u5B58\u5728\u4E0E\u8868\u8FBE\u5F0F\u7684\u5173\u952E\u5B57\u7279\u6B8A\u5206\u9694\u7B26
 keyword_expr=***and***
-#\u65f6\u533a
+#\u65F6\u533A
 time_zone=8
-#\u9700\u8981\u7279\u6b8a\u5904\u7406\u7684\u4e1a\u52a1\u7c7b\u578b
+#\u9700\u8981\u7279\u6B8A\u5904\u7406\u7684\u4E1A\u52A1\u7C7B\u578B
 service_pxy_domain_intercept=513
 service_ip_mulitiplex=768
 service_ip_ratelimit=1057
 service_domain_ratelimit=1058
-#\u7528\u6237\u81ea\u5b9a\u4e49\u57df
+#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF
 userregion_rate_limit=Droprate
 userregion_ir_strategy=IR_STRATEGY
 userregion_ir_type=IR_TYPE
@@ -364,25 +364,25 @@ userregion_replace_type_key=zone
 userregion_replace_req_key_value=http_req_body
 userregion_replace_res_key_value=http_res_body
 userregion_replace_regex_key=regex
-#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5360\u4f4d\u7b26
+#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5360\u4F4D\u7B26
 user_region_placeholder=0
-#\u7528\u6237\u81ea\u5b9a\u4e49\u57df\u5206\u9694\u7b26
+#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5206\u9694\u7B26
 user_region_split=;
-#IP\u76f8\u5173\u9a8c\u8bc1\u6b63\u5219
+#IP\u76F8\u5173\u9A8C\u8BC1\u6B63\u5219
 ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$
 ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/([2-9]|[1-9][0-9]|1[0-2][0-8])$
 ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
 ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$
 ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
 ipv6_ip_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$
-#\u91cd\u5b9a\u5411\u4e1a\u52a1\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570
+#\u91CD\u5B9A\u5411\u4E1A\u52A1\u81EA\u5B9A\u4E49\u57DF\u76F8\u5173\u53C2\u6570
 redirect_response_code_key=code
 redirect_url_key=url
 redirect_content_key=content
 redirect_response_code_startwith=30
 replace_zone_key=zone
 replace_substitute_key=substitute
-#\u6837\u4f8b\u6587\u4ef6\u4e0a\u4f20\u7684uri\u5173\u952e\u8bcd
+#\u6837\u4F8B\u6587\u4EF6\u4E0A\u4F20\u7684uri\u5173\u952E\u8BCD
 sample_upload_url_keyword=/av
 digest_upload_url_keyword=/filetransfer
 cert_upload_url_keyword=/intercept/strateagy
@@ -391,53 +391,53 @@ cert_upload_url_keyword=/intercept/strateagy
 sample_total_file_max_size=12582912
 #audio File Types
 audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,wav,mp3,
-#audio File Size 10M 10485760\uff08single\uff09 
+#audio File Size 10M 10485760\uFF08single\uFF09 
 audio_single_file_max_size=0
-#speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b
+#speaker File Types \u8BF4\u8BDD\u4EBA\u8BC6\u522B\u6587\u4EF6\u7C7B\u578B
 speaker_file_type=
-#audio File Size 10M 10485760\uff08single\uff09 
+#audio File Size 10M 10485760\uFF08single\uFF09 
 speaker_single_file_max_size=0
 #video File Types
 video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,
-#video File Size 10M 10485760\uff08single\uff09 
+#video File Size 10M 10485760\uFF08single\uFF09 
 video_single_file_max_size=0
-#face File Types \u4eba\u8138\u8bc6\u522b
+#face File Types \u4EBA\u8138\u8BC6\u522B
 face_file_type=
-#face File Size 10M 10485760\uff08single\uff09 
+#face File Size 10M 10485760\uFF08single\uFF09 
 face_single_file_max_size=0
 #picture File Types
 picture_file_type=
-#picture File Size 10M 10485760\uff08single\uff09 
+#picture File Size 10M 10485760\uFF08single\uFF09 
 picture_single_file_max_size=10485760
-#logo File Types \u53f0\u6807\u8bc6\u522b
+#logo File Types \u53F0\u6807\u8BC6\u522B
 logo_file_type=
-#logo File Size 10M 10485760\uff08single\uff09 
+#logo File Size 10M 10485760\uFF08single\uFF09 
 logo_single_file_max_size=10485760
 #voip File Types
 voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
-#voip File Size 10M 10485760\uff08single\uff09 
+#voip File Size 10M 10485760\uFF08single\uFF09 
 voip_single_file_max_size=0
 
 #digest File Types
 digest_file_type=
-#digest File Size 10M 10485760\uff08single\uff09
+#digest File Size 10M 10485760\uFF08single\uFF09
 digest_single_file_max_size=10485760
-#digest File Size 12M 12582912\uff08total\uff09 
+#digest File Size 12M 12582912\uFF08total\uFF09 
 digest_total_file_max_size=12582912
-#cert File Size 12M 12582912\uff08total\uff09 
+#cert File Size 12M 12582912\uFF08total\uFF09 
 cert_total_file_max_size=12582912
 #public File Types
 public_file_type=
-#public File Size 10M 10485760\uff08single\uff09
+#public File Size 10M 10485760\uFF08single\uFF09
 public_single_file_max_size=10485760
 #private File Types
 private_file_type=
-#private File Size 10M 10485760\uff08single\uff09
+#private File Size 10M 10485760\uFF08single\uFF09
 private_single_file_max_size=10485760
-#YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84
+#YSP\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
 av_file_path=/home/ysp/
 #av_file_path=D\:\\ysp\\
-#YSP\u6587\u4ef6\u7279\u5f81\u7c7b\u578b
+#YSP\u6587\u4EF6\u7279\u5F81\u7C7B\u578B
 av_sample_audio_region=av_sample_audio
 av_sample_video_region=av_sample_video
 av_sample_picture_region=av_sample_picture
@@ -446,7 +446,7 @@ mm_speaker_recognization_region=MM_SPEAKER_RECOGNIZATION
 mm_logo_detection_region=MM_LOGO_DETECTION
 mm_face_recognization_region=MM_FACE_RECOGNIZATION
 
-#\u6837\u4f8b\u6587\u4ef6\u751f\u6210\u7a0b\u5e8f
+#\u6837\u4F8B\u6587\u4EF6\u751F\u6210\u7A0B\u5E8F
 audio_sample_create_proc=/home/ceiec/av_feature_gen/audio_convert_proc
 video_sample_create_proc=/home/ceiec/av_feature_gen/extract_frame_feature
 picture_sample_create_proc=/home/ceiec/av_feature_gen/picture_convert_proc
@@ -465,7 +465,7 @@ picture_sample_proc_param_is_translation=false
 speaker_sample_proc_param_is_translation=false
 logo_sample_proc_param_is_translation=false
 face_sample_proc_param_is_translation=false
-#\u672c\u5730\u6d4b\u8bd5
+#\u672C\u5730\u6D4B\u8BD5
 #audio_sample_create_proc=java -jar D\:\\sampleTest.jar
 #video_sample_create_proc=java -jar D\:\\sampleTest.jar
 #picture_sample_create_proc=java -jar D\:\\sampleTest.jar
@@ -484,41 +484,41 @@ face_sample_proc_param_is_translation=false
 #speaker_sample_proc_param_is_translation=true
 #logo_sample_proc_param_is_translation=true
 #face_sample_proc_param_is_translation=true
-#http\u81ea\u5b9a\u4e49\u57df\u76f8\u5173\u53c2\u6570
+#http\u81EA\u5B9A\u4E49\u57DF\u76F8\u5173\u53C2\u6570
 http_header_user_region_key=HTTP_HEADER
 http_header_dict_module=HTTP_HEADER_DISTRICT
-#dns\u81ea\u5b9a\u4e49\u57df\u53c2\u6570key
+#dns\u81EA\u5B9A\u4E49\u57DF\u53C2\u6570key
 dns_strategy_user_region_key=DNS_STRATEGY
-#p2p\u81ea\u5b9a\u4e49\u57dfkey
+#p2p\u81EA\u5B9A\u4E49\u57DFkey
 p2p_ip_type_user_region_key=P2P_IP_TYPE
 p2p_hash_type_user_region_key=P2P_HASH_TYPE
-#\u7279\u5b9a\u670d\u52a1\u7c7b\u522b
+#\u7279\u5B9A\u670D\u52A1\u7C7B\u522B
 specific_service_cfg_type_app=social_app
 specific_service_cfg_type_encrypted_tunnel_behavior=encrypted_tunnel_behavior
 specific_service_cfg_type_basic_protocol=basic_protocol
-#\u57fa\u7840\u534f\u8bae\u81ea\u5b9a\u4e49\u57df
+#\u57FA\u7840\u534F\u8BAE\u81EA\u5B9A\u4E49\u57DF
 proto_id_region=PROTO_ID
-#\u62e6\u622aIP\u81ea\u5b9a\u4e49\u57dfkey
+#\u62E6\u622AIP\u81EA\u5B9A\u4E49\u57DFkey
 keyring_id=keyring_id
 droprate=Droprate
 bandwidth=Bandwidth
 intercept_domain_intensity=DOMAIN_INTENSITY
-#IP\u9ed8\u8ba4\u503c
+#IP\u9ED8\u8BA4\u503C
 ipv4_default_ip_value=0.0.0.0
 ipv6_default_ip_value=\:\:
 ipv4_default_ip_subnet_value=0.0.0.0/16
 ipv6_default_ip_subnet_value=::/128
 ipv4_default_ip_range_value=0.0.0.0-1
 ipv6_default_ip_range_value=::-::
-#\u7aef\u53e3\u9ed8\u8ba4\u503c
+#\u7AEF\u53E3\u9ED8\u8BA4\u503C
 port_default=0
 port_mask_default=0/65535
-#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c
+#MAAT CFG \u4E00\u4E9B\u9ED8\u8BA4\u503C
 maat_cfg_dolog_default=2
 maat_cfg_dolog_doblacklist_default=1
 maat_cfg_dolog_configpercent_default=100
 maat_cfg_dolog_configoption_default=1
-#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26
+#app\uFF0C\u57FA\u7840\u534F\u8BAE\uFF0C\u7279\u5B9A\u670D\u52A1\u7684userregion\u5206\u9694\u7B26
 app_cfg_userregion_splitor=&
 app_id_region=APP_ID
 #application spec service code scope
@@ -532,36 +532,36 @@ area_tag=location
 isp_tag=isp
 mmFileDigestLog=mmFileDigestLogs
 ntcStreamMediaLog=ntcStreamMediaLogs
-#\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2
+#\u97F3\u89C6\u9891\u6837\u4F8B\u9650\u5236\u65F6\u957F\uFF0C\u5355\u4F4D\u79D2
 av_duration_limit=120
 video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame
-#\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84
+#\u8BC1\u4E66\u6587\u4EF6\u8DEF\u5F84
 cert_file_path=/home/cert/
-#\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0
+#\u8BC1\u4E66\u6821\u9A8C\u5DE5\u5177\u540D\u79F0
 cert_validate_file=x509
-#\u8bc1\u4e66\u6821\u9a8c\u6210\u529f\u7684\u5173\u952e\u4fe1\u606f
+#\u8BC1\u4E66\u6821\u9A8C\u6210\u529F\u7684\u5173\u952E\u4FE1\u606F
 cert_validate_success_info=Successful
-#ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2
+#ipv4 range\u65B0\u683C\u5F0F0.0.0.1-2
 ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
 ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
-#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
+#\u57DF\u540D\u9A8C\u8BC1\u6B63\u5219
 domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$
-#IP\u590d\u7528maat json\u4e2d\u7684ip region\u5355\u6b21send \u6700\u5927\u4e2a\u6570
+#IP\u590D\u7528maat json\u4E2D\u7684ip region\u5355\u6B21send \u6700\u5927\u4E2A\u6570
 maat_json_send_size=20000
-#\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf
+#\u5BFC\u5165\u9A8C\u8BC1\u7684\u7EBF\u7A0B\u6570\u91CF
 mulity_thread_size=5
 ntcRadiusReport=ntcRadiusReport
 ntcCollectVoipLog=ntcCollectVoipLogs
 ntcKeywordsUrlLog=ntcKeywordsUrlLogs
 save_and_del_thread_size=5
-#mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e
+#mysql \u5355\u4E2Asql\u5927\u5C0F\u9650\u5236,\u6839\u636Emariadb\u76F8\u5173\u53C2\u6570\u914D\u7F6E
 max_allowed_packet=1048576
-#http client\u8fde\u63a5\u6c60\u76f8\u5173\u53c2\u6570\uff0chttp_max_connection:\u6700\u5927\u8fde\u63a5\u6570\uff0cdefault_max_perroute:\u6bcf\u4e2a\u4e3b\u673a\u5730\u5740\u7684\u5e76\u53d1\u6570\uff0cpoolcm_socket_timeout:socket\u8d85\u65f6\u65f6\u95f4
+#http client\u8FDE\u63A5\u6C60\u76F8\u5173\u53C2\u6570\uFF0Chttp_max_connection:\u6700\u5927\u8FDE\u63A5\u6570\uFF0Cdefault_max_perroute:\u6BCF\u4E2A\u4E3B\u673A\u5730\u5740\u7684\u5E76\u53D1\u6570\uFF0Cpoolcm_socket_timeout:socket\u8D85\u65F6\u65F6\u95F4
 http_max_connection=1000
 default_max_perroute=100
 poolcm_socket_timeout=3000
 app_vignore_user_region_key=VIGNORE
-#policies\u83dc\u5355\u7684\u83dc\u5355ID
+#policies\u83DC\u5355\u7684\u83DC\u5355ID
 policies_menu_id=86
 userCreate=UserCreate
 userPasswordSet=UserPasswordSet
@@ -571,7 +571,7 @@ userList=UserList
 ip_reuse_call_cgi_url=http://192.168.11.137:8090/command
 ipNumGet=IpNumGet
 allIpGet=AllIpGet
-#\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5
+#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5
 trafficBandwidthTrans=trafficBandwidthTrans
 trafficProtocolList=trafficProtocolList
 irSnatLog=irSnatLogs
@@ -591,7 +591,7 @@ trafficBandwidthTransFour=trafficBandwidthTransFour
 ntcCollectRadiusLog=ntcCollectRadiusLogs
 ntcConnRecordLog=ntcConnRecordLogs
 ntcConnRecordPercent=ntcConnRecordPercent
-#\u5bfc\u51fa\u6700\u5927\u6761\u6570
+#\u5BFC\u51FA\u6700\u5927\u6761\u6570
 maxLogExportSize=2000
 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID
 ntc_subscribe_id_region=NTC_SUBSCRIBE_ID
@@ -602,4 +602,5 @@ trafficWebsiteListNoTime=trafficWebsiteListNoTime
 trafficTopicList=trafficTopicList
 trafficDomainTrans=trafficDomainTrans
 #maximum number to import
-import_limit=10
\ No newline at end of file
+import_limit=10
+trafficPortActiveFiveMinute=trafficPortActiveFiveMinute
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 1ea623730..17d655c0d 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -72,7 +72,7 @@ body {
                 </div>
                 <div class="fr_fc" style="width:40%">
                 	<div class="fl_visual">
-                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><i class="fa fa-ban"></i></a>
+                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><i class="fa fa-ban"></i></a>
                 	 </div>
                     <div class="fl_fc">
 						<p style="margin-left: 0px;width:100%">
@@ -81,7 +81,7 @@ body {
                          <!-- 阻断链接数 --><spring:message code="action_reject"/>
                         </label>
                          </p>
-                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><p class="numberRun1">0</p></a>
+                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><p class="numberRun1">0</p></a>
                     </div>
                 </div>
             </div>
@@ -90,38 +90,37 @@ body {
             <div class="text_2">
              <div class="fr_fc">
              		<div class="fl_visual">
-                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><i class="fa fa-eye"> </i></a>
+                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_monit"><i class="fa fa-eye"> </i></a>
                 	 </div>
                     <div class="fl_fc">
                         <p data-original-title="<spring:message code="action_monit"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
                          <!-- 监测链接数 --><spring:message code="action_monit"/></p>
-                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><p class="numberRun2">0</p></a>
+                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_monit"><p class="numberRun2">0</p></a>
                     </div>
                 </div>
             	<div class="fr_fc">
             		<div class="fl_visual">
-                		<i class="fa fa-trash"> </i>
+                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_drop"><i class="fa fa-trash"> </i></a>
                 	 </div>
                     <div class="fl_fc">
 <%--                      <a href="${ctx}/dashboard/ipActiveList"> --%>
                         <p data-original-title="<spring:message code="action_drop"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
                          <!-- 丢弃链接数 --><spring:message code="action_drop"/></p>
-                        <p class="numberRun3">0</p>
+                       <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_drop"> <p class="numberRun3">0</p></a>
                     </div>
                 </div>
                 <div class="fr_fc">
                 	<div class="fl_visual">
-                		<i class="fa fa-recycle"> </i>
+                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_loop"><i class="fa fa-recycle"> </i></a>
                 	 </div>
                     <div class="fl_fc">
 <!--                     <a href="javacript:;"> -->
                         <p data-original-title="<spring:message code="action_loop"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top">
 							<!-- 回流链接数 --><spring:message code="action_loop"/></p>
-                        <p class="numberRun">0</p>
-                    
+                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_loop"><p class="numberRun">0</p></a>
                     </div>
                 </div>
                 
@@ -220,9 +219,9 @@ body {
                     <span class="label_block" style="border-left:2px #1F235C solid;">
                     	<label><a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
                     </span>
-                  <%--   <span class="label_block" style="border-left:2px #22265E solid;">
+                  <span class="label_block" style="border-left:2px #22265E solid;">
                     	<label><a href="${ctx}/dashboard/portActiveList"><i class="fa fa-line-chart"></i></a></label>
-                    </span> --%>
+                    </span>
                 </div>
                 
                  <div class="main_table_port">
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new
deleted file mode 100644
index bc3ab2e8c..000000000
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp_new
+++ /dev/null
@@ -1,935 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>数据概览</title>
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/common.css">
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/data_text.css">
-    <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/dashboard.css">
-    <script src="${pageContext.request.contextPath}/static/pages/scripts/dashboard.js"></script>
-
-    <!--[if lt IE 9]>
-    <script src="js/html5shiv.min.js"></script>
-    <script src="js/respond.min.js"></script>
-    <![endif]-->
-<style>
-body {
-	overflow-x:hidden
-}
-.chart_topic text {
-	color: #fff
-}
-.fa-arrow-circle-up {
-	color: #fe392e;
-	background-color: white;
-	border-radius: 10px;
-	font-size: 13px;
-	width: 10px;
-	height: 10px;
-	line-height: 9px !important;
-}
-.fa-arrow-circle-down {
-	color: #42DEEB;
-	background-color: white;
-	border-radius: 10px;
-	font-size: 13px;
-	width: 10px;
-	height: 10px;
-	line-height: 9px !important;
-}
-</style>
-</head>
-
-<body>
-<!--content开始-->
-<div class="data_content">
-<!--header开始-->
-<!--    <div class="header-title">
-        <div class="title-left fl"></div>
-        <div class="title-center fl"><a href="javascript:window.location.reload()"><i class="fa fa-line-chart"></i>&nbsp;网络流量分析</a></div>
-        <div class="title-right fr"></div>
-</div> -->
-	<div class="header">
-    <div class="data_info">
-        <div class="info_1 fl_fc">
-            <div class="text_1">
-                <div class="fr_fc" style="width:60%">
-                 <div class="fl_visual">
-                	<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
-                 </div>
-                    <div class="fl_fc">
-						<p>
-                        <label data-original-title="<spring:message code="traffic"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- 网络带宽 --><spring:message code="traffic"/>
-                        </label>
-                        </p>
-                 			<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">c2s <span class="c2sNum">0</span> | s2c <span class="s2cNum">0</span> </p>
-                        	<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
-                    </div>
-                </div>
-                <div class="fr_fc" style="width:40%">
-                	<div class="fl_visual">
-                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><i class="fa fa-ban"></i></a>
-                	 </div>
-                    <div class="fl_fc">
-						<p style="margin-left: 0px;width:100%">
-                        <label data-original-title="<spring:message code="action_reject"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- 阻断链接数 --><spring:message code="action_reject"/>
-                        </label>
-                         </p>
-                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><p class="numberRun1">0</p></a>
-                    </div>
-                </div>
-            </div>
-        </div>
-      <div class="info_2 fl_fc">
-            <div class="text_2">
-             <div class="fr_fc">
-             		<div class="fl_visual">
-                		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><i class="fa fa-eye"> </i></a>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="action_monit"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- 监测链接数 --><spring:message code="action_monit"/></p>
-                        <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><p class="numberRun2">0</p></a>
-                    </div>
-                </div>
-            	<div class="fr_fc">
-            		<div class="fl_visual">
-                		<i class="fa fa-trash"> </i>
-                	 </div>
-                    <div class="fl_fc">
-<%--                      <a href="${ctx}/dashboard/ipActiveList"> --%>
-                        <p data-original-title="<spring:message code="action_drop"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- 丢弃链接数 --><spring:message code="action_drop"/></p>
-                        <p class="numberRun3">0</p>
-                    </div>
-                </div>
-                <div class="fr_fc">
-                	<div class="fl_visual">
-                		<i class="fa fa-recycle"> </i>
-                	 </div>
-                    <div class="fl_fc">
-<!--                     <a href="javacript:;"> -->
-                        <p data-original-title="<spring:message code="action_loop"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top">
-							<!-- 回流链接数 --><spring:message code="action_loop"/></p>
-                        <p class="numberRun">0</p>
-                    
-                    </div>
-                </div>
-                
-                 <div class="fr_fc">
-                	<div class="fl_visual">
-                		<i class="fa fa-link"> </i>
-                	 </div>
-                    <div class="fl_fc">
-<!--                     <a href="javacript:;"> -->
-                        <p data-original-title="<spring:message code="new_link"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top">
-							<!-- 新建链接数 --><spring:message code="new_link"/></p>
-                        <p class="numberRun5">0</p>
-                    
-                    </div>
-                </div>
-                 <div class="fr_fc">
-                	<div class="fl_visual">
-                		<i class="fa fa-unlink"> </i>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="active_link"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top">
-							<!-- 活跃链接数 --><spring:message code="active_link"/></p>
-                        <p class="numberRun6">0</p>
-                    
-                    </div>
-                </div>
-                
-                <div class="fr_fc">
-             		<div class="fl_visual">
-                		<i class="fa fa-smile-o"> </i>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="pass"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- pass --><spring:message code="pass"/></p>
-                        <p class="numberRun7">0</p>
-                    </div>
-                </div>
-                <div class="fr_fc">
-             		<div class="fl_visual">
-                		<i class="fa fa-heartbeat"> </i>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="live_link"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- live link--><spring:message code="live_link"/></p>
-                        <p class="numberRun8">0</p>
-                    </div>
-                </div>
-                
-        </div>
-    </div>
-</div>
-</div>
-			<input id="beginDateh" type="hidden" value="${beginDate}"/>
-			<input id="endDateh" type="hidden" value="${endDate}"/>
-<!--header结束-->
-<!-- 第一行 -->
-    <div class="data_main">
-        <div class="main_left fl">
-            <div class="left_1">
-                <div class="main_title">
-                	<label class="txt"><spring:message code="traffic_ipactive_chart"/></label>
-                	<span class="label_block" style="border-left:2px #646d8a solid;">
-                		<label class="btn2"> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
-                	</span>
-                	<span class="label_block" style="border-left:2px #626a87 solid;">
-                		<label><a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-line-chart"></i></a></label>
-                	</span>
-                </div>
-               <!-- 活跃IP图 --> <div class="chart-back" id="chart_main" style="width:100%;height:400px;"></div>
-            </div>
-        </div>
-        <!-- 协议类型图 -->
-        <div class="main_center fl">
-            <div class="center_text">
-                <div class="main_title">
-                    <label class="txt"><spring:message code="traffic_protocol_chart"/></label>
-                    <span class="label_block" style="border-left:2px #575073 solid;">
-	                    <label><a href="javascipt:void(0)" onclick="protocolList();return false;"><i class="fa fa-refresh"></i></a></label>
-                    </span>
-                    <span class="label_block" style="border-left:2px #575073 solid;">
-                    	<label><a href="${ctx}/dashboard/traffic/protocolTypeList"><i class="fa fa-line-chart"></i></a></label>
-                    </span>
-                </div>
-                <div id="chart_1" class="chart-back" style="width:100%;height: 400px;"></div>
-            </div>
-        </div>
-        <!-- 活跃端口 -->
-        <div class="main_right fr">
-            <div class="right_1">
-                <div class="main_title_port">
-                    <label class="txt"><spring:message code="active_port"/></label>
-                    <span class="label_block" style="border-left:2px #575073 solid;">
-                    	<label><a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
-                    </span>
-                </div>
-                
-                 <div class="main_table_port">
-                    <table id="contentTable">
-                        <thead>
-                        <tr>
-                            <th><spring:message code="port"/></th>
-                            <th><spring:message code="visits"/></th>
-                            <th><spring:message code="trend"/></th>
-                        </tr>
-                        </thead>
-                        <tbody id="tbodyDataPort">
-                        </tbody>
-                    </table>
-                </div>
-
-            </div>
-        </div>
-        
-    </div>
-    
-<!-- 第2行 -->
-    <div class="data_main1">
-        <div class="main_left1 fl">
-            <div class="left_1">
-                <div class="main_title1">
-                	<label class="txt"><spring:message code="service"/></label>
-                	<span class="label_block" style="border-left:2px #99879b solid;">
-		              	<label><a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a></label>
-                	</span>
-                	<span class="label_block" style="border-left:2px #9f8da1 solid;">
-                    	<label><a href="${ctx}/dashboard/httpStatisticList"><i class="fa fa-line-chart"></i></a></label>
-                    </span>
-	             </div>
-	                <!-- 网站主题分类图 --><div id="chart_topic" style="width:100%;height:400px;"></div>
-            </div>
-        </div>
-        
-          <div class="main_center1 fl">
-            <div class="bottom_web fl">
-	            <div class="main_title_web">
-                    <label class="txt"><spring:message code="traffic_website_list"/></label>
-                    <span class="label_block" style="border-left:2px #824e6a solid;">
-	                    <label><a href="javascipt:void(0)" onclick="websiteList();return false;"><i class="fa fa-refresh"></i></a></label>
-                    </span>
-                </div>
-	             <div class="main_table_web">
-                    <table>
-                        <thead>
-                        <tr>
-                            <th><spring:message code="ranking"/></th>
-                            <th><spring:message code="website"/></th>
-                            <th><spring:message code="trend"/></th>
-                        </tr>
-                        </thead>
-                        <tbody id="tbodyData2">
-                        </tbody>
-                    </table>
-                </div>
-	        </div>
-        </div>
-	        <div class="main_right1 fl" style="margin-left:5px;">
-            	<div class="bottom_web fl">
-				    <%-- <div class="main_title_web">
-				        <spring:message code="traffic_website_type_chart"/>
-				    </div> --%>
-				    <div class="main_table_web">
-				        <!-- http网站分类图 --><div id="chart_4" class=""></div>
-				    </div>
-				</div>
-        </div>
-    </div>
-    <!-- 第三行-->
-    <div class="data_main1">
-        <div class="main_left1 fl">
-            <div class="left_1">
-                <div class="main_title1">
-                <label class="txt"><spring:message code="traffic_app_chart"/></label>
-                <span class="label_block" style="border-left:2px #5c6a78 solid;">
-	                <label><a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a></label>
-                </span>
-                <span class="label_block" style="border-left:2px #5c6a78 solid;">
-                	<label><a href="${ctx}/dashboard/traffic/appTypeList"><i class="fa fa-line-chart"></i></a></label>
-                </span>
-                </div>
-                 <!--app应用图  --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
-            </div>
-        </div>
-        
-          <div class="main_center1 fl">
-            <div class="bottom_web fl">
-	            <div class="main_title_web">
-                   <label class="txt"><!-- 终端 -->OS/BS </label><!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
-                   <span class="label_block" style="border-left:2px #6e5377 solid;">
-		                <label><a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a></label>
-                   </span>
-                </div>
-	             <div class="main_table_web">
-                    <table>
-	                    <thead>
-	                    <tr>
-	                        <th><spring:message code="ranking"/></th>
-	                        <th>
-								 <div class="choice">
-	                    			<select name="uaSelect" id="uaSelect" style="text-align:center; text-align-last:center; -webkit-appearance: none; background-color: #3D495F; width: 80px;" class="minimal">
-	                       				<option value="system">&nbsp;<spring:message code="os"/></option>
-	                        			<option value="browser">&nbsp;<spring:message code="browser"/></option>
-	                    			</select>
-	                			</div>
-							</th>
-	                        <th><spring:message code="trend"/></th>
-	                    </tr>
-	                    </thead>
-	                    <tbody id="tbodyData1">
-	                    </tbody>
-	                </table>
-                </div>
-	        </div>
-        </div>
-	        <div class="main_right1 fl">
-            	<div class="bottom_web fl" style="margin-left:5px;">
-				    <%-- <div class="main_title_web">
-				        <spring:message code="traffic_website_type_chart"/>
-				    </div> --%>
-				    <div class="main_table_web">
-				        <!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 470px;"></div>
-				    </div>
-				</div>
-        </div>
-        
-    </div>
-    </div>
-
-<!--content结束-->
-<!-- 列表显示 -->
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/data.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/drilldown.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/sunburst.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/pages/scripts/echart.js"></script>
-
-<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
-<style>
-	tr.select-row-tr:HOVER {
-	background-color: #5d6062 !important;
-	cursor: pointer;
-}
-	tr.select-row-tr:ACTIVE {
-	background-color: #5d6062 !important;
-}
-.activeColor{
-	background-color: #5d6062 !important;
-}
-</style>
-<script type="text/javascript">
-$(document).ready(function(){
-	//动态显示数据
-	ajaxinfo();
-	setInterval(function(){
-	 ajaxinfo();
-	},300000);
-	
-	protocolList();//协议统计
-	ipActiveList();//活跃IP
-	portActiveList();//活跃端口
-	appTypeList();//应用类型
-// 	systemList();//操作系统列表
-	websiteList();//http网站列表
-	topicAndDomainList();//主题网站域名
-	
-
-	uaSelectChange();
-	//当选择改变时触发
-	$('#uaSelect').change(function(){
-		uaSelectChange();
-	});
-
-	var starth=$("#beginDateh").val();
-	var endh=$("#endDateh").val();
-	$("#ipBeginDate").val(starth);
-	$("#ipEndDate").val(endh);
-});
-//获取数据info 
-function ajaxinfo(){
-	$.ajax({
-		url:'${ctx}/dashboard/traffic/info',
-		type : "get" ,
-		dataType:'json',
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (data){
-			var loopConnNum =loopConnNum= data.loopConnNum;
-			var rejectNum =data.rejectNum;
-			var monitorNum =data.monitorNum;
-			var dropConnNum =data.dropConnNum;
-			var newUniConnNum=data.newUniConnNum;
-			var liveConnNum=data.liveConnNum;
-			
-			if(loopConnNum==null||loopConnNum==""){
-				loopConnNum=0;
-			}
-			if(rejectNum==null||rejectNum==""){
-				rejectNum=0;
-			}
-			if(monitorNum==null||monitorNum==""){
-				monitorNum=0;
-			}
-			if(dropConnNum==null||dropConnNum==""){
-				dropConnNum=0;
-			}
-			if(newUniConnNum==null||newUniConnNum==""){
-				newUniConnNum=0;
-			}
-			if(liveConnNum==null||liveConnNum==""){
-				liveConnNum=0;
-			}
-			dataScroll(".numberRun",Math.round(loopConnNum));
-			dataScroll(".numberRun1",Math.round(rejectNum));
-			dataScroll(".numberRun2",Math.round(monitorNum));
-			dataScroll(".numberRun3",Math.round(dropConnNum));
-			dataScroll(".numberRun5",Math.round(newUniConnNum));
-			dataScroll(".numberRun6",Math.round(liveConnNum));
-			dataScroll(".numberRun7",Math.round(newUniConnNum-rejectNum));
-			dataScroll(".numberRun8",Math.round(newUniConnNum-rejectNum-dropConnNum));
-			
-			//计算带宽进出口流量百分比
-
-			var inoctetsNum=Math.round(data.inoctetsNum);
-			var inoctetsNumK=inoctetsNum/1024;
-			var inoctetsNumM=inoctetsNumK/1024;
-			var inoctetsNumG=inoctetsNumM/1024;
-			var outoctetsNum=Math.round(data.outoctetsNum);
-			var outoctetsNumK=outoctetsNum/1024;
-			var outoctetsNumM=outoctetsNumK/1024;
-			var outoctetsNumG=outoctetsNumM/1024;
-			var unit="bps";
-			var bandwidth=inoctetsNum+outoctetsNum;
-			if(inoctetsNumK>1||outoctetsNumK>1){
-				inoctetsNum=inoctetsNumK.toFixed(2);
-				outoctetsNum=outoctetsNumK.toFixed(2);
-				unit="Kbps";
-				};
-			if(inoctetsNumM>1||outoctetsNumM>1){
-				inoctetsNum=inoctetsNumM.toFixed(2);
-				outoctetsNum=outoctetsNumM.toFixed(2);
-				unit="Mbps";
-				};
-			if(inoctetsNumG>1||outoctetsNumG>1){
-				inoctetsNum=inoctetsNumG.toFixed(2);
-				outoctetsNum=outoctetsNumG.toFixed(2);
-				unit="Gbps";
-				};
-			$(".c2sNum").text(inoctetsNum);
-			$(".s2cNum").text(outoctetsNum);
-			
-			$(".numberRun4-unit").text(" "+unit);
-			
-			bandwidth=parseFloat(inoctetsNum)+parseFloat(outoctetsNum);
-			dataScroll2(".numberRun4",bandwidth);
-
-		},
-	});
-}
-//动态显示数据
-function dataScroll(index,nums){
-	if(typeof nums=='undefined'||nums==null||nums==""){
-		nums=0;
-	}
-	var num=nums;
-	  var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:","});
-	    numRun.resetData(nums);
-}
-function dataScroll2(index,nums){
-	if(typeof nums=='undefined'||nums==null||nums==""){
-		nums=0;
-	}
-	var num=nums;
-	  var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:",",dot:2});
-	    numRun.resetData(nums);
-}
-
-//切换下拉列表-操作系统与浏览器
-function uaSelectChange(){
-	var ua = $('#uaSelect').val();
-	if(ua=="system"){
-		systemList();
-	}
-	if(ua=="browser"){
-		browserList();
-	}
-}
-
-//协议类型统计
-function protocolList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/protocol',
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-		  if(rs!=null&&rs.length>0&&rs[0].error!=null){
-			  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
-				return;
-			}else{
-				echart_1(rs);
-			}
-				
-			closeTip(); 
-		}, 
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-//活跃IP统计
-function ipActiveList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/ipActive',
-		type : "get" ,
-		dataType:"json",
-		cache:false,
-		async:true,
-		timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			if(rs!=null&&rs.length>0&&rs[0].error!=null){
-				  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
-					return;
-				}else{
-					echart_main(rs);
-				}
-					
-		closeTip();
-		}, 
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-//活跃端口统计
-function portActiveList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/portActive',  
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		beforeSend: function () {
-			
-			var msg = "OnLoading...";
-			var trLen = $("#tbodyDataPort tr").length;
-			if(trLen<=0) {
-				msg = "OnLoading...";
-			}else {
-				$("#tbodyDataPort").html("")
-			}
-
-			var tr = "<tr class='frist rowData'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
-			
-			$("#tbodyDataPort").prepend(tr);
-		},
-		success:function (rs) { 
-			rs.reverse();
-			  $("#tbodyDataPort").html("");
-				var n=rs.length;
-				if(rs!=null&&rs.length>0&&rs[0].error!=null){
-					$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
-				}else{
-					if(n>0){
-		
-					   $(rs).each(function(i, itemObj) { 
-						   var count= itemObj.sum;
-						   var preCount = itemObj.preSum;
-							var tr = "<tr class='frist rowData'>";
-							tr += "<td class='list_c1' style='color:#fff' title='"+itemObj.port+"'>"+itemObj.port+"</td>";
-							tr += "<td class='list_c2' style='color:#fff'>"+count+"</td>";
-							if(preCount<count){
-								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
-							}else if(preCount>count){
-								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down/>"+"</td></tr>";
-							}else{
-								tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
-							}
-							$("#tbodyDataPort").prepend(tr);
-					   })
-					}else{
-						 $("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
-					}
-				}
-			
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-
-//app应用类型统计
-function appTypeList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/app',
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			if(rs!=null&&rs.length>0&&rs[0].error!=null){
-				  top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
-					return;
-				}else{
-				echart_3(rs);
-			}
-				
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-//获取终端用户-操作系统列表 左下
-function systemList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/osList',  
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		beforeSend: function () {
-			
-			var msg = "OnLoading...";
-			var trLen = $("#tbodyData1 tr").length;
-			if(trLen<=0) {
-				msg = "OnLoading...";
-			}else {
-				$("#tbodyData1").html("")
-			}
-
-			var tr = "<tr class='frist rowData'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
-			
-			$("#tbodyData1").prepend(tr);
-		},
-		success:function (rs) {  
-		   $("#tbodyData1").html("");
-		   rs.reverse();
-			var n=rs.length;
-			if(rs!=null&&rs.length>0&&rs[0].error!=null){
-				$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
-			}else{
-				if(n>0){
-	
-				   $(rs).each(function(i, itemObj) {
-					   var os="";
-					   if(typeof(itemObj.osType)!="undefined"&&itemObj.osType!=null){
-						   os=(itemObj.osType).toString();
-						   if(os.length>18){
-							   os=os.substring(0,18);
-						   }
-					   }
-					   
-					   var count= itemObj.count;
-					   var preCount = itemObj.preCount;
-						var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:osClick(\""+itemObj.osType+"\",this);return false;'>";
-						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
-						tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.osType+"'>"+os+"</td>";
-						if(preCount<count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
-						}else if(preCount>count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
-						}else{
-							tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
-						}
-						n=n-1;
-						$("#tbodyData1").prepend(tr);
-				   })
-				}else{
-					 $("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
-				}
-				//终端图-操作系统
-				echart_2(rs.reverse());
-			}
-				
-			closeTip();
-		}, 
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-// 点击操作系统列表右侧显示 浏览器图
-function osClick(osType,obj){
-	//点击行变色
-	$("#tbodyData1 tr").removeClass("activeColor");
-	loading();
-	$(obj).addClass("activeColor");
-	
-	$.ajax({
-		url: '${ctx}/dashboard/browserChart',
-		type : "get" ,
-		data:{"osType":osType},
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			echart_5(rs);
-			
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-}
-//点击浏览器列表右侧显示 操作系统图
-function bsClick(bsType,obj){
-	$("#tbodyData1 tr").removeClass("activeColor");
-	loading();
-	$(obj).addClass("activeColor");
-	$.ajax({
-		url: '${ctx}/dashboard/systemChart',
-		type : "get" ,
-		data:{"bsType":bsType},
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			echart_2(rs);
-			
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-}
-
-
-//获取终端用户-浏览器列表
-function browserList() {
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/bsList', 
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		beforeSend: function () {
-			var msg = "OnLoading...";
-			var trLen = $("#tbodyData1 tr").length;
-			if(trLen<=0) {
-				msg = "OnLoading...";
-			}else {
-				$("#tbodyData1").html("")
-			}
-			var tr = "<tr class='frist rowData'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
-			$("#tbodyData1").prepend(tr);
-		},
-		success:function (rs) { 
-		   $("#tbodyData1").html("");
-		   rs.reverse();
-		   var n=rs.length;
-		   if(rs!=null&&rs.length>0&&rs[0].error!=null){
-				$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
-			}else{
-			   if(n>0){
-				   $(rs).each(function(i, itemObj) {
-					   var bs="";
-					   if(typeof(itemObj.bsType)!="undefined"&&itemObj.bsType!=null){
-						   bs=(itemObj.bsType).toString();
-						   if(bs.length>18){
-							   bs=bs.substring(0,18);
-						   }
-					   }
-					   var count= itemObj.count;
-					   var preCount = itemObj.preCount; 
-						var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:bsClick(\""+itemObj.bsType+"\",this);return false;'>";
-						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
-						tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.bsType+"'>"+bs+"</td>";
-						if(preCount<count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
-						}else if(preCount>count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
-						}else{
-							tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
-						}
-						$("#tbodyData1").prepend(tr);
-						n=n-1;
-			   		})
-			   	}else{
-				   $("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
-				}
-		 		//终端图-浏览器
-				echart_5(rs.reverse());
-			}
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-//获取http网站table列表
-function websiteList() {
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/websiteList',  
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		beforeSend: function () {
-			var msg = "OnLoading...";
-			var trLen = $("#tbodyData2 tr").length;
-			if(trLen<=0) {
-				msg = "OnLoading...";
-			}else {
-				$("#tbodyData2").html("")
-			}
-
-			var tr = "<tr class='frist rowData'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
-			
-			$("#tbodyData2").prepend(tr);
-		},
-		success:function (rs) {
-			rs.reverse();
-		   $("#tbodyData2").html("");
-		   var n=rs.length;
-		   if(rs!=null&&rs.length>0&&rs[0].error!=null){
-				$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
-			}else{
-			   if(n>0){
-				   $(rs).each(function(i, itemObj) {
-					   var web="";
-					   if(typeof(itemObj.websiteService)!="undefined"&&itemObj.websiteService!=null){
-							   web=(itemObj.websiteService).toString();
-						   if(web.length>18){
-							   web=web.substring(0,18);
-						   }
-					   }
-						var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:webClick(\""+itemObj.websiteServiceId+"\",this);return false;'>";
-						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
-						tr += "<td class='list_c2' style='color:#fff' title="+itemObj.websiteService+">"+web+"</td>";
-						if(itemObj.preCount<itemObj.count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
-						}else if(itemObj.preCount>itemObj.count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
-						}else{
-							tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
-						}
-						
-						$("#tbodyData2").prepend(tr);
-						n=n-1;
-				   })
-			   }else{
-				   $("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
-			}
-		 	//网站统计图
-			echart_4(rs.reverse());
-			}
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-  }
-//点击http网站列表-显示域名图
-function webClick(websiteServiceId,obj){
-	//点击行变色
-	$("#tbodyData2 tr").removeClass("activeColor");
-	loading();
-	$(obj).addClass("activeColor");
-	$.ajax({
-		url: '${ctx}/dashboard/webTypeChart',
-		type : "get" ,
-		data:{"websiteServiceId":websiteServiceId},
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			echart_6(rs);
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-}
-//网站主题
-function topicAndDomainList(){
-	loading();
-	$.ajax({
-		url: '${ctx}/dashboard/topicAndDomainList',
-		type : "get" ,
-		dataType:"json",
-		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
-		success:function (rs) {
-			//主题域名流量统计图
-			echart_topic_domain(rs);
-			closeTip();
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			closeTip();
-		}
-	});
-}
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
index e6b540661..3fdcd0936 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
@@ -155,17 +155,18 @@ function showActionTransChart(rs){
 	    credits:{//是否有highcharts水印
 	        enabled:false
 	    },
-	   /*  plotOptions: {
-	    	area: {
-	    		stacking: 'normal',
-				lineColor: '#666666',
-				lineWidth: 1,
-				marker: {
-					lineWidth: 1,
-					lineColor: '#666666'
-				}
-			}
-		}, */
+	    plotOptions: {
+	        series: {
+	            marker: {
+	                radius: 2,
+	                hover: {
+	                	enabled: true,
+	                	radius: 7,
+	                	radiusPlus: 5
+	                	}
+	            }
+	        }
+	    },
 // 	    legend: {
 // 	        layout: 'vertical',
 // 	        align: 'right',
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
index 25fc51671..2e78423b6 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
@@ -66,7 +66,6 @@ $(document).ready(function(){
 			},  
 			error: function(data, textStatus, errorThrown){
 				closeTip();
-//	 			warning_prompt("获取实时列表数据失败！",1500);
 			},
 			complete:function(XMLHttpRequest,status){//超时设置
 				closeTip();
@@ -130,6 +129,18 @@ function showDomainTrans(rs){
 	    legend: {
 	    	enabled:false
 	    },
+	    plotOptions: {
+	        series: {
+	            marker: {
+	                radius: 2,
+	                hover: {
+	                	enabled: true,
+	                	radius: 7,
+	                	radiusPlus: 5
+	                	}
+	            }
+	        }
+	    },
 	    series: series,
 	});
 }
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index 3c81febbc..921f743c1 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -205,6 +205,18 @@ function showIpActiveChart(rs){
 					align:'high',
 			},
 		},
+		 plotOptions: {
+		        series: {
+		            marker: {
+		                radius: 2,
+		                hover: {
+		                	enabled: true,
+		                	radius: 7,
+		                	radiusPlus: 5
+		                	}
+		            }
+		        }
+		    },
 		tooltip: {
 	        pointFormat: '<b><spring:message code="ip"/>:</b>{series.name}  <b><spring:message code="count"/>:</b>{point.y}<br/>'
 	    },
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
new file mode 100644
index 000000000..717ede5b6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp
@@ -0,0 +1,288 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title>
+	<spring:message code="active_port"></spring:message>
+</title>
+</head>
+<body>
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/portActiveList'"><i class="fa fa-refresh"></i></button>
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><i class="fa fa-history"></i></button>
+	</div>
+	<h3 class="page-title">
+		<spring:message code="active_port"></spring:message>
+	</h3>
+		<div class="row" >
+			<form:form id="searchForm" action="${ctx}/dashboard/portActiveList" method="get" class="form-search">
+			<input id="beginDateh" type="hidden" value="${beginDate}"/>
+			<input id="endDateh" type="hidden" value="${endDate}"/>
+			<!-- 搜索内容与操作按钮栏 -->
+			<div class="col-md-12">
+				<div class="pull-left">
+ 				  <div class="input-group">
+                              <div class="input-group-btn">
+						<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+                          	</div>
+                              	<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
+							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
+						</div>
+                    		</div>
+				<div class="pull-left">
+ 				  <div class="input-group">
+                              <div class="input-group-btn">
+						<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+                          	</div>
+                              	<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium" 
+							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
+						</div>
+                    		</div>
+                    		
+				<div class="pull-left">
+					 <button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+					 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+				</div>
+			</div>
+			<!-- 搜索内容与操作按钮栏 -->
+		</form:form>
+		</div>
+	<div id="chart" style="width:95%;height:530px;"></div>
+</div>
+ <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/xlsx.core.js"></script>
+ <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/FileSaver.js"></script>
+ <script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
+<script type="text/javascript">
+$(document).ready(function(){
+	var starth=$("#beginDateh").val();
+	var endh=$("#endDateh").val();
+	$("#beginDate").val(starth);
+	$("#endDate").val(endh);
+	portActiveMinuteList(starth,endh);
+	//portActiveOneHourList(starth,endh);
+	//筛选功能初始化
+	$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+});
+//导出列表
+$(".export-btn").click(function(){
+	var dataType = $(this).attr("data-type");
+	var te = $("#contentTable").tableExport({
+		headings:true,
+		footers:true,
+		formats:[dataType],
+		fileName:"Port-Active-2",
+		bootstrap:false
+	});
+	$("#myexport").click();
+	$("caption").remove();
+});
+function searchList(){
+	var start=$("#beginDate").val();
+	var end=$("#endDate").val();
+	loading();
+	if(start==''||end==''||end==null||start==null){
+		window.location.reload();
+	}else{
+		portActiveMinuteList(start,end);
+		//portActiveOneHourList(start,end);
+	}
+}
+
+function showPortActiveChart(rs){
+	var data=new Array();
+	var xData=new Array();
+		xData=rs[0].statTime;
+	var series=new Array();
+	var legend=new Array();
+	$(rs).each(function(i, d) {
+	series.push({
+		name: d.port,
+		data: d.sum
+	});
+	})
+	var chart = Highcharts.chart('chart', {
+		chart:{
+// 			type: 'area',
+			zoomType: 'x'
+		}, 
+		exporting: {
+			filename:'Port-Active',
+			scale:1,
+			sourceWidth: 1280,
+			sourceHeight: 500,
+			buttons: {
+                contextButton: {
+                    menuItems: [
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
+                                Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
+                            ]
+                }
+            }
+		},
+		plotOptions: {
+	        line: {
+				 marker: {
+	                enabled: true,
+	                radius: 2,
+	                states: {
+	                    hover: {
+	                        enabled: true,
+	                        radius: 7,
+	                        radiusPlus: 5
+	                    }
+	                }
+	            },
+	            shadow: false
+	        }
+	    },
+	    title: {
+	        text: null
+	    },
+		xAxis: {
+			type:'category',
+			categories: xData,
+			title: {
+					text: 'time',
+					align:'high',
+			},
+	},
+	    yAxis: {
+	        title: {
+	            text: 'bytes'
+	        }
+	    },
+	    credits:{//是否有highcharts水印
+	        enabled:false
+	    },
+	    legend: {
+	        layout: 'vertical',
+	        align: 'right',
+	        verticalAlign: 'middle'
+	    },
+	    series: series,
+	});
+}
+	//活跃IP一小时间隔五分钟统计
+	function portActiveMinuteList(beginDate,endDate){
+		loading();
+		$.ajax({
+			url: '${ctx}/dashboard/portActiveChart',
+			type : "get" ,
+			dataType:"json",
+			data:{"beginDate":beginDate,"endDate":endDate},
+			cache:false,
+			async:false,
+			timeout:40000,
+			success:function (rs) {
+				$("#tbodyData").html("");
+				if(rs!=null&&rs.length>0){
+					showPortActiveChart(rs);
+				}
+				closeTip();
+			},  
+			error: function(data, textStatus, errorThrown){
+				closeTip();
+//	 			warning_prompt("获取实时列表数据失败！",1500);
+			},
+			complete:function(XMLHttpRequest,status){//超时设置
+				closeTip();
+			}
+		});
+		 
+	  }
+	//活跃IP一小时统计
+/* 	function portActiveOneHourList(beginDate,endDate){
+		loading();
+		$.ajax({
+			url: '${ctx}/dashboard/ajaxPortActiveList',
+			type : "get" ,
+			dataType:"json",
+			data:{"beginDate":beginDate,"endDate":endDate},
+			cache:false,
+			async:false,
+			timeout:40000,
+			success:function (data) {
+				$("#tbodyData").html("");
+				if(data!=null&&data.length>0){
+					var totalc2sByte= 0;
+					var totals2cByte= 0;
+					var totalByte= 0;
+					var totalLink=  0;
+					var totalc2sPkt=  0;
+					var totals2cPkt=  0;
+					var totalpacket=  0;
+					$(data).each(function(i, rs) {
+						var byteNum=rs.s2cByteLen+rs.c2sByteLen;
+						var packetNum=rs.s2cPktNum+rs.c2sPktNum;
+						totalc2sByte=totalc2sByte+(rs.c2sByteLen);
+						totals2cByte=totals2cByte+(rs.s2cByteLen);
+						totalByte=totalByte+(byteNum);
+						totalLink=totalLink+(rs.linkNum);
+						totalc2sPkt=totalc2sPkt+(rs.c2sPktNum);
+						totals2cPkt=totals2cPkt+(rs.s2cPktNum);
+						totalpacket=totalpacket+(packetNum);
+							
+						var html = "<tr>";
+		            	html+= "<td class='tc'>"+rs.ipAddr+"</td>";
+		            	html+= "<td class='tc'>"+(rs.areaId==1? "Astana":"Alamty")+"</td>";
+		            	html+= "<td class='tc'>"+rs.c2sByteLen+"</td>";
+		            	html+= "<td class='tc'>"+rs.s2cByteLen+"</td>";
+		            	html+= "<td class='tc'>"+byteNum+"</td>";
+		            	html+= "<td class='tc'>"+rs.linkNum+"</td>";
+		            	html+= "<td class='tc'>"+rs.c2sPktNum+"</td>";
+		            	html+= "<td class='tc'>"+rs.s2cPktNum+"</td>";
+		            	html+= "<td class='tc'>"+packetNum+"</td>";
+		            	html+= "<td class='tc'>"+rs.statTime+"</td>";
+		                html+="</tr>"
+		                
+                	if(i==data.length-1){
+                		html+="<tr class='tr-total hidden'>"
+                		html+= "<td class='tc'>"+"<spring:message code='report_total'/>"+"</td>";
+                		html+= "<td class='tc'>"+"--"+"</td>";
+                    	html+= "<td class='tc'>"+totalc2sByte+"</td>";
+                    	html+= "<td class='tc'>"+totals2cByte+"</td>";
+                    	html+= "<td class='tc'>"+totalByte+"</td>";
+                    	html+= "<td class='tc'>"+totalLink+"</td>";
+                    	html+= "<td class='tc'>"+totalc2sPkt+"</td>";
+                    	html+= "<td class='tc'>"+totals2cPkt+"</td>";
+                    	html+= "<td class='tc'>"+totalpacket+"</td>";
+                    	html+= "<td class='tc'>"+beginDate+"--"+ endDate +"</td>";
+                		html+="</tr>"
+                	}
+		                $("#tbodyData").append(html);
+						
+					   })
+					
+				}
+				closeTip();
+			},  
+			error: function(data, textStatus, errorThrown){
+				closeTip();
+//	 			warning_prompt("获取实时列表数据失败！",1500);
+			},
+			complete:function(XMLHttpRequest,status){//超时设置
+				closeTip();
+			}
+		});
+		 
+	  } */
+</script>
+</body>
+</html>
\ 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 7b91a36e1..56b620563 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -361,11 +361,13 @@
 		}
 		function openPicWindow(url){
 			$.jBox("iframe:"+url, {
-				title: "",
+				title: "Domain",
 			    top: '1%',
 			    draggable:false,
 			    width: $(document).width()*0.9,
 			    height:$(document).height()*0.9,
+			    showScrolling: false, /* 是否显示浏览的滚动条 */
+			    iframeScrolling: 'no',
 			    buttons: { 'close': true }
 			});
 		}