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

俄文国际化修正%s以及VoIP相关字典为空的情况

Browse Source
This commit is contained in:
DuanDongmei
2018-12-07 09:51:29 +08:00
parent 23b402fc50
commit d530ffdd10
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
View File

@@ -119,7 +119,17 @@ public class IpAddrPoolCfgService extends BaseService{
// 2.更新地址池IP信息 // 2.更新地址池IP信息
ipAddrPoolCfgDao.deleteReuseIpCfgs(addrPoolId); ipAddrPoolCfgDao.deleteReuseIpCfgs(addrPoolId);
for (BaseIpCfg IpCfg : entity.getIpCfgs()) { for (BaseIpCfg IpCfg : entity.getIpCfgs()) {
BeanUtils.copyProperties(entity, IpCfg, new String[]{"cfgId"}); try {
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
if(compileIds != null && compileIds.size() > 0 ){
IpCfg.setCompileId(compileIds.get(0));
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
BeanUtils.copyProperties(entity, IpCfg, new String[]{"cfgId","compileId"});
IpCfg.setUserRegion1(addrPoolId+""); IpCfg.setUserRegion1(addrPoolId+"");
ipAddrPoolCfgDao.saveReuseIpCfgs(IpCfg); ipAddrPoolCfgDao.saveReuseIpCfgs(IpCfg);
} }
@@ -169,7 +179,7 @@ public class IpAddrPoolCfgService extends BaseService{
List<IpAddrPool> resStrategyList=new ArrayList<IpAddrPool>(); List<IpAddrPool> resStrategyList=new ArrayList<IpAddrPool>();
for(BaseIpCfg ipcfg : cfg.getIpCfgs()) { for(BaseIpCfg ipcfg : cfg.getIpCfgs()) {
IpAddrPool ip = new IpAddrPool(); IpAddrPool ip = new IpAddrPool();
BeanUtils.copyProperties(cfg, ipcfg, new String[]{"cfgId"}); BeanUtils.copyProperties(cfg, ipcfg, new String[]{"cfgId","compileId"});
List<IpCfg> cfgs = BaseService.ipConvert(new IpCfg(), ipcfg); List<IpCfg> cfgs = BaseService.ipConvert(new IpCfg(), ipcfg);
if (cfgs.size() > 1) { if (cfgs.size() > 1) {
throw new RuntimeException("CallBack IP did not support IP range!"); throw new RuntimeException("CallBack IP did not support IP range!");
@@ -216,7 +226,7 @@ public class IpAddrPoolCfgService extends BaseService{
List<IpAddrPool> resStrategyList=new ArrayList<IpAddrPool>(); List<IpAddrPool> resStrategyList=new ArrayList<IpAddrPool>();
for(BaseIpCfg ipcfg : cfg.getIpCfgs()) { for(BaseIpCfg ipcfg : cfg.getIpCfgs()) {
IpAddrPool ip = new IpAddrPool(); IpAddrPool ip = new IpAddrPool();
BeanUtils.copyProperties(cfg, ipcfg, new String[]{"cfgId"}); BeanUtils.copyProperties(cfg, ipcfg, new String[]{"cfgId","compileId"});
List<IpCfg> cfgs = BaseService.ipConvert(new IpCfg(), ipcfg); List<IpCfg> cfgs = BaseService.ipConvert(new IpCfg(), ipcfg);
if (cfgs.size() > 1) { if (cfgs.size() > 1) {
throw new RuntimeException("CallBack IP did not support IP range!"); throw new RuntimeException("CallBack IP did not support IP range!");

18
src/main/resources/messages/message_ru.properties
View File

@@ -660,8 +660,8 @@ c2s_pkt_num=C2S(Pkt)
s2c_pkt_num=S2C(Pkt) s2c_pkt_num=S2C(Pkt)
c2s_byte_num=C2S(Byte) c2s_byte_num=C2S(Byte)
s2c_byte_num=S2C(Byte) s2c_byte_num=S2C(Byte)
voip_recv_time=null voip_recv_time=VoIP \u0432\u0440\u0435\u043C\u044F \u043F\u0440\u0438\u0435\u043C\u0430
voip_protocol=null voip_protocol=VoIP
av_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E av_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E
duation=\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\uFF08\u0441.\uFF09 duation=\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\uFF08\u0441.\uFF09
calling_account=\u0410\u043A\u043A\u0430\u0443\u043D\u0442 \u0438\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u0445 \u0432\u044B\u0437\u043E\u0432 calling_account=\u0410\u043A\u043A\u0430\u0443\u043D\u0442 \u0438\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u0445 \u0432\u044B\u0437\u043E\u0432
@@ -790,8 +790,8 @@ NTC_MAIL_BODY=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435
NTC_FILE_DIGEST=\u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442 \u0444\u0430\u0439\u043B\u043E\u0432 NTC_FILE_DIGEST=\u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442 \u0444\u0430\u0439\u043B\u043E\u0432
NTC_FTP_URL=URL NTC_FTP_URL=URL
NTC_FTP_CONTENT=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 NTC_FTP_CONTENT=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435
id_not_exists=ID s% s% \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 id_not_exists=ID %s %s \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
id_not_valid=ID s% s% \u043D\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u0435\u043D id_not_valid=ID %s %s \u043D\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u0435\u043D
num_split_by_comma=%s - \u0441\u0438\u043C\u0432\u043E\u043B, \u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0437\u0430\u043F\u044F\u0442\u043E\u0439 num_split_by_comma=%s - \u0441\u0438\u043C\u0432\u043E\u043B, \u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0437\u0430\u043F\u044F\u0442\u043E\u0439
no_data=\u041D\u0435\u0442 \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445 no_data=\u041D\u0435\u0442 \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
must_be=%s \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C%s must_be=%s \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C%s
@@ -834,8 +834,8 @@ video_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D
video_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 \u0432\u0438\u0434\u0435\u043E video_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 \u0432\u0438\u0434\u0435\u043E
pic_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u0440\u0430\u0437\u0446\u0430 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F pic_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u0440\u0430\u0437\u0446\u0430 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F
pic_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F pic_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F
voip_sample_reject=null voip_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 VOIP \u0430\u0443\u0434\u0438\u043E
voip_sample_monit=null voip_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u0440\u0430\u0437\u0446\u043E\u0432 \u0433\u043E\u043B\u043E\u0441\u043E\u0432 VoIP
audio_pornography_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u0441\u0446\u0435\u043D\u044B \u0430\u0443\u0434\u0438\u043E audio_pornography_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u0441\u0446\u0435\u043D\u044B \u0430\u0443\u0434\u0438\u043E
audio_pornography_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u0441\u0446\u0435\u043D\u044B \u0430\u0443\u0434\u0438\u043E audio_pornography_sample_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u0441\u0446\u0435\u043D\u044B \u0430\u0443\u0434\u0438\u043E
video_pornography_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u044D\u0440\u043E\u0442\u0438\u043A\u0438 video_pornography_sample_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u044D\u0440\u043E\u0442\u0438\u043A\u0438
@@ -1344,3 +1344,9 @@ crl_file=\u0424\u0430\u0439\u043B Crl
equal_password=\u041D\u0435\u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043F\u0430\u0440\u043E\u043B\u0438! equal_password=\u041D\u0435\u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043F\u0430\u0440\u043E\u043B\u0438!
cgi_failed=CGL \u0441\u0435\u0440\u0432\u0435\u0440 cgi_failed=CGL \u0441\u0435\u0440\u0432\u0435\u0440
ip_check=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 IP-\u0430\u0434\u0440\u0435\u0441 ip_check=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 IP-\u0430\u0434\u0440\u0435\u0441
user_type=User Type
policy_vpn_user=VPN access user name
policy_sipv4_user=Three tier access to IP(IPv4)
policy_sipv6_user=Three tier access to IP(IPv6)
traffic=Traffic
ip_info=IP Info