Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

@@ -0,0 +1,60 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+/**
+ * http代理文件策略
+ * @author nanfang
+ * 
+ */
+public class ProxyFileStrategyCfg extends BaseCfg<ProxyFileStrategyCfg> {
+	private static final long serialVersionUID = 4283944377949702481L;
+	public final static String TABLE_NAME = "PROXY_FILE_STRATEGY_CFG";//对应表名
+	private String fileId;//glaxy返回的文件id
+	private String fileDesc;//文件描述
+	private String url;//文件保存的url
+	private String contentType;//内容类型，如text/html，取字典表contentType
+	private String md5;//文件md5值
+	private Long contentLength;//文件长度
+	
+	public ProxyFileStrategyCfg() {
+		super();
+	}
+	
+	public String getFileId() {
+		return fileId;
+	}
+	public void setFileId(String fileId) {
+		this.fileId = fileId;
+	}
+	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/util/Constants.java

@@ -480,6 +480,7 @@ public final class Constants {
 	public static final String REDIRECT_RESPONSE_CODE_KEY = Configurations.getStringProperty("redirect_response_code_key","code");
 	public static final String REDIRECT_URL_KEY = Configurations.getStringProperty("redirect_url_key","url");
 	public static final String REDIRECT_CONTENT_KEY = Configurations.getStringProperty("redirect_content_key","content");
+	public static final String CONTENT_FILE_ID_KEY = Configurations.getStringProperty("content_file_id_key","content_file_id");
 	public static final String REDIRECT_RESPONSE_CODE_STARTWITH = Configurations.getStringProperty("redirect_response_code_startwith","30");
 	public static final String REPLACE_ZONE_KEY = Configurations.getStringProperty("replace_zone_key","zone");
 	public static final String REPLACE_SUBSTITUTE_KEY = Configurations.getStringProperty("replace_substitute_key","substitute");

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

@@ -82,6 +82,7 @@ import com.nis.web.service.configuration.IpCfgService;
 import com.nis.web.service.configuration.IpMultiplexPoolCfgService;
 import com.nis.web.service.configuration.MailCfgService;
 import com.nis.web.service.configuration.NumCfgService;
+import com.nis.web.service.configuration.ProxyFileStrategyService;
 import com.nis.web.service.configuration.RequestInfoService;
 import com.nis.web.service.configuration.WebsiteCfgService;
 import com.nis.web.service.configuration.XmppCfgService;
@@ -182,6 +183,10 @@ public class BaseController {
 	protected IpMultiplexPoolCfgService ipMultiplexPoolCfgService;
 	@Autowired 
 	protected ConfigureStatisticsService configureStatisticsService;
+	@Autowired
+	protected ProxyFileStrategyService proxyFileStrategyService;//代理文件策略service
+	
+	
 	/**
 	 * 管理基础路径
 	 */

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

@@ -0,0 +1,155 @@
+/**
+ *@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.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+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.ProxyFileStrategyCfg;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.ToMaatResult.ResponseData;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
+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/fileStrategy")
+public class FileStrategyController extends CommonController {
+	
+	@RequestMapping(value = {"list"})
+	public String fileStrategyList(ProxyFileStrategyCfg cfg,Model model,HttpServletRequest request,HttpServletResponse response) {
+		Page<ProxyFileStrategyCfg> page = proxyFileStrategyService.findPage(new Page<ProxyFileStrategyCfg>(request, response,"a"), cfg);
+		model.addAttribute("page", page);
+		model.addAttribute("cfg", cfg);
+		initPageCondition(model);
+		return "/cfg/proxy/fileStrategy/list";
+	}
+
+	@RequestMapping(value = {"form"})
+	@RequiresPermissions(value={"proxy:fileStrategy:config"})
+	public String fileform(Model model,HttpServletRequest request
+			,HttpServletResponse response
+			,@ModelAttribute("cfg")ProxyFileStrategyCfg cfg
+			,String ids
+			,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			cfg = proxyFileStrategyService.getCfgById(Long.valueOf(ids));
+		}
+//		initFormCondition(model);
+		initFormCondition(model, cfg);
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/proxy/fileStrategy/form";
+	}
+
+	/**
+	 * 保存 文件
+	 * 1、将文件上传到 service 接口
+	 * 2、将文件信息及 1返回的结果 保存到数据库
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @param cfgFile
+	 * @param cfg
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions(value={"proxy:fileStrategy:config"})
+	@RequestMapping(value = {"saveOrUpdate"})
+	public String saveOrUpdate(Model model,HttpServletRequest request
+			,HttpServletResponse response,MultipartFile cfgFile,
+			@ModelAttribute("cfg")ProxyFileStrategyCfg 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());//文件长度
+				cfg.setFileId(md5);
+			}
+			proxyFileStrategyService.saveOrUpdate(cfg);
+			addMessage(redirectAttributes,"save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			addMessage(redirectAttributes,"save_failed");
+		}finally {
+			if(file != null) {
+				file.delete();//删除临时文件
+			}
+		}
+		return "redirect:" + adminPath +"/proxy/fileStrategy/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"delete"})
+	@RequiresPermissions(value={"proxy:fileStrategy:config"})	
+	public String delete(Integer isAudit,Integer isValid,
+			String ids,
+			Integer functionId,
+			RedirectAttributes redirectAttributes){
+		proxyFileStrategyService.update(isAudit,isValid,ids,functionId);
+		return "redirect:" + adminPath +"/proxy/fileStrategy/list?functionId="+functionId;
+	}
+	
+	
+	@RequestMapping(value = {"audit"})
+	@RequiresPermissions(value={"proxy:fileStrategy:confirm"})
+	public String audit(Integer isAudit,Integer isValid,String ids
+			,Integer functionId, RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			proxyFileStrategyService.audit(isAudit, isValid, functionId, ids);
+		}
+		return "redirect:" + adminPath +"/proxy/fileStrategy/list?functionId="+functionId;
+	}
+}

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
+import com.nis.domain.callback.ProxyFileStrategyCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
@@ -42,6 +43,9 @@ public class HttpRedirectPolicyController extends BaseController{
 		Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(searchPage, cfg);
 		model.addAttribute("page", page);
 		initPageCondition(model,cfg);
+		//获取所有的响应文件内容，阻断，或重定向时可以选择
+		List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService.getProxyFileStrategyCfgList(new ProxyFileStrategyCfg());
+		model.addAttribute("allProxyFileStrategys", allProxyFileStrategys);
 		return "/cfg/proxy/control/httpRedirectList";
 	}
 	@RequestMapping(value = {"form"})
@@ -136,8 +140,10 @@ public class HttpRedirectPolicyController extends BaseController{
 			entity.setIpPortList(ipPortList);
 			initFormCondition(model,entity);
 		}
-		
+		//获取所有的响应文件内容，阻断，或重定向时可以选择
+		List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService.getProxyFileStrategyCfgList(new ProxyFileStrategyCfg());
 		model.addAttribute("_cfg", entity);
+		model.addAttribute("allProxyFileStrategys", allProxyFileStrategys);
 		return "/cfg/proxy/control/httpRedirectForm";
 	}
 	

src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.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.ProxyFileStrategyCfg;
+import com.nis.web.dao.MyBatisDao;
+
+
+/**
+ * 特定协议相关配置数据处理类
+ * @author dell
+ *
+ */
+@MyBatisDao
+public interface ProxyFileStrategyDao {
+	
+	public List<ProxyFileStrategyCfg> findPage(ProxyFileStrategyCfg entity) ;
+	public ProxyFileStrategyCfg getCfgById(@Param("cfgId")Long cfgId);
+	public void insert(ProxyFileStrategyCfg entity);
+	public void update(ProxyFileStrategyCfg entity);
+	
+	
+}

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

@@ -0,0 +1,294 @@
+<?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.ProxyFileStrategyDao" >
+ 
+<resultMap id="ProxyFileStrategyCfg" type="com.nis.domain.callback.ProxyFileStrategyCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    
+    <result column="file_id" property="fileId" jdbcType="VARCHAR" />
+    <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="ProxyFileStrategyCfgColumn" >
+    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_ID,a.FILE_DESC,a.URL,a.CONTENT_TYPE,a.CONTENT_LENGTH,a.MD5
+  </sql>
+  
+  
+  <!-- voip条件查询列表信息 -->
+  <select id="findPage" resultMap="ProxyFileStrategyCfg" parameterType="com.nis.domain.callback.ProxyFileStrategyCfg" >
+		SELECT 
+	    <include refid="ProxyFileStrategyCfgColumn" />
+	    <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 proxy_file_strategy_cfg 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>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+	    	<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="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}
+			</when>
+			<otherwise>
+				ORDER BY a.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+  
+  <!-- 根据Id获取ProxyFileStrategyCfg信息 -->
+  <select id="getCfgById" resultMap="ProxyFileStrategyCfg">
+		 SELECT 
+	     <include refid="ProxyFileStrategyCfgColumn" />
+	    FROM proxy_file_strategy_cfg a
+	    <where>
+  			<if test="cfgId != null">
+  				and a.CFG_ID=#{cfgId,jdbcType=INTEGER}
+	   		</if>
+  		</where>
+  </select>
+  
+  <insert id="insert" parameterType="com.nis.domain.callback.ProxyFileStrategyCfg" >
+    insert into proxy_file_strategy_cfg (
+		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_id,
+		file_desc,
+		url,
+		content_type,
+		content_length,
+		md5
+    )values (
+   		#{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},
+    	#{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},
+    	
+    	#{fileId,jdbcType=VARCHAR},
+    	#{fileDesc,jdbcType=VARCHAR},
+    	#{url,jdbcType=VARCHAR},
+    	#{contentType,jdbcType=VARCHAR},
+    	#{contentLength,jdbcType=INTEGER},
+    	#{md5,jdbcType=VARCHAR}
+    )
+  </insert>
+  
+  
+  <update id="update" parameterType="com.nis.domain.callback.ProxyFileStrategyCfg" >
+    update proxy_file_strategy_cfg
+    <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="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="fileId != null" >
+        file_id =  #{fileId ,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/service/configuration/HttpRedirectCfgService.java

@@ -408,15 +408,25 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			if(entity.getAction().equals(16)){
 				String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
 				userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
-				String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
+				String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();//应答文件
-				userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
+				if(StringUtils.isNotBlank(userRegion3)) {
+					userRegion=userRegion+";"+Constants.CONTENT_FILE_ID_KEY+"="+userRegion3;
+				}else {//应答内容
+					String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
+					userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
+				}
 			}
 			//HTTP redirect： response code is not null ;response content is not null(userRegion is not null)
 			if(entity.getAction().equals(48)){
 				String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
 				userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
-				String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
+				String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();//应答文件
-				userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
+				if(StringUtils.isNotBlank(userRegion3)) {
+					userRegion=userRegion+";"+Constants.CONTENT_FILE_ID_KEY+"="+userRegion3;
+				}else {//应答内容
+					String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
+					userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
+				}
 			}
 			//HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
 			if(entity.getAction().equals(80)){

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

@@ -0,0 +1,114 @@
+package com.nis.web.service.configuration;
+
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.nis.domain.Page;
+import com.nis.domain.SysUser;
+import com.nis.domain.callback.ProxyFileStrategyCfg;
+import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.HttpBodyCfg;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.ProxyFileStrategyDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+
+@Service
+public class ProxyFileStrategyService extends BaseService{
+	@Autowired
+	protected ProxyFileStrategyDao proxyFileDao;
+	
+	
+	/**
+	 * 分页查询
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	public Page<ProxyFileStrategyCfg> findPage(Page page, ProxyFileStrategyCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.setPage(page);
+		List<ProxyFileStrategyCfg> list=proxyFileDao.findPage(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	public ProxyFileStrategyCfg getCfgById(Long cfgId) {
+		return proxyFileDao.getCfgById(cfgId);
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdate(ProxyFileStrategyCfg entity){
+		Date createTime=new Date();
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		//新增
+		if(entity.getCfgId()==null){
+			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);
+		}
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void update(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		ProxyFileStrategyCfg entity = new ProxyFileStrategyCfg();
+		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 id){
+		Date auditTime = new Date();//审核时间
+		ProxyFileStrategyCfg entity = proxyFileDao.getCfgById(Long.parseLong(id));
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		proxyFileDao.update(entity);
+	}
+	
+	/**
+	 * 获取所有的 响应文件 策略
+	 * @return
+	 */
+	public List<ProxyFileStrategyCfg> getProxyFileStrategyCfgList(ProxyFileStrategyCfg entity){
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		List<ProxyFileStrategyCfg> list=proxyFileDao.findPage(entity);
+		return list;
+	}
+	
+}

src/main/resources/messages/message_en.properties

@@ -709,7 +709,7 @@ pid=Program Id
 log_uri=Log URI
 fd_type=Block Type
 access_url=Progam Access URL
-referer=Referer
+refer=Refer
 black_block_list=Active Block Black List
 static_cfg_block=Static Cfg Block
 first_hit=First Hit
@@ -738,7 +738,7 @@ policy_group_manage=Policy Group
 #===========policy_group_manage end  =============
 #=============about manipulation=========
 ip_Reuse_policy=IP Reuse Policy
-target_ip_protect=Anti DDOS 
+target_ip_protect=Target IP Protect
 ratelimit_config=Ratelimit
 ip_ratelimit=IP Ratelimit
 domain_ratelimit=Website Ratelimit
@@ -984,6 +984,7 @@ dest_ip_report=Dest IP Report
 isp_report=ISP Report
 #=============about report===================
 ip_multiplex_policy=IP Reuse Policy
+target_ip_protect=Anti DDOS 
 ip_multiplex_pool_config=IP Reuse Addr Pool
 letter=Official Letter
 show_more=Show More
@@ -1042,44 +1043,9 @@ app_desc=Application Description
 tunnel_code=Tunnel Behavior No
 tunnel_name=Tunnel Behavior Name
 tunnel_desc=Tunnel Behavior Description
-call_external_procedures_failed=Call external procedures failed
+call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4EF6\u7B56\u7565
-is_hex=Is HEX
+file_strategy=File Strategy
-is_case_insenstive=Is Case-senstive
+file_desc=File Desc
-case_senstive=Case-senstive
+content_type=Content Type
-case_insenstive=Case-insenstive
+content_length=Content Length
-hex=Hex
+response_file=Response File
-not_hex=Not HEX
-
-p2p_reject=P2P Control
-NTC_P2P_IP=IP Configuration
-NTC_P2P_HASH_BIN=HASH Configuration
-NTC_P2P_KEYWORDS=Content Configuration
-
-s_asn=Source ASN
-d_asn=Destination ASN
-s_subscribe_id=Source Subscribe ID
-d_subscribe_id=Destination Subscribe ID
-scene_file=Scene File
-req_hdr_key=Request Header File Key
-req_body_key=Request Body File Key
-res_hdr_key=Response Header File Key
-res_body_key=Response Body File Key
-website=Website
-
-p2p_ip_config_type=IP Config Type
-p2p_hash_type=Hash Type
-NTC_SUBSCRIBE_ID=Certification Mark Configuration
-
-app_header_config=APP Header Feature
-app_ssl_config=APP SSL Cert Feature
-ip_intercepter_replace=IP Intercept Replace
-domain_intercepter_replace=Domain Intercept Replace
-ip_intercepter_ratelimit=IP Intercept Ratelimit
-domain_intercepter_ratelimit=Domain Intercept Ratelimit
-app_built_in_features_config=APP Built-in Features
-PXY_INTERCEPT_PKT_BIN=Intercept Messages
-certificate=Certificate
-do_log=Do Log
-no_log=Not Do Log
-all_log=Log All Logs
-framework_log=Only Framework Logs

src/main/resources/messages/message_ru.properties

@@ -883,4 +883,9 @@ MM_VOIP_ACCOUNT=VOIP Account
 drop_ip=IP Drop
 loop_ip=IP Loop
 drop_or_loop_ip=IP Drop Or Loop
-reject_or_monit_ip=IP Reject Or Monit
+reject_or_monit_ip=IP Reject Or Monit
+
+file_desc=File Desc
+content_type=Content Type
+content_length=Content Length
+response_file=Response File

src/main/resources/messages/message_zh_CN.properties

@@ -1080,4 +1080,9 @@ certificate=\u8BC1\u4E66
 do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
 no_log=\u4E0D\u8BB0\u5F55
 all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
-framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
+framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
+file_strategy=\u6587\u4EF6\u7B56\u7565
+file_desc=\u6587\u4EF6\u63CF\u8FF0	
+content_type=\u5185\u5BB9\u7C7B\u578B
+content_length=\u6587\u4EF6\u957F\u5EA6
+response_file=\u54CD\u5E94\u6587\u4EF6

src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp

@@ -32,14 +32,62 @@
 	</div>
 	<div class="col-md-6">
 		<div class="form-group ">
-			<label class="control-label col-md-3">
+				<div class="col-md-3">
-				<spring:message code="response_content" /></label>
+					<select id="response" class="selectpicker select2 input-small pull-right">
-			<div class="col-md-6">
+						<option value="responseContent"><spring:message code="response_content"></spring:message></option>
-				<input class="form-control" type="text"
+						<option value="responseFile"><spring:message code="response_file"></spring:message></option>
-					name="userRegion2"
+					</select>
-					value="${_cfg.userRegion2 }">
+				</div>
-			</div>
+				<div class="col-md-6">
+					<input id="responseContent" name="userRegion2" class="form-control" type="text" value="${_cfg.userRegion2 }">
+					<select id="responseFile" name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+	               		<option value=""><spring:message code="select"/></option>
+	               		<c:forEach items="${allProxyFileStrategys}" var="file">
+	               			<c:if test="${file.isValid!=0 and file.isAudit!=3}">
+	               				<option action="${file.action }" value="${file.fileId}" 
+	               		 	<c:if test="${file.fileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
+	               		</c:if>
+	               		</c:forEach>
+	               </select>
+				</div>
 			<div for="userRegion2"></div>
+			<script type="text/javascript">
+				$(function(){
+					//清除没用的 file 信息
+					var action = $("input[name='action']").val();
+					$("#responseFile option").each(function(i,n){
+						var oa = $(this).attr("action");
+						if(oa != action && i != 0){
+							$(this).remove();
+						}
+					});
+					//页面加载时触发初始化操作
+					var file = $("#responseFile").val();
+					if(file){
+						$("#responseContent").hide();//隐藏输入框
+						$("#response").val("responseFile");
+						$("#responseFile").selectpicker("show");//隐藏选择框
+					}else{
+						$("#responseFile").selectpicker("hide");//隐藏选择框
+						$("#response").val("responseContent");
+						$("#responseContent").show();//隐藏输入框
+					}
+					
+					$("#response").on("change",function(){
+						var $this = $(this);
+						var inputId = $this.val();
+						$("#responseContent").val("");//清空
+						$("#responseFile").selectpicker("val","");
+						if("responseContent" == inputId){
+							$("#responseContent").show();//显示输入框
+							$("#responseFile").selectpicker("hide");//隐藏选择框
+						}else{
+							$("#responseContent").hide();//隐藏输入框
+							$("#responseFile").selectpicker("show");//显示选择框
+						}
+					});
+				});
+			</script>
 		</div>
 	</div>
 </div>
@@ -56,7 +104,7 @@
 					<spring:message code="redirect_response_code" />
 			</label>
 			<div class="col-md-6">
-				<select name="userRegion1"
+				<select id="redirectResponseCode" name="userRegion1"
 				class="selectpicker show-tick form-control required">
 					<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="redirectResponseCodeC">
 						<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>>${redirectResponseCodeC.itemCode} <spring:message code="${redirectResponseCodeC.itemValue}"/></option>
@@ -68,13 +116,68 @@
 	</div>
 	<div class="col-md-6">
 		<div class="form-group ">
-			<label class="control-label col-md-3"><font color="red">*</font>
+			<label id="responseLabel" class="control-label col-md-3 "><font color="red">*</font>
+				<spring:message code="redirect_url" /></label>
+			<div class="col-md-6">
+				<input id="responseContent" name="userRegion2" class="form-control" type="text" value="${_cfg.userRegion2 }">
+				<select id="responseFile" name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+               		<option value=""><spring:message code="select"/></option>
+               		<c:forEach items="${allProxyFileStrategys}" var="file">
+               			<c:if test="${file.isValid!=0 and file.isAudit!=3}">
+               				<option action="${file.action }" value="${file.fileId}" 
+               		 			<c:if test="${file.fileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
+               			</c:if>
+               		</c:forEach>
+               </select>
+			</div>
+			<div for="userRegion2"></div>
+			<script type="text/javascript">
+				$(function(){
+					//清除没用的 file 信息
+					var action = $("input[name='action']").val();
+					$("#responseFile option").each(function(i,n){
+						var oa = $(this).attr("action");
+						if(oa != action && i != 0){
+							$(this).remove();
+						}
+					});
+					//页面加载时触发初始化操作
+					var code = $("#redirectResponseCode").val();
+					if(code == 200){//响应文件
+						$("#responseContent").hide();//隐藏输入框
+						$("#responseFile").selectpicker("show");//隐藏选择框
+						$("#responseLabel").html('<font color="red">*</font><spring:message code="response_file" />');
+					}else{
+						$("#responseContent").show();//隐藏输入框
+						$("#responseFile").selectpicker("hide");//隐藏选择框
+						$("#responseLabel").html('<font color="red">*</font><spring:message code="redirect_url" />');
+					}
+					
+					$("#redirectResponseCode").on("change",function(){
+						var $this = $(this);
+						var code = $this.val();
+						if(code == 200){//重定向 应答码 为  200 时可以选择 应答文件
+							$("#responseContent").hide();//隐藏输入框
+							$("#responseFile").selectpicker("show");//隐藏选择框
+							$("#responseLabel").html('<font color="red">*</font><spring:message code="response_file" />');
+						}else{
+							$("#responseContent").show();//隐藏输入框
+							$("#responseFile").selectpicker("hide");//隐藏选择框
+							$("#responseLabel").html('<font color="red">*</font><spring:message code="redirect_url" />');
+						}
+						$("#responseContent").val("");//清空
+						$("#responseFile").selectpicker("val","");
+					});
+				});
+			</script>
+
+			<%-- <label class="control-label col-md-3"><font color="red">*</font>
 				<spring:message code="redirect_url" /></label>
 			<div class="col-md-6">
 				<input class="form-control url required" type="text"
 					name="userRegion2"
 					value="${_cfg.userRegion2 }">
-			</div>
+			</div> --%>
 			<div for="userRegion2"></div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -559,7 +559,16 @@
 												</c:if>
 											</c:forEach>
 										</td>
-										<td>${indexCfg.userRegion2 }</td>
+										<td><!-- 阻断 响应内容 -->
+											<c:if test="${not empty indexCfg.userRegion2  }">${indexCfg.userRegion2 }</c:if>
+											<c:if test="${not empty indexCfg.userRegion3  }">
+												<c:forEach items="${allProxyFileStrategys}" var="file">
+							               			<c:if test="${file.fileId eq indexCfg.userRegion3}">
+							               				<a href="${file.url }" target="_blank">${file.fileDesc }</a>
+							               			</c:if>
+							               		</c:forEach>
+											</c:if>
+										</td>
 									</c:if>
 									<c:if test="${action == 48}">
 										<td>
@@ -570,7 +579,16 @@
 												</c:if>
 											</c:forEach>
 										</td>
-										<td>${indexCfg.userRegion2 }</td>
+										<td><!-- 重定向 响应内容 ，userRegion3 不为空 响应文件-->
+											<c:if test="${not empty indexCfg.userRegion2  }">${indexCfg.userRegion2 }</c:if>
+											<c:if test="${not empty indexCfg.userRegion3  }">
+												<c:forEach items="${allProxyFileStrategys}" var="file">
+							               			<c:if test="${file.fileId eq indexCfg.userRegion3}">
+							               				<a href="${file.url }" target="_blank">${file.fileDesc }</a>
+							               			</c:if>
+							               		</c:forEach>
+											</c:if>
+										</td>
 									</c:if>
 									<c:if test="${action == 80}">
 										<td>

src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp

@@ -0,0 +1,170 @@
+<%@ 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() {
+
+		$("#urlInfo,#urlBtn").on('click',function(){
+			$("#cfgFile").trigger("click");
+		});
+		
+		$(".action").on("change",function(){
+			$("#serviceId").val($(this).attr("serviceId"));
+		});
+		$("#serviceId").val($(".action:checked").attr("serviceId"));//初始化
+
+		$("#cfgFile").on('change',function(){
+			$("#urlInfo").val($("#cfgFile").val());
+		});
+		
+		$("#cancel").on("click", function() {
+			window.history.back();
+		});
+
+		$("#cfgFrom") .validate( {
+			submitHandler : function(form) {
+				loading('onloading...');
+				form.submit();
+			},
+			errorContainer : "#messageBox",
+			errorPlacement : function(error, element) {
+				$(element).parents(".form-group").find( "div[for='" + element.attr("name") + "']").append(error);
+			},
+		});
+		
+	});
+</script>
+</head>
+<body>
+
+	<div class="page-content">
+
+		<h3 class="page-title">
+			<spring:message code="file_strategy"></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/fileStrategy/saveOrUpdate" enctype="multipart/form-data" method="post" class="form-horizontal">
+							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+							<input type="hidden" name="functionId" value="${_cfg.functionId}">
+							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							<div class="form-body">
+							<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="reply_file" /></label>
+											<div class="col-md-6">
+												<input id="cfgFile" name="cfgFile" type="file" style="width: 330px; display: none" />
+												<div class="input-group">
+													<input id="urlInfo" name="urlInfo" readonly="readonly" data-msg-required="" placeholder="<spring:message code="select_file"/>" class="required form-control"
+														style="background-color: transparent" aria-required="true"
+														type="text" value="${_cfg.url }">
+													<div class="input-group-btn">
+														<a id="urlBtn" class="btn btn-default btn-search"
+															href="javascript:" style=""><i class="fa fa-search"></i></a>
+													</div>
+												</div>
+											</div>
+											<div for="fileUrl"></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="file_desc" /></label>
+											<div class="col-md-6">
+												<input class="form-control required" type="text" name="fileDesc" value="${_cfg.fileDesc}">
+											</div>
+											<div for="fileDesc"></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="content_type" />
+											</label>
+											<div class="col-md-6">
+												<select name="contentType" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+													<option value=""><spring:message code="select"/></option>
+													<c:forEach items="${fns:getDictList('CONTENT_TYPE')}" var="dict">
+														<option value="${dict.itemCode}"  <c:if test="${dict.itemCode==_cfg.contentType}">selected</c:if>>${dict.itemCode}</option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="contentType"></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="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 }"
+																protocolId="${service.protocolId }"
+																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>
+								<input type="hidden" name="isAreaEffective" value="0">
+								<%@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>

src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp

@@ -0,0 +1,395 @@
+<%@ 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.fileDesc}"){
+			$("#intype").val("${cfg.fileDesc}");
+		}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",'');
+			$("#level").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+		
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
+	}); 
+
+</script>
+
+</head>
+<body>
+
+<div class="page-content">
+		
+		<div class="theme-panel hidden-xs hidden-sm">
+		<shiro:hasPermission name="proxy:fileStrategy:config">
+			<button type="button" class="btn btn-primary"
+				onClick="javascript:window.location='${ctx}/proxy/fileStrategy/form?functionId=${cfg.functionId}'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
+		</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<spring:message code="file_strategy"></spring:message>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<sys:message content="${message}"/>
+						
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/fileStrategy/list" 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="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="fileDesc"><spring:message code="file_desc"></spring:message></form:option>
+											</form:select>
+                                         </div>
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                    </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:fileStrategy:config">
+							 			<sys:delRow url="${ctx}/proxy/fileStrategy/form" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/proxy/fileStrategy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="proxy:fileStrategy: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/fileStrategy/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/proxy/fileStrategy/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/proxy/fileStrategy/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='request_number'/></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='type'/></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> 
+							<c:forEach items="${serviceList}" var="service"
+									varStatus="satus">
+									<c:if
+										test="${cfg.functionId eq service.functionId}">
+										<c:set var="action" value="${service.action }"></c:set>
+									</c:if>
+								</c:forEach>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<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="file_desc"/></th>
+									<th><spring:message code="content_type"/></th>
+									<th><spring:message code="content_length"/></th>
+									<th><spring:message code="block_type"/></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><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
+								<tr>
+									<td>
+									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
+									</td>
+								    <td><a href="${indexCfg.url }" target="_blank">${indexCfg.fileDesc }</a></td>
+								    <td>${indexCfg.contentType }</td>
+								    <td>${indexCfg.contentLength }</td>
+								    <td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>${indexCfg.requestName }</td>
+									<td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(indexCfg.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(indexCfg.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(indexCfg.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>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+								    <td>${indexCfg.creatorName }</td>
+									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.editorName }</td>
+									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.auditorName }</td>
+									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page" style="margin-top:40px">${page}</div>
+					</div>
+					
+				</div>
+			</div>
+</div>
+
+</body>
+</html>