新增访问阻断页面菜单;完善劫持、策略、注入脚本、镜像文件菜单相关功能

src/main/java/com/nis/domain/callback/ProxyFileHijackCfgAudit.java

@@ -28,6 +28,15 @@ public class ProxyFileHijackCfgAudit {
 	private String path;
 	@Expose
 	private String contentName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
 	
 	public String getContentName() {
 		return contentName;

src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfgAudit.java

@@ -25,6 +25,16 @@ public class ProxyFileInsertScriptCfgAudit {
 	private String format;
 	@Expose
 	private String path;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	
 	public Long getId() {
 		return id;
 	}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java

@@ -0,0 +1,63 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+/**
+ * http代理文件策略
+ * @author nanfang
+ * 
+ */
+public class ProxyFileResponsePageCfg extends BaseCfg<ProxyFileResponsePageCfg> {
+	
+	private static final long serialVersionUID = -1989406217948847813L;
+	public final static String TABLE_NAME = "pxy_profile_response_pages";//对应表名
+	private String indexTable = "pxy_profile_response_pages";
+	private String fileDesc;//文件描述
+	private String url;//文件保存的url
+	private String contentType;//内容类型，如text/html，取字典表contentType
+	private String md5;//文件md5值
+	private Long contentLength;//文件长度
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+
+	public ProxyFileResponsePageCfg() {
+		super();
+	}
+	
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getMd5() {
+		return md5;
+	}
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileResponsePageCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String format;
+	@Expose
+	private Long contentLength;
+	@Expose
+	private String path;
+	@Expose
+	private Long profileId;
+	@Expose
+	private String profileName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+	public Long getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Long profileId) {
+		this.profileId = profileId;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileStrategyCfgAudit.java

@@ -27,6 +27,15 @@ public class ProxyFileStrategyCfgAudit {
 	private Long fileId;
 	@Expose
 	private String fileDesc;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
 	public Long getId() {
 		return id;
 	}

src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java

@@ -26,6 +26,15 @@ public class ProxyFileTrafficMirrorCfgAudit {
 	private List<String> addrList;
 	@Expose
 	private String addrType;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
 	public Long getId() {
 		return id;
 	}

src/main/java/com/nis/web/controller/BaseController.java

@@ -52,6 +52,7 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.callback.ProxyFileHijackCfg;
 import com.nis.domain.callback.ProxyFileInsertScriptCfg;
+import com.nis.domain.callback.ProxyFileResponsePageCfg;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
 import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
 import com.nis.domain.configuration.AppComplexFeatureCfg;
@@ -194,6 +195,7 @@ import com.nis.web.service.configuration.ManipulatPolicyService;
 import com.nis.web.service.configuration.NumCfgService;
 import com.nis.web.service.configuration.ProxyFileHijackService;
 import com.nis.web.service.configuration.ProxyFileInsertScriptService;
+import com.nis.web.service.configuration.ProxyFileResponsePageService;
 import com.nis.web.service.configuration.ProxyFileStrategyService;
 import com.nis.web.service.configuration.ProxyFileTrafficMirrorService;
 import com.nis.web.service.configuration.PxyObjKeyringService;
@@ -315,6 +317,8 @@ public class BaseController {
 	@Autowired
 	protected ProxyFileInsertScriptService proxyFileInsertScriptService;//注入脚本文件service
 	@Autowired
+	protected ProxyFileResponsePageService proxyFileResponsePageService;//阻断访问页面
+	@Autowired
 	protected ProxyFileTrafficMirrorService proxyFileTrafficMirrorService;//注入流量镜像文件ervice
 	@Autowired
 	protected AppBuiltInFeatureService appBuiltInFeatureService;// 拦截策略service
@@ -2803,6 +2807,7 @@ public class BaseController {
 		ProxyFileInsertScriptCfg searFileInsertScriptCfg = new ProxyFileInsertScriptCfg();
 		ProxyFileTrafficMirrorCfg searFileTrafficMirrorCfg = new ProxyFileTrafficMirrorCfg();
 		ProxyFileStrategyCfg searFileStrategyCfg = new ProxyFileStrategyCfg();
+		ProxyFileResponsePageCfg searFileResponsePageCfg = new ProxyFileResponsePageCfg();
 		if(entity != null  && (entity instanceof CfgIndexInfo)) {
 			BeanUtils.copyProperties(entity, auditBatchCfg);
 			BeanUtils.copyProperties(entity, searchCfg);
@@ -2891,6 +2896,9 @@ public class BaseController {
 		}if(entity != null && (entity instanceof ProxyFileStrategyCfg)){
 			BeanUtils.copyProperties(entity, auditBatchCfg);
 			BeanUtils.copyProperties(entity, searFileStrategyCfg);
+		}if(entity != null && (entity instanceof ProxyFileResponsePageCfg)){
+			BeanUtils.copyProperties(entity, auditBatchCfg);
+			BeanUtils.copyProperties(entity, searFileResponsePageCfg);
 		}
 		
 		
@@ -2972,6 +2980,8 @@ public class BaseController {
 			searFileTrafficMirrorCfg.setTableName(tableNameXml);
 			searFileStrategyCfg.setServiceId(Integer.valueOf(serviceIdXml));
 			searFileStrategyCfg.setTableName(tableNameXml);
+			searFileResponsePageCfg.setServiceId(Integer.valueOf(serviceIdXml));
+			searFileResponsePageCfg.setTableName(tableNameXml);
 			
 			if("1".equals(serviceTypeXml)){//maat类配置
 				// 存放域配置类型 及 对应表名
@@ -3371,7 +3381,8 @@ public class BaseController {
 												, searFileHijackCfg
 												, searFileInsertScriptCfg
 												, searFileTrafficMirrorCfg
-												, searFileStrategyCfg);
+												, searFileStrategyCfg
+												, searFileResponsePageCfg);
 				}
 			}
 		}
@@ -3455,6 +3466,7 @@ public class BaseController {
 		ProxyFileInsertScriptCfg searchFileInsertScriptCfg = new ProxyFileInsertScriptCfg();
 		ProxyFileTrafficMirrorCfg searchFileTrafficMirrorCfg = new ProxyFileTrafficMirrorCfg();
 		ProxyFileStrategyCfg searchFileStrategyCfg = new ProxyFileStrategyCfg();
+		ProxyFileResponsePageCfg searchFileResponsePageCfg = new ProxyFileResponsePageCfg();
 		
 		// 传递检索条件
 		if(entity != null  && (entity instanceof CfgIndexInfo)) {
@@ -3537,6 +3549,9 @@ public class BaseController {
 		}if(entity != null  && (entity instanceof ProxyFileStrategyCfg)){
 			BeanUtils.copyProperties(entity, searchFileStrategyCfg);
 			searchFileStrategyCfg.setFunctionId(functionId);
+		}if(entity != null  && (entity instanceof ProxyFileResponsePageCfg)){
+			BeanUtils.copyProperties(entity, searchFileResponsePageCfg);
+			searchFileResponsePageCfg.setFunctionId(functionId);
 		}
 		
 		BaseCfg batchCfg = new BaseCfg();
@@ -3812,6 +3827,19 @@ public class BaseController {
 						}
 					}
 					
+				}else if("pxy_profile_response_pages".equals(tableNameXml)) {
+					boolean hasData = true;
+					while(hasData){
+						page.setPageNo(1);
+						page.setLastPage(false);
+						List list = proxyFileResponsePageService.findPage(page,searchFileResponsePageCfg).getList();						
+						if(!StringUtil.isEmpty(list)){	
+							hasData = commonPolicyService.batchDeleteMaatData(cfgList, page, batchCfg, list, hasData);
+						}else{
+							hasData = false;
+						}
+					}
+					
 				}else {
 					boolean hasData = true;
 					while(hasData){
@@ -3952,7 +3980,8 @@ public class BaseController {
 								,ProxyFileHijackCfg searFileHijackCfg
 								,ProxyFileInsertScriptCfg searFileInsertScriptCfg
 								,ProxyFileTrafficMirrorCfg searFileTrafficMirrorCfg
-								,ProxyFileStrategyCfg searFileStrategyCfg) {	
+								,ProxyFileStrategyCfg searFileStrategyCfg
+								,ProxyFileResponsePageCfg searFileResponsePageCfg) {	
 		ToMaatBean maatBean;		
 		MaatCfg maatCfg;
 		List<MaatCfg> configCompileList;
@@ -4079,6 +4108,25 @@ public class BaseController {
 						notAuditList.add(cfg);
 					}
 				}			
+			}else if(className.equals("ProxyFileResponsePageCfg")){
+				list = proxyFileResponsePageService.findPage(page, searFileResponsePageCfg).getList();
+				for(int i=0;i<list.size();i++){
+					ProxyFileResponsePageCfg cfg = (ProxyFileResponsePageCfg) list.get(i);
+					ids.add(cfg.getCompileId());
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						auditList.add(cfg);
+					}else {						
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						notAuditList.add(cfg);
+					}
+				}			
 			}else if(className.equals("ProxyFileHijackCfg")){
 				list = proxyFileHijackService.findPage(page, searFileHijackCfg).getList();
 				for(int i=0;i<list.size();i++){

src/main/java/com/nis/web/controller/configuration/proxy/FileResponsePageController.java

@@ -0,0 +1,222 @@
+/**
+ *@Title: ControlController.java
+ *@Package com.nis.web.controller.configuration.proxy 
+ *@Description TODO
+ *@author dell
+ *@date 2018年6月22日 下午4:35:42
+ *@version  版本号
+ */
+package com.nis.web.controller.configuration.proxy;
+
+import java.io.File;
+import java.util.Date;
+import java.util.Map;
+
+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.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.callback.ProxyFileResponsePageCfg;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.ToMaatResult.ResponseData;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
+import com.nis.util.StringUtil;
+import com.nis.web.controller.configuration.CommonController;
+
+/**
+ * @ClassName: ControlController.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年6月22日 下午4:35:42
+ * @version V1.0
+ */
+@Controller
+@RequestMapping("${adminPath}/proxy/fileResponsePage")
+public class FileResponsePageController extends CommonController {
+	
+	@RequestMapping(value = {"list"})
+	public String fileResponsePageList(ProxyFileResponsePageCfg cfg,Model model,HttpServletRequest request,HttpServletResponse response) {
+		Page<ProxyFileResponsePageCfg> page = proxyFileResponsePageService.findPage(new Page<ProxyFileResponsePageCfg>(request, response,"a"), cfg);
+		model.addAttribute("page", page);
+		model.addAttribute("cfg", cfg);
+		initPageCondition(model);
+		return "/cfg/proxy/fileResponsePage/list";
+	}
+
+	@RequestMapping(value = {"form"})
+	@RequiresPermissions(value={"proxy:fileResponsePage:config"})
+	public String fileform(Model model,HttpServletRequest request
+			,HttpServletResponse response
+			,@ModelAttribute("cfg")ProxyFileResponsePageCfg cfg
+			,String ids
+			,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			cfg = proxyFileResponsePageService.getCfgById(Long.valueOf(ids));
+		}
+//		initFormCondition(model);
+		initFormCondition(model, cfg);
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/proxy/fileResponsePage/form";
+	}
+
+	/**
+	 * 保存 文件
+	 * 1、将文件上传到 service 接口
+	 * 2、将文件信息及 1返回的结果 保存到数据库
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @param cfgFile
+	 * @param cfg
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions(value={"proxy:fileResponsePage:config"})
+	@RequestMapping(value = {"saveOrUpdate"})
+	public String saveOrUpdate(Model model,HttpServletRequest request
+			,HttpServletResponse response,MultipartFile cfgFile,
+			@ModelAttribute("cfg")ProxyFileResponsePageCfg cfg,
+			RedirectAttributes redirectAttributes){
+		File file = null;
+		try{
+			if(cfgFile != null) {
+				String filename = cfgFile.getOriginalFilename();
+				String prefix = FileUtils.getPrefix(filename, false);
+				String suffix = FileUtils.getSuffix(filename, false);
+				file = File.createTempFile("file_"+ prefix, suffix);
+				cfgFile.transferTo(file);//复制文件
+				String md5 = FileUtils.getFileMD5(file);
+				Map<String,Object> srcMap = Maps.newHashMap();
+				srcMap.put("filetype", suffix);
+				srcMap.put("datatype", "dbSystem");//源文件存入数据中心
+				srcMap.put("createTime",new Date());
+				srcMap.put("key",prefix);
+				srcMap.put("fileName", filename);
+				srcMap.put("checksum", md5);
+				ToMaatResult result = ConfigServiceUtil.postFileCfg(null, file, JsonMapper.toJsonString(srcMap));
+				logger.info("http 重定向阻断文件上传响应信息："+JsonMapper.toJsonString(result));
+				String srcAccessUrl = null;
+				if(!StringUtil.isEmpty(result)){
+					ResponseData data = result.getData();
+					srcAccessUrl=data.getAccessUrl();
+					cfg.setUrl(srcAccessUrl);;
+				}
+				cfg.setMd5(md5);//文件md5值
+				cfg.setContentLength(file.length());//文件长度
+ 			}
+			proxyFileResponsePageService.saveOrUpdate(cfg);
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}	
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			if(e instanceof MaatConvertException) {
+				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
+			}else {
+				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
+			}
+		}finally {
+			if(file != null) {
+				file.delete();//删除临时文件
+			}
+		}
+		
+		return "redirect:" + adminPath +"/proxy/fileResponsePage/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"delete"})
+	@RequiresPermissions(value={"proxy:fileResponsePage:config"})	
+	public String delete(Integer isAudit, Integer isValid, String ids, Integer functionId, Model model,  @ModelAttribute("cfg")ProxyFileResponsePageCfg cfg,
+			HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes){
+		try {
+			if (!StringUtil.isEmpty(ids)) {
+				proxyFileResponsePageService.update(isAudit, isValid, ids, functionId);
+				addMessage(redirectAttributes, "success", "delete_success");
+			}else {
+				// 批量删除
+				Page<ProxyFileResponsePageCfg> searchPage = new Page<ProxyFileResponsePageCfg>(request, response, "a");
+				deleteAll(searchPage, functionId, cfg);
+			}
+		} catch (Exception e) {
+			logger.error("配置删除失败：", e);
+			if (e instanceof MaatConvertException) {
+				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
+			} else {
+				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
+			}
+
+		}
+		return "redirect:" + adminPath +"/proxy/fileResponsePage/list?functionId="+functionId;
+	}
+	
+	
+	@RequestMapping(value = {"audit"})
+	@RequiresPermissions(value={"proxy:fileResponsePage:confirm"})
+	public String audit(Model model, @ModelAttribute("cfg") ProxyFileResponsePageCfg cfg, Integer isValid, Integer isAudit,
+			String ids, Integer functionId, RedirectAttributes redirectAttributes, HttpServletResponse response,
+			HttpServletRequest request) {
+		if (!StringUtil.isEmpty(ids)) {
+			String[] idArray = ids.split(",");
+			for (String id : idArray) {
+				try {
+					proxyFileResponsePageService.audit(isAudit, isValid, functionId, id);
+					addMessage(redirectAttributes, "success", "audit_success");
+				} catch (MaatConvertException e) {
+					logger.error(e);
+					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
+				} catch (Exception e) {
+					logger.error(e);
+					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
+				}
+			}
+
+		} else {
+			Page<ProxyFileResponsePageCfg> searchPage = new Page<ProxyFileResponsePageCfg>(request, response, "a");
+			Page<ProxyFileResponsePageCfg> auditPage = new Page<ProxyFileResponsePageCfg>(request, response, "a");
+
+			try {
+				BeanUtils.copyProperties(searchPage, auditPage);
+				auditAll(auditPage, isValid, cfg);
+				addMessage(redirectAttributes, "success", "audit_success");
+			} catch (Exception e) {
+				logger.error("配置下发失败：", e);
+				if (e instanceof MaatConvertException) {
+					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
+				} else {
+					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
+				}
+
+			}
+
+			return fileResponsePageList(cfg, model, request, response);
+		}
+		return "redirect:" + adminPath +"/proxy/fileResponsePage/list?functionId="+functionId;
+	}
+}

src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml

@@ -117,6 +117,25 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
+    			<foreach collection="compileIdNew.split('-')" index="index" item="item" >
+    				<if test="index == 0">
+    					AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
+    				</if>
+					<if test="index == 1">
+    					AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
+    				</if>
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
+	    		AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml

@@ -117,6 +117,25 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
+    			<foreach collection="compileIdNew.split('-')" index="index" item="item" >
+    				<if test="index == 0">
+    					AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
+    				</if>
+					<if test="index == 1">
+    					AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
+    				</if>
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
+	    		AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.java

@@ -0,0 +1,25 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.callback.ProxyFileResponsePageCfg;
+import com.nis.web.dao.MyBatisDao;
+
+
+/**
+ * 特定协议相关配置数据处理类
+ * @author dell
+ *
+ */
+@MyBatisDao
+public interface ProxyFileResponsePageDao {
+	
+	public List<ProxyFileResponsePageCfg> findPage(ProxyFileResponsePageCfg entity) ;
+	public ProxyFileResponsePageCfg getCfgById(@Param("cfgId")Long cfgId);
+	public void insert(ProxyFileResponsePageCfg entity);
+	public void update(ProxyFileResponsePageCfg entity);
+	
+	
+}

src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml

@@ -0,0 +1,334 @@
+<?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.ProxyFileResponsePageDao" >
+ 
+<resultMap id="ProxyFileResponsePageCfg" type="com.nis.domain.callback.ProxyFileResponsePageCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    
+    <result column="file_desc" property="fileDesc" jdbcType="VARCHAR" />
+    <result column="url" property="url" jdbcType="VARCHAR" />
+    <result column="content_type" property="contentType" jdbcType="VARCHAR" />
+    <result column="content_length" property="contentLength" jdbcType="VARCHAR" />
+    <result column="md5" property="md5" jdbcType="VARCHAR" />
+    
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="level" property="level" 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="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="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+    <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
+    <result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
+    <result column="editor_name" property="editorName" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <sql id="ProxyFileResponsePageCfgColumn" >
+    a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
+    a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
+    a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,
+    a.FILE_DESC,a.URL,a.CONTENT_TYPE,a.CONTENT_LENGTH,a.MD5
+  </sql>
+  
+  
+  <!-- voip条件查询列表信息 -->
+  <select id="findPage" resultMap="ProxyFileResponsePageCfg" parameterType="com.nis.domain.callback.ProxyFileResponsePageCfg" >
+		SELECT 
+	    <include refid="ProxyFileResponsePageCfgColumn" />
+	    <trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName
+		</trim>
+	    FROM pxy_profile_response_pages a
+	    left join sys_user s on a.creator_id=s.id
+		left join sys_user e on a.editor_id=e.id
+		left join sys_user u on a.auditor_id=u.id
+		left join request_info ri on a.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 a.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.ACTION=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+			    	</if>
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND a.CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND a.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND a.AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND a.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileId != null">
+	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
+    			<foreach collection="compileIdNew.split('-')" index="index" item="item" >
+    				<if test="index == 0">
+    					AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
+    				</if>
+					<if test="index == 1">
+    					AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
+    				</if>
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
+	    		AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND a.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND a.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND a.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+	    		AND a.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="fileDesc != null and fileDesc != ''">
+	    		AND a.file_desc like concat(concat('%',#{fileDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc
+			</when>
+			<otherwise>
+				ORDER BY a.is_audit,a.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+  
+  <!-- 根据Id获取ProxyFileResponsePageCfg信息 -->
+  <select id="getCfgById" resultMap="ProxyFileResponsePageCfg">
+		 SELECT 
+	     <include refid="ProxyFileResponsePageCfgColumn" />
+	    FROM pxy_profile_response_pages a
+	    <where>
+  			<if test="cfgId != null">
+  				and a.CFG_ID=#{cfgId,jdbcType=INTEGER}
+	   		</if>
+  		</where>
+  </select>
+  
+  <insert id="insert" parameterType="com.nis.domain.callback.ProxyFileResponsePageCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into pxy_profile_response_pages (
+		CFG_DESC,
+		ACTION,
+		IS_VALID,
+		IS_AUDIT,
+		CREATOR_ID,
+		CREATE_TIME,
+		EDITOR_ID,
+		EDIT_TIME,
+		AUDITOR_ID,
+		AUDIT_TIME,
+		SERVICE_ID,
+		REQUEST_ID,
+		COMPILE_ID,
+		IS_AREA_EFFECTIVE,
+		CLASSIFY,
+		ATTRIBUTE,
+		LABLE,
+		AREA_EFFECTIVE_IDS,
+		function_id,
+		cfg_type,
+		cfg_region_code,
+
+		file_desc,
+		url,
+		content_type,
+		content_length,
+		md5
+    )values (
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	#{isValid,jdbcType=INTEGER},
+    	#{isAudit,jdbcType=INTEGER},
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{compileId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{cfgType,jdbcType=VARCHAR},
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	
+    	#{fileDesc,jdbcType=VARCHAR},
+    	#{url,jdbcType=VARCHAR},
+    	#{contentType,jdbcType=VARCHAR},
+    	#{contentLength,jdbcType=INTEGER},
+    	#{md5,jdbcType=VARCHAR}
+    )
+  </insert>
+  
+  
+  <update id="update" parameterType="com.nis.domain.callback.ProxyFileResponsePageCfg" >
+    update pxy_profile_response_pages
+    <set>
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,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="creatorId != null" >
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null and createTime != ''" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      <if test="auditorId != null" >
+         auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null and auditTime != ''" >
+        audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="serviceId != null" >
+        service_id = #{serviceId,jdbcType=INTEGER},
+      </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="cfgRegionCode != null" >
+        cfg_region_code =  #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+      <if test="cfgType != null" >
+        cfg_type =  #{cfgType,jdbcType=VARCHAR},
+      </if>
+
+      <if test="fileDesc != null" >
+        file_desc  =  #{fileDesc ,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null" >
+        url  =  #{url ,jdbcType=VARCHAR},
+      </if>
+      <if test="contentType != null" >
+        content_type = #{contentType ,jdbcType=VARCHAR},
+      </if>
+      <if test="contentLength != null" >
+        content_length =  #{contentLength ,jdbcType=BIGINT},
+      </if>
+      <if test="md5 != null" >
+        md5 =  #{md5 ,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where cfg_id = #{cfgId,jdbcType=BIGINT}
+  </update>
+  
+  
+  
+</mapper>

src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml

@@ -119,6 +119,25 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
+    			<foreach collection="compileIdNew.split('-')" index="index" item="item" >
+    				<if test="index == 0">
+    					AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
+    				</if>
+					<if test="index == 1">
+    					AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
+    				</if>
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
+	    		AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml

@@ -116,6 +116,25 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
+    			<foreach collection="compileIdNew.split('-')" index="index" item="item" >
+    				<if test="index == 0">
+    					AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
+    				</if>
+					<if test="index == 1">
+    					AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
+    				</if>
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
+	    	<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
+	    		AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/service/BaseService.java

@@ -58,6 +58,8 @@ import com.nis.domain.callback.ProxyFileHijackCfg;
 import com.nis.domain.callback.ProxyFileHijackCfgAudit;
 import com.nis.domain.callback.ProxyFileInsertScriptCfg;
 import com.nis.domain.callback.ProxyFileInsertScriptCfgAudit;
+import com.nis.domain.callback.ProxyFileResponsePageCfg;
+import com.nis.domain.callback.ProxyFileResponsePageCfgAudit;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
 import com.nis.domain.callback.ProxyFileStrategyCfgAudit;
 import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
@@ -3198,6 +3200,7 @@ public abstract class BaseService {
 		hijackTemp.setService(cfg.getServiceId());
 		hijackTemp.setIsValid(cfg.getIsValid());
 		hijackTemp.setOpTime(cfg.getAuditTime());
+		hijackTemp.setOpUser(UserUtils.getUser().getId());
 		return hijackTemp;
 	}
 	//注入脚本文件
@@ -3213,6 +3216,7 @@ public abstract class BaseService {
 		fileInsertScriptTemp.setService(cfg.getServiceId());
 		fileInsertScriptTemp.setIsValid(cfg.getIsValid());
 		fileInsertScriptTemp.setOpTime(cfg.getAuditTime());
+		fileInsertScriptTemp.setOpUser(UserUtils.getUser().getId());
 		return fileInsertScriptTemp;
 	}
 	//流量转发目的地址
@@ -3228,6 +3232,7 @@ public abstract class BaseService {
 		fileTemp.setService(cfg.getServiceId());
 		fileTemp.setIsValid(cfg.getIsValid());
 		fileTemp.setOpTime(cfg.getAuditTime());
+		fileTemp.setOpUser(UserUtils.getUser().getId());
 		return fileTemp;
 	}
 	//文件策略
@@ -3244,6 +3249,24 @@ public abstract class BaseService {
 		fileTemp.setFilePath(cfg.getUrl());
 		fileTemp.setIsValid(cfg.getIsValid());
 		fileTemp.setOpTime(cfg.getAuditTime());
+		fileTemp.setOpUser(UserUtils.getUser().getId());
+		return fileTemp;
+	}
+	//访问阻断页面
+	public static ProxyFileResponsePageCfgAudit convertCallBackProxyFileResponsePage(ProxyFileResponsePageCfg cfg) {
+		ProxyFileResponsePageCfgAudit fileTemp = new ProxyFileResponsePageCfgAudit();
+		fileTemp.setId(Long.valueOf(cfg.getCompileId()));
+		fileTemp.setCfgId(cfg.getCompileId());
+		fileTemp.setProfileId((Long.valueOf(cfg.getCompileId())));
+		fileTemp.setProfileName(keywordsEscape(cfg.getFileDesc()));		
+		fileTemp.setFormat(cfg.getContentType());
+		fileTemp.setContentLength(cfg.getContentLength());
+		fileTemp.setAction(cfg.getAction());
+		fileTemp.setService(cfg.getServiceId());
+		fileTemp.setPath(cfg.getUrl());
+		fileTemp.setIsValid(cfg.getIsValid());
+		fileTemp.setOpTime(cfg.getAuditTime());
+		fileTemp.setOpUser(UserUtils.getUser().getId());
 		return fileTemp;
 	}
 	

src/main/java/com/nis/web/service/configuration/CommonPolicyService.java

@@ -17,6 +17,8 @@ import com.nis.domain.callback.ProxyFileHijackCfg;
 import com.nis.domain.callback.ProxyFileHijackCfgAudit;
 import com.nis.domain.callback.ProxyFileInsertScriptCfg;
 import com.nis.domain.callback.ProxyFileInsertScriptCfgAudit;
+import com.nis.domain.callback.ProxyFileResponsePageCfg;
+import com.nis.domain.callback.ProxyFileResponsePageCfgAudit;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
 import com.nis.domain.callback.ProxyFileStrategyCfgAudit;
 import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
@@ -405,12 +407,21 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 				if(convertList.size() > 0) {
 					notAuditList = convertList;
 				}
+			}else if(entity.getServiceId().equals(646)) { // 访问阻断页面
+				List<ProxyFileResponsePageCfgAudit> convertList = Lists.newArrayList();
+				for (Object object : notAuditList) {
+					ProxyFileResponsePageCfg cfg = (ProxyFileResponsePageCfg)object;
+					convertList.add(BaseService.convertCallBackProxyFileResponsePage(cfg));
+				}
+				if(convertList.size() > 0) {
+					notAuditList = convertList;
+				}
 			}
 			// 格式转换 -->
 			
 			//调用服务接口下发配置数据
 			String json=gsonToJson(notAuditList);
-			//logger.warn("批量下发配置参数："+json);
+			logger.debug("批量下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
 			logger.warn("批量下发响应信息："+result.getMsg());
@@ -496,19 +507,28 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 				}
 			}else if(entity.getServiceId().equals(608)) { // 文件策略
 				List<ProxyFileStrategyCfgAudit> convertList = Lists.newArrayList();
-				for (Object object : notAuditList) {
+				for (Object object : auditList) {
 					ProxyFileStrategyCfg cfg = (ProxyFileStrategyCfg)object;
 					convertList.add(BaseService.convertCallBackProxyFileStrategy(cfg));
 				}
 				if(convertList.size() > 0) {
-					notAuditList = convertList;
+					auditList = convertList;
+				}
+			}else if(entity.getServiceId().equals(646)) { // 访问阻断页面
+				List<ProxyFileResponsePageCfgAudit> convertList = Lists.newArrayList();
+				for (Object object : auditList) {
+					ProxyFileResponsePageCfg cfg = (ProxyFileResponsePageCfg)object;
+					convertList.add(BaseService.convertCallBackProxyFileResponsePage(cfg));
+				}
+				if(convertList.size() > 0) {
+					auditList = convertList;
 				}
 			}
 			// 格式转换 -->
 			
 			//调用服务接口取消配置
 			String json=gsonToJson(auditList);
-			//logger.warn("批量下发配置参数："+json);
+			logger.debug("批量下发配置参数："+json);
 			if(!StringUtil.isEmpty(auditList)) {
 				logger.warn("批量配置取消个数："+auditList.size());
 			}

src/main/java/com/nis/web/service/configuration/ProxyFileResponsePageService.java

@@ -0,0 +1,135 @@
+package com.nis.web.service.configuration;
+
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.beust.jcommander.internal.Lists;
+import com.nis.domain.Page;
+import com.nis.domain.callback.ProxyFileResponsePageCfg;
+import com.nis.domain.callback.ProxyFileResponsePageCfgAudit;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.ProxyFileResponsePageDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+
+@Service
+public class ProxyFileResponsePageService extends BaseService{
+	@Autowired
+	protected ProxyFileResponsePageDao proxyFileDao;
+	
+	
+	/**
+	 * 分页查询
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	public Page<ProxyFileResponsePageCfg> findPage(Page page, ProxyFileResponsePageCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.setPage(page);
+		List<ProxyFileResponsePageCfg> list=proxyFileDao.findPage(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	public ProxyFileResponsePageCfg getCfgById(Long cfgId) {
+		return proxyFileDao.getCfgById(cfgId);
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdate(ProxyFileResponsePageCfg entity){
+		Date createTime=new Date();
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);		
+		int isValid=0; 
+		if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
+			isValid=1;
+		}
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		//新增
+		if(entity.getCfgId()==null){
+			Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
+			entity.setCompileId(compileId);
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			proxyFileDao.insert(entity);//新增
+		}else{
+			Date editTime=new Date();
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			proxyFileDao.update(entity);//更新
+		}
+		if(isValid==1) {
+			entity.setIsAudit(1);
+			entity.setIsValid(1);		
+			audit( entity.getIsAudit(), isValid, entity.getFunctionId(), String.valueOf(entity.getCfgId()));
+		}
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void update(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		ProxyFileResponsePageCfg entity = new ProxyFileResponsePageCfg();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			proxyFileDao.update(entity);
+		}
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void audit(Integer isAudit,Integer isValid,Integer functionId,String ids){
+		Date auditTime = new Date();//审核时间
+		String[] idArray = ids.split(",");
+		for(String id : idArray) {
+			ProxyFileResponsePageCfg entity = proxyFileDao.getCfgById(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(auditTime);
+			proxyFileDao.update(entity);
+			if(isAudit == 1) {//审核通过，下发配置回调配置信息
+				List<ProxyFileResponsePageCfgAudit> convertList = Lists.newArrayList();
+				convertList.add(BaseService.convertCallBackProxyFileResponsePage(entity));			
+				String json = gsonToJson(convertList);
+				logger.debug("访问阻断页面下发参数:" + json);
+				ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+				logger.debug("访问阻断页面下发响应："+gsonToJson(result));
+			}else if(isAudit == 3) {//取消审核通过，将回调配置信息置为无效
+				List<ProxyFileResponsePageCfgAudit> convertList = Lists.newArrayList();
+				convertList.add(BaseService.convertCallBackProxyFileResponsePage(entity));
+				String json = gsonToJson(convertList);
+				logger.debug("访问阻断页面下发参数:" + json);
+				ToMaatResult result = ConfigServiceUtil.put(json,2);
+				logger.debug("访问阻断页面下发响应："+gsonToJson(result));
+			}
+		}
+		
+	}
+	
+	/**
+	 * 获取所有的 响应文件 策略
+	 * @return
+	 */
+	public List<ProxyFileResponsePageCfg> getProxyFileResponsePageCfgList(ProxyFileResponsePageCfg entity){
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		List<ProxyFileResponsePageCfg> list=proxyFileDao.findPage(entity);
+		return list;
+	}
+	
+}