From 453ed153bc0c37baea2ec870b997c0a3a1ff162d Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Mon, 28 Jan 2019 05:13:15 +0000
Subject: [PATCH] =?UTF-8?q?IP=20Spoofing=E7=9A=84action=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=94=B1redirect=E4=BF=AE=E6=94=B9=E4=B8=BASpoofing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7bfcbe614a59db03e3d33a603bc753413c0f4ac3)
---
 src/main/java/com/nis/util/excel/ExcelCsv.java    | 8 ++++++++
 src/main/java/com/nis/util/excel/ExportExcel.java | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java
index d2bdd346e..05c3125fa 100644
--- a/src/main/java/com/nis/util/excel/ExcelCsv.java
+++ b/src/main/java/com/nis/util/excel/ExcelCsv.java
@@ -268,6 +268,7 @@ public class ExcelCsv {
 		for (String key : keyList) {
 			List<E> list=dataMap.get(key);
 			List<List<String>> listT=new ArrayList<List<String>>();
+				
 			for (E e : list){
 				int colunm = 0;
 				List<String>  lisb=new ArrayList<String>();
@@ -305,9 +306,16 @@ public class ExcelCsv {
 									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"))) {
+									dict="action_spoofing";
+									val = msgProp.getProperty(dict,dict);
+								}
 							}
 							
 						}
+						
 						if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
 							Integer whetherAreaBlock=Integer.parseInt(valStr);
 							if(whetherAreaBlock.equals(0)){
diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java
index 2d0e613e2..78e925289 100644
--- a/src/main/java/com/nis/util/excel/ExportExcel.java
+++ b/src/main/java/com/nis/util/excel/ExportExcel.java
@@ -2274,6 +2274,12 @@ public class ExportExcel {
 									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"))) {
+									dict="action_spoofing";
+									val = msgProp.getProperty(dict,dict);
+								}
 							}
 							
 						}