From 16d56e3f98a2a9855416a4ad70cedd6a5495b9c8 Mon Sep 17 00:00:00 2001 From: tanghao Date: Tue, 15 Jan 2019 17:47:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=97=AD=E6=97=A5=E5=9B=BE=E6=97=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=E6=98=BE=E7=A4=BA=E5=AD=97=E4=BD=93=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E4=B8=BA=E7=99=BD=E8=89=B2=202.=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E3=80=8B=E6=8B=A6=E6=88=AA=E7=AD=96=E7=95=A5?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E6=B2=A1=E6=9C=89=E4=B8=A2=E5=8C=85?= =?UTF-8?q?=E7=8E=87=203.=E5=9B=BD=E5=AE=B6=E4=BB=A3=E7=90=86=E3=80=8B?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E7=AD=96=E7=95=A5=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=98=BB=E6=96=AD=E7=B1=BB=E5=9E=8B=E5=86=85=E5=AE=B9=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=204.=E5=9B=BD=E5=AE=B6=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E3=80=8B=E7=BC=93=E5=AD=98=E7=AD=96=E7=95=A5=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=97=A0=E6=B3=95=E8=BF=87=E6=BB=A4=E9=98=BB=E6=96=AD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/proxy/InterceptController.java | 14 +++++++++++++- .../webapp/WEB-INF/views/cfg/proxy/cache/list.jsp | 2 +- src/main/webapp/static/pages/scripts/echart.js | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index cec2841c1..c3f01a4e5 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -329,6 +329,18 @@ public class InterceptController extends CommonController { httpUrlList.addAll(maps.get("NTC_HTTP_URL")); ipList.addAll(maps.get("PXY_INTERCEPT_IP")); pktBinList.addAll(maps.get("PXY_INTERCEPT_PKT_BIN")); + if (entity.getFunctionId() == 200){ + Properties msgProp = getMsgProp(); + if(cfg.getAction().equals(1)) { + cfg.setUserRegion5(msgProp.getProperty("intercept")); + }else if(cfg.getAction().equals(48)) { + cfg.setUserRegion5(msgProp.getProperty("action_spoofing")); + }else if(cfg.getAction().equals(128)) { + cfg.setUserRegion5(msgProp.getProperty("bypass")); + }else { + cfg.setUserRegion5(msgProp.getProperty(DictUtils.getDictLabels("SERVICE_ACTION", cfg.getAction().toString(), cfg.getAction().toString()))); + } + } } pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList); httpUrlList = BaseStringCfg.baseHexList(httpUrlList); @@ -344,7 +356,7 @@ public class InterceptController extends CommonController { dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList); } else if (entity.getFunctionId() == 200) {// IP拦截 - cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,userregion2,&userregion1:intercept_file_strategy-"; + cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,block_type,&userregion1:intercept_file_strategy-userregion2:ratelimit-userregion5:block_type"; titleList.add("PXY_INTERCEPT_IP"); classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp index a7b70a08a..a3151175a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp @@ -355,7 +355,7 @@ - + diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js index 9d31f02f6..716bc023f 100644 --- a/src/main/webapp/static/pages/scripts/echart.js +++ b/src/main/webapp/static/pages/scripts/echart.js @@ -1377,6 +1377,11 @@ function echart_topic_domain(rs){ marginTop:50, marginBottom:10 }, + noData:{ + style: {//设置字体颜色 + color: '#fff', + }, + }, exporting: { allowHTML:true, filename:'Service'+addDateName(),