(1)IP Pattern拆分为源IP Pattern,目的IP Pattern,Port Pattern

拆分为源端口Pattern,目的端口Pattern
(2)show more修改，并移动刀ipRegion.js中
(3)IP复用未作修改
(4)删除部分废弃的导入模板以及废弃的导入方法

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

@@ -64,7 +64,6 @@ import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.ComplexStringCfgTemplate;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.DnsIpCfg;
@@ -75,7 +74,6 @@ import com.nis.domain.configuration.PxyObjKeyring;
 import com.nis.domain.configuration.PxyObjTrustedCaCert;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.configuration.template.AppDomainTemplate;
 import com.nis.domain.configuration.template.AppPayloadTemplate;
 import com.nis.domain.configuration.template.AsnIpTemplate;
@@ -100,7 +98,6 @@ import com.nis.domain.configuration.template.HttpsReplaceIpTemplate;
 import com.nis.domain.configuration.template.HttpsReplaceTemplate;
 import com.nis.domain.configuration.template.IpAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
-import com.nis.domain.configuration.template.IpCfgTemplate;
 import com.nis.domain.configuration.template.IpPayloadTemplate;
 import com.nis.domain.configuration.template.IpRateLimitTemplate;
 import com.nis.domain.configuration.template.IpSpoofingTemplate;
@@ -771,75 +768,6 @@ public class BaseController {
 		}
 		return msgProp;
 	}
-	@Deprecated
-	public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response,
-			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
-		Properties msgProp = getMsgProp();
-		try {
-			List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(functionId);
-			for (FunctionRegionDict dict : dictList) {
-				if (dict.getConfigRegionCode() == cfgRegionCode) {
-					String fileName = dict.getConfigRegionValue() + ".xlsx";
-					if (dict.getRegionType() == 1) {
-						List<IpCfgTemplate> list = Lists.newArrayList();
-						list.add(new IpCfgTemplate());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
-								IpCfgTemplate.class, 2).setDataList(msgProp, list, null)
-										.write(request, response, fileName).dispose();
-					} else if (dict.getRegionType() == 2) {
-						List<StringCfgTemplate> list = Lists.newArrayList();
-						list.add(new StringCfgTemplate());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
-								StringCfgTemplate.class, 2).setDataList(msgProp, list, null)
-										.write(request, response, fileName).dispose();
-					} else if (dict.getRegionType() == 3) {
-						List<ComplexStringCfgTemplate> list = Lists.newArrayList();
-						list.add(new ComplexStringCfgTemplate());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
-								ComplexStringCfgTemplate.class, 2).setDataList(msgProp, list, null)
-										.write(request, response, fileName).dispose();
-					}
-				}
-			}
-
-		} catch (Exception e) {
-			msgProp = null;
-			e.printStackTrace();
-		}
-	}
-	@Deprecated
-	public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response,
-			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode, Class clazz) {
-		Properties msgProp = getMsgProp();
-		try {
-			List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(functionId);
-			for (FunctionRegionDict dict : dictList) {
-				if (dict.getConfigRegionCode() == cfgRegionCode) {
-					String fileName = dict.getConfigRegionValue() + ".xlsx";
-					if (dict.getRegionType() == 1) {
-						List<IpCfgTemplate> list = Lists.newArrayList();
-						list.add((IpCfgTemplate) clazz.newInstance());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
-								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
-					} else if (dict.getRegionType() == 2) {
-						List<StringCfgTemplate> list = Lists.newArrayList();
-						list.add(new StringCfgTemplate());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
-								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
-					} else if (dict.getRegionType() == 3) {
-						List<ComplexStringCfgTemplate> list = Lists.newArrayList();
-						list.add(new ComplexStringCfgTemplate());
-						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
-								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
-					}
-				}
-			}
-
-		} catch (Exception e) {
-			msgProp = null;
-			e.printStackTrace();
-		}
-	}
 
 	public void setLogAction(BaseLogEntity log, List<FunctionServiceDict> serviceList) {
 		if (!StringUtil.isEmpty(serviceList)) {

src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java

@@ -350,7 +350,7 @@ public class AppFeatureCfgController extends BaseController {
 			String ipPortInfoNoExport = ",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
 					+ ",config_time,editor,edit_time,auditor,audit_time"
 					+ ",letter,whether_area_block,classification,attribute,label"
-					+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
+					+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,client_ip,src_ip_pattern,client_port,src_port_pattern,";
 
 			// 时间过滤
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

src/main/java/com/nis/web/controller/configuration/CommonController.java

@@ -8,10 +8,8 @@
  */
 package com.nis.web.controller.configuration;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -19,38 +17,22 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.axis2.databinding.types.soapencoding.Array;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.ui.Model;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.nis.domain.FunctionRegionDict;
-import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.HttpBodyCfg;
-import com.nis.domain.configuration.HttpReqHeadCfg;
-import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
-import com.nis.domain.configuration.template.IpAllTemplate;
-import com.nis.domain.configuration.template.IpCfgTemplate;
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.domain.configuration.IpPortCfg;
-import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
-import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
-import com.nis.util.excel.ImportExcel;
 import com.nis.web.controller.BaseController;
-import com.nis.web.dao.configuration.IpCfgDao;
-import com.nis.web.security.UserUtils;
 
 /**
  * @ClassName: CommonController.java 
@@ -288,15 +270,7 @@ public class CommonController extends BaseController {
 			e.printStackTrace();
 		}
 	}*/
-	public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
-    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
-		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
-	}
-	@Deprecated
-	public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
-			RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode,Class clazz) {
-		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,clazz);
-	}
+	
 	//ip配置导出
 	public void _exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,
 			IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){

src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java

@@ -235,7 +235,7 @@ public class DnsIpCfgController extends BaseController {
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), DnsIpCfg.class);
-			String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+			String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,src_ip_pattern,src_port_pattern,dest_port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 
 			// 时间过滤
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -40,7 +40,6 @@ import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.IpReuseDnatPolicyCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.configuration.UserManage;
-import com.nis.domain.configuration.template.IpMultiplexPolicyTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
@@ -120,26 +119,6 @@ public class IpMultiplexController extends CommonController {
 		return "redirect:" + adminPath + "/manipulation/ipmulitiplex/list?functionId=" + cfg.getFunctionId();
 	}
 
-	// ip配置导入
-	/*
-	 * @RequestMapping(value = "/import", method=RequestMethod.POST) public
-	 * String importIp(String cfgName,RedirectAttributes redirectAttributes,
-	 * 
-	 * @RequestParam("file") MultipartFile file,IpPortCfg cfg) {
-	 * this._importIp(cfgName,redirectAttributes,
-	 * file,cfg,IpMultiplexPolicyTemplate.class);
-	 * redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex")
-	 * ; redirectAttributes.addAttribute("requiresPermissionPrefix",
-	 * "ip:mulitiplex"); return "redirect:" + adminPath
-	 * +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId(); }
-	 */
-	// ip模板下载
-	@RequestMapping(value = "import/template")
-	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
-			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
-		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,
-				IpMultiplexPolicyTemplate.class);
-	}
 
 	// ip配置导出
 	@RequestMapping(value = "export")

src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java

@@ -112,20 +112,7 @@ public class RatelimitController extends CommonController {
 		redirectAttributes.addAttribute("requiresPermissionPrefix","domain:ratelimit");
 		return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+cfg.getFunctionId();
 	}
