diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 534208676..256a135fe 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1648,7 +1648,7 @@ most_eight_group=At most 8 groups you can choose no_common_group=The configuration ID of %s does not have a group; #---------------------------Object List Group Manage------------------------------------ built_in_tip=Forbidden -policy_object_group=Policy-Object-Group +object_list_group=Object-List-Group policy_group=Policy Group object_list=Object List ip_group_configuration=IP Object List diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index a614c17f8..34771fd23 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1652,7 +1652,7 @@ most_eight_group=At most 8 groups you can choose no_common_group=The configuration ID of %s does not have a group; #---------------------------Object List Group Manage------------------------------------ built_in_tip=Forbidden -policy_object_group=Policy-Object-Group +object_list_group=Object-List-Group policy_group=Policy Group object_list=Object List ip_group_configuration=IP Object List diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4affe9b11..8a1274ea4 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1648,7 +1648,7 @@ most_eight_group=\u81F3\u591A\u53EF\u9009\u62E9\u0038\u4E2A\u7EC4 no_common_group=ID\u4E3A%s\u7684\u914D\u7F6E\u7F3A\u5C11\u7EC4 #---------------------------Object List Group Manage------------------------------------ built_in_tip=\u7981\u6B62\u64CD\u4F5C -policy_object_group=\u7B56\u7565-\u5BF9\u8C61-\u7EC4 +object_list_group=Object-List-Group policy_group=\u7B56\u7565\u7EC4 object_list=Object List ip_group_configuration=IP Object List diff --git a/src/main/resources/sql/20190608/alter_trusted_column.sql b/src/main/resources/sql/20190608/alter_trusted_column.sql index af521031e..2721d9f28 100644 --- a/src/main/resources/sql/20190608/alter_trusted_column.sql +++ b/src/main/resources/sql/20190608/alter_trusted_column.sql @@ -1,4 +1,4 @@ #可信证书列表增加是否内置证书属性 alter table pxy_obj_trusted_ca_cert add built_in int(1) default 0 comment 'is built-in'; #修改已有证书为非内置证书 -update pxy_obj_trusted_ca_cert set built_in=0; \ No newline at end of file +update pxy_obj_trusted_ca_cert set built_in=0 where built_in is null; \ No newline at end of file diff --git a/src/main/resources/sql/20190613/obj_group_list.sql b/src/main/resources/sql/20190613/obj_group_list.sql index 841ef17ba..61c2770a0 100644 --- a/src/main/resources/sql/20190613/obj_group_list.sql +++ b/src/main/resources/sql/20190613/obj_group_list.sql @@ -11,15 +11,15 @@ INSERT INTO `sys_menu`(`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href` #配置菜单 Object-List-Group INSERT INTO `sys_menu`(`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`) select id, CONCAT('0,1,',id),'object_list_group', 'Object-List-Group', 5060, '', '', '', 1, '', '1', '2019-06-13 19:46:56', '1', '2019-06-13 19:46:56', '', 1, NULL, 0, 0, NULL from sys_menu s1 where s1.code='configuration_manage' and s1.del_flag=1; #审计置菜单 Policy Group -INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:audit', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='audit_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='Object-List-Group'; +INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:audit', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='audit_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='object_list_group'; #审核置菜单 Policy Group -INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:confirm', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='examine_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='Object-List-Group'; +INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:confirm', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='examine_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='object_list_group'; #配置置菜单 Policy Group -INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:config', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='configuration_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='Object-List-Group'; +INSERT INTO `sys_menu`(`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`) select s1.id,CONCAT_WS(',','0,1',s2.id,s1.id), 'policy_group', 'Policy Group', 30, '/objgroup/list', '', '', 1, 'objgroup:config', '1', '2019-06-13 19:47:42', '1', '2019-06-13 19:47:42', '', 1, NULL, 0, 0, 888 from sys_menu s1,sys_menu s2 where s2.code='configuration_manage' and s2.del_flag=1 and s1.parent_id=s2.id and s1.code='object_list_group'; # Object List -INSERT INTO `sys_menu` (`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`)SELECT s1.id, CONCAT_WS(',', s1.parent_ids, s1.id), 'object_list', 'Object List', '60', '', '', '', '1', '', '1', '2019-06-12 10:12:05', '1', '2019-06-12 10:12:05', '', '1', NULL, '0', '0', NULL FROM sys_menu s1, sys_menu s2 WHERE s2.CODE = 'configuration_manage' AND s2.del_flag = 1 AND s1.parent_id = s2.id AND s1.CODE = 'Object-List-Group'; +INSERT INTO `sys_menu` (`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`)SELECT s1.id, CONCAT_WS(',', s1.parent_ids, s1.id), 'object_list', 'Object List', '60', '', '', '', '1', '', '1', '2019-06-12 10:12:05', '1', '2019-06-12 10:12:05', '', '1', NULL, '0', '0', NULL FROM sys_menu s1, sys_menu s2 WHERE s2.CODE = 'configuration_manage' AND s2.del_flag = 1 AND s1.parent_id = s2.id AND s1.CODE = 'object_list_group'; # IP、URL、Domain、SubscribeId INSERT INTO `sys_menu` (`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`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'ip_group_configuration', 'IP公共组管理', '340', '/basics/ip/list', '', '', '1', 'ip:common:config', '1', '2019-05-27 14:06:23', '1', '2019-06-12 10:13:38', '', '1', NULL, '0', '0', '605' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; INSERT INTO `sys_menu` (`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`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'url_group_configuration', 'URL公共组管理', '350', '/basics/url/list', '', '', '1', 'url:common:config', '1', '2019-05-27 15:54:43', '1', '2019-06-12 10:12:56', '', '1', NULL, '0', '0', '606' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; diff --git a/src/main/resources/sql/20190613/update_sys_menu.sql b/src/main/resources/sql/20190613/update_sys_menu.sql deleted file mode 100644 index 73010c05f..000000000 --- a/src/main/resources/sql/20190613/update_sys_menu.sql +++ /dev/null @@ -1,2 +0,0 @@ -#修改实时报表->流量统计->统计菜单 url -UPDATE `sys_menu` SET `href`='/dashboard/traffic/commonNewList' WHERE `code`='statistics' and `href`='/dashboard/traffic/configStatistic'; \ No newline at end of file