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

国际化

Browse Source 
更改：
intercept_intensity
新增：
default_value=Default Value
intercept=Intercept
修改部分导出提示信息
This commit is contained in:
duandongmei
2018-11-01 19:38:53 +08:00
parent 43fbee90a0
commit 7808f09f1c
4 changed files with 1118 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -144,14 +144,15 @@ public class ExportExcel {
} }
} }
public String[] validRegionFieldAndSetComment(String headerStr,String commentStr,FunctionRegionDict region,FunctionServiceDict service,Properties msgProp){ public String[] validRegionFieldAndSetComment(String headerStr,String commentStr,FunctionRegionDict region,FunctionServiceDict service,Properties msgProp){
String defaultValue="";
int index=0; int index=0;
String[] titleInfo=new String[3]; String[] titleInfo=new String[3];
//p2p_hash_type //p2p_hash_type
if("p2p_hash_type".equals(headerStr)){ if("p2p_hash_type".equals(headerStr)){
commentStr=""; commentStr="";
List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("P2P_HASH_TYPE"); List<SysDataDictionaryItem> p2pHashType=DictUtils.getDictList("P2P_HASH_TYPE");
if(ratelimit !=null && ratelimit.size()>0){ if(p2pHashType !=null && p2pHashType.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) { for (SysDataDictionaryItem sysDataDictionaryItem : p2pHashType) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){ if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n"; commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n";
index++; index++;
@@ -167,20 +168,25 @@ public class ExportExcel {
//p2p_ip_config_type //p2p_ip_config_type
if("p2p_ip_config_type".equals(headerStr)){ if("p2p_ip_config_type".equals(headerStr)){
commentStr=""; commentStr="";
List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("P2P_IP_TYPE"); List<SysDataDictionaryItem> p2pIpType=DictUtils.getDictList("P2P_IP_TYPE");
if(ratelimit !=null && ratelimit.size()>0){ if(p2pIpType !=null && p2pIpType.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) { for (SysDataDictionaryItem sysDataDictionaryItem : p2pIpType) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){ commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue(),sysDataDictionaryItem.getItemValue())+"）\n";
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n"; index++;
index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）\n";
index++;
}
} }
defaultValue=p2pIpType.get(0).getItemCode()+"（"+msgProp.getProperty(p2pIpType.get(0).getItemValue(),p2pIpType.get(0).getItemValue())+"）";
} }
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
index++;
commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
if(!StringUtil.isEmpty(defaultValue)){
//2、默认值说明
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
}
} }
//ratelimit //ratelimit
if("ratelimit".equals(headerStr)){ if("ratelimit".equals(headerStr)){
@@ -188,39 +194,51 @@ public class ExportExcel {
List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("RATE_LIMIT"); List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("RATE_LIMIT");
if(ratelimit !=null && ratelimit.size()>0){ if(ratelimit !=null && ratelimit.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) { for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){ commentStr=commentStr+msgProp.getProperty(sysDataDictionaryItem.getItemValue(),sysDataDictionaryItem.getItemValue())+"\n";
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"\n";
index++; index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"\n";
index++;
}
} }
defaultValue=ratelimit.get(0).getItemCode();
} }
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
if(!StringUtil.isEmpty(defaultValue)){
//2、默认值说明
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
index++;
}
} }
//replace_zone //intercept replace replace_zone
if("replace_zone".equals(headerStr)){ if("replace_zone".equals(headerStr)){
commentStr=""; commentStr="";
List<SysDataDictionaryItem> interceptReplaceZone=DictUtils.getDictList("INTERCEPT_REPLACE_ZONE"); List<SysDataDictionaryItem> interceptReplaceZone=DictUtils.getDictList("INTERCEPT_REPLACE_ZONE");
if(interceptReplaceZone !=null && interceptReplaceZone.size()>0){ if(interceptReplaceZone !=null && interceptReplaceZone.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : interceptReplaceZone) { for (SysDataDictionaryItem sysDataDictionaryItem : interceptReplaceZone) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){ commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue(),sysDataDictionaryItem.getItemValue())+"）\n";
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n"; index++;
index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）\n";
index++;
}
} }
defaultValue=interceptReplaceZone.get(0).getItemCode()+"（"+msgProp.getProperty(interceptReplaceZone.get(0).getItemValue(),interceptReplaceZone.get(0).getItemValue())+"）";
} }
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
index++;
commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
if(!StringUtil.isEmpty(defaultValue)){
//2、默认值说明
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
index++;
}
} }
if("asn_no".equals(headerStr)){ if("asn_no".equals(headerStr)){
commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr; commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
//2、数值类型
commentStr=commentStr+"▶"+msgProp.getProperty("input_integer")+"\n";
index++; index++;
} }
if("policy_name".equals(headerStr)){ if("policy_name".equals(headerStr)){
@@ -232,6 +250,7 @@ public class ExportExcel {
List<DnsResStrategy> resStrategys=dnsResStrategyDao.findList(null, 1,1); List<DnsResStrategy> resStrategys=dnsResStrategyDao.findList(null, 1,1);
commentStr=commentStr+"0"+"（"+msgProp.getProperty("no_strategy")+"）\n"; commentStr=commentStr+"0"+"（"+msgProp.getProperty("no_strategy")+"）\n";
index++; index++;
defaultValue="0"+"（"+msgProp.getProperty("no_strategy")+"）";
if(!StringUtil.isEmpty(resStrategys)){ if(!StringUtil.isEmpty(resStrategys)){
for (DnsResStrategy dnsResStrategy : resStrategys) { for (DnsResStrategy dnsResStrategy : resStrategys) {
commentStr=commentStr+dnsResStrategy.getCfgId()+"（"+dnsResStrategy.getCfgDesc()+"）\n"; commentStr=commentStr+dnsResStrategy.getCfgId()+"（"+dnsResStrategy.getCfgDesc()+"）\n";
@@ -245,8 +264,41 @@ public class ExportExcel {
}else{ }else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
index++;
commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
if(!StringUtil.isEmpty(defaultValue)){
//2、默认值说明
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
}
} }
} }
if("antiddos_protocol".equals(headerStr)) {
commentStr="";
List<SysDataDictionaryItem> antiddosProtocol=DictUtils.getDictList("ANTIDDOS_PROTOCOL");
if(antiddosProtocol !=null && antiddosProtocol.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : antiddosProtocol) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n";
index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）\n";
index++;
}
}
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if("bps_threadshold".equals(headerStr)){
commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr;
index++;
}
if("pps_threadshold".equals(headerStr)){
commentStr=msgProp.getProperty("input_integer")+":\n"+commentStr;
index++;
}
if(region.getRegionType().equals(1)){//IP配置 if(region.getRegionType().equals(1)){//IP配置
//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction //ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
//确定需要导入的srcIp srcPort destIp destPort信息 //确定需要导入的srcIp srcPort destIp destPort信息

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

@@ -1245,7 +1245,7 @@ mail_address_whitelist=Mail Address White List
mail_address_monit=Mail Address Monitor mail_address_monit=Mail Address Monitor
mail_address_reject=Mail Address Block mail_address_reject=Mail Address Block
ipsec_protocol=IPSEC Protocol ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Related Domains intercept_intensity=Affect Related Domains
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit. exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.
file_in_wrong_format=File Format Error file_in_wrong_format=File Format Error
select_certificate=Please Select Certificate Type First select_certificate=Please Select Certificate Type First
@@ -1301,4 +1301,8 @@ log_to_url=To HTTP URL
source_compile_id=Configuration Source source_compile_id=Configuration Source
most_keywords=%s can have 1024 chars at most most_keywords=%s can have 1024 chars at most
hex_case_insensitive=Hexadecimal values must case insensitive hex_case_insensitive=Hexadecimal values must case insensitive
default_request=Default Letter default_request=Default Letter
default_value=Default Value
intercept=Intercept
unkown_error=Unkown Error Infomation
exception_info=Exception Infomation

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

File diff suppressed because it is too large Load Diff

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

@@ -1293,4 +1293,7 @@ log_to_url=\u8F6CHTTP URL\u914D\u7F6E
source_compile_id=\u914D\u7F6E\u6765\u6E90 source_compile_id=\u914D\u7F6E\u6765\u6E90
most_keywords=%s\u6700\u591A\u5305\u542B1024\u4E2A\u5B57\u7B26 most_keywords=%s\u6700\u591A\u5305\u542B1024\u4E2A\u5B57\u7B26
hex_case_insensitive=16\u8FDB\u5236\u7684\u503C\u5927\u5C0F\u5199\u4E0D\u654F\u611F hex_case_insensitive=16\u8FDB\u5236\u7684\u503C\u5927\u5C0F\u5199\u4E0D\u654F\u611F
default_request=\u9ED8\u8BA4\u51FD default_request=\u9ED8\u8BA4\u51FD
default_value=\u9ED8\u8BA4\u503C
unkown_error=\u672A\u77E5\u9519\u8BEF\u4FE1\u606F
exception_info=\u5F02\u5E38\u4FE1\u606F