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/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面
This commit is contained in:
duandongmei
2018-10-19 17:19:52 +08:00
parent 3b6a3b8721 02b7908116
commit 04833e917c
23 changed files with 250 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -780,7 +780,7 @@ intra=Inbound
#=============about Maintenance=========
#=============some validation===========
line=line %s
can_not_null=%sCan't be empty
can_not_null=%s can't be empty
is_incorrect=%s value is incorrect
are_the_same=%s and %s can't be equal
is_in_wrong_format=%s formatting error

2
src/main/resources/sql/20181019/alert_service_region_dict_table.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE function_region_dict ADD is_import int(2) DEFAULT 0 COMMENT '域是否是否支持导出';
ALTER TABLE function_service_dict ADD is_import int(2) DEFAULT 0 COMMENT '业务是否支持导出';

2
src/main/resources/sql/20181019/alert_table_website_domain_topic.sql Normal file
View File

@@ -0,0 +1,2 @@
#域名修改长度为1024
ALTER TABLE website_domain_topic MODIFY domain VARCHAR(1024);

33
src/main/resources/sql/20181019/import_service_region_Set.sql Normal file
View File

@@ -0,0 +1,33 @@
#ip addr
update function_service_dict set is_import=1 where function_id=5 and is_valid=1 and dict_id in(23,24,25,108);
update function_region_dict set is_import=1 where function_id=5 and is_valid=1 and dict_id in(27,35,228);
#basic
update function_service_dict set is_import=1 where function_id=407 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=407 and is_valid=1 and dict_id in(107);
#tunnel
update function_service_dict set is_import=1 where function_id=408 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=408 and is_valid=1 and dict_id in(157);
#ip payload
update function_service_dict set is_import=1 where function_id=212 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=212 and is_valid=1 and dict_id in(230);
#app
update function_service_dict set is_import=1 where function_id=63 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=63 and is_valid=1 and dict_id in(78);
#dns
update function_service_dict set is_import=1 where function_id=7 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=7 and is_valid=1 and dict_id in(28,29);
#url
update function_service_dict set is_import=1 where function_id=6 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=6 and is_valid=1 ;
#url advanced
update function_service_dict set is_import=1 where function_id=8 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=8 and is_valid=1 and dict_id in(9,10,11,12,13,14);
#mail
update function_service_dict set is_import=1 where function_id=37 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=37 and is_valid=1 and dict_id in(599);
#mail advanced
update function_service_dict set is_import=1 where function_id=35 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=35 and is_valid=1 and dict_id in(30,31,33);
#ftp
update function_service_dict set is_import=1 where function_id=51 and is_valid=1 ;
update function_region_dict set is_import=1 where function_id=51 and is_valid=1 and dict_id in(36,37,38);