-	//ip配置导入
-	/*@RequestMapping(value = "/ip/import", method=RequestMethod.POST)
-	public String importIp(String cfgName,RedirectAttributes redirectAttributes,
-			@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
-		this._importIp(cfgName,redirectAttributes, file,cfg,IpRateLimitTemplate.class);
-		redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/ip");
-		redirectAttributes.addAttribute("requiresPermissionPrefix","ip:ratelimit");
-		return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+cfg.getFunctionId();
-	}*/
-	@RequestMapping(value = "/ip/import/template")
-	public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
-    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
-		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpRateLimitTemplate.class);
-	}
+	
 	//ip配置导出
 	@RequestMapping(value = "/ip/export")
 	public void exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -27,7 +27,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
-import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
@@ -66,7 +65,6 @@ import com.nis.domain.configuration.template.SnatTemplate;
 import com.nis.domain.configuration.template.StringAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.StringAllTemplate;
 import com.nis.domain.configuration.template.TopicWebsiteTemplate;
-import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -14,15 +14,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.taglibs.standard.functions.Functions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.FunctionRegionDict;
@@ -31,10 +27,6 @@ import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.DnsResStrategy;
-import com.nis.domain.configuration.ComplexStringCfgTemplate;
-import com.nis.domain.configuration.template.IpCfgTemplate;
-import com.nis.domain.specific.ConfigGroupInfo;
-import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
@@ -46,7 +38,6 @@ import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
-import com.nis.util.excel.ImportExcel;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
@@ -616,13 +607,6 @@ public class WebsiteController extends BaseController {
 		return "redirect:" + adminPath + "/ntc/website/dnsList?functionId=" + functionId;
 	}
 
-	@Deprecated
-	// 下载导入模板
-	@RequestMapping(value = "import/template")
-	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
-			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
-		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
-	}
 	// http配置导入
 	/*
 	 * @RequestMapping(value = "importHttp", method=RequestMethod.POST) public

src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java

@@ -1,7 +1,6 @@
 package com.nis.web.controller.configuration.ntc;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -26,12 +25,10 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
-import com.nis.domain.configuration.template.WhiteListIpTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
-import com.nis.web.security.UserUtils;
 
 /**
  * 白名单
@@ -386,24 +383,6 @@ public class WhiteListController extends CommonController {
 		return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + functionId;
 	}
 
-	// ip配置导入
-	/*
-	 * @RequestMapping(value = "ip/import", method=RequestMethod.POST) public
-	 * String importIp(String cfgName,RedirectAttributes redirectAttributes,
-	 * 
-	 * @RequestParam("file") MultipartFile file,IpPortCfg cfg) {
-	 * this._importIp(cfgName,redirectAttributes,
-	 * file,cfg,WhiteListIpTemplate.class); return "redirect:" + adminPath
-	 * +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId(); }
-	 */
-	// ip模板下载
-	@RequestMapping(value = "ip/import/template")
-	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
-			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
-		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,
-				WhiteListIpTemplate.class);
-	}
-
 	// ip配置导出
 	@RequestMapping(value = "ip/export")
 	public void exportIp(String columns, Model model, HttpServletRequest request, HttpServletResponse response,

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

@@ -120,11 +120,6 @@ public class ControlController extends CommonController {
 		redirectAttributes.addAttribute("requiresPermissionPrefix","control:ip");
 		return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId();
 	}
-	@RequestMapping(value = "/ip/import/template")
-	public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
-    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
-		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
-	}
 	//ip配置导出
 	@RequestMapping(value = "/ip/export")
 	public void exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml

@@ -5,7 +5,8 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -48,7 +49,7 @@
     </resultMap>
   	
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -91,8 +92,11 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPattern != null">
-	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+	    	<if test="srcIpPattern != null">
+	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destIpPattern != null">
+	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -100,8 +104,11 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="portPattern != null">
-	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+	    	<if test="srcPortPattern != null">
+	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destPortPattern != null">
+	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -227,8 +234,11 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPattern != null">
-	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+	    	<if test="srcIpPattern != null">
+	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destIpPattern != null">
+	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -236,8 +246,11 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="portPattern != null">
-	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+	    	<if test="srcPortPattern != null">
+	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destPortPattern != null">
+	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -345,9 +358,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -388,8 +399,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -473,11 +484,17 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="ipPattern != null" >
-        ip_pattern = #{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null" >
+        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="portPattern != null" >
-        port_pattern = #{portPattern,jdbcType=INTEGER},
+      <if test="destIpPattern != null" >
+        dest_ip_pattern =#{destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="srcPortPattern != null" >
+        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="destPortPattern != null" >
+        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},
@@ -564,7 +581,7 @@
 	    INSERT INTO asn_ip_cfg
 	            (CFG_DESC,ACTION,IS_VALID,IS_AUDIT,CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,
 	            AUDIT_TIME,SERVICE_ID,REQUEST_ID,region_id,compile_id,IS_AREA_EFFECTIVE,CLASSIFY,ATTRIBUTE,LABLE,
-    			AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,ip_pattern,port_pattern,src_port,
+    			AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,src_port,
     			protocol,protocol_id,direction,dest_port,dest_ip_address,cfg_type,cfg_region_code,
 				asn_ip_group,user_region1,user_region2,user_region3,user_region4,user_region5,organization,country,detail)
 	    VALUES
@@ -591,8 +608,10 @@
     	#{asnIp.functionId,jdbcType=INTEGER},
     	#{asnIp.ipType,jdbcType=INTEGER},
     	#{asnIp.srcIpAddress,jdbcType=VARCHAR},
-    	#{asnIp.ipPattern,jdbcType=INTEGER},
-    	#{asnIp.portPattern,jdbcType=INTEGER},
+    	#{asnIp.srcIpPattern,jdbcType=INTEGER},
+    	#{asnIp.destIpPattern,jdbcType=INTEGER},
+    	#{asnIp.srcPortPattern,jdbcType=INTEGER},
+    	#{asnIp.destPortPattern,jdbcType=INTEGER},
     	#{asnIp.srcPort,jdbcType=VARCHAR},
     	#{asnIp.protocol,jdbcType=INTEGER},
     	#{asnIp.protocolId,jdbcType=INTEGER},

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

@@ -43,7 +43,8 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -235,7 +236,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -394,7 +396,7 @@
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
+    r.IP_TYPE, r.SRC_IP_PATTERN,r.DEST_IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.SRC_PORT_PATTERN,r.DEST_PORT_PATTERN,r.SRC_PORT,DEST_PORT,
     r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
   </sql>
   
@@ -461,7 +463,7 @@
   </sql>
   
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -887,8 +889,11 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPattern != null">
-	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+	    	<if test="srcIpPattern != null">
+	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destIpPattern != null">
+	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -896,8 +901,11 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="portPattern != null">
-	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+	    	<if test="srcPortPattern != null">
+	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destPortPattern != null">
+	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -1823,12 +1831,12 @@
     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,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )
@@ -1839,12 +1847,12 @@
     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,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )
@@ -1855,7 +1863,7 @@
     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,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values
     <foreach collection ="list" item="appIp" separator =",">
@@ -1868,9 +1876,10 @@
     #{appIp.requestId,jdbcType=INTEGER},#{appIp.compileId,jdbcType=INTEGER},#{appIp.isAreaEffective,jdbcType=INTEGER},
     #{appIp.classify,jdbcType=VARCHAR},#{appIp.attribute,jdbcType=VARCHAR},#{appIp.lable,jdbcType=VARCHAR},    
     #{appIp.areaEffectiveIds,jdbcType=VARCHAR},#{appIp.ratelimit,jdbcType=VARCHAR},#{appIp.functionId,jdbcType=INTEGER},
