diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 05c3125fa..77cca0d9f 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -306,6 +306,13 @@ public class ExcelCsv { dict="block_drop"; val = msgProp.getProperty(dict,dict); } + if ("action".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "service").toString().equals("35") + || Reflections.invokeGetter(e, "service").toString().equals("33") + || Reflections.invokeGetter(e, "service").toString().equals("36"))) { + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } //ip spoofing redirect动作修改为Spoofing if(ef.title().equals("block_type") && (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) { diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index ff8f78446..67b0667a8 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2308,6 +2308,13 @@ public class ExportExcel { dict="block_drop"; val = msgProp.getProperty(dict,dict); } + if ("action".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "service").toString().equals("35") + || Reflections.invokeGetter(e, "service").toString().equals("33") + || Reflections.invokeGetter(e, "service").toString().equals("36"))) { + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } //ip spoofing redirect动作修改为Spoofing if(ef.title().equals("block_type") && (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) { diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index e55faa7bc..93717a179 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -195,7 +195,14 @@ - + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index 9059a983e..3508f7c84 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -199,7 +199,16 @@ - + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index 9febca607..b1dff9c18 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -196,7 +196,14 @@ - + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index eaa50d9c7..e0b7df49c 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -109,8 +109,15 @@ $(document).ready(function(){ - - + + + + + + + + + @@ -305,10 +312,18 @@ $(document).ready(function(){ ${log.action } + + + + + + + + + ${dict.itemValue} - ${log.foundTime } ${log.recvTime }