1、APP策略配置增加IP配置；2、修改IP转换时，IPV4的IP/MASK格式时，MASK为0异常的错误。

Signed-off-by: zhangwei <zhangwei@intranet.com>

src/main/java/com/nis/domain/configuration/AppPolicyCfg.java

@@ -8,6 +8,8 @@
  */
 package com.nis.domain.configuration;
 
+import java.util.List;
+
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.util.excel.ExcelField;
@@ -38,17 +40,20 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	@Expose
 	@ExcelField(title="expression_type")
 	@SerializedName("exprType")
-	protected Integer exprType ;
+	private Integer exprType ;
 
 	@Expose
 	@ExcelField(title="match_method")
 	@SerializedName("matchMethod")
-	protected Integer matchMethod ;
+	private Integer matchMethod ;
 
 	@Expose
 	@ExcelField(title="whether_hexbinary")
 	@SerializedName("isHexbin")
-	protected Integer isHexbin;
+	private Integer isHexbin;
+	
+	private List<IpPortCfg> ipPortList;
+	private IpPortCfg ipPort;
 
 	public Integer getExprType() {
 		return exprType;
@@ -134,5 +139,21 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	public void setBehavCode(Integer behavCode) {
 		this.behavCode = behavCode;
 	}
+
+	public List<IpPortCfg> getIpPortList() {
+		return ipPortList;
+	}
+
+	public void setIpPortList(List<IpPortCfg> ipPortList) {
+		this.ipPortList = ipPortList;
+	}
+
+	public IpPortCfg getIpPort() {
+		return ipPort;
+	}
+
+	public void setIpPort(IpPortCfg ipPort) {
+		this.ipPort = ipPort;
+	}
 	
 }

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

@@ -1,6 +1,8 @@
 package com.nis.web.controller.configuration;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -19,6 +21,9 @@ import com.nis.domain.configuration.AppDomainCfg;
 import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppPolicyCfg;
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.web.controller.BaseController;
@@ -52,6 +57,31 @@ public class AppCfgController extends BaseController {
 		initPageCondition(model,cfg);
 		return "/cfg/app/appPolicyCfgList";
 	}