-    #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER},
-     #{appIp.ipType,jdbcType=INTEGER}, #{appIp.ipPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR},#{appIp.destIpAddress,jdbcType=VARCHAR},
-    #{appIp.portPattern,jdbcType=INTEGER},#{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, 
+    #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER},#{appIp.ipType,jdbcType=INTEGER}, 
+    #{appIp.srcIpPattern,jdbcType=INTEGER},#{appIp.destIpPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR},
+    #{appIp.destIpAddress,jdbcType=VARCHAR},#{appIp.srcPortPattern,jdbcType=INTEGER},#{appIp.destPortPattern,jdbcType=INTEGER},
+    #{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, 
     #{appIp.protocol,jdbcType=INTEGER},#{appIp.doLog,jdbcType=INTEGER},#{appIp.userRegion1,jdbcType=VARCHAR},#{appIp.userRegion2,jdbcType=VARCHAR}
     ,#{appIp.userRegion3,jdbcType=VARCHAR},#{appIp.userRegion4,jdbcType=VARCHAR},#{appIp.userRegion5,jdbcType=VARCHAR}
     )
@@ -2057,9 +2066,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -2090,8 +2097,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -2294,8 +2301,11 @@
       <if test="ipType != null" >
         IP_TYPE = #{ipType,jdbcType=INTEGER},
       </if>
-      <if test="ipPattern != null">
-   		IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null">
+   		SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},
+   	  </if>
+      <if test="destIpPattern != null">
+   		DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER},
    	  </if>
    	  <if test="srcIpAddress != null and srcIpAddress != ''">
    		SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
@@ -2303,8 +2313,11 @@
    	  <if test="destIpAddress != null and destIpAddress != ''">
    		DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
    	  </if>
-   	  <if test="portPattern != null">
-   		PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
+   	  <if test="srcPortPattern != null">
+   		SRC_PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},
+   	  </if>
+   	  <if test="destPortPattern != null">
+   		DEST_PORT_PATTERN=#{destPortPattern,jdbcType=INTEGER},
    	  </if>
    	  <if test="srcPort != null and srcPort !=''">
    		SRC_PORT=#{srcPort,jdbcType=VARCHAR},

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

@@ -42,7 +42,8 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -196,7 +197,7 @@
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
+    r.IP_TYPE, r.src_ip_pattern,r.dest_ip_pattern, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.src_port_pattern,r.dest_port_pattern,r.SRC_PORT,DEST_PORT,
     r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
   </sql>
   
@@ -540,13 +541,13 @@
     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,
-    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
      #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},
-     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )

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

@@ -1,13 +1,14 @@
 <?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.AreaIpCfgDao" >
-  <resultMap id="BaseIpMap" type="com.nis.domain.configuration.AreaIpCfg" >
+  <resultMap id="AreaIpMap" type="com.nis.domain.configuration.AreaIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -36,13 +37,13 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="AreaIpCfg_Column_List_with_id" >
-    CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,
+    CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,
     DEST_PORT,DIRECTION,PROTOCOL,PROTOCOL_ID,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
   </sql>
-  <select id="getByCompileId" resultMap="BaseIpMap" >
+  <select id="getByCompileId" resultMap="AreaIpMap" >
     SELECT 
     <include refid="AreaIpCfg_Column_List_with_id" />
     FROM area_ip_cfg
@@ -76,9 +77,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -109,8 +108,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -147,9 +146,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -180,8 +177,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -255,11 +252,17 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="ipPattern != null" >
-        ip_pattern = #{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null" >
+        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="portPattern != null" >
-        port_pattern = #{portPattern,jdbcType=INTEGER},
+      <if test="destIpPattern != null" >
+        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="srcPortPattern != null" >
+       src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="destPortPattern != null" >
+        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

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

@@ -30,7 +30,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -94,7 +95,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -193,7 +195,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -224,7 +227,7 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap> 
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -238,7 +241,7 @@
     r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log,r.do_blacklist
   </sql>
   <sql id="AvVoipIp_Column" >
-    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
+    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
     ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 	,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 	,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -252,7 +255,7 @@
   r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code
   </sql>
   <sql id="AvContIp_Column" >
-    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
+    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
     ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 	,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 	,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -816,8 +819,10 @@
     function_id,
     ip_type,
     src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_pattern,
+    dest_ip_pattern,
+    src_port_pattern,
+    dest_port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -848,8 +853,10 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+		#{srcIpPattern,jdbcType=INTEGER},
+    	#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},
+    	#{destPortPattern,jdbcType=INTEGER},    	
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -1053,9 +1060,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -1086,8 +1091,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -1237,11 +1242,17 @@
       <if test="voipIp != null and voipIp.srcIpAddress != null and voipIp.srcIpAddress != ''" >
         src_ip_address = #{voipIp.srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="voipIp != null and voipIp.ipPattern != null" >
-        ip_pattern = #{voipIp.ipPattern,jdbcType=INTEGER},
+      <if test="voipIp != null and voipIp.srcIpPattern != null" >
+        src_ip_pattern = #{voipIp.srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="voipIp != null and voipIp.portPattern != null" >
-        port_pattern = #{voipIp.portPattern,jdbcType=INTEGER},
+      <if test="voipIp != null and voipIp.destIpPattern != null" >
+        dest_ip_pattern = #{voipIp.destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="voipIp != null and voipIp.srcPortPattern != null" >
+        src_port_pattern = #{voipIp.srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="voipIp != null and voipIp.destPortPattern != null" >
+        dest_port_pattern = #{voipIp.destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="voipIp != null and voipIp.srcPort != null and voipIp.srcPort != ''" >
         src_port = #{voipIp.srcPort,jdbcType=VARCHAR},
@@ -1652,9 +1663,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -1686,8 +1695,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -1762,11 +1771,17 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="ipPattern != null" >
-        ip_pattern = #{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null" >
+        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="portPattern != null" >
-        port_pattern = #{portPattern,jdbcType=INTEGER},
+      <if test="destIpPattern != null" >
+        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="srcPortPattern != null" >
+        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="destPortPattern != null" >
+        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

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

@@ -30,7 +30,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -162,7 +163,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -432,9 +433,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -465,8 +464,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -74,7 +74,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -172,7 +173,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -489,9 +490,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -527,8 +526,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -80,7 +80,8 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -240,7 +241,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -381,7 +383,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -701,7 +704,8 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+		<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -775,12 +779,12 @@
   <sql id="DdosIpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_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.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+	a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold,
     a.antiddos_protocol,a.bps_threadshold
   </sql>
   <sql id="IpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
+    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
   </sql>
   <sql id="IpCfg_AllColumn" >
@@ -788,7 +792,7 @@
 	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.do_log,a.dns_strategy_id,a.user_region1,a.user_region2,
 	a.user_region3,a.user_region4,a.user_region5,
-	a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
+	a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
   </sql>
   <sql id="IpDropCfg_Column" >
@@ -796,11 +800,11 @@
 	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.user_region1,a.user_region2,
 	a.user_region3,a.user_region4,a.user_region5,
-	a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
+	a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
   </sql>
   <sql id="AsnIpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.asn_ip_group,
     a.user_region1,a.region_id
   </sql>
@@ -883,7 +887,7 @@
 		,a.area_effective_ids,a.function_id,a.cfg_region_code,a.compile_id
 	</sql>
 	<sql id="DnsIpCfgColumns">
