Merge remote-tracking branch 'origin/main' into lichang
This commit is contained in:
TsMask
@@ -647,5 +647,6 @@ REPLACE INTO `sys_dict_data` VALUES (2129, 2129, 'menu.monitor.event', '事件',
|
||||
REPLACE INTO `sys_dict_data` VALUES (2130, 2130, 'post.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
|
||||
REPLACE INTO `sys_dict_data` VALUES (2131, 2131, 'role.export.time', '创建时间', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
|
||||
REPLACE INTO `sys_dict_data` VALUES (2132, 2132, 'dictData.ne_host_authMode.2', '免密认证', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
|
||||
REPLACE INTO `sys_dict_data` VALUES (2133, 2133, 'menu.ne.neConfPara5G', '网元公共配置', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,28 +1,27 @@
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user` (
|
||||
`user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
|
||||
`dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID',
|
||||
`user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户账号',
|
||||
`nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户昵称',
|
||||
`user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
|
||||
`email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱',
|
||||
`phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码',
|
||||
`sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
|
||||
`avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '头像地址',
|
||||
`password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码',
|
||||
`status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
|
||||
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
|
||||
`login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP',
|
||||
`login_date` bigint(20) NULL DEFAULT 0 COMMENT '最后登录时间',
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
|
||||
`create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
|
||||
`update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
|
||||
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
|
||||
CREATE TABLE IF NOT EXISTS `omc_db`.`sys_user` (
|
||||
`user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
|
||||
`dept_id` bigint DEFAULT '0' COMMENT '部门ID',
|
||||
`user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号',
|
||||
`nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称',
|
||||
`user_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'sys' COMMENT '用户类型（sys系统用户）',
|
||||
`email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户邮箱',
|
||||
`phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '手机号码',
|
||||
`sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '用户性别（0未知 1男 2女）',
|
||||
`avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '头像地址',
|
||||
`password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码',
|
||||
`status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '帐号状态（0停用 1正常）',
|
||||
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
|
||||
`login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '最后登录IP',
|
||||
`login_date` bigint DEFAULT '0' COMMENT '最后登录时间',
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
|
||||
`create_time` bigint DEFAULT '0' COMMENT '创建时间',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
|
||||
`update_time` bigint DEFAULT '0' COMMENT '更新时间',
|
||||
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
|
||||
PRIMARY KEY (`user_id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
|
||||
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
|
||||
|
||||
--DELETE FROM `omc_db`.`sys_user` WHERE `user_id` IN (1,2);
|
||||
|
||||
@@ -202,4 +201,12 @@ VALUES (
|
||||
''
|
||||
);
|
||||
|
||||
-- 20240508
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID' AFTER `user_id`;
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `user_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `dept_id`;
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `nick_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称' AFTER `user_name`;
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `email` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户邮箱' AFTER `user_type`;
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `phonenumber` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '手机号码' AFTER `email`;
|
||||
ALTER TABLE `omc_db`.`sys_user` MODIFY COLUMN `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `update_time`;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=1;
|
||||
Reference in New Issue
Block a user