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

(1)细化IPV4掩码范围验证的提示

Browse Source 
(2)IP不能为xxxx的提示前方加入空格
(3)DNS响应策略导入模板，导入功能提交
This commit is contained in:
wangxin
2018-11-02 14:53:51 +08:00
parent 6ab181c329
commit e063194254
11 changed files with 307 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1271,8 +1271,8 @@ port_mask_comment_tip=Port and port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
ipv4_mask_range_tip=IP mask must between 16 and 32
ipv6_mask_range_tip=IP Mask must between 2 and 128
ipv4_mask_range_tip=IP\u63A9\u7801\u5FC5\u987B\u4ECB\u4E8E16\u548C32\u4E4B\u95F4
ipv6_mask_range_tip=IP\u63A9\u7801\u5FC5\u987B\u4ECB\u4E8E2\u548C128\u4E4B\u95F4
letter_cancel_info=\u53D6\u6D88\u5BA1\u6838\u6765\u51FD
import_tip_excel=\u8BF7\u9009\u62E9\u6587\u4EF6\u7ED3\u5C3E\u4E3A.xls\u6216\u8005.xlsx\u7684\u6709\u6548Excel\u6587\u4EF6\u5BFC\u5165
http_keyword=\u7F51\u9875\u5173\u952E\u5B57

3
src/main/resources/nis.properties
View File

@@ -540,4 +540,5 @@ cert_validate_file=x509
#证书校验成功的关键信息
cert_validate_success_info=Successful
#ipv4 range新格式0.0.0.1-2
ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$

5
src/main/resources/sql/20181030/update_region.sql
View File

@@ -26,4 +26,7 @@ UPDATE function_region_dict SET is_import=0,region_type=1,config_ip_port_show='3
UPDATE function_service_dict SET is_import=0 WHERE function_id=633;
#DNS欺骗IP
UPDATE function_region_dict SET is_import=1 WHERE function_id=401;
UPDATE function_service_dict SET is_import=1 WHERE function_id=401;
UPDATE function_service_dict SET is_import=1 WHERE function_id=401;
#DNS策略
UPDATE function_region_dict SET is_import=1 WHERE function_id=400;
UPDATE function_service_dict SET is_import=1 WHERE function_id=400;