-	    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+	    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
 	    ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 		,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,
@@ -907,7 +911,7 @@
 	    a.feature_table_type,a.app_code,a.spec_service_id,a.cfg_region_code
    </sql>
    <sql id="AppIpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
   </sql>
 	
@@ -928,7 +932,7 @@
     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,AREA_EFFECTIVE_IDS,a.RATELIMIT,a.FUNCTION_ID,a.CFG_TYPE,a.CFG_REGION_CODE,
-    a.IP_TYPE, a.IP_PATTERN, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.PORT_PATTERN,a.SRC_PORT,DEST_PORT,
+    a.IP_TYPE, a.src_ip_pattern,a.dest_ip_pattern, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.src_port_pattern,a.dest_port_pattern,a.SRC_PORT,DEST_PORT,
     a.DIRECTION,a.PROTOCOL,a.DO_LOG,a.USER_REGION1,a.USER_REGION2,a.USER_REGION3,a.USER_REGION4,a.USER_REGION5
   </sql>
   
@@ -1629,7 +1633,7 @@
   </select>
   <select id="getAsnIpList" resultType="com.nis.domain.basics.AsnIpCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 select 
-		 	a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+		 	a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
 		    ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 			,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,

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

@@ -5,7 +5,8 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -41,7 +42,7 @@
     </resultMap>
   
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -80,8 +81,11 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPattern != null">
-	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+	    	<if test="srcIpPattern != null">
+	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destIpPattern != null">
+	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -89,8 +93,11 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="portPattern != null">
-	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+	    	<if test="srcPortPattern != null">
+	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destPortPattern != null">
+	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -217,9 +224,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -254,8 +259,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -332,11 +337,17 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="ipPattern != null" >
-        ip_pattern = #{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null" >
+        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="portPattern != null" >
-        port_pattern = #{portPattern,jdbcType=INTEGER},
+      <if test="destIpPattern != null" >
+        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="srcPortPattern != null" >
+        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="destPortPattern != null" >
+        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

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

@@ -5,7 +5,8 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -40,7 +41,7 @@
     </resultMap>
   
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -83,8 +84,11 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPattern != null">
-	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+	    	<if test="srcIpPattern != null">
+	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destIpPattern != null">
+	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -92,8 +96,11 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="portPattern != null">
-	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+	    	<if test="srcPortPattern != null">
+	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="destPortPattern != null">
+	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -229,9 +236,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -264,8 +269,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -340,11 +345,17 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="ipPattern != null" >
-        ip_pattern = #{ipPattern,jdbcType=INTEGER},
+      <if test="srcIpPattern != null" >
+        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
       </if>
-      <if test="portPattern != null" >
-        port_pattern = #{portPattern,jdbcType=INTEGER},
+      <if test="destIpPattern != null" >
+        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
+      </if>
+      <if test="srcPortPattern != null" >
+        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
+      </if>
+      <if test="destPortPattern != null" >
+        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

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

@@ -35,7 +35,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -172,7 +173,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -453,9 +454,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -491,8 +490,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -1,13 +1,15 @@
 <?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.IpCfgDao" >
+  <!-- 基础 -->
   <resultMap id="BaseIpMap" type="com.nis.domain.configuration.BaseIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -85,7 +87,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -116,14 +119,14 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="BaseIpCfg_Column_List_with_id" >
-    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,PROTOCOL_ID,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,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE,USER_REGION1,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5
   </sql>
   <sql id="BaseIpCfg_Column_List_with_id_name" >
-    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
+    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,PROTOCOL_ID,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,
@@ -133,7 +136,8 @@
   	<choose>
   		<when test="page !=null and page.alias != null and page.alias != ''">
   			${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.CFG_REGION_CODE as cfgRegionCode,${page.alias}.CFG_TYPE as cfgType, ${page.alias}.IP_TYPE as ipType, 
-  			${page.alias}.IP_PATTERN as ipPattern, ${page.alias}.SRC_IP_ADDRESS as srcIpAddress, ${page.alias}.DEST_IP_ADDRESS as destIpAddress, ${page.alias}.PORT_PATTERN as portPattern,${page.alias}.SRC_PORT as srcPort,${page.alias}.DEST_PORT as destPort,
+  			${page.alias}.SRC_IP_PATTERN as srcIpPattern,${page.alias}.DEST_IP_PATTERN as destIpPattern, ${page.alias}.SRC_IP_ADDRESS as srcIpAddress, ${page.alias}.DEST_IP_ADDRESS as destIpAddress,
+  			${page.alias}.SRC_PORT_PATTERN as srcPortPattern,${page.alias}.DEST_PORT_PATTERN as destPortPattern,${page.alias}.SRC_PORT as srcPort,${page.alias}.DEST_PORT as destPort,
     		${page.alias}.DIRECTION as direction,${page.alias}.PROTOCOL as protocol,${page.alias}.PROTOCOL_ID as protocolId,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
     		${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
     		${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
@@ -147,7 +151,8 @@
   		</when>
   		<otherwise>
   			r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, 
-  			r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
+  			r.src_ip_pattern as srcIpPattern,r.dest_ip_pattern as destIpPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress,
+  			r.src_port_pattern as srcPortPattern,r.dest_port_pattern as destPortPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
     		r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     		r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     		r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
@@ -163,8 +168,7 @@
   </sql>
   <sql id="BaseIpCfg_Column_List" >
     CFG_DESC,CFG_REGION_CODE,CFG_TYPE,
-    IP_TYPE,IP_PATTERN,SRC_IP_ADDRESS,DEST_IP_ADDRESS,
-    PORT_PATTERN,SRC_PORT,DEST_PORT,DIRECTION,
+    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,DIRECTION,
     PROTOCOL,PROTOCOL_ID,ACTION,
     IS_VALID,IS_AUDIT,CREATOR_ID,
     CREATE_TIME,EDITOR_ID,EDIT_TIME,
@@ -176,8 +180,8 @@
   </sql>
   <sql id="BaseIpCfg_Value_List" >
     #{cfgDesc,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{cfgType,jdbcType=VARCHAR},
-    #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+    #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{protocolId,jdbcType=INTEGER},#{action,jdbcType=INTEGER}, 
     #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER}, 
     #{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP}, 
@@ -201,7 +205,7 @@
     a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -291,8 +295,11 @@
 			    	<if test="ipType != null">
 			    		AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="ipPattern != null">
-			    		AND ${page.alias}.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+			    	<if test="srcIpPattern != null">
+			    		AND ${page.alias}.SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="destIpPattern != null">
+			    		AND ${page.alias}.DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIpAddress != null and srcIpAddress != ''">
 			    		AND ${page.alias}.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -300,8 +307,11 @@
 			    	<if test="destIpAddress != null and destIpAddress != ''">
 			    		AND ${page.alias}.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 			    	</if>
-			    	<if test="portPattern != null">
-			    		AND ${page.alias}.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+			    	<if test="srcPortPattern != null">
+			    		AND ${page.alias}.SRC_PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="destPortPattern != null">
+			    		AND ${page.alias}.DEST_PORT_PATTERN=#{destPortPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcPort != null and srcPort !=''">
 			    		AND ${page.alias}.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -416,8 +426,11 @@
 			    	<if test="ipType != null">
 			    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="ipPattern != null">
-			    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
+			    	<if test="srcIpPattern != null">
+			    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="destIpPattern != null">
+			    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIpAddress != null and srcIpAddress != ''">
 			    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -425,8 +438,11 @@
 			    	<if test="destIpAddress != null and destIpAddress != ''">
 			    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 			    	</if>
-			    	<if test="portPattern != null">
-			    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
+			    	<if test="srcPortPattern != null">
+			    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="destPortPattern != null">
+			    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcPort != null and srcPort !=''">
 			    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -596,8 +612,11 @@
 	      <if test="ipType != null" >
 	        IP_TYPE = #{ipType,jdbcType=INTEGER},
 	      </if>
-	      <if test="ipPattern != null">
-    		IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
+	      <if test="srcIpPattern != null">
+    		SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},
+    	  </if>
+	      <if test="destIpPattern != null">
+    		DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER},
     	  </if>
     	  <if test="srcIpAddress != null and srcIpAddress != ''">
     		SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
@@ -606,7 +625,7 @@
     		DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
     	  </if>
     	  <if test="portPattern != null">
-    		PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
+    		PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	  </if>
     	  <if test="srcPort != null and srcPort !=''">
     		SRC_PORT=#{srcPort,jdbcType=VARCHAR},
@@ -744,7 +763,8 @@
   <select id="getListByCfgIdWithName" resultMap="BaseIpMapWithUser">
 		select 
 		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, 
-		r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
+		r.src_ip_pattern as srcIpPattern,r.dest_ip_pattern as destIpPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, 
+		r.src_port_pattern as srcPortPattern,r.dest_port_pattern as destPortPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
    		r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
    		r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
    		r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
@@ -927,9 +947,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -965,8 +983,10 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},
+    	#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},
+    	#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -29,7 +29,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -124,7 +125,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -384,9 +385,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -417,8 +416,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -39,7 +39,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -137,7 +138,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -567,9 +568,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -605,8 +604,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

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

