diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 5f5a86ee5..6d7200c89 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/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){ - entity.setVoipIp(new AvVoipIpCfg()); + if(entity.getIpPort()== null){ + 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 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 page = avContentCfgService.findContUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model,entity); diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java index b4c568a31..ec1b84cd6 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java +++ b/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 findVoipAccountCfgList(CfgIndexInfo entity); public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity); + public List 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 findIpList(BaseIpCfg entity) ; public List getIpList(BaseIpCfg entity) ; - + public void updateCfgValid(BaseCfg entity); public BaseStringCfg findStringCfgById(BaseStringCfg entity) ; public void insertString(BaseStringCfg entity); public void updateString(BaseStringCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index ceb889982..e9ad54c57 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -155,7 +155,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + 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 + + @@ -1734,4 +1878,18 @@ + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, + editor_id = #{editorId,jdbcType=INTEGER} , + edit_time = #{editTime,jdbcType=TIMESTAMP} + + + AND cfg_id = #{cfgId,jdbcType=BIGINT} + + + AND compile_id = #{compileId,jdbcType=INTEGER} + + and function_id=#{functionId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index dbd11cde5..7e8689ed8 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/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 ntcSubscribeList=getSubscribeIdCfgList(cfg); - List voipIps=getVoipIpCfgList(cfg); + //List voipIps=getVoipIpCfgList(cfg); + List ipPortList = avContentCfgDao.getIpPortList(cfg); List 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 list = new ArrayList(); - List voipIpList = new ArrayList(); + //List voipIpList = new ArrayList(); + List ipPortList =new ArrayList(); List ntcList = new ArrayList(); List accountList = new ArrayList(); List 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 digestRegionList = new ArrayList(); List areaIpRegionList = new ArrayList(); + if(isAudit==1){ - if(!StringUtil.isEmpty(voipIpList)){ + /* if(!StringUtil.isEmpty(voipIpList)){ Map ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); + }*/ + if(!StringUtil.isEmpty(ipPortList)){ + Map 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)){ diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index 642df6b81..feef3efb5 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -425,11 +425,12 @@ public class DomainService extends CrudService { } public void saveDomainCfg(CfgIndexInfo entity){ if(entity.getAction()==128){ - entity.setRequestId(0); - entity.setClassify("0"); - entity.setAttribute("0"); - entity.setLable("0"); - entity.setIsAreaEffective(0); + entity.setCfgType("WHITE_LIST_DOMAIN"); + if(entity.getHttpUrlList().size()>0){ + for (int i = 0; i < entity.getHttpUrlList().size(); i++) { + entity.getHttpUrlList().get(i).setCfgType("WHITE_LIST_DOMAIN"); + } + } } //设置区域运营商信息 setAreaEffectiveIds(entity); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 76c3d3cdc..baf0668e5 100644 --- a/src/main/resources/messages/message_en.properties +++ b/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_reddirect=HTTP(S) Redirect -http_replace=HTTP(S) Replace -http_monit=HTTP(S) Monitoring -http_whitelist=HTTP(S) White List +http_block=HTTP(s) Block +http_reddirect=HTTP(s) Redirect +http_replace=HTTP(s) Replace +http_monit=HTTP(s) Monitoring +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_monit=VoIP Sample Monitoring +voip_sample_reject=VoIP Voice Sample Control +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_monit=Video Scene Detection Monitoring +video_pornography_sample_reject=Porn Detection Control +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_monit=APP Protocol IP Monitoring +app_protocol_ip_reject=App Identify IP Control +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_redirect=HTTP(S) Redirect -ctrl_http_replace=HTTP(S) Replace -ctrl_http_monit=HTTP(S) Monitoring -ctrl_http_whitelist=HTTP(S) White List +ctrl_http_reject=HTTP(s) Block +ctrl_http_redirect=HTTP(s) Redirect +ctrl_http_replace=HTTP(s) Replace +ctrl_http_monit=HTTP(s) Monitoring +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_ratelimit=Basic Protocol Ratelimit -basic_protocol_monit=Basic Protocol Monitoring -basic_protocol_drop=Basic Protocol Drop -encrypted_tunnel_behavior_reject=Tunnel Behavior Reject -encrypted_tunnel_behavior_ratelimit=Tunnel Behavior Ratelimit -encrypted_tunnel_behavior_monit=Tunnel Behavior Monitoring -encrypted_tunnel_behavior_drop=Tunnel Behavior Drop +basic_protocol_reject=Protocol Identify Reject +basic_protocol_ratelimit=Protocol Identify Ratelimit +basic_protocol_monit=Protocol Identify Monitoring +basic_protocol_drop=Protocol Identify Drop +encrypted_tunnel_behavior_reject=Behavior Identify Reject +encrypted_tunnel_behavior_ratelimit=Behavior Identify Ratelimit +encrypted_tunnel_behavior_monit=Behavior Identify Monitoring +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_name=Tunnel Behavior Name -tunnel_desc=Tunnel Behavior Description +tunnel_code=Behavior Identify No +tunnel_name=Behavior Identify Name +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 -tunnel_behavior_business_type=Tunnel behavior business classification +basic_protocol_business_type=Basic Identify 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 \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index e8627c4ab..d14105682 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/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 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index c9962e705..b079ab5e7 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/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 \ No newline at end of file diff --git a/src/main/resources/sql/20181010/update_media_region.sql b/src/main/resources/sql/20181010/update_media_region.sql new file mode 100644 index 000000000..3071f9521 --- /dev/null +++ b/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'; + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp index 7d971563b..b9e80dd2d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp @@ -274,7 +274,7 @@ $(function(){ -
+