仿冒功能

仿冒地址池ip 来函和任务修改样例新增界面增加631业务
2018-12-17 00:21:27 +08:00
parent 23bfe1c136
commit f3e4844f92
33 changed files with 2076 additions and 99 deletions
--- a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java
+++ b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java
@@ -0,0 +1,108 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 代理欺骗IP池对象类
+ * @author dell
+ *
+ */
+public class PxyObjSpoofingIpPool extends BaseIpCfg{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8149437730819674317L;
+	private String indexTable="ip_port_cfg";
+	@Expose
+	@SerializedName("port")
+	private String port;
+	@Expose
+	@SerializedName("addrType")
+	private Integer ipType;
+	@Expose
+	@SerializedName("ip")
+	private String ipAddress;
+	private String groupName;//欺骗IP池（IP组）名称
+	@Expose
+	@SerializedName("policyGroup")
+	private Integer groupId;//欺骗IP池（IP组）id
+	@Expose
+	@SerializedName("location")
+	private Integer location;//位置，无意义，固定为0
+	@Expose
+	@SerializedName("cfgId")
+	private Integer compileId;
+	@Expose
+	@SerializedName("userRegion")
+	private String userRegion;
+	@Expose
+	@SerializedName("effectiveRange")
+	private String areaEffectiveIds ;
+	public String getIpAddress() {
+		return ipAddress;
+	}
+	public void setIpAddress(String ipAddress) {
+		this.ipAddress = ipAddress;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public Integer getLocation() {
+		return location;
+	}
+	public void setLocation(Integer location) {
+		this.location = location;
+	}
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getPort() {
+		port="0";
+		return port;
+	}
+	public void setPort(String port) {
+		this.port = port;
+	}
+	public Integer getIpType() {
+		return ipType;
+	}
+	public void setIpType(Integer ipType) {
+		this.ipType = ipType;
+	}
+	public String getUserRegion() {
+		return userRegion;
+	}
+	public void setUserRegion(String userRegion) {
+		this.userRegion = userRegion;
+	}
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
+	
+}
--- a/src/main/java/com/nis/domain/configuration/RequestInfo.java
+++ b/src/main/java/com/nis/domain/configuration/RequestInfo.java
@@ -4,48 +4,130 @@ import java.util.Date;
 import java.util.List;

 import com.nis.domain.BaseEntity;
+import com.nis.domain.SysMenu;
+import com.nis.util.StringUtil;
+import com.nis.util.excel.ExcelField;
+import com.nis.web.security.UserUtils;

 public class RequestInfo extends BaseEntity<RequestInfo>{
-	
+	@ExcelField(title="Id",sort=1)
+	private Long id;
 	private Long taskId;
-	
+	@ExcelField(title="title",sort=2)
    private String requestNumber;
-
+	@ExcelField(title="request_organization",sort=3)
    private String requestOrg;
-
+	@ExcelField(title="request_time",sort=4)
    private Date requestTime;
-
+	@ExcelField(title="request_number",sort=6)
    private String requestTitle;
-
+	@ExcelField(title="content",sort=7)
    private String requestContent;

    private Integer isValid;
-
+    @ExcelField(title="state",dictType="AUDIT_STATUS",sort=5)
    private Integer isAudit;

    private Integer creatorId;
-
+    @ExcelField(title="create_time",sort=10)
    private Date createTime;

    private Integer editorId;
-
+    @ExcelField(title="edit_time",sort=12)
    private Date editTime;

    private Integer auditorId;
-
+    @ExcelField(title="audit_time",sort=14)
    private Date auditTime;
    
    //自定义 创建人员 修改人员 审核人员
+    @ExcelField(title="creator",sort=9)
    private String creatorName;
+    @ExcelField(title="editor",sort=11)
    private String editorName;
+    @ExcelField(title="auditor",sort=13)
    private String auditorName;
    private Date beginDate;//来函开始时间
    private Date endDate;//来函结束时间
    private String timeType;//时间类型
+    @ExcelField(title="special_task",sort=8)
    private String taskName;//专项任务
    private String seltype;//选中类型
    private Date dobeginDate;//操作开始时间
    private Date doendDate;//操作结束时间
+    /**
+	 * 菜单ID
+	 */
+    private Integer functionId;
+    /**
+	 * 菜单权限
+	 */
+    private String permission;
+	/**
+	 * 菜单权限
+	 */
+	private String menuNameCode;
+	private String columns;
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getFunctionId() {
+		return functionId;
+	}
+
+	/**
+	 * @param functionId the functionId to set
+	 */
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+		if(!StringUtil.isEmpty(functionId) && StringUtil.isEmpty(this.menuNameCode)){
+			List<SysMenu> list = UserUtils.getMenuList();
+			if(!StringUtil.isEmpty(list)) {
+				for (SysMenu menu :list) {
+					if (!StringUtil.isEmpty(menu.getCode()) 
+							&&menu.getFunctionId()!=null 
+							&& menu.getFunctionId().equals(functionId)
+							//&& menu.getFunctionId().equals(functionId)
+							) {
+						this.setMenuNameCode(menu.getCode());
+						break;
+					}
+					
+				}
+			}
+		}
+
+	}
+
+	public String getPermission() {
+		return permission;
+	}
+
+	public void setPermission(String permission) {
+		this.permission = permission;
+	}
+
+	public String getMenuNameCode() {
+		return menuNameCode;
+	}
+
+	public void setMenuNameCode(String menuNameCode) {
+		this.menuNameCode = menuNameCode;
+	}
+
+	public String getColumns() {
+		return columns;
+	}
+
+	public void setColumns(String columns) {
+		this.columns = columns;
+	}

 	public Long getTaskId() {
 		return taskId;
--- a/src/main/java/com/nis/domain/configuration/TaskInfo.java
+++ b/src/main/java/com/nis/domain/configuration/TaskInfo.java
@@ -1,45 +1,114 @@
 package com.nis.domain.configuration;

 import java.util.Date;
+import java.util.List;

 import com.nis.domain.BaseEntity;
+import com.nis.domain.SysMenu;
+import com.nis.util.StringUtil;
+import com.nis.util.excel.ExcelField;
+import com.nis.web.security.UserUtils;

 public class TaskInfo extends BaseEntity<TaskInfo> {
 	private static final long serialVersionUID = 1L;
-
+	@ExcelField(title="task_name",sort=1)
 	private String taskName;
-
+	@ExcelField(title="task_org",sort=2)
 	private String taskOrg;
-
+	@ExcelField(title="task_time",sort=3)
 	private Date taskTime;
-
+	@ExcelField(title="desc",sort=6)
 	private String taskDesc;
-
 	private Integer isValid;
-
+	@ExcelField(title="state",dictType="AUDIT_STATUS",sort=4)
 	private Integer isAudit;
-
-	private Integer creatorId;
-
-	private Date createTime;
-
-	private Integer editorId;
-
-	private Date editTime;
-
-	private Integer auditorId;
-
-	private Date auditTime;
 	
+	private Integer creatorId;
+	@ExcelField(title="create_time",sort=8)
+	private Date createTime;
+	private Integer editorId;
+	@ExcelField(title="edit_time",sort=10)
+	private Date editTime;
+	private Integer auditorId;
+	@ExcelField(title="audit_time",sort=12)
+	private Date auditTime;
 	//自定义 创建人员 修改人员 审核人员
+	@ExcelField(title="creator",sort=7)
    private String creatorName;
+	@ExcelField(title="editor",sort=9)
    private String editorName;
+	@ExcelField(title="auditor",sort=11)
    private String auditorName;
    private Date beginDate;//来函开始时间
    private Date endDate;//来函结束时间
    private String seltype;//选中类型
    private Date dobeginDate;//操作开始时间
    private Date doendDate;//操作结束时间
+    /**
+	 * 菜单ID
+	 */
+    private Integer functionId;
+    /**
+	 * 菜单权限
+	 */
+    private String permission;
+	/**
+	 * 菜单权限
+	 */
+	private String menuNameCode;
+	private String columns;
+	
+	public String getColumns() {
+		return columns;
+	}
+
+	public void setColumns(String columns) {
+		this.columns = columns;
+	}
+
+	public Integer getFunctionId() {
+		return functionId;
+	}
+
+	/**
+	 * @param functionId the functionId to set
+	 */
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+		if(!StringUtil.isEmpty(functionId) && StringUtil.isEmpty(this.menuNameCode)){
+			List<SysMenu> list = UserUtils.getMenuList();
+			if(!StringUtil.isEmpty(list)) {
+				for (SysMenu menu :list) {
+					if (!StringUtil.isEmpty(menu.getCode()) 
+							&&menu.getFunctionId()!=null 
+							&& menu.getFunctionId().equals(functionId)
+							//&& menu.getFunctionId().equals(functionId)
+							) {
+						this.setMenuNameCode(menu.getCode());
+						break;
+					}
+					
+				}
+			}
+		}
+
+	}
+
+	public String getPermission() {
+		return permission;
+	}
+
+	public void setPermission(String permission) {
+		this.permission = permission;
+	}
+
+	public String getMenuNameCode() {
+		return menuNameCode;
+	}
+
+	public void setMenuNameCode(String menuNameCode) {
+		this.menuNameCode = menuNameCode;
+	}

 	public String getTaskName() {
 		return taskName;
--- a/src/main/java/com/nis/util/excel/ImportBigExcel.java
+++ b/src/main/java/com/nis/util/excel/ImportBigExcel.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.jets3t.service.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
@@ -399,14 +400,18 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 	 * @throws ParserConfigurationException 
 	 * @throws OpenXML4JException 
 	 * @throws IOException
+	 * @throws ServiceException 
 	 */
-	public <E> BlockingQueue<E> getDataList(Class<E> cls) throws InstantiationException, IllegalAccessException, IOException, OpenXML4JException, ParserConfigurationException, SAXException, SQLException{
+	public <E> BlockingQueue<E> getDataList(Class<E> cls) throws InstantiationException, IllegalAccessException, IOException, OpenXML4JException, ParserConfigurationException, SAXException, SQLException, ServiceException{
 		log.warn("start to load data...");
 		this.processOneSheet(uploadFile, this.sheetIndex);
 		long start=System.currentTimeMillis();
 		if(regionDict==null) {
 			throw new RuntimeException("regionDict is null!");
 		}
+		if(dataList.size()==0) {
+			throw new ServiceException(props.getProperty("noneData", "noneData"));
+		}
 		// Get excel data
 		BlockingQueue<E> _dataList =new ArrayBlockingQueue(dataList.size(),true);
 		for (int i = 0; i < dataList.size(); i++) {
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -1,23 +1,33 @@
 package com.nis.web.controller.basics;

+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;

 import com.nis.domain.Page;
 import com.nis.domain.configuration.TaskInfo;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.util.excel.ExcelField;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.basics.TaskInfoService;

+import jersey.repackaged.com.google.common.collect.Lists;
+
@Controller
@RequestMapping("${adminPath}/basics/taskInfo")
 public class TaskInfoController extends BaseController{
@@ -25,7 +35,6 @@ public class TaskInfoController extends BaseController{
 	@Autowired
 	private TaskInfoService taskInfoService;
 	
-	
 	/**
 	 *来函列表
 	 */
@@ -41,7 +50,9 @@ public class TaskInfoController extends BaseController{
 	@RequestMapping(value={"form"})
 	public String form(TaskInfo taskInfo, Model model) {
 		if(taskInfo.getId()!=null){
+			Integer functionId=taskInfo.getFunctionId();
 			taskInfo = taskInfoService.getTaskInfoById(taskInfo.getId());
+			taskInfo.setFunctionId(functionId);
 			model.addAttribute("taskInfo", taskInfo);
 		}else{
 			model.addAttribute("taskInfo", taskInfo);
@@ -63,7 +74,7 @@ public class TaskInfoController extends BaseController{
 			}else{
 				if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
 					logger.info(taskInfo.getTaskName()+"重复数据");
-					addMessage(model,"error", "save_failed");
+					addMessage("error",model,"save_failed");
 					return form(taskInfo, model);
 				}
 				// 保存用户信息
@@ -76,7 +87,7 @@ public class TaskInfoController extends BaseController{
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "save_failed");
 		}
-		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+taskInfo.getFunctionId()+"&repage";
 	}
 	
 	/**
@@ -98,11 +109,11 @@ public class TaskInfoController extends BaseController{
     * @return
     */
 	@RequestMapping(value = "taskExamine")
-    public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+    public String taskExamine(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
    	taskInfoService.taskExamine(exId);
-    	addMessage(redirectAttributes,"success", "save_success");
-    	return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+    	addMessage(redirectAttributes,"success", "audit_success");
+    	return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+functionId+"&repage";
    	
    }
 	/**
@@ -112,11 +123,11 @@ public class TaskInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "taskExamineNo")
-	public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String taskExamineNo(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
 		taskInfoService.taskExamineNo(noId);
-		addMessage(redirectAttributes,"success", "save_success");
-		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		addMessage(redirectAttributes,"success", "audit_success");
+		return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+functionId+"&repage";
 		
 	}
 	/**
@@ -126,11 +137,11 @@ public class TaskInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "taskCancelExamine")
-	public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String taskCancelExamine(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
 		taskInfoService.taskCancelExamine(canclelId);
-		addMessage(redirectAttributes,"success", "save_success");
-		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		addMessage(redirectAttributes,"success", "audit_success");
+		return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+functionId+"&repage";
 		
 	}
 	/**
@@ -140,12 +151,67 @@ public class TaskInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "delete")
-	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String delete(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
 		taskInfoService.delete(delId);
 		addMessage(redirectAttributes,"success", "delete_success");
-		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
+		return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+functionId+"&repage";
 		
 	}
+	//配置导出
+	@RequestMapping(value = "exportTaskInfo")
+	public void exportTaskInfo(Model model,HttpServletRequest  request,HttpServletResponse response,
+			@ModelAttribute("cfg")TaskInfo entity,String ids,RedirectAttributes redirectAttributes){
+		try {
+			//export data info
+			List<String> titleList=new ArrayList<String>();
+			Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
+			Map<String, List> dataMap=new HashMap<String, List>();
+			Map<String, String> noExportMap=new HashMap<String, String>();
+			
+			
+			//导出选中记录
+			List<TaskInfo> list=Lists.newArrayList();
+			titleList.add(entity.getMenuNameCode());
+			classMap.put(entity.getMenuNameCode(), TaskInfo.class);
+			Field[] fields=TaskInfo.class.getDeclaredFields();
+			StringBuffer column=new StringBuffer();
+			Properties props=  this.getMsgProp();
+			for(Field f: fields) {
+				ExcelField ex=f.getAnnotation(ExcelField.class);
+				if(ex!=null) {
+					String title=ex.title();
+					if(entity.getColumns().indexOf(props.getProperty(title, title))==-1) {
+						column.append(","+title);
+					}
+				}
+			}
+			if(column.toString().length()>0) {
+				column.append(",");
+			}
+			noExportMap.put(entity.getMenuNameCode(),column.toString());
+			if(!StringUtil.isEmpty(ids)){
+				for(String id:ids.split(",")){
+					Long.parseLong(id);
+				}
+				list=taskInfoService.getTaskInfoByIds(ids);
+			}else{
+				//条件导出数据大于最大导出数，只导出最大导出条数
+				Page<TaskInfo> pageInfo=new Page<TaskInfo>(request, response,"a");
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
+				Page<TaskInfo> page = taskInfoService.findTaskInfo(pageInfo, entity);
+				list=page.getList();
+			}	
+			
+			dataMap.put(entity.getMenuNameCode(),list);
+			// 获取国际化配置
+			this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
+		} catch (Exception e) {
+			logger.error("ip addr export failed",e);
+			addMessage(redirectAttributes,"error",  "export_failed");
+		}
+		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
+	}

 }
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -1,6 +1,11 @@
 package com.nis.web.controller.configuration;

+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,6 +14,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -16,9 +22,14 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.TaskInfo;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.util.excel.ExcelField;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.configuration.RequestInfoService;

+import jersey.repackaged.com.google.common.collect.Lists;
+
@Controller
@RequestMapping("${adminPath}/cfg/request")
 public class RequestInfoController extends BaseController{
@@ -45,7 +56,9 @@ public class RequestInfoController extends BaseController{
 		taskInfo.setId(requestInfo.getTaskId());
 		showTask(taskInfo,model);
 		if(requestInfo.getId()!=null){
+			Integer functionId=requestInfo.getFunctionId();
 			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
+			requestInfo.setFunctionId(functionId);
 			model.addAttribute("requestInfo", requestInfo);
 		}else{
 			model.addAttribute("requestInfo", requestInfo);
@@ -67,7 +80,7 @@ public class RequestInfoController extends BaseController{
 			}else{
 				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
 					logger.info(requestInfo.getRequestNumber()+"重复数据");
-					addMessage(redirectAttributes,"error","save_failed");
+					addMessage("error",model,"save_failed");
 					return form(requestInfo, model);
 				}
 				// 保存用户信息
@@ -78,9 +91,9 @@ public class RequestInfoController extends BaseController{
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			e.printStackTrace();
-			addMessage(redirectAttributes,"error","save_failed");
+			addMessage(model,"error","save_failed");
 		}
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		return "redirect:" + adminPath + "/cfg/request/list?functionId="+requestInfo.getFunctionId()+"&repage";
 	}
 	
 	/**
@@ -102,11 +115,11 @@ public class RequestInfoController extends BaseController{
     * @return
     */
 	@RequestMapping(value = "requestExamine")
-    public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+    public String requestExamine(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
    	requestInfoService.requestExamine(exId);
-    	addMessage(redirectAttributes,"success","save_success");
-    	return "redirect:" + adminPath + "/cfg/request/list?repage";
+    	addMessage(redirectAttributes,"success","audit_success");
+    	return "redirect:" + adminPath + "/cfg/request/list?functionId="+functionId+"&repage";
    	
    }
 	/**
@@ -116,11 +129,11 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestExamineNo")
-	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String requestExamineNo(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
 		requestInfoService.requestExamineNo(noId);
-		addMessage(redirectAttributes,"success","save_success");
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		addMessage(redirectAttributes,"success","audit_success");
+		return "redirect:" + adminPath + "/cfg/request/list?functionId="+functionId+"&repage";
 		
 	}
 	/**
@@ -130,11 +143,11 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestCancelExamine")
-	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String requestCancelExamine(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
 		requestInfoService.requestCancelExamine(canclelId);
-		addMessage(redirectAttributes,"success","save_success");
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		addMessage(redirectAttributes,"success","audit_success");
+		return "redirect:" + adminPath + "/cfg/request/list?functionId="+functionId+"&repage";
 		
 	}
 	/**
@@ -144,11 +157,11 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "delete")
-	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
+	public String delete(Integer functionId,String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
 		requestInfoService.delete(delId);
 		addMessage(redirectAttributes,"success","delete_success");
-		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		return "redirect:" + adminPath + "/cfg/request/list?functionId="+functionId+"&repage";
 		
 	}

@@ -173,4 +186,59 @@ public class RequestInfoController extends BaseController{
 		model.addAttribute("requestInfos", requestInfos);
 		return "/basics/requestSelectInfo";
 	}
+	//配置导出
+		@RequestMapping(value = "exportRequestInfo")
+		public void exportTaskInfo(Model model,HttpServletRequest  request,HttpServletResponse response,
+				@ModelAttribute("requestInfo")RequestInfo entity,String ids,RedirectAttributes redirectAttributes){
+			try {
+				//export data info
+				List<String> titleList=new ArrayList<String>();
+				Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
+				Map<String, List> dataMap=new HashMap<String, List>();
+				Map<String, String> noExportMap=new HashMap<String, String>();
+				
+				
+				//导出选中记录
+				List<RequestInfo> list=Lists.newArrayList();
+				titleList.add(entity.getMenuNameCode());
+				classMap.put(entity.getMenuNameCode(), RequestInfo.class);
+				Field[] fields=RequestInfo.class.getDeclaredFields();
+				StringBuffer column=new StringBuffer();
+				Properties props=  this.getMsgProp();
+				for(Field f: fields) {
+					ExcelField ex=f.getAnnotation(ExcelField.class);
+					if(ex!=null) {
+						String title=ex.title();
+						if(entity.getColumns().indexOf(props.getProperty(title, title))==-1) {
+							column.append(","+title);
+						}
+					}
+				}
+				if(column.toString().length()>0) {
+					column.append(",");
+				}
+				noExportMap.put(entity.getMenuNameCode(),column.toString());
+				if(!StringUtil.isEmpty(ids)){
+					for(String id:ids.split(",")){
+						Long.parseLong(id);
+					}
+					list=requestInfoService.getRequestInfoByIds(ids);
+				}else{
+					//条件导出数据大于最大导出数，只导出最大导出条数
+					Page<RequestInfo> pageInfo=new Page<RequestInfo>(request, response,"a");
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
+					Page<RequestInfo> page = requestInfoService.findRequestInfo(pageInfo, entity);
+					list=page.getList();
+				}	
+				
+				dataMap.put(entity.getMenuNameCode(),list);
+				// 获取国际化配置
+				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
+			} catch (Exception e) {
+				logger.error("ip addr export failed",e);
+				addMessage(redirectAttributes,"error",  "export_failed");
+			}
+			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
+		}
 }
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -20,6 +20,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;


 import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
@@ -58,7 +59,9 @@ public class InterceptController extends CommonController{
 			certificateList=pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "domain");
 		}
 		model.addAttribute("certificateList", certificateList);
-		
+		//IP地址仿冒策略使用策略组
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(6);
+		model.addAttribute("policyGroups", policyGroups);
 		return "/cfg/intercept/interceptList";
 	}
 	@RequestMapping(value = {"/interceptIpForm","interceptDomainForm","interceptIpPayloadForm"})
@@ -80,6 +83,10 @@ public class InterceptController extends CommonController{
 		model.addAttribute("certificateList", certificateList);
 		
 		model.addAttribute("_cfg", entity);
+		//IP地址仿冒策略使用策略组
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(6);
+		model.addAttribute("policyGroups", policyGroups);
+		
 		return "/cfg/intercept/interceptForm";
 	}
 	@RequestMapping(value = {"/ip/saveOrUpdate","/domain/saveOrUpdate","/ippayload/SaveOrUpdate"})
@@ -173,7 +180,6 @@ public class InterceptController extends CommonController{
 			
 			try {
 				auditAll(auditPage,isValid , cfg);
-				addMessage(redirectAttributes,"success", "audit_success");
 			} catch (Exception e) {
 				logger.error("配置下发失败：",e);
 				if(e instanceof MaatConvertException) {
--- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java
@@ -0,0 +1,201 @@
+package com.nis.web.controller.configuration.proxy;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.KeyStore;
+import java.security.Principal;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Maps;
+import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.domain.configuration.DnsResStrategy;
+import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
+import com.nis.domain.configuration.PxyObjTrustedCaCert;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.ToMaatResult.ResponseData;
+import com.nis.exceptions.CallExternalProceduresException;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.exceptions.MultiPartNewException;
+import com.nis.util.ConfigDictUtils;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
+import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
+import com.nis.web.controller.BaseController;
+
+/**
+ * 拦截策略
+ * @author ddm
+ *
+ */
+@Controller
+@RequestMapping("${adminPath}/proxy/spoofing/pool")
+public class PxyObjSpoofingIpPoolController extends BaseController  {
+	SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	
+	@RequestMapping(value = {"/form"})
+	@RequiresPermissions(value={"proxy:spoofing:pool:config"})
+	public String from(Model model,
+							HttpServletRequest request,
+							HttpServletResponse response,
+							String ids,
+							@ModelAttribute("cfg")PxyObjSpoofingIpPool cfg
+							,RedirectAttributes redirectAttributes){
+		if(cfg == null){
+			cfg=new PxyObjSpoofingIpPool();
+		}
+		if(!StringUtil.isEmpty(ids)){
+			cfg = pxyObjSpoofingIpPoolService.getPxyObjSpoofingIpPool(Long.valueOf(ids));
+			initFormCondition(model, cfg);
+			model.addAttribute("isAdd", false);
+		}else{
+			initFormCondition(model, cfg);
+			model.addAttribute("isAdd", true);
+		}
+		
+		List<PolicyGroupInfo> groups=policyGroupInfoService.findPolicyGroupInfosByType(6);
+		List<PolicyGroupInfo> policyGroups = new ArrayList();
+		//解决目前一个分组只能有一个生效IP
+		for(PolicyGroupInfo group:groups){
+			PxyObjSpoofingIpPool entity = new PxyObjSpoofingIpPool();
+			entity.setGroupId(group.getGroupId());
+			entity.setCfgId(cfg.getCfgId());
+			List<PxyObjSpoofingIpPool> spoofingIpPool = pxyObjSpoofingIpPoolService.findPxyObjSpoofingIpPools(entity);
+			if(spoofingIpPool==null || spoofingIpPool.size()==0){
+				policyGroups.add(group);
+			}
+		}
+		model.addAttribute("policyGroups", policyGroups);
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/proxy/spoofingIpPool/form";
+	}
+	
+	@RequestMapping(value = {"/saveOrUpdate"})
+	@RequiresPermissions(value={"proxy:spoofing:pool:config"})
+	public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
+			@ModelAttribute("cfg")PxyObjSpoofingIpPool cfg,
+			RedirectAttributes redirectAttributes){
+		try{
+			pxyObjSpoofingIpPoolService.saveOrUpdate(cfg);
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			if(e instanceof MaatConvertException) {
+				addMessage(redirectAttributes,"error","request_service_failed");
+			}else {
+				addMessage(redirectAttributes,"error","save_failed");
+			}
+		}
+		
+		return "redirect:" + adminPath +"/proxy/spoofing/pool/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/list"})
+	@RequiresPermissions(value={"proxy:spoofing:pool:config"})
+	public String list(Model model,HttpServletRequest  request,HttpServletResponse response
+			,@ModelAttribute("cfg")PxyObjSpoofingIpPool entity
+			,RedirectAttributes redirectAttributes){
+		//查询时left join policyGroup
+		Page<PxyObjSpoofingIpPool> page = pxyObjSpoofingIpPoolService.findPage(new Page<PxyObjSpoofingIpPool>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model,entity);
+		return "/cfg/proxy/spoofingIpPool/list";
+	}
+	
+	@RequestMapping(value = {"/delete"})
+	@RequiresPermissions(value={"proxy:spoofing:pool:config"})
+	public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId
+			,Model model,HttpServletRequest request
+			,HttpServletResponse response
+			,RedirectAttributes redirectAttributes){
+		if(!StringUtil.isEmpty(ids)){
+			pxyObjSpoofingIpPoolService.delete(isAudit,isValid,ids,functionId);
+		}
+		
+		return "redirect:" + adminPath +"/proxy/spoofing/pool/list?functionId="+functionId;
+	}
+	
+	@RequestMapping(value = {"/audit"})
+	@RequiresPermissions(value={"proxy:spoofing:pool:confirm"})
+	public String audit(Model model,@ModelAttribute("cfg")PxyObjSpoofingIpPool cfg,
+										Integer isValid,
+										Integer isAudit,
+										String ids,
+										Integer functionId, 
+										RedirectAttributes redirectAttributes,
+										HttpServletResponse response,
+										HttpServletRequest request) {
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				try {
+					pxyObjSpoofingIpPoolService.audit(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					logger.error(e);
+					addMessage(redirectAttributes,"error", "request_service_failed");
+				}catch (Exception e) {
+					logger.error(e);
+					addMessage(redirectAttributes,"error", "audit_failed");
+				}
+			}
+			
+		}else {
+			/*Page<PxyObjSpoofingIpPool> searchPage=new Page<PxyObjSpoofingIpPool>(request,response,"r");
+			Page<PxyObjSpoofingIpPool> auditPage=new Page<PxyObjSpoofingIpPool>(request,response,"r");
+
+			try {
+				BeanUtils.copyProperties(searchPage, auditPage);
+				auditAll(auditPage,isValid , cfg);
+			} catch (Exception e) {
+				logger.error("配置下发失败：",e);
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes,"error", "request_service_failed");
+				}else {
+					addMessage(redirectAttributes,"error", "audit_failed");
+				}
+				
+			}
+			
+			return list(model, request, response, cfg,redirectAttributes);*/
+		}
+		return "redirect:" + adminPath +"/proxy/spoofing/pool/list?functionId="+functionId;
+	}
+
+}
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java
@@ -0,0 +1,21 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
+import com.nis.domain.configuration.PxyObjTrustedCaCert;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface PxyObjSpoofingIpPoolDao  extends CrudDao<PxyObjSpoofingIpPool>{
+	List<PxyObjSpoofingIpPool> findPage(PxyObjSpoofingIpPool  spoofingPool);
+	List<PxyObjSpoofingIpPool> findList(PxyObjSpoofingIpPool  spoofingPool);
+	PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId);
+	int insert(PxyObjSpoofingIpPool spoofingPool);
+	int update(PxyObjSpoofingIpPool spoofingPool);
+}
--- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao" >
+  
+	  <resultMap id="PxyObjSpoofingPoolMap" type="com.nis.domain.configuration.PxyObjSpoofingIpPool" >
+	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
+    <result column="ip_address" property="ipAddress" jdbcType="VARCHAR" />
+    <result column="direction" property="direction" jdbcType="INTEGER" />
+    <result column="protocol" property="protocol" jdbcType="INTEGER" />
+    <result column="location" property="location" jdbcType="INTEGER" />
+    <result column="port" property="port" jdbcType="VARCHAR" />
+   <!--  <result column="action" property="action" jdbcType="INTEGER" /> -->
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="location" property="location" jdbcType="INTEGER"/>
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="group_id" property="groupId" jdbcType="INTEGER" />
+    <result column="group_name" property="groupName" jdbcType="INTEGER" />
+    <result column="user_region" property="userRegion" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	  
+    <sql id="PxyObjSpoofingIpPoolColumns">
+		 r.CFG_ID, r.CFG_DESC,r.CFG_REGION_CODE, r.IP_TYPE, r.IP_ADDRESS,
+		 r.DIRECTION,r.PROTOCOL,r.IS_VALID,r.IS_AUDIT,r.location,r.port,
+    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
+    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
+    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.FUNCTION_ID,r.GROUP_ID,r.user_region
+	</sql>
+   
+  
+   <!-- 查出所有 有效数据-->
+      <select id="findPage" resultMap="PxyObjSpoofingPoolMap">
+		SELECT
+			<include refid="PxyObjSpoofingIpPoolColumns"/>
+		<trim prefix="," prefixOverrides=",">
+			,s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName,p.group_name as group_name
+		</trim>
+	    FROM  pxy_obj_spoofing_ip_pool r
+	    left join policy_group_info p on p.group_id=r.group_id
+	    left join sys_user s on r.creator_id=s.id
+		left join sys_user e on r.editor_id=e.id
+		left join sys_user u on r.auditor_id=u.id
+		left join request_info ri on r.request_id=ri.id
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
+	 		<if test="cfgId != null">
+	   			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	 		<if test="compileId != null">
+	   			AND r.compile_id=#{compileId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	
+	    	<if test="action != null">
+	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+   <select id="getPxyObjSpoofingIpPool" resultMap="PxyObjSpoofingPoolMap" >
+		SELECT
+			<include refid="PxyObjSpoofingIpPoolColumns"/>
+	    FROM pxy_obj_spoofing_ip_pool r
+	    where r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	</select>
+   <!-- 查出所有 有效数据-->
+   <select id="findList" resultMap="PxyObjSpoofingPoolMap" parameterType="com.nis.domain.configuration.PxyObjSpoofingIpPool">
+		SELECT
+			<include refid="PxyObjSpoofingIpPoolColumns"/>
+	    FROM pxy_obj_spoofing_ip_pool r where (r.is_valid!=-1 and r.is_audit!=3) AND r.group_id =#{groupId,jdbcType=INTEGER}
+	   	 <if test="cfgId != null">
+   			AND r.CFG_ID!=#{cfgId,jdbcType=BIGINT}
+   		</if>
+	</select>
+
+	<insert id="insert" parameterType="com.nis.domain.configuration.PxyObjSpoofingIpPool" >
+    insert into pxy_obj_spoofing_ip_pool (
+     CFG_ID,
+     CFG_DESC,
+     ACTION,
+     IS_VALID,
+     IS_AUDIT,
+     CREATOR_ID,
+    CREATE_TIME,
+    EDITOR_ID,
+    EDIT_TIME,
+    AUDITOR_ID,
+    AUDIT_TIME,
+   	SERVICE_ID,
+   	REQUEST_ID,
+   	IS_AREA_EFFECTIVE,
+   	CLASSIFY,
+    ATTRIBUTE,
+    LABLE,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+   	ip_type, 
+  	ip_address, 
+  	direction, 
+ 	protocol, 
+ 	location, 
+ 	group_id,
+	compile_Id,
+    cfg_region_code,
+    user_region
+    )values (
+   		#{cfgId,jdbcType=VARCHAR},
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{ipType, jdbcType=INTEGER},
+  		#{ipAddress, jdbcType=VARCHAR},
+  		#{direction, jdbcType=INTEGER},
+ 		#{protocol, jdbcType=INTEGER},
+ 		0,
+ 		#{groupId, jdbcType=INTEGER},
+    	#{compileId,jdbcType=INTEGER},
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{userRegion,jdbcType=VARCHAR}
+    	
+    )
+  </insert>
+  <update id="update" parameterType="com.nis.domain.configuration.PxyObjSpoofingIpPool" >
+    update pxy_obj_spoofing_ip_pool
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="compileId != null " >
+        compile_Id = #{compileId,jdbcType=VARCHAR},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+       <if test="editTime != null  and editTime != ''" >
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
+      </if>
+       <if test="auditTime != null  and auditTime != ''" >
+     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null and classify != ''" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null and attribute != ''" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null and lable != ''" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="port != null and port!=''" >
+      	port=#{port, jdbcType=VARCHAR},
+      </if>
+      <if test="ipType != null" >
+      	ip_type=#{ipType, jdbcType=INTEGER},
+      </if>
+ 	  <if test="ipAddress != null and ipAddress!=''" >
+  		ip_address=#{ipAddress, jdbcType=VARCHAR},
+  	  </if>
+  	  <if test="groupId != null" >
+  		group_id=#{groupId, jdbcType=INTEGER},
+  	  </if>
+      <if test="serviceId != null" >
+        service_id =  #{serviceId,jdbcType=INTEGER},
+      </if>
+      <if test="userRegion != null and userRegion!=''" >
+      	user_region=#{userRegion, jdbcType=VARCHAR},
+      </if>
+      </trim>
+    </set>
+    <where>
+       	and cfg_id =  #{cfgId,jdbcType=INTEGER}
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
+</mapper>
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
@@ -18,6 +18,7 @@ public interface RequestInfoDao  extends CrudDao {
 	RequestInfo getRequestInfoByRequestNumber(@Param("requestNumber") String requestNumber);
 	
 	RequestInfo getRequestInfoById(@Param("id") Long id);
+	List<RequestInfo> getRequestInfoByIds(@Param("ids") String ids);
 	
    int deleteByPrimaryKey(Long id);

--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -129,6 +129,33 @@
 	where r.is_valid!=-1 and r.is_audit !=3
    and r.id = #{id,jdbcType=BIGINT}
  </select>
+  <select id="getRequestInfoByIds" parameterType="java.lang.String" resultMap="BaseResultMap">
+    	select
+		r.id AS id,
+		r.task_id AS taskId,
+		r.request_number AS requestNumber,
+		r.request_org AS requestOrg,
+		r.request_time AS requestTime,
+		r.request_title AS requestTitle,
+		r.request_content AS requestContent,
+		r.is_valid AS isValid,
+		r.is_audit AS isAudit,
+		s.name AS creatorName,
+		r.create_time AS createTime,
+		u.name AS editorName,
+		r.edit_time AS editTime,
+		e.name AS currentName,
+		e.name AS auditorName,
+		r.audit_time AS auditTime,
+		t.task_name AS taskName
+	from request_info r
+	left join sys_user s on r.creator_id=s.id
+	left join sys_user u on r.editor_id=u.id
+	left join sys_user e on r.auditor_id=e.id
+	left join task_info t on r.task_id=t.id
+	where r.is_valid!=-1 and r.is_audit !=3
+    and r.id in(${ids})
+  </select>
  <!-- 新增 -->
  <insert id="insert" parameterType="com.nis.domain.configuration.RequestInfo">
    insert into request_info (
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java
@@ -14,6 +14,7 @@ public interface TaskInfoDao extends CrudDao<TaskInfo>{
 	TaskInfo getTaskInfoByTaskName(@Param("taskName") String taskName);
 	
 	TaskInfo getTaskInfoById(@Param("id") Long id);
+	List<TaskInfo> getTaskInfoByIds(@Param("ids") String ids);
 	
 	void delete(@Param("id") Long id);

--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -105,6 +105,13 @@
    from task_info
    where id = #{id,jdbcType=BIGINT}
  </select>
+  <!-- 根据来id查询 -->
+  <select id="getTaskInfoByIds" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List"/>
+    from task_info
+    where id in (${ids})
+  </select>
  <insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
    insert into task_info (id, task_name, task_org, 
      task_time, task_desc, is_valid, 
--- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java
@@ -59,6 +59,10 @@ public class TaskInfoService extends BaseService{
 		
 		return taskInfoDao.getTaskInfoById(id);
 	}
+	public List<TaskInfo> getTaskInfoByIds(String ids) {
+		
+		return taskInfoDao.getTaskInfoByIds(ids);
+	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
 	public void taskExamine(String[] exId){
 		TaskInfo taskInfo = new TaskInfo();
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -394,6 +394,13 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 					userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
 					maatCfg.setUserRegion(userRegion);
 			}
+			//ip仿冒自定义域信息
+			if(entity.getAction().equals(48)){
+					//HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
+					userRegion="nat_type="+entity.getUserRegion1();
+					userRegion+=";spoofing_ip_pool="+entity.getUserRegion2();
+					maatCfg.setUserRegion(userRegion);
+			}
 			
 			//域名拦截需要增加域名id和域名字符串自定义配置
 			if(StringUtil.isEmpty(maatCfg.getUserRegion()) 
--- a/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java
+++ b/src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java
@@ -0,0 +1,269 @@
+package com.nis.web.service.configuration;
+
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.nis.domain.Page;
+import com.nis.domain.basics.SysDictInfo;
+import com.nis.domain.callback.ProxyObjKeyring;
+import com.nis.domain.callback.ProxyObjTrustedCa;
+import com.nis.domain.callback.ProxyObjTrustedCaCrl;
+import com.nis.domain.configuration.AvFileSampleCfg;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
+import com.nis.domain.maat.EffectiveRangeCfg;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.EffectiveRangeCfg.AreaIsp;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
+import com.nis.web.dao.basics.ServiceDictInfoDao;
+import com.nis.web.dao.basics.SysDictInfoDao;
+import com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+import com.nis.web.service.SpringContextHolder;
+import com.nis.web.service.basics.SysDictInfoService;
+
+import oracle.sql.ARRAY;
+
+
+
+/**
+ * 欺骗IP地址池管理
+ * @author dell
+ *
+ */
+@Service
+public class PxyObjSpoofingIpPoolService extends BaseService{
+	@Autowired
+	protected PxyObjSpoofingIpPoolDao pxyObjSpoofingIpPoolDao;
+	@Autowired
+    private SysDictInfoDao sysDictInfoDao;
+	/**
+	 * @param entity
+	 * @return
+	 */
+	public PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId) {
+		return pxyObjSpoofingIpPoolDao.getPxyObjSpoofingIpPool(cfgId);
+	}
+	/**
+	 * 查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<PxyObjSpoofingIpPool> findPage(Page page, PxyObjSpoofingIpPool entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<PxyObjSpoofingIpPool> list=pxyObjSpoofingIpPoolDao.findPage(entity);
+		page.setList(list);
+		return page;
+	}
+
+	
+	public List<PxyObjSpoofingIpPool> findPxyObjSpoofingIpPools(PxyObjSpoofingIpPool entity) {
+		List<PxyObjSpoofingIpPool> list=pxyObjSpoofingIpPoolDao.findList(entity);
+		return list;
+	}
+	//新增或保存
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdate(PxyObjSpoofingIpPool entity){
+		Date createTime=new Date();
+		setAreaEffectiveIds(entity);
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		//新增
+		if(StringUtil.isEmpty(entity.getCfgId())){
+			entity.initDefaultValue();
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+			}
+			pxyObjSpoofingIpPoolDao.insert(entity);
+			//修改
+		}else{
+			Date editTime=new Date();
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			pxyObjSpoofingIpPoolDao.update(entity);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			PxyObjSpoofingIpPool entity = new PxyObjSpoofingIpPool();
+			entity.setCfgId(Long.valueOf(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			pxyObjSpoofingIpPoolDao.update(entity);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		PxyObjSpoofingIpPool entity=new PxyObjSpoofingIpPool();
+		entity.setCfgId(Long.valueOf(id));
+		entity.setIsValid(isValid);
+		entity.setIsAudit(isAudit);
+		entity.setEditTime(auditTime);
+		entity.setEditorId(UserUtils.getUser().getId());
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		pxyObjSpoofingIpPoolDao.update(entity);
+		entity=pxyObjSpoofingIpPoolDao.getPxyObjSpoofingIpPool(entity.getCfgId());
+		List<PxyObjSpoofingIpPool> list = new ArrayList<PxyObjSpoofingIpPool>();
+		String json="";
+		String areaEffectiveIds="0";
+		if(entity.getIsAudit()==1){
+			if(!StringUtils.isEmpty(entity.getAreaEffectiveIds())){
+				// 组织区域、运营商配置下发格式
+				areaEffectiveIds = this.setEffectiveRange(entity.getAreaEffectiveIds());
+			}
+			entity.setAreaEffectiveIds(areaEffectiveIds);
+			list.add(entity);
+			//调用服务接口下发配置数据
+			json=gsonToJson(list);
+			logger.info("欺骗IP池配置下发配置参数："+json);
+			//调用服务接口下发配置
+			try {
+				ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+				if(result!=null){
+					logger.info("欺骗IP池配置下发响应信息："+result.getMsg());
+				}
+			} catch (Exception e) {
+				logger.error("欺骗IP池配置配置下发失败",e);
+				throw e;
+			}
+		}else if(entity.getIsAudit()==3){
+			PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
+			cfg.setIsValid(0);
+			cfg.setCompileId(entity.getCompileId());
+			cfg.setServiceId(entity.getServiceId());
+			list.add(cfg);
+			//调用服务接口取消配置
+			json=gsonToJson(list);
+			logger.info("欺骗IP池配置配置参数："+json);
+			//调用服务接口取消配置
+			try {
+				ToMaatResult result = ConfigServiceUtil.put(json, 2);
+				logger.info("欺骗IP池配置响应信息："+result.getMsg());
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("欺骗IP池配置配置失败");
+				throw e;
+			}
+		}
+	}
+	public String setEffectiveRange(String areaEffectiveIds){
+		HashMap<String, List<String>> map = new HashMap<String,List<String>>();
+		List<String> ispList = new ArrayList();
+		for (String areaEffectiveId : StringUtils.split(areaEffectiveIds, ",")) {
+			if(areaEffectiveId.contains(":")) {
+				// 区域和运营商
+				int index = areaEffectiveId.indexOf(":");
+				String areaCode = areaEffectiveId.substring(0, index);
+				String ispCode = areaEffectiveId.substring(index+1);
+				
+				if(!map.containsKey(areaCode)){
+					ispList = new ArrayList();
+					ispList.add(ispCode);
+					map.put(areaCode, ispList);
+				}else{
+					if(!ispList.contains(ispCode)){
+						ispList.add(ispCode);
+					}
+					map.replace(areaCode, ispList);
+				}
+			}else {
+				// 区域
+				if(!map.containsKey(areaEffectiveId)){
+					map.put(areaEffectiveId, null);
+				}
+				
+			}
+			
+		}
+
+		EffectiveRangeCfg rangeCfg = new EffectiveRangeCfg();
+		List<List<AreaIsp>> effectiveRangeList = new ArrayList();
+		Set<String> keySet = map.keySet();
+		for (String key : keySet) {
+			AreaIsp area = new AreaIsp();
+			area.setTag(Constants.AREA_TAG);
+			AreaIsp isp = new AreaIsp();
+			isp.setTag(Constants.ISP_TAG);
+			List<String> locaValueList = new ArrayList();
+			List<String> ispValueList = new ArrayList();
+			List<AreaIsp> areaIspList = new ArrayList();
+			// 获取区域信息
+			String areaStr = "";
+			SysDictInfo areaDict = sysDictInfoDao.getDictByItemCode(key);
+			areaStr += areaDict.getItemValue();
+			while(areaDict.getParent().getSysDictId() != 0) {
+				areaDict = sysDictInfoDao.getDictById(areaDict.getParent().getSysDictId());
+				areaStr += "/"+areaDict.getItemValue();
+			}
+			locaValueList.add(StringUtils.revertStr(areaStr, "/"));
+			area.setValue(locaValueList);
+			areaIspList.add(area);
+			
+			// 获取运营商信息
+			if(map.get(key) != null){
+				for (String ispCode : map.get(key)) {
+					SysDictInfo ispDict = sysDictInfoDao.getDictByItemCode(ispCode);
+					ispValueList.add(ispDict.getItemValue());
+				}
+				isp.setValue(ispValueList);
+				areaIspList.add(isp);
+			}
+			effectiveRangeList.add(areaIspList);
+			
+		}
+		rangeCfg.setEffectiveRangeList(effectiveRangeList);
+		return gsonToJson(rangeCfg);
+		
+	}
+}
+	
+	
--- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
+++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
@@ -63,6 +63,9 @@ public class RequestInfoService extends BaseService{
 		
 		return requestInfoDao.getRequestInfoById(id);
 	}
+	public List<RequestInfo> getRequestInfoByIds(String ids) {
+		return requestInfoDao.getRequestInfoByIds(ids);
+	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
 	public void requestExamine(String[] exId){
 		RequestInfo requestInfo = new RequestInfo();
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1371,4 +1371,8 @@ conn_record=Connection Records
 bps=Bps
 bps_percent=Bps Percent
 pps=pps
-pps_percent=pps Percent
+pps_percent=pps Percent
+spoofing_ip_object=Spoofing Policy Object
+spoofing_ip_policy=Spoofing Policy
+action_spoofing=Spoofing
+spoofing=spoofing
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1375,4 +1375,8 @@ conn_record=Connection Records
 bps=Bps
 bps_percent=Bps Percent
 pps=pps
-pps_percent=pps Percent
+pps_percent=pps Percent
+spoofing_ip_object=Spoofing Policy Object
+spoofing_ip_policy=Spoofing Policy
+action_spoofing=Spoofing
+spoofing=spoofing
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1371,4 +1371,8 @@ conn_record=\u901A\u8054\u5173\u7CFB
 bps=Bps
 bps_percent=Bps Percent
 pps=pps
-pps_percent=pps Percent
+pps_percent=pps Percent
+spoofing_ip_object=Spoofing Policy Object
+spoofing_ip_policy=Spoofing Policy
+action_spoofing=Spoofing
+spoofing=spoofing
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
@@ -24,6 +24,7 @@
 					<form:form action="${ctx}/basics/taskInfo/saveOrUpdate" modelAttribute="taskInfo" class="form-horizontal" id="inputForm" method="post" >
 					<sys:message content="${message}" type="${messageType }"/>
 					<input type="hidden"  name="id" value="${taskInfo.id}"/>
+					<input type="hidden"  name="functionId" value="${taskInfo.functionId}"/>
 						<div class="form-body">
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_name"></spring:message>:</label>
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -13,7 +13,7 @@
 	<shiro:hasPermission name="basics:taskInfo:config">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
+			onClick="javascript:window.location='${ctx}/basics/taskInfo/form?functionId=${taskInfo.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
@@ -32,6 +32,7 @@
 						<form:form id="searchForm" modelAttribute="taskInfo" action="${ctx}/basics/taskInfo/list" method="post" class="form-search">
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${taskInfo.functionId}"/>
 							
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
@@ -64,9 +65,10 @@

 									<div class="pull-right">
 									<shiro:hasPermission name="basics:taskInfo:config"> 
-                                        <button type="button" class="btn btn-default" onclick="edit()">
+                                        <button type="button" class="btn btn-default" onclick="edit(${taskInfo.functionId})">
                                            <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
-                                            <sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
+                                            <sys:delRow url="${ctx}/basics/taskInfo/delete?functionId=${taskInfo.functionId}" id="contentTable" label="delete"></sys:delRow>
+                                             <sys:delRow url="${ctx}/basics/taskInfo/exportTaskInfo?functionId=${taskInfo.functionId}"    searchUrl="${ctx}/basics/taskInfo/list?functionId=${taskInfo.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                      <!--   <button type="button" class="btn btn-default">
                                            <i class="fa fa-download"></i> 导出</button> -->
                                        </shiro:hasPermission>
@@ -77,9 +79,9 @@
                                                <i class="fa fa-angle-down"></i>
                                            </button>
                                            <ul class="dropdown-menu pull-right">
-                                                <li><sys:delRow url="${ctx}/basics/taskInfo/taskExamine" id="contentTable" label="approved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/taskInfo/taskExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
+                                                <li><sys:delRow url="${ctx}/basics/taskInfo/taskExamine?functionId=${taskInfo.functionId}" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/taskInfo/taskExamineNo?functionId=${taskInfo.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine?functionId=${taskInfo.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                            </ul>
                                        </div>
                                        </shiro:hasPermission>
@@ -255,7 +257,7 @@
 		return false;
 	}
 	//编辑
-	function edit(){
+	function edit(functionId){
 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
 		if(cked.val()==1){
 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
@@ -266,7 +268,7 @@
 			return;
 		}
 		if(cked.length==1){
-			window.location = "${ctx}/basics/taskInfo/form?id="+cked.attr("id");
+			window.location = "${ctx}/basics/taskInfo/form?functionId="+functionId+"&id="+cked.attr("id");
 		}else{
 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
 			return;
@@ -276,4 +278,4 @@
 </script>

 </body>
-</html>
+</html>
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -47,7 +47,7 @@ $(function(){
 	});
 	
 	$("#srcFile").on('change',function(){
-		if(sfd!=632&&sampleFileValidate(fileType,$("#srcFile").val())){
+		if(sfd!=631&&sfd!=632&&sampleFileValidate(fileType,$("#srcFile").val())){
 			//样例文件类型正确进行后续处理
 			$("#srcFileInfo").val($("#srcFile").val());
 			var videoToPicture = $("#videoToPicture").val();
@@ -95,8 +95,8 @@ $(function(){
 		    	});
 			}
 		}
-			// 人脸识别
-			if(sfd==632){
+			// 人脸识别,人脸识别
+			if(sfd==632||sfd==631){
 				 var files = $(this)[0].files;
 				 if(files.length>0){
 					 for(var i = 0;i < files.length;i ++) {
@@ -383,14 +383,14 @@ function sampleFileValidate(fileType,fileName){
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_file"/></label>
 							            <div class="col-md-6">
 							            	 <%-- <input class="form-control required" type="text" name="srcUrl" value="${_cfg.srcUrl }"> --%>
-							            	 <c:if test="${_cfg.functionId != 632}">
+							            	 <c:if test="${_cfg.functionId != 632 and _cfg.functionId != 631}">
 							            		 <input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" />
 							            	 </c:if>
 							            	 <c:set var="videoToPicture" value="${fns:getDictLabel('VIDEO_TO_PICTURE', _cfg.functionId, 'false')}" />
 							            	 <input type="hidden" name="videoToPicture" id="videoToPicture" value="${videoToPicture }">
 							            	 <c:choose>
 							            	 		
-							            	 		<c:when test="${videoToPicture and _cfg.functionId != 632}">
+							            	 		<c:when test="${videoToPicture and _cfg.functionId != 632 and _cfg.functionId != 631}">
 							            	 			<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;" />
 							            	 			<div class="input-group">
 								            	 			<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required="" 
@@ -407,8 +407,7 @@ function sampleFileValidate(fileType,fileName){
 																<i class="fa btn-search"></i>
 															<spring:message code="show"></spring:message></button>
 							            	 		</c:when>
-							            	 		
-							            	 		<c:when test="${_cfg.functionId eq 632}">
+							            	 		<c:when test="${_cfg.functionId eq 632 or _cfg.functionId eq 631}">
 							            	 			<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" multiple/>
 							            	 			<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;"/>
 							            	 			<input id="faceFilePath" name="faceFilePath" type="hidden" value="${faceFilePath}"/>
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -85,10 +85,12 @@
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".spoofingAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else if(action==64){//限速
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".spoofingAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												var rateLimitType=$("input[name='userRegion1']checked").val();
 												if(rateLimitType == 0){//丢包率
 													$(".bandwith").find("input[name='userRegion3']").attr("disabled",true);
@@ -100,10 +102,17 @@
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".spoofingAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+											}else if(action==48){//IP仿冒业务
+												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".whiteListAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}else {//白名单
 												$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 												$(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
+												$(".spoofingAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
 											}
 											loading('onloading...');
 											form.submit();
@@ -307,6 +316,7 @@
 			$(".ratelimitAction").addClass("hidden");
 			$(".replaceAction").addClass("hidden");
 			$(".whiteListAction").addClass("hidden");
+			$(".spoofingAction").addClass("hidden");
 			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
@@ -325,6 +335,7 @@
 			$(".ratelimitAction").removeClass("hidden");
 			$(".replaceAction").addClass("hidden");
 			$(".whiteListAction").addClass("hidden");
+			$(".spoofingAction").addClass("hidden");
 			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){	
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
@@ -344,6 +355,7 @@
 			$(".ratelimitAction").addClass("hidden");
 			$(".replaceAction").removeClass("hidden");
 			$(".whiteListAction").addClass("hidden");
+			$(".spoofingAction").addClass("hidden");
 			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
@@ -360,6 +372,7 @@
 			$(".ratelimitAction").addClass("hidden");
 			$(".replaceAction").addClass("hidden");
 			$(".whiteListAction").removeClass("hidden");
+			$(".spoofingAction").addClass("hidden");
 			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
@@ -372,6 +385,24 @@
 				$("."+interceptReplacePktBin).addClass("hidden");
 				$("."+interceptReplacePktBin+"_div").addClass("hidden");
 			}
+		}else if(action==48){
+			//重定向，IP仿冒业务
+			$(".monitAction").addClass("hidden");
+			$(".ratelimitAction").addClass("hidden");
+			$(".replaceAction").addClass("hidden");
+			$(".whiteListAction").addClass("hidden");
+			$(".spoofingAction").removeClass("hidden");
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17' selected>UDP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6' >TCP</option>")
+				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
+			}
+			if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){
+				$("."+interceptReplacePktBin).addClass("hidden");
+				$("."+interceptReplacePktBin).find("span").removeClass("hidden");
+			}
 		}
 		
 	}
@@ -379,7 +410,7 @@
 </head>
 <body>
 			<!-- fucntion_ID 200-IP 201-DOMAIN -->
-			<c:if test="${_cfg.functionId eq 200}">
+			<c:if test="${_cfg.functionId eq 200 or _cfg.functionId eq 214}">
 				<c:set var="interceptType" value="Ip"/>
 			</c:if>
 			<c:if test="${_cfg.functionId eq 201}">
@@ -455,7 +486,10 @@
 																	<c:if test="${(dict.itemCode eq service.action) && (service.action eq 128) }">
 																			<spring:message code="bypass"/>
 																	</c:if>
-																	<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1 && service.action ne 128 ) }">
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action eq 48) }">
+																			<spring:message code="Spoofing"/>
+																	</c:if>
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1 && service.action ne 128 && service.action ne 48 ) }">
 																		<spring:message code="${dict.itemValue }"/>
 																	</c:if>
 																</c:forEach>
@@ -653,6 +687,61 @@
 											</div>
 										</div>
 								</div>
+								<div class="row spoofingAction hidden">
+									<h4 class="form-section">
+											<spring:message code="action_region" />
+											<small></small>
+										</h4>
+										<div class="row">
+											<div class="col-md-6">
+												<div class="form-group">
+													<label class="control-label col-md-3"><font color="red">*</font>
+															<spring:message code="Spoofing" />
+													</label>
+													<div class="col-md-6">
+														<select name="userRegion1"
+														class="selectpicker show-tick form-control required">
+															<option value="" ><spring:message code="selected"/></option>
+															<c:forEach items="${fns:getDictList('SPOOFING_IP_TYPE')}" var="spoofingIp">
+																<option value="${spoofingIp.itemCode}" <c:if test="${_cfg.userRegion1==spoofingIp.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${spoofingIp.itemValue}"/></option>
+															</c:forEach>
+														</select>
+													</div>
+													<div for="userRegion1"></div>
+												</div>
+											</div>
+											<div class="col-md-6">
+												<div class="form-group ">
+													<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="With" /></label>
+													<div class="col-md-6">
+														<select name="userRegion2" class="selectpicker show-tick form-control required">
+										            		<option value="" ><spring:message code="select"/></option>
+							               					<c:forEach items="${policyGroups }" var="policyGroup">
+																<option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion2==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+									              			</c:forEach>
+										                </select>
+													</div>
+													<div for="userRegion2"></div>
+												</div>
+											</div>
+										</div>
+										<%-- <div class="row">
+											<div class="col-md-6">
+												<div class="form-group ">
+													<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="IP" /></label>
+													<div class="col-md-6">
+														<input class="form-control required" type="text"
+															name="userRegion2"
+															value="${_cfg.userRegion2 }">
+													</div>
+													<div for="userRegion2"></div>
+												</div>
+											</div>
+											
+										</div> --%>
+								</div>
 								<%--   action 为128 白名单时 --%>
 								<c:if test="${_cfg.functionId eq 201}">
 								<div class="row whiteListAction hidden">
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -95,7 +95,7 @@

 </head>
 <body>
-<c:if test="${cfg.functionId eq 200}">
+<c:if test="${cfg.functionId eq 200 or cfg.functionId eq 214}">
 	<c:set var="interceptType" value="Ip"/>
 </c:if>
 <c:if test="${cfg.functionId eq 201}">
@@ -384,6 +384,10 @@
 							    		<th><spring:message code="replaced_content"/></th>
 							    		<th><spring:message code="replace_content"/></th>
 							    	</c:if>
+							    	<c:if test="${cfg.functionId eq 214 }">
+							    		<th><spring:message code="Spoofing"/></th>
+							    		<th><spring:message code="With"/></th>
+							    	</c:if>
 							    	<c:if test="${cfg.functionId eq 201 }">
 							    		<th><spring:message code="intercept_intensity"/></th>
 							    	</c:if>
@@ -420,7 +424,10 @@
 										<c:if test="${indexCfg.action eq 128}">
 											<spring:message code="bypass"/>
 										</c:if>
-										<c:if test="${(indexCfg.action ne 1) && (indexCfg.action ne 128)}">
+										<c:if test="${indexCfg.action eq 48}">
+											<spring:message code="Spoofing"/>
+										</c:if>
+										<c:if test="${(indexCfg.action ne 1) && (indexCfg.action ne 128) && (indexCfg.action ne 48)}">
 											<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 												<c:if test="${dict.itemCode eq indexCfg.action }">
 													<spring:message code="${dict.itemValue }"/>
@@ -482,6 +489,22 @@
 									    <td>
 									    	${indexCfg.userRegion3 }
 									    </td>
+									 </c:if>
+									 <c:if test="${cfg.functionId eq 214 }">
+									    <td>
+									    	<c:forEach items="${fns:getDictList('SPOOFING_IP_TYPE')}" var="spoofingIp">
+												<c:if test="${indexCfg.userRegion1==spoofingIp.itemCode}">
+												<spring:message code="${spoofingIp.itemValue}"/>
+												</c:if>
+											</c:forEach>
+									    </td>
+									    <td>
+									    	<c:forEach items="${policyGroups}" var="policyGroup">
+												<c:if test="${indexCfg.userRegion2==policyGroup.groupId}">
+													${policyGroup.groupName }
+												</c:if>
+											</c:forEach>
+									    </td>
 									</c:if>
 									<c:if test="${cfg.functionId eq 201 }">
 							    		<td>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
@@ -0,0 +1,181 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script type="text/javascript">
+$(function(){
+	$(".action").on("change", function() {
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
+	$("#serviceId").val($(".action:checked").attr("serviceId"));
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
+});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+
+ 	<h3 class="page-title">
+		<spring:message code="spoofing_ip_pool"></spring:message>
+	</h3> 
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/proxy/spoofing/pool/saveOrUpdate" method="post" class="form-horizontal">
+                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" name="direction" value="0">
+                       	<input type="hidden" name="location" value="0">
+                       	<input type="hidden" name="protocol" value="0">
+                       	<input type="hidden" name="port" value="0">
+                       	<input type="hidden" name="userRegion" value="0">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				isMaat="${region.isMaat}"
+						   		 serviceType="${region.configServiceType}"
+						   		 ipType="${region.configIpType}"
+						   		 ipPattern="${region.configIpPattern}"
+						   		 direction="${region.configDirection}"
+						   		 protocol="${region.configProtocol}"
+						   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
+								            <div class="col-md-6">
+								            	<select name="groupId" class="selectpicker show-tick form-control required">
+								            		<option value="" ><spring:message code="select"/></option>
+					               					<c:forEach items="${policyGroups }" var="policyGroup">
+														<option value="${policyGroup.groupId}" <c:if test="${_cfg.groupId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+							              			</c:forEach>
+								                </select>
+								            </div>
+								             <div for="groupId"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6 hidden">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="action"/></label>
+								            <div class="col-md-6">
+								            	<c:forEach items="${serviceList}" var="service"
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					regionCode="${service.regionCode }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
+								            </div>
+								            <div for="action"></div>
+								       </div>
+								   </div>
+								</div>
+							<!-- desc and action -->
+                           <%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> --%>
+                           <div class="row ipInfo">
+								<div class="row ip">
+									<div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
+								            <div class="col-md-6">
+								            	 <select name="ipType" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+														<option value="${ipTypeC.itemCode}" 
+																<c:if test="${_cfg.ipType==ipTypeC.itemCode 
+																	|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
+																	selected
+																</c:if>
+																>
+														<spring:message code="${ipTypeC.itemValue}"/>
+														</option>
+							               			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="ipType"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ip" type="text" name="ipAddress" value="${_cfg.ipAddress}">
+								            </div>
+								            <div for="ipAddress"></div>
+								        </div>
+								    </div>
+								</div>
+							</div>
+							<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+													<br>
+                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/list.jsp
@@ -0,0 +1,432 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.ipAddress}"){
+			$("#intype").val("${cfg.ipAddress}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#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",'');
+			$("#description").attr("value",'');
+			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+ 		});
+		
+
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+					 if($("#intype").val() != null && $("#intype").val() != ""){
+						$("#exportValue").val($("#intype").val());
+				  } 
+				}
+ 	});
+ 	var edit=function(url){
+ 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
+ 		if(cked.val()==1){
+ 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 		if(cked.length==1){
+ 			window.location = url+"&compileId="+cked.attr("id");
+ 		}else{
+ 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 	}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+			<shiro:hasPermission name="proxy:spoofing:pool:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/proxy/spoofing/pool/form?functionId=${cfg.functionId}'">
+				<i class="fa fa-plus"></i>
+				<spring:message code="add"></spring:message></button>
+				<c:set var="serviceImport" value="false"></c:set>
+				<c:set var="regionImport" value="false"></c:set>
+				
+			</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+	<spring:message code="spoofing_ip_pool"></spring:message>
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/spoofing/pool/list?functionId=${cfg.functionId}" method="post" class="form-search">
+							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
+							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
+						callback="page();" />
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="all_states"/></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<%-- <form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option> --%>
+									</form:select>
+								</div>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
+												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="ipAddress"><spring:message code="IP"></spring:message></form:option>
+												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
+												<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+	                                  		 <%-- <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${serviceList}" var="service">
+														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach>
+											 </form:select> --%>
+											 <form:select path="isValid" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<form:option value="1"><spring:message code="yes"/></form:option>
+													<form:option value="0"><spring:message code="no"/></form:option>
+											 </form:select>
+										 </div>
+                                  
+                                    </div> 
+								</div>
+								<div class="pull-left">
+									 <button type="button" class="btn blue" onClick="return page()"> <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>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+							 		<shiro:hasPermission name="proxy:spoofing:pool:config">
+							 			<sys:delRow url="${ctx}/proxy/spoofing/pool/form" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/proxy/spoofing/pool/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+							 		<shiro:hasPermission name="proxy:spoofing:pool:confirm">
+	                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/proxy/spoofing/pool/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/proxy/spoofing/pool/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/proxy/spoofing/pool/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+				                            </ul>
+				                         </div>
+                                    </shiro:hasPermission>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                 </div>
+							</div>
+							<!-- /搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='letter'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='classification'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+								</div>
+								
+							
+							</div> 
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<sys:message content="${message}" type="${messageType }"/>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<%-- <th><spring:message code="seq"/></th> --%>
+									 <th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
+									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
+									<th><spring:message code="group"/></th>
+									<th><spring:message code="ip_type"/></th>
+									<th><spring:message code="IP"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="classification"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
+									<%-- <th><spring:message code="operation"></spring:message></th> --%>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
+									<tr>
+									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
+									<td>${cfg.cfgDesc }</td>
+									
+									<td>${cfg.groupName }
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${cfg.ipAddress }</td>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
+									<td>${cfg.requestName }</td>
+									<td >
+										<c:set var="classify"></c:set>
+										<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
+											<c:forEach items="${fls}" var="fl">
+												<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="classify" value="${fl.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<a href="javascript:;" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>
+									</td>
+									<td>
+										<c:set var="attribute"></c:set>
+										<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
+											<c:forEach items="${xzs}" var="xz">
+												<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="attribute" value="${xz.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<a href="javascript:;" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>
+									</td>
+									<td>
+										<c:set var="lableInfo"></c:set>
+										<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
+											<c:forEach items="${lables}" var="lable">
+												<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+												<c:if test="${status.index+1 eq 1}">
+													<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+												</c:if>
+												<c:if test="${status.index+1 ne 1}">
+													<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+												</c:if>
+												</c:if>
+											</c:forEach>
+										</c:forEach>
+										<a href="javascript:;" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
+									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+					</div>
+				</div>
+			</div>
+</div>
+<c:set var="importPath" value="/proxy/spoofing/pool/list?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -24,6 +24,7 @@
 					<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
 					<sys:message content="${message}" type="${messageType }"/>
 					<input type="hidden"  name="id" value="${requestInfo.id}"/>
+					<input type="hidden"  name="functionId" value="${requestInfo.functionId}"/>
 						<div class="form-body">
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -12,7 +12,7 @@
 	<shiro:hasPermission name="cfg:requestInfo:config">
 		<div class="theme-panel hidden-xs hidden-sm">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/request/form'">
+			onClick="javascript:window.location='${ctx}/cfg/request/form?functionId=${requestInfo.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 		</div>
@@ -31,7 +31,7 @@
 						<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="form-search">
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-							
+							<input id="functionId" name="functionId" type="hidden" value="${requestInfo.functionId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${requestInfo.isFilterAction }"/>
 							
@@ -72,9 +72,10 @@

 									<div class="pull-right">
 									<shiro:hasPermission name="cfg:requestInfo:config">
-                                        <button type="button" class="btn btn-default" onClick="edit()">
+                                        <button type="button" class="btn btn-default" onClick="edit(${requestInfo.functionId})">
                                            <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
-                                            <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
+                                            <sys:delRow url="${ctx}/cfg/request/delete?functionId=${requestInfo.functionId}" id="contentTable" label="delete"></sys:delRow>
+                                            <sys:delRow url="${ctx}/cfg/request/exportRequestInfo?functionId=${requestInfo.functionId}"  searchUrl="${ctx}/cfg/request/list?functionId=${requestInfo.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                      <!--   <button type="button" class="btn btn-default">
                                            <i class="fa fa-download"></i> 导出</button> -->
                        			</shiro:hasPermission>
@@ -85,9 +86,9 @@
 	                                                <i class="fa fa-angle-down"></i>
 	                                            </button>
 	                                            <ul class="dropdown-menu pull-right">
-	                                                <li><sys:delRow url="${ctx}/cfg/request/requestExamine" id="contentTable" label="approved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
+	                                                <li><sys:delRow url="${ctx}/cfg/request/requestExamine?functionId=${requestInfo.functionId}" id="contentTable" label="approved"></sys:delRow></li>
+													<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo?functionId=${requestInfo.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
+													<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine?functionId=${requestInfo.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
 	                                            </ul>
 	                                        </div>
                        			</shiro:hasPermission>
@@ -173,11 +174,11 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th><spring:message code="Id"></spring:message></th>
-									<th><spring:message code="request_number"></spring:message></th>
+									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="request_organization"></spring:message></th>
 									<th><spring:message code="request_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
-									<th><spring:message code="title"></spring:message></th>
+									<th><spring:message code="request_number"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
 									<th><spring:message code="special_task"></spring:message></th>
 									<th><spring:message code="creator"/></th>
@@ -194,7 +195,7 @@
 								<tr>
 									<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
 									<td>${requestInfo.id }</td>
-									<td>${requestInfo.requestTitle }</td><!--requestTitle当成来函函号使用 -->
+									<td>${requestInfo.requestNumber }</td><!--requestTitle当成来函函号使用 -->
 									<td>${requestInfo.requestOrg }</td>
 									<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
 									<td>
@@ -205,7 +206,7 @@
 											<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td>${requestInfo.requestNumber }</td><!--requestTitle当成来函标题使用 -->
+									<td>${requestInfo.requestTitle}</td><!--requestTitle当成来函标题使用 -->
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
 									<td>${requestInfo.creatorName }</td>
@@ -294,7 +295,7 @@
 		return false;
 	}
 	//编辑
-	function edit(){
+	function edit(functionId){
 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
 		if(cked.val()==1){
 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
@@ -305,7 +306,7 @@
 			return;
 		}
 		if(cked.length==1){
-			window.location = "${ctx}/cfg/request/form?id="+cked.attr("id");
+			window.location = "${ctx}/cfg/request/form?functionId="+functionId+"&id="+cked.attr("id");
 		}else{
 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
 			return;
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -81,6 +81,7 @@
 		areaUnique:"Area already exists.",
 		config_sync_tip:"The system is being maintained and temporarily inaccessible.",
 		ipMaskSole:"IP already exists.",
-		noStrategyCheck:"No effective spoofing IP configuration"
+		noStrategyCheck:"No effective spoofing IP configuration",
+		keywordLength:"Please enter a value between 4 and 1024 characters long."
 	});
 }(jQuery));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -81,6 +81,7 @@
 		areaUnique:"Регион уже существует.",
 		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
 		ipMaskSole:"IP уже существует.",
-		noStrategyCheck:"No effective spoofing IP configuration"
+		noStrategyCheck:"No effective spoofing IP configuration",
+		keywordLength:"Введите между 4 и 1024 символов длинной."
 	});
 }(jQuery));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -81,6 +81,7 @@
 		areaUnique:"该区域已存在",
 		config_sync_tip:"系统正在维护中，暂时不可访问！",
 		ipMaskSole:"IP已存在",
-		noStrategyCheck:"策略组下无有效的欺骗IP配置"
+		noStrategyCheck:"策略组下无有效的欺骗IP配置",
+		keywordLength:"请输入一个长度介于4 和1024 之间的字符串"
 	});
 }(jQuery));