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/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
	证书增加CN和SAN列，修改时间类型
	common.js去掉无用字符
	国际化增加cert_not_match_domain
This commit is contained in:
duandongmei
2018-11-06 11:36:31 +08:00
parent 295c45f3b7 554fd2a01e
commit e579e0d617
119 changed files with 2944 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/sql/20181105/alert_pxy_obj_file.sql Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE pxy_obj_keyring ADD cn varchar(400) DEFAULT null COMMENT 'CN<EFBFBD><EFBFBD>Ϣ';
ALTER TABLE pxy_obj_keyring ADD alt_name varchar(4000) DEFAULT null COMMENT 'SAN<EFBFBD><EFBFBD>Ϣ';
alter table pxy_obj_keyring modify column not_before_time varchar(40);
alter table pxy_obj_keyring modify column not_after_time varchar(40);

2
src/main/resources/sql/20181105/change_asn_no_range.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE config_group_info MODIFY COLUMN asn_id BIGINT(20) NULL COMMENT 'asn 组对应的asn号';
ALTER TABLE policy_group_info MODIFY COLUMN asn_no BIGINT(20) NULL COMMENT 'asn号';

2
src/main/resources/sql/20181105/update_region_dict.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE function_region_dict SET config_ip_port_show = '1' WHERE function_id = 300 AND dict_id = 68;
UPDATE function_region_dict SET config_ip_port_show = '3,4' WHERE function_id = 304 AND dict_id = 232;

2
src/main/resources/sql/20181105/update_region_service_dict.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE function_region_dict SET is_import=1 WHERE function_id=403 AND is_valid=1;
UPDATE function_service_dict SET is_import=1 WHERE function_id=403 AND is_valid=1;