@@ -29,7 +29,8 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -125,7 +126,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,do_log
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,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,
@@ -353,9 +354,7 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     protocol_id,
@@ -386,8 +385,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml

@@ -7,7 +7,8 @@
 		<id column="host_id" property="hostId" jdbcType="INTEGER" />
 		<result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
 		<result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
+<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -121,9 +122,7 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
 	<!-- 新增 -->
 	<insert id="insert" parameterType="com.nis.domain.specific.SpecificServiceHostCfg">
 	insert into specific_service_host_cfg (spec_service_id,ip_type,
-    src_ip_address,
-    ip_pattern,
-    port_pattern,
+    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
     src_port,
     protocol,
     direction,
@@ -132,8 +131,8 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
     is_valid,is_audit,creator_id,create_time,editor_id,edit_time,auditor_id,audit_time)
 	values(#{specServiceId},#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{ipPattern,jdbcType=INTEGER},
-    	#{portPattern,jdbcType=INTEGER},
+    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{direction,jdbcType=INTEGER},
@@ -146,10 +145,10 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
 	update specific_service_host_cfg s set 
 		s.spec_service_id = #{specServiceId},
         s.IP_TYPE = #{ipType,jdbcType=INTEGER},
-   		s.IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
+   		s.IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
    		s.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
    		s.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
-   		s.PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
+   		s.PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
    		s.SRC_PORT=#{srcPort,jdbcType=VARCHAR},
    		s.DEST_PORT=#{destPort,jdbcType=VARCHAR},
         s.direction = #{direction,jdbcType=INTEGER},

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

@@ -1044,31 +1044,45 @@ public abstract class BaseService {
 	 */
 	public static List<IpCfg> ipConvert(IpCfg dstIp, BaseIpCfg srcIp) {
 		List<IpCfg> ipConvertList = Lists.newArrayList();
-		boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2)
-				|| (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1)
-				|| (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1));
-		if (isRange) {
-			List<IpCfg> tempList = Lists.newArrayList();
-			List<IpCfg> tempList1 = Lists.newArrayList();
-			if (srcIp.getIpType().intValue() == 4) {
-				if (srcIp.getSrcIpAddress() != null) {
-					String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
-					String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
-					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
-					Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
-					for (int i = startNum; i <= endNum; i++) {
-						IpCfg tempIp = new IpCfg();
-						BeanUtils.copyProperties(dstIp, tempIp);
-						tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
-						tempIp.setSrcIpMask("255.255.255.255");
-						tempList.add(tempIp);
+		List<IpCfg> tempList = Lists.newArrayList();
+		List<IpCfg> tempList1 = Lists.newArrayList();
+		if (srcIp.getIpType().equals(4)) {// IP V4
+			if(srcIp.getSrcIpPattern().equals(2)) {//源IP范围
+					if (srcIp.getSrcIpAddress() != null) {
+						String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
+						String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
+						Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
+						Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
+						for (int i = startNum; i <= endNum; i++) {
+							IpCfg tempIp = new IpCfg();
+							BeanUtils.copyProperties(dstIp, tempIp);
+							tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
+							tempIp.setSrcIpMask("255.255.255.255");
+							tempList.add(tempIp);
+						}
+					}else {
+						dstIp.setSrcIp("0.0.0.0");
+						dstIp.setSrcIpMask("255.255.255.255");
+						tempList.add(dstIp);
 					}
+			}else if(srcIp.getSrcIpPattern().equals(1)){
+				Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
+				if (srcMaskNum == 0) {
+					dstIp.setSrcIpMask("0.0.0.0");
 				} else {
-					dstIp.setSrcIp("0.0.0.0");
-					dstIp.setSrcIpMask("255.255.255.255");
-					tempList.add(dstIp);
+					dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
 				}
-				if (srcIp.getDestIpAddress() != null) {
+				dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+				tempList.add(dstIp);
+			}else if(srcIp.getSrcIpPattern().equals(3)){
+				dstIp.setSrcIp(srcIp.getSrcIpAddress());
+				dstIp.setSrcIpMask("255.255.255.255");
+				tempList.add(dstIp);
+			}else {
+				throw new RuntimeException("Unsupported IP Pattern " + srcIp.getSrcIpPattern());
+			}
+			if (srcIp.getDestIpAddress() != null) {
+				if(srcIp.getDestIpPattern().equals(2)) {
 					String startIpPart = srcIp.getDestIpAddress().split("-")[0];
 					String endIpPart = srcIp.getDestIpAddress().split("-")[1];
 					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
@@ -1088,217 +1102,93 @@ public abstract class BaseService {
 						}
 					}
 					tempList.clear();
-				} else {
+				}else if(srcIp.getDestIpPattern().equals(1)) {
+					Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
 					for (IpCfg _cfg : tempList) {
-						_cfg.setDstIp("0.0.0.0");
-						_cfg.setSrcIpMask("255.255.255.255");
-						convertPortValues(_cfg, srcIp);
+						IpCfg tempIp = new IpCfg();
+						BeanUtils.copyProperties(_cfg, tempIp);
+						if (dstMaskNum == 0) {
+							tempIp.setDstIpMask("0.0.0.0");
+						} else {
+							tempIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
+						}
+						tempIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
+							// 处理
+							convertPortValues(tempIp, srcIp);
+							tempList1.add(tempIp);
+						}
 					}
+					tempList.clear();
+				}else {
+					for (IpCfg _cfg : tempList) {
+						IpCfg tempIp = new IpCfg();
+						BeanUtils.copyProperties(_cfg, tempIp);
+						tempIp.setDstIp(srcIp.getDestIpAddress());
+						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
+							tempIp.setDstIpMask("255.255.255.255");
+							// 处理
+							convertPortValues(tempIp, srcIp);
+							tempList1.add(tempIp);
+						}
+					}
+					tempList.clear();
 				}
-				if (tempList1.size() > 0) {
-					ipConvertList.addAll(tempList1);
-				} else {
-					ipConvertList.addAll(tempList);
+			}else {
+				for (IpCfg _cfg : tempList) {
+					_cfg.setDstIp("0.0.0.0");
+					_cfg.setSrcIpMask("255.255.255.255");
+					convertPortValues(_cfg, srcIp);
 				}
-			} else if (srcIp.getIpType().intValue() == 6) {
-				if (srcIp.getSrcIpAddress() != null) {
+			}
+			if (tempList1.size() > 0) {
+				ipConvertList.addAll(tempList1);
+			} else {
+				ipConvertList.addAll(tempList);
+			}
+		}else if(srcIp.getIpType().equals(6)){// IP V6
+			if (srcIp.getSrcIpAddress() != null) {
+				if(srcIp.getSrcIpPattern().equals(2)) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setSrcIp(address1.toString());
 					dstIp.setSrcIpMask(network.getNetmask().asAddress().toString());
-				} else {
-					dstIp.setSrcIp("::");
+				}else if(srcIp.getSrcIpPattern().equals(1)){// IP/掩码
+					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
+					dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+					dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
+				}else {// IP
+					dstIp.setSrcIp(srcIp.getSrcIpAddress());
 					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
-				if (srcIp.getDestIpAddress() != null) {
+			} else {
+				dstIp.setSrcIp("::");
+				dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+			}
+			if (srcIp.getDestIpAddress() != null) {
+				if(srcIp.getDestIpPattern().equals(2)) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setDstIp(address1.toString());
 					dstIp.setDstIpMask(network.getNetmask().asAddress().toString());
-				} else {
-					dstIp.setDstIp("::");
-					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-				}
-
-				ipConvertList.add(dstIp);
-			} else {
-				throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-			}
-		} else {
-			if (srcIp.getSrcIpAddress() != null) {
-				if (srcIp.getSrcIpAddress().indexOf("/") != -1) {
-					if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
-						Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
-						if (srcMaskNum == 0) {
-							dstIp.setSrcIpMask("0.0.0.0");
-						} else {
-							dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
-						}
-
-						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
-						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-						dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
-					} /*
-						 * else { Pattern
-						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
-						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
-						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher
-						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress());
-						 * if(matchernV4Subnet.matches()) { Integer srcMaskNum =
-						 * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){
-						 * dstIp.setSrcIpMask("0.0.0.0"); }else{
-						 * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); }
-						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else
-						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
-						 * IPv6Network.fromString(srcIp.getSrcIpAddress());
-						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-						 * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
-						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
-						 */
-					else {
-						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-					}
-				} else {
-					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
-						dstIp.setSrcIp(srcIp.getSrcIpAddress());
-						dstIp.setSrcIpMask("255.255.255.255");
-					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-						dstIp.setSrcIp(srcIp.getSrcIpAddress());
-						dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-					} /*
-						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
-						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
-						 * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher
-						 * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches())
-						 * { dstIp.setSrcIp(srcIp.getSrcIpAddress());
-						 * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
-						 * dstIp.setSrcIp(srcIp.getSrcIpAddress());
-						 * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
-						 * new RuntimeException("Invalid IP format"); } }
-						 */
-					else {
-						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-					}
-				}
-			} else {
-				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
-					dstIp.setSrcIp(srcIp.getSrcIpAddress());
-					dstIp.setSrcIpMask("255.255.255.255");
-				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-					dstIp.setSrcIp(srcIp.getSrcIpAddress());
-					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-				} /*
-					 * else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress());
-					 * dstIp.setSrcIpMask("255.255.255.255"); }
-					 */
-				else {
-					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-				}
-			}
-			if (srcIp.getDestIpAddress() != null) {
-				if (srcIp.getDestIpAddress().indexOf("/") != -1) {
-					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-						Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
-						if (dstMaskNum == 0) {
-							dstIp.setDstIpMask("0.0.0.0");
-						} else {
-							dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
-							;
-						}
-						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
-						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
-						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-						dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
-					} /*
-						 * else { Pattern
-						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
-						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
-						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher
-						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress());
-						 * if(matchernV4Subnet.matches()) { Integer dstMaskNum =
-						 * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){
-						 * dstIp.setDstIpMask("0.0.0.0"); }else{
-						 * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; }
-						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else
-						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
-						 * IPv6Network.fromString(srcIp.getDestIpAddress());
-						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-						 * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
-						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
-						 */
-					else {
-						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-					}
-
-				} else {
-					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-						dstIp.setDstIp(srcIp.getDestIpAddress());
-						dstIp.setDstIpMask("255.255.255.255");
-					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
-						dstIp.setDstIp(srcIp.getDestIpAddress());
-						dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-					} /*
-						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
-						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
-						 * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher
-						 * matcherV6=patternV6.matcher(srcIp.getDestIpAddress());
-						 * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress());
-						 * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
-						 * dstIp.setDstIp(srcIp.getDestIpAddress());
-						 * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
-						 * new RuntimeException("invalid ip format"); } }
-						 */
-					else {
-						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-					}
-				}
-			} else {
-				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
-					dstIp.setDstIp(srcIp.getDestIpAddress());
-					dstIp.setDstIpMask("255.255.255.255");
-				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+				}else if(srcIp.getDestIpPattern().equals(1)) {// IP/掩码
+					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
+					dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+					dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
+				}else {// IP
 					dstIp.setDstIp(srcIp.getDestIpAddress());
 					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-				} /*
-					 * else {//all dstIp.setDstIp(srcIp.getDestIpAddress());
-					 * dstIp.setDstIpMask("255.255.255.255"); }
-					 */
-				else {
-					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
-				}
-			}
-			if (srcIp.getSrcPort() != null) {
-				if (srcIp.getSrcPort().indexOf("/") != -1) {
-					String srcMaskNum = srcIp.getSrcPort().split("/")[1];
-					dstIp.setSrcPortMask(srcMaskNum);
-					dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]);
-				} else {
-					dstIp.setSrcPort(srcIp.getSrcPort());
-					dstIp.setSrcPortMask("65535");
 				}
 			} else {
-				dstIp.setSrcPort("0");
-				dstIp.setSrcPortMask("65535");
-			}
-			if (srcIp.getDestPort() != null) {
-				if (srcIp.getDestPort().indexOf("/") != -1) {
-					String dstMaskNum = srcIp.getDestPort().split("/")[1];
-					dstIp.setDstPortMask(dstMaskNum);
-					dstIp.setDstPort(srcIp.getDestPort().split("/")[0]);
-				} else {
-					dstIp.setDstPort(srcIp.getDestPort());
-					dstIp.setDstPortMask("65535");
-				}
-			} else {
-				dstIp.setDstPort("0");
-				dstIp.setDstPortMask("65535");
+				dstIp.setDstIp("::");
+				dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 			}
+			convertPortValues(dstIp, srcIp);
 			ipConvertList.add(dstIp);
