Merge remote-tracking branch 'origin/main' into lichang

2024-05-11 16:25:54 +08:00
parent d547914ab5 f665656f86
commit e27e69284f
25 changed files with 972 additions and 168 deletions
--- a/database/upgrade/upg_sys_menu.sql
+++ b/database/upgrade/upg_sys_menu.sql
@@ -255,7 +255,7 @@ INSERT IGNORE INTO `sys_menu` VALUES (2131, 'menu.dashboard', 2087, 0, 'dashboar
 INSERT IGNORE INTO `sys_menu` VALUES (2132, 'menu.dashboard.overview', 2131, 1, 'overview', 'dashboard/overview/index', '1', '0', 'M', '1', '1', 'dashboard:overview:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_menu` VALUES (2133, 'menu.dashboard.cdr', 2131, 3, 'imsCDR', 'dashboard/imsCDR/index', '1', '0', 'M', '1', '1', 'dashboard:cdr:index', 'icon-paixu', 'supervisor', 1705550000000, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2134, 'menu.tools.terminal', 3, 3, 'terminal', 'tool/terminal/index', '1', '1', 'M', '1', '1', 'tool:terminal:index', 'icon-pcduan', 'supervisor', 1708481172778, '', 0, '');
-INSERT IGNORE INTO `sys_menu` VALUES (2135, 'menu.config.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '0', 'M', '1', '1', 'ne:neHost:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
+INSERT IGNORE INTO `sys_menu` VALUES (2135, 'menu.config.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '1', 'M', '1', '1', 'ne:neHost:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2136, 'menu.config.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '1', 'ne:neHostCommand:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2137, 'menu.config.neInfo', 4, 14, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', 'supervisor', 1708583596871, '', 0, '');
 INSERT IGNORE INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2131, 6, 'amfUE', 'dashboard/amfUE/index', '1', '0', 'M', '1', '1', 'dashboard:amfUE:index', 'icon-paixu', 'supervisor', 1705550000000, '', 0, '');
@@ -272,6 +272,9 @@ UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2118;
 UPDATE `omc_db`.`sys_menu` SET `is_cache` = '1' WHERE `menu_id` = 2134;
 UPDATE `omc_db`.`sys_menu` SET  `path` = 'imsCDR', `component` = 'dashboard/imsCDR/index' WHERE `menu_id` = 2133;

+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2142;
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2143;
+
 UPDATE `omc_db`.`sys_menu`
 SET
    `menu_name` = 'menu.system.cacheInfo',
@@ -448,9 +451,7 @@ SET
 WHERE
    `menu_id` = 2105;

-DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2142;

-DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2143;

 UPDATE `omc_db`.`sys_menu`
 SET
@@ -958,4 +959,193 @@ SET
 WHERE
    `menu_id` = 2141;

+-- begin: remove some excess old menus at 2024/05/10, r2.2405.1
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 3;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 6;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 7;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 8;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 9;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 10;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 11;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 12;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 13;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 14;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 15;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 118;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2011;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2012;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2013;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2014;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2015;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2016;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2017;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2018;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2019;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2020;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2021;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2022;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2023;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2024;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2025;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2026;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2027;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2028;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2029;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2030;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2031;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2032;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2033;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2034;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2035;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2036;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2037;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2038;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2039;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2040;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2041;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2042;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2043;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2044;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2045;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2046;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2047;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2048;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2049;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2050;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2051;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2052;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2053;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2054;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2055;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2056;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2057;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2058;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2059;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2060;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2065;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2066;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2067;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2068;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2069;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2070;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2071;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2072;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2073;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2074;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2076;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2077;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2090;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2093;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2096;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2116;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2117;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2134;
+
+DELETE FROM `omc_db`.`sys_menu` WHERE `menu_id` = 2139;
+
+UPDATE `omc_db`.`sys_menu`
+SET
+    `menu_name` = 'menu.log.set',
+    `parent_id` = 2089,
+    `menu_sort` = 15,
+    `path` = 'logSet',
+    `component` = 'logManage/logSet/index',
+    `is_frame` = '1',
+    `is_cache` = '0',
+    `menu_type` = 'M',
+    `visible` = '0',
+    `status` = '0',
+    `perms` = 'logManage:logSet:index',
+    `icon` = 'icon-you',
+    `create_by` = 'supervisor',
+    `create_time` = 1700000000000,
+    `update_by` = 'supervisor',
+    `update_time` = 1715332370830,
+    `remark` = 'menu.log.setRemark'
+WHERE
+    `menu_id` = 2095;
+
+-- end: remove 
+
 SET FOREIGN_KEY_CHECKS = 1;