Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

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

@@ -26,6 +26,7 @@ import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.domain.configuration.AvVoipIpCfg;
@@ -124,8 +125,8 @@ public class AvContentController extends BaseController  {
 	@RequestMapping(value = {"/voipList"})
 	public String voipCfgList(Model model,HttpServletRequest  request ,HttpServletResponse response ,@ModelAttribute("cfg")CfgIndexInfo entity
 			,RedirectAttributes redirectAttributes){
-		if(entity.getVoipIp()== null){
+		if(entity.getIpPort()== null){
-			entity.setVoipIp(new AvVoipIpCfg());
+			entity.setIpPort(new IpPortCfg());
 		}
 		if(entity.getVoipAccount()== null){
 			entity.setVoipAccount(new AvVoipAccountCfg());
@@ -283,7 +284,7 @@ public class AvContentController extends BaseController  {
 		CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo);
 		List<String[]> tabList = new ArrayList();
 		//获取voipIpCfg信息
-		if(cfg.getVoipIps()!=null){
+/*		if(cfg.getVoipIps()!=null){
 			String cfgType = null;
 			for(AvVoipIpCfg ip:cfg.getVoipIps()){
 				if(!ip.getCfgType().equals(cfgType)){
@@ -291,7 +292,17 @@ public class AvContentController extends BaseController  {
 					cfgType = ip.getCfgType();
 				}
 			}
+		}*/
+		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();
+				}
+			}
 		}
+		
 		if(cfg.getVoipAccounts()!=null){
 			String cfgType = null;
 			for(AvVoipAccountCfg account:cfg.getVoipAccounts()){
@@ -536,6 +547,9 @@ public class AvContentController extends BaseController  {
 			,HttpServletResponse response
 			,@ModelAttribute("cfg")BaseStringCfg entity
 			,RedirectAttributes redirectAttributes){
+		if(entity.getIpPort()== null){
+			entity.setIpPort(new IpPortCfg());
+		}
 		Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
 		initPageCondition(model,entity);

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

@@ -6,9 +6,11 @@ import java.util.List;
 
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.AvVoipIpCfg;
+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.IpPortCfg;
 import com.nis.web.dao.MyBatisDao;
 
 
@@ -20,6 +22,10 @@ public interface AvContentCfgDao {
 	public List<AvVoipAccountCfg> findVoipAccountCfgList(CfgIndexInfo entity);
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity);
 	
+	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
+	public void saveIpPortCfg(IpPortCfg entity);
+	public void deleteIpCfg(CfgIndexInfo entity);
+	
 	public void insertCfgIndexInfo(CfgIndexInfo entity);
 	public void insertAvVoipIp(CfgIndexInfo entity);
 	public void insertAvVoipAccountCfg(CfgIndexInfo entity);
@@ -38,7 +44,7 @@ public interface AvContentCfgDao {
 	public void updateIp(BaseIpCfg entity);
 	public List<BaseIpCfg> findIpList(BaseIpCfg entity) ;
 	public List<BaseIpCfg> getIpList(BaseIpCfg entity) ;
-	
+	public void updateCfgValid(BaseCfg entity);
 	public BaseStringCfg findStringCfgById(BaseStringCfg entity) ;
 	public void insertString(BaseStringCfg entity);
 	public void updateString(BaseStringCfg entity);

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

@@ -155,7 +155,48 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" 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="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="AvVoip_Column" >
     r.CFG_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,
@@ -190,6 +231,12 @@
   r.audit_time,r.service_id,r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
   r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log
   </sql>
+    <select id="getIpPortList" 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>
+  
   <!-- voip IP条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
@@ -283,7 +330,26 @@
 	    	<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="(voipIp.srcIpAddress != null and voipIp.srcIpAddress != '') or (voipIp.srcPort != null and voipIp.srcPort != '')">
+	    	<if test="(ipPort.srcIpAddress != null and ipPort.srcIpAddress != '') or (ipPort.srcPort != null and ipPort.srcPort != '')">
+	    		AND r.compile_id in (select t.compile_id from ip_port_cfg t 
+	    		<where>
+	    			and t.protocol_id=4
+	    			<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>
+	  <!--   	<if test="(voipIp.srcIpAddress != null and voipIp.srcIpAddress != '') or (voipIp.srcPort != null and voipIp.srcPort != '')">
 	    		AND r.compile_id in (select t.compile_id from av_voip_ip_cfg t 
 	    		<where>
 	    			<if test="voipIp.srcIpAddress != null and voipIp.srcIpAddress != ''">
@@ -294,7 +360,7 @@
 		    		</if>
 	    		</where>
 	    		 )
-	    	</if>
+	    	</if> -->
 	    	<if test="(ntcSubscribeIdCfg.cfgKeywords != null and ntcSubscribeIdCfg.cfgKeywords != '') ">
 	    		AND r.compile_id in (select f.compile_id from ntc_subscribe_id_cfg f
 	    		<where>
@@ -737,6 +803,78 @@
     	#{ntcSubscribeIdCfg.isHexbin,jdbcType=INTEGER}
     )
   </insert>
+  
+   <insert id="saveIpPortCfg" 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 cfg_index_info表信息 -->
   <update id="updateCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
     update cfg_index_info
@@ -1122,6 +1260,12 @@
       	</if>
     </where>
   </delete>
+  
+  
+ <!-- 删除http子配置 -->
+  <delete id="deleteIpCfg" >
+  	delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
 <!--**********************************BaseIpCfg*******************************************************-->
 <!-- avContIp条件查询列表信息 -->
   <select id="findIpList" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.BaseIpCfg" >
@@ -1734,4 +1878,18 @@
 			</choose>
   		</where>
   </select>
+    <update id="updateCfgValid" parameterType="com.nis.domain.configuration.BaseCfg">
+    update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
+    editor_id = #{editorId,jdbcType=INTEGER} , 
+    edit_time = #{editTime,jdbcType=TIMESTAMP} 
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+		<if test="cfgId !=null ">
+		AND cfg_id = #{cfgId,jdbcType=BIGINT}
+		</if>
+		<if test="compileId !=null ">
+		AND compile_id = #{compileId,jdbcType=INTEGER}
+		</if>
+		and function_id=#{functionId,jdbcType=INTEGER}
+	</trim>
+  </update>
 </mapper>

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

@@ -117,12 +117,13 @@ public class AvContentCfgService extends BaseService{
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
 		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(cfg);
-		List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(cfg);
+		//List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(cfg);
+		List<IpPortCfg> ipPortList = avContentCfgDao.getIpPortList(cfg);
 		List<AvVoipAccountCfg>  voipAccounts=getVoipAccountCfgList(cfg);
 		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
-		cfg.setVoipIps(voipIps);
+		//cfg.setVoipIps(voipIps);
 		cfg.setVoipAccounts(voipAccounts);
-		
+		cfg.setIpPortList(ipPortList);
 		return cfg;
 	}
 /*	public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) {
@@ -160,11 +161,17 @@ public class AvContentCfgService extends BaseService{
 						entity.setCreateTime(new Date());
 						entity.setCreatorId(entity.getCurrentUser().getId());
 						avContentCfgDao.insertCfgIndexInfo(entity);
-						if(entity.getVoipIps()!=null){
+/*						if(entity.getVoipIps()!=null){
 							for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
 								entity.setVoipIp(voipIp);
 								avContentCfgDao.insertAvVoipIp(entity);
 							}
+						}*/
+						if(entity.getIpPortList()!=null){
+							for(IpPortCfg cfg:entity.getIpPortList()){
+								BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+								avContentCfgDao.saveIpPortCfg(cfg);
+							}
 						}
 						if(entity.getNtcSubscribeIdCfgList()!=null){
 							for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
@@ -199,7 +206,8 @@ public class AvContentCfgService extends BaseService{
 					entity.setEditorId(entity.getCurrentUser().getId());
 					avContentCfgDao.updateCfgIndexInfo(entity);
 					//无效子配置后，再新增子配置
-					avContentCfgDao.deleteAvVoipIp(entity);
+					//avContentCfgDao.deleteAvVoipIp(entity);
+					avContentCfgDao.deleteIpCfg(entity);
 					stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
 					avContentCfgDao.deleteAvVoipAccountCfg(entity);
 					AreaIpCfg area = new AreaIpCfg();
@@ -208,11 +216,17 @@ public class AvContentCfgService extends BaseService{
 					areaIpCfgDao.deleteAreaIpCfg(area);
 					entity.setCreateTime(new Date());
 					entity.setCreatorId(entity.getCurrentUser().getId());
-					if(entity.getVoipIps()!=null&&entity.getVoipIps().size()>0){
+					/*if(entity.getVoipIps()!=null&&entity.getVoipIps().size()>0){
 						for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
 							entity.setVoipIp(voipIp);
 							avContentCfgDao.insertAvVoipIp(entity);
 						}
+					}*/
+					if(entity.getIpPortList()!=null){
+						for(IpPortCfg cfg:entity.getIpPortList()){
+							BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+							avContentCfgDao.saveIpPortCfg(cfg);
+						}
 					}
 					if(entity.getNtcSubscribeIdCfgList()!=null){
 						for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
@@ -340,7 +354,13 @@ public class AvContentCfgService extends BaseService{
 			entity.setIsValid(isValid);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(new Date());
-			avContentCfgDao.updateAvVoipIp(entity);
+			//avContentCfgDao.updateAvVoipIp(entity);
+			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+				IpPortCfg cfg = new IpPortCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(IpPortCfg.getTablename());
+				avContentCfgDao.updateCfgValid(cfg);
+			}
 			avContentCfgDao.updateAvVoipKeywordCfgt(entity);
 			avContentCfgDao.updateAvVoipAccount(entity);
 			avContentCfgDao.updateCfgIndexInfo(entity);
@@ -386,7 +406,8 @@ public class AvContentCfgService extends BaseService{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		
 		List<CfgIndexInfo> list = new ArrayList();
-		List<AvVoipIpCfg> voipIpList = new ArrayList();
+		//List<AvVoipIpCfg> voipIpList = new ArrayList();
+		List<IpPortCfg> ipPortList =new ArrayList();
 		List <NtcSubscribeIdCfg> ntcList = new ArrayList();
 		List<AvVoipAccountCfg> accountList = new ArrayList();
 		List<AreaIpCfg> areaIpCfgList = new ArrayList();
@@ -409,7 +430,8 @@ public class AvContentCfgService extends BaseService{
 		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"});
 		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
 		
-		voipIpList=avContentCfgDao.findVoipIpCfgList(entity);
+		//voipIpList=avContentCfgDao.findVoipIpCfgList(entity);
+		ipPortList = avContentCfgDao.getIpPortList(entity);
 		accountList=avContentCfgDao.findVoipAccountCfgList(entity);
 		ntcList=stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
@@ -424,11 +446,21 @@ public class AvContentCfgService extends BaseService{
 		List<DigestCfg> digestRegionList = new ArrayList();
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
+		
 		if(isAudit==1){
-			if(!StringUtil.isEmpty(voipIpList)){
+	/*		if(!StringUtil.isEmpty(voipIpList)){
 				Map<String,List> ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList);
 				groupRelationList=ipMap.get("groupList");
 				ipRegionList=ipMap.get("dstList");
+			}*/
+			if(!StringUtil.isEmpty(ipPortList)){
+				Map<String,List> ipMap = cfgConvert(ipRegionList,ipPortList,1,entity,groupRelationList);
+				groupRelationList=ipMap.get("groupList");
+				ipRegionList=ipMap.get("dstList");
+				if(ipMap.get("numRegionList")!=null){
+					numRegionList.addAll(ipMap.get("numRegionList"));
+
+				}
 			}
 			
 			if(!StringUtil.isEmpty(ntcList)){

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

@@ -425,11 +425,12 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 	}
 	public void saveDomainCfg(CfgIndexInfo entity){
 		if(entity.getAction()==128){
-			entity.setRequestId(0);
+			entity.setCfgType("WHITE_LIST_DOMAIN");
-			entity.setClassify("0");
+			if(entity.getHttpUrlList().size()>0){
-			entity.setAttribute("0");
+				for (int i = 0; i < entity.getHttpUrlList().size(); i++) {
-			entity.setLable("0");
+					entity.getHttpUrlList().get(i).setCfgType("WHITE_LIST_DOMAIN");
-			entity.setIsAreaEffective(0);
+				}
+			}
 		}
 		//设置区域运营商信息
 		setAreaEffectiveIds(entity);

src/main/resources/messages/message_en.properties

@@ -35,7 +35,7 @@ control_grey=Grey List
 social_app_grey=Application Grey List
 encryption_control=Encrypted Text Control
 specific_agreement_control=Specific Protocol Control
-social_app_control=App Protocol
+social_app_control=App Identify
 online_media_control=Media Addr
 sip_ip_control=SIP IP Control
 domain_control_white=Domain White List
@@ -513,15 +513,15 @@ av_content_ip_control=Audio/Video IP
 av_picture_ip_control=Picture IP
 av_content_url_control=Audio/Video URL
 av_picture_url_control=Picture URL
-av_voip_control=VoIP Protocol
+av_voip_control=VoIP
 av_voip_ip_control=VoIP IP
 av_voip_account_control=VoIP Account
 av_sample_audio_control=Audio Sample
 av_sample_video_control=Video Sample
 av_sample_picture_control=Picture Sample
-av_sample_voip_control=VoIP Sample
+av_sample_voip_control=VoIP Voice Sample
 av_sample_audio_porn_control=Audio Scene Detection
-av_sample_video_porn_control=Video Scene Detection
+av_sample_video_porn_control=Porn Detection
 av_sample_control=Sample
 configure_statistics_info=Configuration Service And Status Statistics
 letter_statistics_info=Letter And Configuration Service Statistics
@@ -695,7 +695,7 @@ s2c_pkt_num=S2C(Pkt)
 c2s_byte_num=C2S(Byte)
 s2c_byte_num=S2C(Byte)
 voip_recv_time=VoIP Receive Time
-voip_protocol=VoIP Protocol
+voip_protocol=VoIP
 av_protocol=AV Protocol
 duation=Duation(S)
 calling_account=Calling Account
@@ -725,7 +725,7 @@ ip_intercept=IP Intercept
 domain_intercept=Domain Intercept
 control_policy=Control Policy
 domain_forward=Domain Forward
-http_redirect=HTTP(S) Redirect
+http_redirect=HTTP(s) Redirect
 http_req_replace=Http Request Body Replace
 http_res_replace=Http Response Body Replace
 replace_content=Replace With 
@@ -750,18 +750,18 @@ no_strategy=No Strategy
 #=============about manipulation=========
 #=============about app config===========
 domain=Domain
-app_ip_config=APP Protocol IP
+app_ip_config=App Identify IP
 bytes=Byte
 app_http_config=APP HTTP Feature
 app_domain_config=APP Domain Feature
 app_byte_config=APP Byte Feature
 social_app=Applicaiton
 app_policy_config=APP Policy
-app_features_config=APP Feature
+app_features_config=APP Policy Object
 cfg_type=Configuration Type
-encrypted_tunnel_behavior=Tunnel Behavior
+encrypted_tunnel_behavior=Behavior Identify
 behaviour_type=Behaviour Type
-basic_protocol=Basic Protocol
+basic_protocol=Protocol Identify
 #=============about app config===========
 #=============about Maintenance=========
 ip_Reuse_pool_config=IP Reusing Pool
@@ -791,9 +791,9 @@ not_number=%s must be a number
 av_sample_audio=Audio Sample
 av_sample_video=Video Sample
 av_sample_picture=Picture Sample
-av_sample_voip=VoIP Sample
+av_sample_voip=VoIP Voice Sample
 av_sample_audio_porn=Audio Scene Detection
-av_sample_video_porn=Video Scene Detection
+av_sample_video_porn=Porn Detection
 WHITE_LIST_IP=IP White List
 av_voip_ip=VoIP IP Configuration
 NTC_HTTP_URL=URL Configuration
@@ -822,7 +822,7 @@ PXY_CTRL_HTTP_RES_BODY=Response Body Configuration
 dns_fake_ip=DNS Spoofing IP Configuration
 APP_POLICY=APP Policy Configuration
 PXY_CTRL_IP=IP Control Configuration
-APP_STATIC_SEV_IP=APP Protocol IP Configuration
+APP_STATIC_SEV_IP=App Identify IP Configuration
 APP_HTTP=APP HTTP Feature Configuration
 APP_DOMAIN=APP Domain Feature Configuration
 APP_PKT_BIN=APP Byte Feature Configuration
@@ -848,11 +848,11 @@ temporary_redirect=Found (Previously "Moved temporarily")
 prohibition_access=Forbidden
 not_allowed_method=Not Found
 law_prohibition_access=Unavailable For Legal Reasons
-http_block=HTTP(S) Block
+http_block=HTTP(s) Block
-http_reddirect=HTTP(S) Redirect
+http_reddirect=HTTP(s) Redirect
-http_replace=HTTP(S) Replace
+http_replace=HTTP(s) Replace
-http_monit=HTTP(S) Monitoring
+http_monit=HTTP(s) Monitoring
-http_whitelist=HTTP(S) White List
+http_whitelist=HTTP(s) White List
 response_code=Response Code
 response_content=Response Content
 not_found=Not Found
@@ -888,12 +888,12 @@ video_sample_reject=Video Sample Control
 video_sample_monit=Video Sample Monitoring
 pic_sample_reject=Picture Sample Control
 pic_sample_monit=Picture Sample Monitoring
-voip_sample_reject=VoIP Sample Control
+voip_sample_reject=VoIP Voice Sample Control
-voip_sample_monit=VoIP Sample Monitoring
+voip_sample_monit=VoIP Voice Sample Monitoring
 audio_pornography_sample_reject=Audio Scene Detection Control
 audio_pornography_sample_monit=Audio Scene Detection Monitoring
-video_pornography_sample_reject=Video Scene Detection Control
+video_pornography_sample_reject=Porn Detection Control
-video_pornography_sample_monit=Video Scene Detection Monitoring
+video_pornography_sample_monit=Porn Detection Monitoring
 ip_white_monit=IP Address White List Monitoring
 ip_white_reject=IP Address White List Control
 ip_white_whitelist=IP Address White List
@@ -957,8 +957,8 @@ app_strategy_reject=APP Strategy Control
 app_strategy_ratelimit=APP Strategy Ratelimit
 proxy_ip_redirect=IP Redirect
 proxy_ip_forward=IP Forward
-app_protocol_ip_reject=APP Protocol IP Control
+app_protocol_ip_reject=App Identify IP Control
-app_protocol_ip_monit=APP Protocol IP Monitoring
+app_protocol_ip_monit=App Identify IP Monitoring
 app_http_feature_monit=APP HTTP Feature Monitoring
 app_domain_feature_monit=APP Domain Feature Monitoring
 app_byte_feature_monit=APP Byte Feature Monitoring
@@ -968,11 +968,11 @@ ddos_ip_drop=DDOS IP
 ip_reuse_adress_pool_loop=IP Reuse Address Pool
 app_strategy_monit=APP Strategy Monitoring
 app_strategy_drop=APP Strategy Drop 
-ctrl_http_reject=HTTP(S) Block
+ctrl_http_reject=HTTP(s) Block
-ctrl_http_redirect=HTTP(S) Redirect
+ctrl_http_redirect=HTTP(s) Redirect
-ctrl_http_replace=HTTP(S) Replace
+ctrl_http_replace=HTTP(s) Replace
-ctrl_http_monit=HTTP(S) Monitoring
+ctrl_http_monit=HTTP(s) Monitoring
-ctrl_http_whitelist=HTTP(S) White List
+ctrl_http_whitelist=HTTP(s) White List
 #=============function_service_dict==>service_name=================
 #=============about report===================
 report_list=Report
@@ -1009,19 +1009,19 @@ traffic_website_type_chart=Website Type
 website=Website
 #===============dashboard end===================================
 ratelimit_limit=Limit Rate must between 0 and 1
-Maintenance=Advanced
+Maintenance=Policy Object
 Proxy=Proxy
 selective=Selective
 max_shouldnot_less_than_min=The max item should not be less than the min item.
 unknown_cfg_type=Unknown configuration type.
-basic_protocol_reject=Basic Protocol Reject
+basic_protocol_reject=Protocol Identify Reject
-basic_protocol_ratelimit=Basic Protocol Ratelimit
+basic_protocol_ratelimit=Protocol Identify Ratelimit
-basic_protocol_monit=Basic Protocol Monitoring
+basic_protocol_monit=Protocol Identify Monitoring
-basic_protocol_drop=Basic Protocol Drop
+basic_protocol_drop=Protocol Identify Drop
-encrypted_tunnel_behavior_reject=Tunnel Behavior Reject
+encrypted_tunnel_behavior_reject=Behavior Identify Reject
-encrypted_tunnel_behavior_ratelimit=Tunnel Behavior Ratelimit
+encrypted_tunnel_behavior_ratelimit=Behavior Identify Ratelimit
-encrypted_tunnel_behavior_monit=Tunnel Behavior Monitoring
+encrypted_tunnel_behavior_monit=Behavior Identify Monitoring
-encrypted_tunnel_behavior_drop=Tunnel Behavior Drop
+encrypted_tunnel_behavior_drop=Behavior Identify Drop
 ip_protocol=IP Protocol
 MM_AV_IP=AV IP
 MM_PIC_IP=Picture IP
@@ -1042,9 +1042,9 @@ ratelimit_ip=IP Ratelimit
 app_code=Application No
 app_name=Application Name
 app_desc=Application Description
-tunnel_code=Tunnel Behavior No
+tunnel_code=Behavior Identify No
-tunnel_name=Tunnel Behavior Name
+tunnel_name=Behavior Identify Name
-tunnel_desc=Tunnel Behavior Description
+tunnel_desc=Behavior Identify Description
 call_external_procedures_failed=Call external procedures failed
 is_hex=Is HEX
 is_case_insenstive=Is Case-sensitive
@@ -1099,8 +1099,8 @@ tcp_unit=Unit / byte
 app_tcp_config=APP TCP Session Feature
 app_tcp_max_min=Maximum Session Should Not Exceed 4294967295
 new=New
-basic_protocol_business_type=Basic protpcol business classification
+basic_protocol_business_type=Basic Identify business classification
-tunnel_behavior_business_type=Tunnel behavior business classification
+tunnel_behavior_business_type=Behavior Identify business classification
 app_business_type=Application business classification
 pxy_intercept_monit_keyring=Certificate Strategy
 intercept_file_strategy=Certificate Strategy
@@ -1124,7 +1124,7 @@ bandwith=Bandwidth
 limit_rate_type=Limit Rate Type
 business_type=Business Type
 topic=Topic
-website_server=Website Server
+website_server=Website
 domain_existed=Domain Has Existed
 app_ssl_cert_feature_monit=APP SSL Cert Feature Monitoring
 app_header_feature_monit=APP Header Feature Monitoring
@@ -1207,3 +1207,9 @@ av_voip_reject=VoIP Reject
 label_proto_source=Protocol Source
 label_behav_source=Behavior Source
 label_app_source=APP Source
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+advanced=Advanced
+protocol_identify=Protocol Identify
+MM_FILE_DIGEST=File Digest Configuration

src/main/resources/messages/message_ru.properties

@@ -1209,3 +1209,7 @@ av_voip_reject=VoIP\u7BA1\u63A7
 label_proto_source=Protocol Source
 label_behav_source=Behavior Source
 label_app_source=APP Source
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+protocol_identify=Protocol Identify

src/main/resources/messages/message_zh_CN.properties

@@ -1201,3 +1201,9 @@ av_voip_reject=VoIP\u7BA1\u63A7
 label_proto_source=\u534F\u8BAE\u6765\u6E90
 label_behav_source=\u884C\u4E3A\u6765\u6E90
 label_app_source=\u5E94\u7528\u6765\u6E90
+packet=Packet
+stream=Stream
+protocol_menu=Protocol
+advanced=Advanced
+protocol_identify=Protocol Identify
+MM_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E

src/main/resources/sql/20181010/update_media_region.sql

@@ -0,0 +1,19 @@
+#流媒体协议配置
+update function_service_dict set service_id='39',protocol_id='23' where dict_id='30';
+update function_service_dict set service_id='151',protocol_id='23' where dict_id='31';
+#流媒体协议 增加IP配置
+INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES ('22', '', '1', 'NTC_UNIVERSAL_IP', '流媒体协议 IP配置', '1', '1', '1', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '', '', '4,6', '', '', '1,2,3', '1,2', '0,1', '0,6,17', '1,2,3,4', '1');
+
+#voip配置
+update function_service_dict set service_id='38',protocol_id='22' where dict_id='16';
+update function_service_dict set service_id='150',protocol_id='22' where dict_id='17';
+#voip 配置
+update function_region_dict set config_region_value='NTC_UNIVERSAL_IP' where dict_id='8';
+
+#文件摘要配置
+update function_service_dict set service_id='399' where dict_id='59';
+update function_service_dict set service_id='273' where dict_id='60';
+
+update function_region_dict set config_region_value ='MM_FILE_DIGEST' where dict_id='50';
+update function_region_dict set is_valid='0' where dict_id='187';
+

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

@@ -274,7 +274,7 @@ $(function(){
 										</div>
 										<!-- WEBSITE -->
 										<!-- EXPRTYPE -->
-										<div class="col-md-6">
+										<div class="col-md-6  hidden">
 											<div class="form-group">
 											
 												<label class="control-label col-md-3"><font color="red">*</font>
@@ -396,7 +396,7 @@ $(function(){
 									</div>
 									
 									<!-- is hex -->
-									<div class="row">
+									<div class="row hidden">
 										<c:if test="${!empty region.configHex}">
 										    <div class="col-md-6">
 										        <div class="form-group ">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -250,11 +250,11 @@
 												class="glyphicon glyphicon-plus  ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="voipIps[${ipCfgIndex}]"></c:set>
+										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
 										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
-											<c:when test="${fn:length(_cfg.voipIps)>0 and ipCfgIndex<fn:length(_cfg.voipIps) }">
+											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
-												<c:forEach items="${_cfg.voipIps}" var="ipPort">
+												<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"%>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp

@@ -22,7 +22,7 @@
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
-		<c:forEach items="${_cfg.voipIps}" var="cfg">
+		<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">

src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp

@@ -37,13 +37,14 @@
 														+ "']").append(error);
 									},
 									submitHandler : function(form) {
-										
 										var flag = true;
+										var actionValue=$("input[name=action]:checked").val();
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
 										if($(".boxSolid").length ==$(".boxSolid.hidden").length){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
+										
 										//代表所有区域都隐藏了，提示必须增加个区域信息
 										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
 											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
@@ -123,10 +124,10 @@
 	}
 	//单域默认展开且不可关闭
 	var openSingleBoxsolid = function() {
-		var boxsolidLenth=$(".boxSolid").prev(".form-section:visible").length;
+		var boxsolidLenth=$(".boxSolid").not(".intercept_replace_pkt_bin_div").prev(".form-section:visible").length;
 		if(boxsolidLenth == 1){
-			$(".boxSolid").prev(".form-section:visible").find("span[title=add]").click();
+			$(".boxSolid").prev(".form-section:visible").eq(0).find("span[title=add]").click();
-			$(".boxSolid").prev(".form-section:visible").next(".boxSolid").find("span[title=remove]").addClass("hidden");
+			$(".boxSolid").prev(".form-section:visible").eq(0).next(".boxSolid").find("span[title=remove]").addClass("hidden");
 		}
 	}
 </script>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp

@@ -16,7 +16,7 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
-							if($(this).val()!=128){
+							/* if($(this).val()!=128){
 								$("#http_url").removeClass("hidden");
 								$(".httpurlCfg").removeClass("hidden").removeClass("disabled");
 								$(".httpwhite").addClass("hidden").addClass("disabled");
@@ -24,7 +24,7 @@
 								$(".httpwhite").removeClass("hidden").removeClass("disabled");
 								$(".httpurlCfg").addClass("hidden").addClass("disabled");
 								$("#http_url").addClass("hidden");
-							}
+							} */
 						}); 
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -89,7 +89,7 @@
 									},
 									errorContainer : "#messageBox",
 								});
-						var actions=$("input[name='action']:checked").val();
+					/* 	var actions=$("input[name='action']:checked").val();
 						if(actions!=128){
 							$("#http_url").removeClass("hidden");
 							$(".httpurlCfg").removeClass("hidden").removeClass("disabled");
@@ -98,7 +98,7 @@
 							$(".httpwhite").removeClass("hidden").removeClass("disabled");
 							$(".httpurlCfg").addClass("hidden").addClass("disabled");
 							$("#http_url").addClass("hidden");
-						}
+						} */
 					});
 
 	//业务窗口打开
@@ -215,7 +215,7 @@
 								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:set var="subscribeIdIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
-								    <c:if test="${region.configRegionValue eq 'WHITE_LIST_DOMAIN' }">
+								   <%--  <c:if test="${region.configRegionValue eq 'WHITE_LIST_DOMAIN' }">
 															  <div class="httpwhite">
 																	<c:set var="tabName" value="httpUrlTab"></c:set>
 																	<c:forEach items="${_cfg.httpUrlList}" var="cfg"
@@ -238,7 +238,7 @@
 																		</div>
 																	</c:forEach>
 																</div>
-														</c:if> 
+														</c:if>  --%>
 								
 												<c:if test="${region.configRegionValue eq _cfg.httpUrl.cfgType }">
 																<div class="httpurlCfg">
@@ -304,10 +304,8 @@
 									</c:if> --%>
 								</c:forEach>
 								<br>
-								<div id="http_url">
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
-                           		</div>
 								<div class="form-actions">
 									<div class="row">
 										<div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp

@@ -114,7 +114,7 @@
 	</c:if>
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.httpUrlList) >0)}">
 		<c:forEach items="${_cfg.httpUrlList}" var="cfg">
-		    <c:if test="${'WHITE_LIST_DOMAIN' eq cfg.cfgType }">
+<%-- 		    <c:if test="${'WHITE_LIST_DOMAIN' eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
@@ -123,9 +123,7 @@
 							</div>
 						</div>
 					</div>
-			</c:if>
+			</c:if> --%>
-			
-			<c:if test="${'NTC_HTTP_URL' eq cfg.cfgType }">
 				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
 					<div class="row">
 						<div class="col-md-8">
@@ -226,7 +224,6 @@
 						</div>
 					</c:if>
 				</div>
-			</c:if>
 		</c:forEach>
 	</c:if>
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">