+		}else {
+			throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
 		}
 		return ipConvertList;
 	}
@@ -2596,7 +2486,15 @@ public abstract class BaseService {
 									if(_cfg.getAction().equals(Constants.MONIT_ACTION)) {
 										maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+Constants.USER_REGION_PLACEHOLDER);
 									}*/
-									maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
+									if(serviceDict!=null&&serviceDict.getAction().equals(Constants.MONIT_ACTION)) {// 监测 需要发keyring_id、拦截强度
+										_cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1());
+										_cfg.setUserRegion5(StringUtil.isEmpty(_cfg.getUserRegion5()) ? "1":_cfg.getUserRegion5());
+										maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"=0"+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+_cfg.getUserRegion5());
+									}
+									if(serviceDict!=null&&serviceDict.getAction().equals(64)) {
+										maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
+									}
+									
 								}else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换
 									String userRegion = Constants.USER_REGION_PLACEHOLDER;
 									if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断

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

@@ -429,7 +429,7 @@ public class AppCfgService extends BaseService {
 					BeanUtils.copyProperties(entity, cfg,
 							new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective",
 									"areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort",
-									"direction", "destIpAddress", "srcIpAddress", "ipPattern" });
+									"direction", "destIpAddress", "srcIpAddress", "srcIpPattern", "destIpPattern" });
 					areaIpCfgDao.saveAreaIpCfg(cfg);
 				}
 			}
