gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.添加了部分菜单的中英文国际化

Browse Source 
2.业务配置的流媒体审核异常已解决

Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
李皓宸
2019-04-23 18:05:00 +08:00
committed by duandongmei
parent 001b8948bd
commit b76dc62cbb
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -125,9 +125,11 @@ public class AvContentCfgService extends BaseService{
List<NtcSubscribeIdCfg> ntcSubscribeList=getSubscribeIdCfgList(cfg);
List<IpPortCfg> ipPortList = avContentCfgDao.getIpPortList(cfg);
List<AvVoipAccountCfg> voipAccounts=getVoipAccountCfgList(cfg);
List<AvContUrlCfg> avContUrlCfgList=avContentCfgDao.getAvContUrlList(cfg);
cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
cfg.setVoipAccounts(voipAccounts);
cfg.setIpPortList(ipPortList);
cfg.setAvContUrlCfgList(avContUrlCfgList);
return cfg;
}

17
src/main/resources/messages/message_en.properties
View File

@@ -1509,4 +1509,19 @@ interface_total=Interface Total
service_total=Service Total
unapproved_all=UnApprove all configurations!
delete_all=Delete all configurations!
none_file_tip=Please Choose File!
none_file_tip=Please Choose File!
the_same_ip_type=Client IP and Server IP must have the same IP type
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
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

12
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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
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