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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
leijun
2018-10-18 18:42:59 +08:00
parent 78d472c223 672765d467
commit 075bdfcf5e
5 changed files with 1717 additions and 1448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/excel/ImportExcel.java
View File

@@ -379,7 +379,7 @@ public class ImportExcel {
if (valType == String.class){
String s = String.valueOf(val.toString());
//0.0.0.0表示任意IP的含义
if(StringUtils.endsWith(s, ".0") && !s.equals("0.0.0.0")){
if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
val = StringUtils.substringBefore(s, ".0");
}else{
val = String.valueOf(val.toString());

3133
src/main/java/com/nis/web/controller/BaseController.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -1255,4 +1255,12 @@ private_certificate=pem key p12
antiddos_protocol=DDOS Protocol
bps_threadshold=Traffic Threshold(bps)
pps_threadshold=Traffic Threshold(pps)
one_more_greater_zero=At Least One Threshold Is Not 0.
one_more_greater_zero=At Least One Threshold Is Not 0.
can_not_be=Can not be %s
the_same_ip_type_pattern=Client IP and Server IP must have the same IP type and the same IP pattern
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit
the_same_port_pattern=Client port and server port must in the same port pattern
ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
ip_range_smaller=Start IP in a IP range should smaller than end IP
alternative_values= Alternative values can be %s

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

@@ -1275,4 +1275,12 @@ private_certificate=pem key p12
antiddos_protocol=DDOS Protocol
bps_threadshold=Traffic Threshold(bps)
pps_threadshold=Traffic Threshold(pps)
one_more_greater_zero=At Least One Threshold Is Not 0.
one_more_greater_zero=At Least One Threshold Is Not 0.
can_not_be=Can not be %s
the_same_ip_type_pattern=Client IP and Server IP must have the same IP type and the same IP pattern
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit
the_same_port_pattern=Client port and server port must in the same port pattern
ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
ip_range_smaller=Start IP in a IP range should smaller than end IP
alternative_values= Alternative values can be %s

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

@@ -1249,4 +1249,12 @@ private_certificate=pem key p12
antiddos_protocol=DDOS\u534F\u8BAE
bps_threadshold=\u6D41\u91CF\u9608\u503C(bps)
pps_threadshold=\u6D41\u91CF\u9608\u503C(pps)
one_more_greater_zero=\u6D41\u91CF\u9608\u503C\u81F3\u5C11\u6709\u4E00\u4E2A\u4E0D\u4E3A 0
one_more_greater_zero=\u6D41\u91CF\u9608\u503C\u81F3\u5C11\u6709\u4E00\u4E2A\u4E0D\u4E3A 0
can_not_be=\u4E0D\u80FD\u4E3A%s
the_same_ip_type_pattern=\u6E90IP\u4E0E\u76EE\u7684IP\u7684IP\u7C7B\u578B\uFF0CIP\u683C\u5F0F\u5FC5\u987B\u76F8\u540C
protocol_and_port=\u975ETCP\u534F\u8BAE\u4E0EUDP\u534F\u8BAE\u7AEF\u53E3\u5FC5\u987B\u4E3A0\uFF0C\u5168\u90E8\u534F\u8BAE\u65E0\u9650\u5236
the_same_port_pattern=\u6E90\u7AEF\u53E3\u4E0E\u76EE\u7684\u7AEF\u53E3\u7AEF\u53E3\u683C\u5F0F\u5FC5\u987B\u76F8\u540C
ip_range_in_c=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u5FC5\u987B\u5728C\u7F51\u6BB5
ip_range_bit_field=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u7F51\u7EDC\u5730\u5740\u5FC5\u987B\u76F8\u540C
ip_range_smaller=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u5FC5\u987B\u5C0F\u4E8E\u7EC8\u6B62IP
alternative_values=\u53EF\u9009\u62E9\u7684\u503C\u6709%s