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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	excel导入提示信息补全，单个字典数据不需要导入
	去掉是否表达式的导入，根据关键词单个和多个区分
This commit is contained in:
duandongmei
2018-10-23 14:14:08 +08:00
parent 5af5a042ae a4ff9ae493
commit 3e1d14602e
84 changed files with 908 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1267,7 +1267,7 @@ alternative_values= Alternative values can be %s
certificate_error=Wrong format of public key file and private key file
public_file_error=Wrong format of public key file
private_file_error=Wrong format of private key file
keyframe_pic_required=No keyframe pictures have been selected.
keyframe_pic_required=No keyframe pictures have been selected.
ipv4_range_tip=IPv4 Range
ipv4_subnet_tip=IPv4/Subnet Mask
ipv6_range_tip=IPv6 Range
@@ -1280,4 +1280,6 @@ multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keyword
visible_keyword_tip=Single keyword is not allowed to enter \n 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
ipv6_mask_range_tip=IP Mask must between 2 and 128
letter_cancel_info=Cancel Letter Info
import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import.

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

@@ -1287,7 +1287,7 @@ alternative_values= Alternative values can be %s
certificate_error=Wrong format of public key file and private key file
public_file_error=Wrong format of public key file
private_file_error=Wrong format of private key file
keyframe_pic_required=No keyframe pictures have been selected.
keyframe_pic_required=No keyframe pictures have been selected.
ipv4_range_tip=IPv4 Range
ipv4_subnet_tip=IPv4/Subnet Mask
ipv6_range_tip=IPv6 Range
@@ -1300,4 +1300,6 @@ multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keyword
visible_keyword_tip=Single keyword is not allowed to enter \n 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
ipv6_mask_range_tip=IP Mask must between 2 and 128
letter_cancel_info=Cancel Letter Info
import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import.

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

@@ -1262,7 +1262,7 @@ certificate_error=\u516C\u94A5\u3001\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u
public_file_error=\u516C\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
private_file_error=\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
ipv4_range_tip=IPv4 Range
ipv4_subnet_tip=IPv4/Subnet Mask
ipv6_range_tip=IPv6 Range
@@ -1275,4 +1275,6 @@ multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keyword
visible_keyword_tip=Single keyword is not allowed to enter \n 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
ipv6_mask_range_tip=IP Mask must between 2 and 128
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

11
src/main/resources/sql/20181022/add_dictionary.sql Normal file
View File

@@ -0,0 +1,11 @@
#取消审核时增加来函信息 数据库增加字段
ALTER TABLE dns_ip_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE dns_res_strategy ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE ip_port_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE ddos_ip_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE av_file_sample_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE cfg_index_info ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE app_policy_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE pxy_obj_keyring ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE file_digest_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';
ALTER TABLE ip_multiplex_pool_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函';