From 94f0bc56b844acfdfb95977bcf1acb8301492496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= Date: Tue, 23 Apr 2019 18:05:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E4=B8=AD=E8=8B=B1=E6=96=87=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=202.=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E5=AA=92=E4=BD=93=E5=AE=A1=E6=A0=B8=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=B7=B2=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/configuration/AvContentCfgService.java | 2 ++ src/main/resources/messages/message_en.properties | 11 ++++++++++- src/main/resources/messages/message_zh_CN.properties | 12 +++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) 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 689305a70..1705238a8 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -125,9 +125,11 @@ public class AvContentCfgService extends BaseService{ List ntcSubscribeList=getSubscribeIdCfgList(cfg); List ipPortList = avContentCfgDao.getIpPortList(cfg); List voipAccounts=getVoipAccountCfgList(cfg); + List avContUrlCfgList=avContentCfgDao.getAvContUrlList(cfg); cfg.setNtcSubscribeIdCfgList(ntcSubscribeList); cfg.setVoipAccounts(voipAccounts); cfg.setIpPortList(ipPortList); + cfg.setAvContUrlCfgList(avContUrlCfgList); return cfg; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 0c1f5055d..21d591aa8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1515,4 +1515,13 @@ src_ip_pattern=Client IP Pattern dest_ip_pattern=Server IP Pattern src_port_pattern=Client Port Pattern dest_port_pattern=Server Port Pattern -range_cross=Found intersections between Server IP address and Client IP address \ No newline at end of file +range_cross=Found intersections between Server IP address and Client IP address +url_group_configuration=URL Group Configuration +dns_keyword_group_configuration=DNS Keyword Group Configuration +app_ip_correlation=APP IP Correlation +ip_group=IP Group +common_ip_config=Common IP Config +common_group=Common Group +dns_keyword_group_manage=DNS Keyword Group Manage +old_asn_group_manage=ASN Group +url_group_manage=URL Group Manage diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 331c2081c..36c015e26 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1514,4 +1514,14 @@ src_ip_pattern=\u6E90IP\u683C\u5F0F dest_ip_pattern=\u76EE\u7684IP\u683C\u5F0F src_port_pattern=\u6E90\u7AEF\u53E3\u683C\u5F0F dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F -range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 \ No newline at end of file +range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 +url_group_configuration=URL\u5206\u7ec4\u914d\u7f6e +dns_keyword_group_configuration=DNS\u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e +app_ip_correlation=APP\u5173\u8054\u7279\u5f81IP\u914d\u7f6e +ip_group=IP\u5206\u7ec4 +common_ip_config=IP\u5206\u7ec4\u914d\u7f6e +common_group=\u5206\u7ec4\u7ba1\u7406 +dns_keyword_group_manage=DNS\u5173\u952e\u5b57\u5206\u7ec4\u7ba1\u7406 +old_asn_group_manage=ASN\u7ec4 +url_group_manage=URL\u5206\u7ec4\u7ba1\u7406\u000d\u000a +