+	/**
+	 * 查询APP策略IP子配置
+	 * @param model
+	 * @param cfgId
+	 * @param index
+	 * @return
+	 */
+	@RequestMapping(value = {"ajaxAppPolicyIpList"})
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
+		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/app/appPolicyIpList";
+	}
 	/**
 	 * 策略配置表单
 	 * @param model

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

@@ -18,6 +18,7 @@ import com.nis.domain.configuration.AppStringCfg;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.ComplexkeywordCfg;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -32,8 +33,13 @@ public interface AppCfgDao {
 	//app策略配置增删改查
 	public List<AppPolicyCfg> findAppPolicyList(AppPolicyCfg entity) ;
 	public AppPolicyCfg getAppPolicyCfg(Long cfgId) ;
+	public IpPortCfg getAppPolicyIpCfg(AppPolicyCfg entity) ;
+	public List<IpPortCfg> getAppPolicyIpList(AppPolicyCfg entity);
 	public int insertAppPolicyCfg(AppPolicyCfg entity);
 	public int updateAppPolicyCfg(AppPolicyCfg entity);	
+	public int insertAppPolicyIpCfg(IpPortCfg entity);
+	public int deleteAppPolicyIpCfg(AppPolicyCfg entity);
+	
 	//app协议IP配置增删改查
 	public List<AppIpCfg> findAppIpList(AppIpCfg entity) ;
 	public AppIpCfg getAppIpCfg(Long cfgId) ;

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

@@ -189,6 +189,41 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
     
+  <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
+    <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="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
+    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
+    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
+    <result column="src_port" property="srcPort" jdbcType="VARCHAR" />
+    <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
+    <result column="direction" property="direction" jdbcType="INTEGER" />
+    <result column="protocol" property="protocol" jdbcType="INTEGER" />
+    <result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+  </resultMap>
+  
   <sql id="AppPolicyCfg_Column" >
     r.CFG_ID, r.APP_CODE,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
@@ -248,6 +283,15 @@
     #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER},
     #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
   </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.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,
+	a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable
+	,a.area_effective_ids,a.function_id,a.cfg_region_code
+  </sql>
   <!-- <sql id="AppCfg_Column_List_with_id_alias" >
   	<choose>
   		<when test="page !=null and page.alias != null and page.alias != ''">
@@ -397,7 +441,25 @@
 	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
-		  		
+		  	<if test="ipPort!=null">
+	    		AND r.compile_id in (select t.compile_id from ip_port_cfg t 
+	    		<where>
+	    			and t.protocol_id=21
+	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
+	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
+		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
+	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
+		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if>	
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -1011,6 +1073,78 @@
     )
   </insert>
   
+  <!-- insert ip_port_cfg表信息 -->
+  <insert id="insertAppPolicyIpCfg" parameterType="com.nis.domain.configuration.IpPortCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ip_port_cfg (
+     CFG_DESC,
+     ACTION,
+     IS_VALID,
+     IS_AUDIT,
+     CREATOR_ID,
+    CREATE_TIME,
+    EDITOR_ID,
+    EDIT_TIME,
+    AUDITOR_ID,
+    AUDIT_TIME,
+   	SERVICE_ID,
+   	REQUEST_ID,
+   	COMPILE_ID,
+   	IS_AREA_EFFECTIVE,
+   	CLASSIFY,
+    ATTRIBUTE,
+    LABLE,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+    ip_type,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
+    src_port,
+    protocol,
+    protocol_id,
+    direction,
+    dest_port,
+    dest_ip_address,
+    cfg_type,
+    cfg_region_code
+    )values (
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{compileId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{ipType,jdbcType=INTEGER},
+    	#{srcIpAddress,jdbcType=VARCHAR},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
+    	#{srcPort,jdbcType=VARCHAR},
+    	#{protocol,jdbcType=INTEGER},
+    	#{protocolId,jdbcType=INTEGER}, 
+    	#{direction,jdbcType=INTEGER},
+    	#{destPort,jdbcType=VARCHAR},
+    	#{destIpAddress,jdbcType=VARCHAR},
+    	#{cfgType,jdbcType=VARCHAR},
+    	#{cfgRegionCode,jdbcType=INTEGER}
+    )
+  </insert>
+  
   <update id="updateAppPolicyCfg" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
     update app_policy_cfg
     <set >
@@ -1525,4 +1659,15 @@
 	</trim>
     
   </update>
+  
+  <!-- 删除APP策略IP子配置 -->
+  <delete id="deleteAppPolicyIpCfg" >
+  	delete from ip_port_cfg where compile_id=#{compileId} and protocol_id=21 and function_id=#{functionId}
+  </delete>
+  <!-- 查询APP策略IP子配置 -->
+  <select id="getAppPolicyIpList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+	     <include refid="IpCfg_Column" />
+	    FROM ip_port_cfg a where compile_id=#{compileId}  and function_id=#{functionId}
+  </select>
 </mapper>

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

@@ -390,7 +390,12 @@ public abstract class BaseService {
 			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]);
-					dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
+					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());
@@ -413,27 +418,31 @@ public abstract class BaseService {
 			}else{
 				if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6
 					dstIp.setSrcIp(srcIp.getSrcIpAddress());
-					dstIp.setSrcIpMask("0.0.0.0");
+					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("::");
+					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
 				
 			}
 		}else{
 			if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6
 				dstIp.setSrcIp(srcIp.getSrcIpAddress());
-				dstIp.setSrcIpMask("0.0.0.0");
+				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("::");
+				dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 			}
 		}
 		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]);
-					dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
+					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());
@@ -456,20 +465,20 @@ public abstract class BaseService {
 			}else{
 				if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4
 					dstIp.setDstIp(srcIp.getDestIpAddress());
-					dstIp.setDstIpMask("0.0.0.0");
+					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("::");
+					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
 				
 			}
 		}else{
 			if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4
 				dstIp.setDstIp(srcIp.getDestIpAddress());
-				dstIp.setDstIpMask("0.0.0.0");
+				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("::");
+				dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 			}
 		}
 		if(srcIp.getSrcPort()!=null){
@@ -479,11 +488,11 @@ public abstract class BaseService {
 				dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]);
 			}else{
 				dstIp.setSrcPort(srcIp.getSrcPort());
-				dstIp.setSrcPortMask("0");
+				dstIp.setSrcPortMask("65535");
 			}
 		}else{
 			dstIp.setSrcPort("0");
-			dstIp.setSrcPortMask("0");
+			dstIp.setSrcPortMask("65535");
 		}
 		if(srcIp.getDestPort()!=null){
 			if(srcIp.getDestPort().indexOf("/")!=-1){
@@ -492,11 +501,11 @@ public abstract class BaseService {
 				dstIp.setDstPort(srcIp.getDestPort().split("/")[0]);
 			}else{
 				dstIp.setDstPort(srcIp.getDestPort());
-				dstIp.setDstPortMask("0");
+				dstIp.setDstPortMask("65535");
 			}
 		}else{
 			dstIp.setDstPort("0");
-			dstIp.setDstPortMask("0");
+			dstIp.setDstPortMask("65535");
 		}
 		return dstIp;
 	}

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

@@ -17,6 +17,7 @@ import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
@@ -84,7 +85,10 @@ public class AppCfgService extends BaseService {
 		return page;
 	}
 	public AppPolicyCfg getAppPolicyCfg(Long cfgId){
-		return appCfgDao.getAppPolicyCfg(cfgId);
+		AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
+		List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy);
+		policy.setIpPortList(ipPortList);
+		return policy;
 	}
 	public AppIpCfg getAppIpCfg(Long cfgId){
 		return appCfgDao.getAppIpCfg(cfgId);
@@ -116,6 +120,13 @@ public class AppCfgService extends BaseService {
 				entity.setIsValid(0);
 				entity.setIsAudit(0);
 				appCfgDao.insertAppPolicyCfg(entity);		
+				//保存策略IP配置
+				if(entity.getIpPortList()!=null){
+					for(IpPortCfg cfg:entity.getIpPortList()){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						appCfgDao.insertAppPolicyIpCfg(cfg);
+					}
+				}
 				//保存区域IP信息
 				if(entity.getAreaCfg()!=null){
 					for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -134,15 +145,25 @@ public class AppCfgService extends BaseService {
 			entity.setEditTime(new Date());
 			entity.setIsValid(0);
 			entity.setIsAudit(0);
-			appCfgDao.updateAppPolicyCfg(entity);
+			appCfgDao.updateAppPolicyCfg(entity);			
 			
+			appCfgDao.deleteAppPolicyIpCfg(entity);
 			//删除旧的区域IP，新增新的区域IP
 			AreaIpCfg area = new AreaIpCfg();
 			area.setCompileId(entity.getCompileId());
 			area.setFunctionId(entity.getFunctionId());
 			areaIpCfgDao.deleteAreaIpCfg(area);
+			
 			entity.setCreateTime(new Date());
 			entity.setCreatorId(entity.getCurrentUser().getId());
+			//保存策略IP配置
+			if(entity.getIpPortList()!=null){
+				for(IpPortCfg cfg:entity.getIpPortList()){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					appCfgDao.insertAppPolicyIpCfg(cfg);
+				}
+			}
+			
 			//保存区域IP信息
 			if(entity.getAreaCfg()!=null){
 				for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -390,19 +411,37 @@ public class AppCfgService extends BaseService {
 		List<IpCfg> areaIpRegionList = new ArrayList();		
 		entity.setTableName(AppPolicyCfg.getTablename());
 		appCfgDao.auditCfg(entity);
+		
 		if(isAudit==1){
 			if(entity.getBehavCode()!=null){
 				entity.setCfgKeywords(entity.getAppCode()+"&"+entity.getBehavCode());
 			}else{
 				entity.setCfgKeywords(entity.getAppCode()+"");
 			}
-			
 			List<AppPolicyCfg> list = new ArrayList();
 			list.add(entity);
 			Map<String,List> map = cfgConvert(strRegionList,list,2,entity,groupRelationList);
 			groupRelationList=map.get("groupList");
 			strRegionList=map.get("dstList");
 		}
+		
+		//查询子配置并修改审核状态
+		entity = this.getAppPolicyCfg(entity.getCfgId());
+		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+			IpPortCfg cfg = new IpPortCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(IpPortCfg.getTablename());
+			appCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				ipRegionList=map.get("dstList");
+				if(map.get("numRegionList")!=null){
+					numRegionList.addAll(map.get("numRegionList"));
+				}
+			}
+		}
+		
 		//保存区域IP信息
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){
@@ -810,6 +849,15 @@ public class AppCfgService extends BaseService {
 			entity.setTableName(AppPolicyCfg.getTablename());
 			entity.setFunctionId(functionId);
 			appCfgDao.updateCfgValid(entity);
+			
+			//查询子配置
+			entity = this.getAppPolicyCfg(Long.parseLong(id));
+			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+				IpPortCfg cfg = new IpPortCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(IpPortCfg.getTablename());
+				appCfgDao.updateCfgValid(cfg);
+			}
 			//保存区域IP信息
 			if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
 				AreaIpCfg cfg = new AreaIpCfg();

src/main/resources/jdbc.properties

@@ -6,14 +6,11 @@ jdbc.devlop.username=root
 jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q==
 jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g==
 
-jdbc.product.driver=oracle.jdbc.driver.OracleDriver
+jdbc.product.driver=com.mysql.jdbc.Driver
-#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180))))
+jdbc.product.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-jdbc.product.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+jdbc.product.username=root
-#jdbc.product.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
+jdbc.product.key=pR3JFt5dsGCW0nZO3TLF7Q==
-jdbc.product.username=gk_pz
+jdbc.product.password=JgW5tsiGBNAtcqCgSQIP0g==
-#jdbc.product.username=z2_5x9pz
-jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw==
-jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A==
 
 #jdbc.log.driver=oracle.jdbc.driver.OracleDriver
 #jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app

src/main/resources/messages/message_zh_CN.properties

@@ -605,7 +605,7 @@ action=\u52A8\u4F5C
 has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664
 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838
 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7
-multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002
+multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u56DE\u8F66\u952E\u9694\u5F00\u3002
 action_drop=\u4E22\u5F03
 action_reject=\u963B\u65AD
 action_redirect=\u91CD\u5B9A\u5411
@@ -814,4 +814,5 @@ FTP_CONTENT=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
 id_not_exists=id\u4E3A%s\u7684%s\u4E0D\u5B58\u5728
 id_not_valid=id\u4E3A%s\u7684%s\u65E0\u6548
 num_split_by_comma=%s\u4E3A\u9017\u53F7\u5206\u9694\u7684\u6570\u5B57
+no_data=\u65E0\u76F8\u5173\u6570\u636E
 #=============region_value,config form title=================

src/main/resources/spring-mvc.xml

@@ -172,29 +172,29 @@
 		</mvc:interceptor>
 
 		<!-- 数据源拦截器，该拦截路径下使用数据源B -->
-		<mvc:interceptor>
+		<!-- <mvc:interceptor>
 			<mvc:mapping path="/service/cfg/**" />
 			<bean class="com.nis.interceptor.DataSourceBInterceptor"></bean>
-		</mvc:interceptor>
+		</mvc:interceptor> -->
 
 		<!-- 数据源拦截器，该拦截路径下使用数据源C -->
-		<mvc:interceptor>
+		<!-- <mvc:interceptor>
 			<mvc:mapping path="/service/log/**" />
 			<bean class="com.nis.interceptor.DataSourceCInterceptor"></bean>
-		</mvc:interceptor>
+		</mvc:interceptor> -->
 
 
 		<!-- 数据源拦截器，该拦截路径下使用数据源D,后期会删除 -->
-		<mvc:interceptor>
+		<!-- <mvc:interceptor>
 			<mvc:mapping path="/service/test/**" />
 			<bean class="com.nis.interceptor.DataSourceDInterceptor"></bean>
-		</mvc:interceptor>
+		</mvc:interceptor> -->
 		
 		<!-- 数据源拦截器，该拦截路径下使用数据源E -->
-		<mvc:interceptor>
+		<!-- <mvc:interceptor>
 			<mvc:mapping path="/service/jk/**" />
 			<bean class="com.nis.interceptor.DataSourceEInterceptor"></bean>
-		</mvc:interceptor>
+		</mvc:interceptor> -->
 
 	</mvc:interceptors>
 

src/main/webapp/WEB-INF/sitemesh3.xml

@@ -26,6 +26,7 @@
   <mapping path="/nis/ntc/app/ajax*" exclue="true"/>
   <mapping path="/nis/ntc/other/ajax*" exclue="true"/>
   <mapping path="/nis/proxy/control/httpRedirect/ajax*" exclue="true"/>
+  <mapping path="/nis/app/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -10,6 +10,7 @@ $(function(){
 	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
+		$("#protocolId").val($(this).attr("protocolId"));
 		if($(".action:checked").val()==64){
 			$("#ratelimit").show();
 		}else{
@@ -17,6 +18,7 @@ $(function(){
 		}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
+	$("#protocolId").val($(".action:checked").attr("protocolId"));
 	if($(".action:checked").val()==64){
 		$("#ratelimit").show();
 	}else{
@@ -43,6 +45,10 @@ $(function(){
 				}
 			})
 			if(flag){
+				//将disable属性的元素删除
+				$(".disabled").each(function(){
+					$(this).remove();
+				});
 				$("input[name$='exprType']").attr("disabled",false);
 				$("#appCode").val($("#specServiceIdId").val());
 				loading('onloading...');
@@ -52,6 +58,19 @@ $(function(){
 		errorContainer: "#messageBox",
 	});
 });
+//业务窗口打开
+var addContent = function(obj, contentClassName) {
+	var showDiv = $(obj).parent().parent().next();
+	$(showDiv).removeClass("hidden").removeClass(
+			"disabled");
+	$(obj).addClass("hidden");
+}
+
+//业务窗口关闭
+var delContent = function(contentClassName, addBtnClassName) {
+	$("." + contentClassName).addClass("hidden").addClass("disabled");
+	$("." + addBtnClassName).removeClass("hidden");
+}
 </script>
 </head>
 <body>
@@ -82,75 +101,105 @@ $(function(){
                        	<input type="hidden" id="exprType" name="exprType" value="0">
                        	<input type="hidden" id="matchMethod" name="matchMethod" value="3">
                        	<input type="hidden" id="isHexbin" name="isHexbin" value="0">
-                       	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
-                              <div class="row">
+                             
-                              		<div class="col-md-6">
+							<c:set var="ipCfgIndex" value="0"></c:set>
-								        <div class="form-group">
+							<c:forEach items="${regionList}" var="region" varStatus="status">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
+								<c:if test="${region.regionType eq 2 }">
-								            <div class="col-md-6">
+									<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
+                   					<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
-												 labelName="parent.specServiceName" 
+									 <div class="row">
-												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
+		                              		<div class="col-md-6">
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
+										        <div class="form-group">
-												 cssClass="form-control required"/>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
-								            </div>
+										            <div class="col-md-6">
-								            <div for="parent.specServiceName"></div>
+												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-								        </div>
+														 labelName="parent.specServiceName" 
-								    </div>
+														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-                              		
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
-								    <div class="col-md-6">
+														 cssClass="form-control required"/>
-								        <div class="form-group">
+										            </div>
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+										            <div for="parent.specServiceName"></div>
-								            <div class="col-md-6">
+										        </div>
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+										    </div>
-								            </div>
+		                              		
-								        </div>
+										    <div class="col-md-6">
-								    </div>
+										        <div class="form-group">
-							</div>
+										            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-							<div class="row">
+										            <div class="col-md-6">
-								    <div class="col-md-6">
+										                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								        <div class="form-group">
+										            </div>
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
+										        </div>
-								            <div class="col-md-6">
+										    </div>
-								            	<c:forEach items="${serviceList}" var="service"
+									</div>
-													varStatus="satus">
+									<div class="row">
-													<label class="radio-inline"> <c:if
+										    <div class="col-md-6">
-															test="${_cfg.functionId eq service.functionId}">
+										        <div class="form-group">
-															<input type="radio" name="action"
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
-																serviceId="${service.serviceId }"
+										            <div class="col-md-6">
-																protocolId="${service.protocolId }"
+										            	<c:forEach items="${serviceList}" var="service"
-																value="${service.action }" class="required action"
+															varStatus="satus">
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+															<label class="radio-inline"> <c:if
-																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	test="${_cfg.functionId eq service.functionId}">
-																	<c:if test="${dict.itemCode eq service.action }">
+																	<input type="radio" name="action"
-																		<spring:message code="${dict.itemValue }"/>
+																		serviceId="${service.serviceId }"
-																	</c:if>
+																		protocolId="${service.protocolId }"
-																</c:forEach>
+																		value="${service.action }" class="required action"
-														</c:if>
+																		<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-													</label>
+																		<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-												</c:forEach>
+																			<c:if test="${dict.itemCode eq service.action }">
-								            </div>
+																				<spring:message code="${dict.itemValue }"/>
-								            <div for="action"></div>
+																			</c:if>
-								       </div>
+																		</c:forEach>
-								   </div>
+																</c:if>
-								   <div class="col-md-6" id="ratelimit">
+															</label>
-								        <div class="form-group">
+														</c:forEach>
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
+										            </div>
-								            <div class="col-md-6">
+										            <div for="action"></div>
-								                <input class="form-control required digest" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
+										       </div>
-								            </div>
+										   </div>
-								            <div for="ratelimit"></div>
+										   <div class="col-md-6" id="ratelimit">
-								        </div>
+										        <div class="form-group">
-								    </div>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
-							</div>
+										            <div class="col-md-6">
+										                <input class="form-control required digest" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
+										            </div>
+										            <div for="ratelimit"></div>
+										        </div>
+										    </div>
+										    
+									</div>
+								</c:if>
+								<c:if test="${region.regionType eq 1 }">
+									<h4 class="form-section">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<spring:message code="NTC_UNIVERSAL_IP" />
+										<small> <span
+														class="glyphicon glyphicon-plus  ${tabName}Add"
+														onClick="addContent(this,'${tabName}')" title="add"></span></small>
+									</h4>
+									<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
+									<c:choose>
+										<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
+											<c:forEach items="${_cfg.ipPortList}" var="ipPort">
+											<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+												<div class="row boxSolid ${tabName}${status.index}">
+													<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+												</div>	
+												<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
+											</c:if>
+											</c:forEach>
+										</c:when>
+										<c:otherwise>
+											<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+											</div>
+											<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
+										</c:otherwise>
+									</c:choose>
+								</c:if>
+							</c:forEach>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -32,6 +32,51 @@
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		//异步获取策略ip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			//var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/app/ajaxAppPolicyIpList',
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+					 		"<input type='checkbox' hidden='hidden'/>"+
+					 	"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	}); 
 </script>
 
@@ -287,6 +332,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
 								    <td>${cfg.cfgDesc }</td>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp

@@ -0,0 +1,130 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:if test="${fn:length(tabList)==0}">
+	<div id="NTC_UNIVERSAL_IPTitle${index}"  onclick="switchSubCfgTabInfo('NTC_UNIVERSAL_IP',${index})"
+		class="col-md-1 tabInfo badge-info" name="tabTitle">
+			<spring:message code='NTC_UNIVERSAL_IP' />
+			<i id="NTC_UNIVERSAL_IP${index}" class="fa fa-angle-double-down" name="tabFlag${index}"></i>
+	</div>
+	</div>
+	<div id="NTC_UNIVERSAL_IPInfo${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+					<spring:message code='no_data' />
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:forEach items="${_cfg.ipPortList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+										<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+</c:forEach>
+</html>