Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

This commit is contained in:
tanghao
2018-12-17 23:44:20 +08:00
17 changed files with 397 additions and 40 deletions

View File

@@ -1372,8 +1372,8 @@ bps=Bps
bps_percent=Bps Percent
pps=pps
pps_percent=pps Percent
spoofing_ip_object=Spoofing Policy Object
spoofing_ip_policy=Spoofing Policy
spoofing_ip_object=Spoofing IP Pool
spoofing_ip_policy=IP Spoofing
action_spoofing=Spoofing
spoofing=spoofing
service=Service
@@ -1395,4 +1395,11 @@ end_ip=End IP
action_detail=Action Detail
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS Group Manage
asn_group_manage=ASN Group Manage
ip_group_manage=IP Group Manage
ip_spoofing_group_manage=IP Spoofing Group Manage
min_tcp=Min
max_tcp=Max
APP_TCP_SESSION_BYTE=Session

View File

@@ -1376,8 +1376,8 @@ bps=Bps
bps_percent=Bps Percent
pps=pps
pps_percent=pps Percent
spoofing_ip_object=Spoofing Policy Object
spoofing_ip_policy=Spoofing Policy
spoofing_ip_object=Spoofing IP Pool
spoofing_ip_policy=IP Spoofing
action_spoofing=Spoofing
spoofing=spoofing
service=Service
@@ -1399,4 +1399,11 @@ end_ip=End IP
action_detail=Action Detail
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS Group Manage
asn_group_manage=ASN Group Manage
ip_group_manage=IP Group Manage
ip_spoofing_group_manage=IP Spoofing Group Manage
min_tcp=Min
max_tcp=Max
APP_TCP_SESSION_BYTE=Session

View File

@@ -1372,8 +1372,8 @@ bps=Bps
bps_percent=Bps Percent
pps=pps
pps_percent=pps Percent
spoofing_ip_object=Spoofing Policy Object
spoofing_ip_policy=Spoofing Policy
spoofing_ip_object=Spoofing IP Pool
spoofing_ip_policy=IP Spoofing
action_spoofing=Spoofing
spoofing=spoofing
service=Service
@@ -1395,4 +1395,11 @@ end_ip=End IP
action_detail=\u52a8\u4f5c\u8be6\u60c5
pass=Pass
live_link=Live Link
area_type=Area Type
area_type=Area Type
dns_group_manage=DNS\u5206\u7EC4\u7BA1\u7406
asn_group_manage=ASN\u5206\u7EC4\u7BA1\u7406
ip_group_manage=IP\u5206\u7EC4\u7BA1\u7406
ip_spoofing_group_manage=IP Spoofing\u5206\u7EC4\u7BA1\u7406
min_tcp=Min
max_tcp=Max
APP_TCP_SESSION_BYTE=Session

View File

@@ -0,0 +1,4 @@
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1197,109,'0,1,109,','asn_group_manage','ASN分组',470,'/basics/policyGroup/policyGroupList?groupType=4','','fa fa-sitemap',1,'','1','2018-12-16 22:17:54','1','2018-12-17 20:03:13','',1,NULL,0,0,NULL);
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1203,109,'0,1,109,','ip_spoofing_group_manage','IP spoofing 分组',500,'/basics/policyGroup/policyGroupList?groupType=6','','fa fa-gear',1,'','1','2018-12-17 20:02:22','1','2018-12-17 20:09:53','',1,NULL,0,0,NULL);
insert into `sys_menu`(`id`,`parent_id`,`parent_ids`,`code`,`name`,`sort`,`href`,`target`,`icon`,`is_show`,`permission`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`,`menu_bg`,`quick_action`,`is_top`,`function_id`) values (1205,109,'0,1,109,','ip_group_manage','IP分组管理',530,'/basics/policyGroup/policyGroupList?groupType=5','','fa fa-tasks',1,'','1','2018-12-17 20:05:14','1','2018-12-17 20:08:44','',1,NULL,0,0,NULL);
UPDATE sys_menu SET CODE='dns_group_manage',NAME='dns分组管理', href='/basics/policyGroup/policyGroupList?groupType=1' WHERE id=716;