@@ -453,7 +453,7 @@ public class AppCfgService extends BaseService {
 					BeanUtils.copyProperties(entity, cfg,
 							new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective", "areaEffectiveIds",
 									"protocol", "portPattern", "srcPort", "destPort", "direction", "destIpAddress",
-									"srcIpAddress", "ipPattern" });
+									"srcIpAddress", "srcIpPattern", "destIpPattern" });
 					areaIpCfgDao.saveAreaIpCfg(cfg);
 				}
 			}

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

@@ -255,7 +255,6 @@ public class AvContentCfgService extends BaseService{
 						auditAvVoip(entity,entity.getIsAudit(), Constants.INSERT_ACTION);
 					}
 					
-					
 				}else{
 					entity.setEditTime(new Date());
 					entity.setEditorId(entity.getCurrentUser().getId());
@@ -534,7 +533,6 @@ public class AvContentCfgService extends BaseService{
 					}
 				}
 		
-		
 		//构造提交综合服务参数格式，一条配置提交一次综合服务
 		if(isAudit==1){
 			maatCfg.initDefaultValue();
@@ -772,9 +770,11 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 																				,"cfgType"
 																				,"ipType"
-																				,"ipPattern"
+																				,"srcIpPattern"
+																				,"destIpPattern"
 																				,"srcIpAddress"
-																				,"portPattern"
+																				,"srcPortPattern"
+																				,"destPortPattern"
 																				,"srcPort"
 																				,"destPort"
 																				,"protocol"
@@ -812,9 +812,11 @@ public class AvContentCfgService extends BaseService{
 																				,"cfgType"
 																				,"cfgId"
 																				,"ipType"
-																				,"ipPattern"
+																				,"srcIpPattern"
+																				,"destIpPattern"
 																				,"srcIpAddress"
-																				,"portPattern"
+																				,"srcPortPattern"
+																				,"destPortPattern"
 																				,"srcPort"
 																				,"destPort"
 																				,"protocol"
@@ -829,9 +831,11 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"ipPattern"
+								,"srcIpPattern"
+								,"destIpPattern"
 								,"srcIpAddress"
-								,"portPattern"
+								,"srcPortPattern"
+								,"destPortPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -936,9 +940,11 @@ public class AvContentCfgService extends BaseService{
 				,"cfgType"
 				,"cfgId"
 				,"ipType"
-				,"ipPattern"
+				,"srcIpPattern"
+				,"destIpPattern"
 				,"srcIpAddress"
-				,"portPattern"
+				,"srcPortPattern"
+				,"destPortPattern"
 				,"srcPort"
 				,"destPort"
 				,"protocol"
@@ -1111,9 +1117,11 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"ipPattern"
+								,"srcIpPattern"
+								,"destIpPattern"
 								,"srcIpAddress"
-								,"portPattern"
+								,"srcPortPattern"
+								,"destPortPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1151,9 +1159,11 @@ public class AvContentCfgService extends BaseService{
 								,"cfgType"
 								,"cfgId"
 								,"ipType"
-								,"ipPattern"
+								,"srcIpPattern"
+								,"destIpPattern"
 								,"srcIpAddress"
-								,"portPattern"
+								,"srcPortPattern"
+								,"destPortPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1168,9 +1178,11 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"ipPattern"
+								,"srcIpPattern"
+								,"destIpPattern"
 								,"srcIpAddress"
-								,"portPattern"
+								,"srcPortPattern"
+								,"destPortPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1275,9 +1287,11 @@ public class AvContentCfgService extends BaseService{
 				,"cfgType"
 				,"cfgId"
 				,"ipType"
-				,"ipPattern"
+				,"srcIpPattern"
+				,"destIpPattern"
 				,"srcIpAddress"
-				,"portPattern"
+				,"srcPortPattern"
+				,"destPortPattern"
 				,"srcPort"
 				,"destPort"
 				,"protocol"

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

@@ -140,11 +140,13 @@ public class DnsIpCfgService extends BaseService{
 		dnsIp.setFunctionId(401);
 		dnsIp.setCfgRegionCode(1);
 		dnsIp.setCfgType("dns_fake_ip");
-		dnsIp.setIpPattern(3);
+		dnsIp.setSrcIpPattern(3);
+		dnsIp.setDestIpPattern(3);
 		dnsIp.setSrcIpAddress("0.0.0.0");
 		dnsIp.setDestPort("0");
 		dnsIp.setSrcPort("0");
-		dnsIp.setPortPattern(1);
+		dnsIp.setSrcPortPattern(1);
+		dnsIp.setDestPortPattern(1);
 		dnsIp.setDnsStrategyId(0);
 		dnsIp.setAction(16);
 		dnsIp.setServiceId(64);

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

@@ -76,7 +76,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 					c.initDefaultValue();
 					BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 							"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-							"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
+							"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
 					c.setTableName(AreaIpCfg.getTablename());
 				}
 				this.saveIpBatch(cfg.getAreaCfg());
@@ -106,7 +106,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				c.initDefaultValue();
 				BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 						"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-						"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
+						"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
 				c.setTableName(AreaIpCfg.getTablename());
 				c.setCreatorId(cfg.getCurrentUser().getId());
 				c.setCreateTime(date);
@@ -202,9 +202,11 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 					,"cfgType"
 					,"cfgId"
 					,"ipType"
-					,"ipPattern"
+					,"srcIpPattern"
+					,"destIpPattern"
 					,"srcIpAddress"
-					,"portPattern"
+					,"srcPortPattern"
+					,"destPortPattern"
 					,"srcPort"
 					,"destPort"
 					,"protocol"

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

@@ -99,7 +99,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 					c.initDefaultValue();
 					BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 							"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-							"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
+							"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
 					c.setTableName(AreaIpCfg.getTablename());
 				}
 				this.saveIpBatch(cfg.getAreaCfg());
@@ -349,7 +349,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 				c.initDefaultValue();
 				BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 						"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-						"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
+						"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
 				c.setTableName(AreaIpCfg.getTablename());
 				c.setCreatorId(cfg.getCurrentUser().getId());
 				c.setCreateTime(date);
@@ -371,9 +371,11 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 					,"cfgType"
 					,"cfgId"
 					,"ipType"
-					,"ipPattern"
+					,"srcIpPattern"
+					,"destIpPattern"
 					,"srcIpAddress"
-					,"portPattern"
+					,"srcPortPattern"
+					,"destPortPattern"
 					,"srcPort"
 					,"destPort"
 					,"protocol"

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

@@ -1,14 +1,11 @@
 package com.nis.web.service.configuration;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,14 +13,12 @@ import org.springframework.transaction.annotation.Transactional;
 import com.beust.jcommander.internal.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.IpReuseDnatPolicyCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.StringUtils;
 import com.nis.web.dao.configuration.IpMultiplexDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;

src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java

@@ -17,7 +17,6 @@ import com.nis.domain.Page;
 import com.nis.domain.SysUser;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.domain.specific.SpecificServiceHostCfg;
-import com.nis.util.BasicProvingUtil;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.specific.SpecificServiceHostCfgDao;
 import com.nis.web.security.UserUtils;
@@ -58,45 +57,66 @@ public class SpecificServiceHostCfgService extends BaseService{
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) {
 		SysUser user = UserUtils.getUser();
-		String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
+		String defaultSrcIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
+		String defaultDestIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
 		if(specificServiceHostCfg.getIpType().equals(4)){
-			if(specificServiceHostCfg.getIpPattern()==1){
-				defaultIp = "0.0.0.0/32"; //0.0.0.0表示任意
-			}else if(specificServiceHostCfg.getIpPattern()==2){
-				defaultIp = "0.0.0.0-0.0.0.0"; 
+			if(specificServiceHostCfg.getSrcIpPattern()==1){
+				defaultSrcIp = "0.0.0.0/32"; //0.0.0.0表示任意
+			}else if(specificServiceHostCfg.getSrcIpPattern()==2){
+				defaultSrcIp = "0.0.0.0-0.0.0.0"; 
 			}else{
-				defaultIp = "0.0.0.0";
+				defaultSrcIp = "0.0.0.0";
+			}
+			if(specificServiceHostCfg.getDestIpPattern()==1){
+				defaultDestIp = "0.0.0.0/32"; //0.0.0.0表示任意
+			}else if(specificServiceHostCfg.getDestIpPattern()==2){
+				defaultDestIp = "0.0.0.0-0.0.0.0"; 
+			}else{
+				defaultDestIp = "0.0.0.0";
 			}
 			
 		}
 		if(specificServiceHostCfg.getIpType().equals(6)){
-			if(specificServiceHostCfg.getIpPattern()==1){
-				defaultIp = "::/64";
-			}else if(specificServiceHostCfg.getIpPattern()==2){
-				defaultIp = "::-::"; 
+			if(specificServiceHostCfg.getSrcIpPattern()==1){
+				defaultSrcIp = "::/64";
+			}else if(specificServiceHostCfg.getSrcIpPattern()==2){
+				defaultSrcIp = "::-::"; 
 			}else{
-				defaultIp = "::";
+				defaultSrcIp = "::";
+			}
+			if(specificServiceHostCfg.getDestIpPattern()==1){
+				defaultDestIp = "::/64";
+			}else if(specificServiceHostCfg.getDestIpPattern()==2){
+				defaultDestIp = "::-::"; 
+			}else{
+				defaultDestIp = "::";
 			}
 		}
-		String defaultPort = "0"; //0表示任意
-		if(specificServiceHostCfg.getPortPattern().equals(1)){
-			defaultPort = "0";
+		String defaultSrcPort = "0"; //0表示任意
+		String defaultDestPort = "0"; //0表示任意
+		if(specificServiceHostCfg.getSrcPortPattern().equals(1)){
+			defaultSrcPort = "0";
 		}else{
-			defaultPort = "0/0";
+			defaultSrcPort = "0/0";
+		}
+		if(specificServiceHostCfg.getDestPortPattern().equals(1)){
+			defaultDestPort = "0";
+		}else{
+			defaultDestPort = "0/0";
 		}
 		//ip地址默认  缺省0.0.0.0值表示任意
 		if(StringUtil.isBlank(specificServiceHostCfg.getSrcIpAddress())){
-			specificServiceHostCfg.setSrcIpAddress(defaultIp);
+			specificServiceHostCfg.setSrcIpAddress(defaultSrcIp);
 		}
 		if(StringUtil.isBlank(specificServiceHostCfg.getDestIpAddress())){
-			specificServiceHostCfg.setDestIpAddress(defaultIp);
+			specificServiceHostCfg.setDestIpAddress(defaultDestIp);
 		}
 		//端口掩码默认
 		if(StringUtil.isBlank(specificServiceHostCfg.getSrcPort())){
-			specificServiceHostCfg.setSrcPort(defaultPort);
+			specificServiceHostCfg.setSrcPort(defaultSrcPort);
 		}
 		if(StringUtil.isBlank(specificServiceHostCfg.getDestPort())){
-			specificServiceHostCfg.setDestPort(defaultPort);
+			specificServiceHostCfg.setDestPort(defaultDestPort);
 		}
 		//方向缺省
 		if(specificServiceHostCfg.getDirection()==null){

src/main/java/com/nis/web/test/MaatCfgConverTest.java

@@ -31,20 +31,24 @@ public class MaatCfgConverTest {
 		ToMaatBean maat = new ToMaatBean();
 		BaseStringCfg str = new BaseStringCfg();
 		BaseIpCfg ip = new BaseIpCfg();
-		ip.setIpPattern(1);
+		ip.setSrcIpPattern(1);
+		ip.setDestIpPattern(1);
 		ip.setIpType(4);
 		ip.setSrcIpAddress("192.168.10.0/24");
-		ip.setPortPattern(2);
+		ip.setSrcPortPattern(2);
+		ip.setDestPortPattern(2);
 		ip.setSrcPort("8080-8089");
 		ip.setCompileId(123);
 		ip.setProtocol(6);
 		ip.setDirection(2);
 		ipList.add(ip);
 		ip = new BaseIpCfg();
-		ip.setIpPattern(2);
+		ip.setSrcIpPattern(2);
+		ip.setDestIpPattern(2);
 		ip.setIpType(4);
 		ip.setSrcIpAddress("10.0.6.0-10.0.6.100");
-		ip.setPortPattern(1);
+		ip.setSrcPortPattern(1);
+		ip.setDestPortPattern(1);
 		ip.setSrcPort("7080/65534");
 		ip.setCompileId(124);
 		ip.setDirection(1);
@@ -67,17 +71,17 @@ public class MaatCfgConverTest {
 		for(BaseIpCfg c:ipList){
 			IpCfg ipCfg = new IpCfg();
 			ipCfg.setRegionId(regionId);
-			if(c.getIpPattern()==1){
+			if(c.getSrcIpPattern()==1){
 				ipCfg.setSrcIp(c.getSrcIpAddress().split("/")[0]);
 				ipCfg.setSrcIpMask(IpUtil.convertMask(Integer.parseInt(c.getSrcIpAddress().split("/")[1])));
-			}else if(c.getIpPattern()==2){
+			}else if(c.getSrcIpPattern()==2){
 				ipCfg.setSrcIp(c.getSrcIpAddress().split("-")[0]);
 				ipCfg.setSrcIpMask(IpUtil.getMask(c.getSrcIpAddress().split("-")[0], c.getSrcIpAddress().split("-")[1]));
 			}
-			if(c.getPortPattern()==1){
+			if(c.getSrcPortPattern()==1){
 				ipCfg.setSrcPort(c.getSrcPort().split("/")[0]);
 				ipCfg.setSrcPortMask(c.getSrcPort().split("/")[1]);
-			}else if(c.getPortPattern()==2){
+			}else if(c.getSrcPortPattern()==2){
 				ipCfg.setSrcPort(c.getSrcPort().split("-")[0]);
 				Integer portMask = Integer.parseInt(c.getSrcPort().split("-")[1])-Integer.parseInt(c.getSrcPort().split("-")[0]);
 				ipCfg.setSrcPortMask(portMask.toString());