diff --git a/server/molly-service/src/main/resources/db/changelog/cms.xml b/server/molly-service/src/main/resources/db/changelog/cms.xml index da40fb5..422118b 100644 --- a/server/molly-service/src/main/resources/db/changelog/cms.xml +++ b/server/molly-service/src/main/resources/db/changelog/cms.xml @@ -20,7 +20,7 @@ `lng` decimal(10, 6) NOT NULL COMMENT '经度', `lat` decimal(10, 6) NOT NULL COMMENT '纬度', `password` varchar(255) NOT NULL COMMENT '项目密码，做一些危险操作时，使用', - `status` tinyint(1) NOT NULL COMMENT '状态 【0.禁用 1.正常 2.锁定 】', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 【0.禁用 1.正常 2.锁定 】', `create_time` datetime NOT NULL COMMENT '创建时间', `create_user` bigint(20) NOT NULL COMMENT '创建人', `last_update_time` datetime NOT NULL COMMENT '最后一次修改时间', diff --git a/server/molly-service/src/main/resources/db/changelog/pms.xml b/server/molly-service/src/main/resources/db/changelog/pms.xml index fe1fb8e..3a84d67 100644 --- a/server/molly-service/src/main/resources/db/changelog/pms.xml +++ b/server/molly-service/src/main/resources/db/changelog/pms.xml @@ -82,12 +82,12 @@ `username` varchar(50) NOT NULL COMMENT '账号', `mobile` varchar(50) NOT NULL COMMENT '手机号码', `email` varchar(50) NOT NULL COMMENT '邮箱', - `nickname` varchar(100) NOT NULL COMMENT '用户名称', + `nickname` varchar(255) NOT NULL COMMENT '用户名称', `password` varchar(255) NOT NULL COMMENT '密码', - `gender` tinyint(4) NOT NULL COMMENT '性别[ 0.女 1.男 2.未知]', + `gender` tinyint(1) NOT NULL DEFAULT '0' COMMENT '性别[ 0.女 1.男 2.未知]', `dept_id` bigint(20) NOT NULL COMMENT '部门ID', - `status` tinyint(1) NOT NULL COMMENT '状态 【0.禁用 1.正常 2.锁定 】', - `admin_flag` tinyint(1) NOT NULL COMMENT '0. 普通用户 1. 管理员', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 【0.禁用 1.正常 2.锁定 】', + `admin_flag` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0. 普通用户 1. 管理员', `expired` datetime DEFAULT NULL COMMENT '过期时间，如果为空，就是默认', `create_time` datetime NOT NULL COMMENT '创建时间', `create_user` bigint(20) NOT NULL COMMENT '创建人', diff --git a/server/molly-service/src/main/resources/db/changelog/sql/sys_menu.sql b/server/molly-service/src/main/resources/db/changelog/sql/sys_menu.sql index 49f5301..f4e0fe5 100644 --- a/server/molly-service/src/main/resources/db/changelog/sql/sys_menu.sql +++ b/server/molly-service/src/main/resources/db/changelog/sql/sys_menu.sql @@ -20,48 +20,48 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Records of sys_menu -- ---------------------------- -INSERT INTO `sys_menu` VALUES (10001, '系统管理', 0, 'sys', 'Layout', 'sys', '/sys', 8, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:20', 19980817); -INSERT INTO `sys_menu` VALUES (10002, '系统监控', 0, 'monitor', 'Layout', 'monitor', '/monitor', 10, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:13', 19980817); -INSERT INTO `sys_menu` VALUES (10003, '权限管理', 0, 'pre', 'Layout', 'pre', '/pre', 6, 0, 1, 2, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:30', 19980817); -INSERT INTO `sys_menu` VALUES (10004, '用户管理', 10003, 'pre:user', 'pre/user/index', 'pre_user', '/pre/user/index', 1, 0, 1, 2, '2021-07-09 12:30:00', 19980817, '2022-03-29 11:30:48', 19980817); -INSERT INTO `sys_menu` VALUES (10005, '角色管理', 10003, 'pre:role', 'pre/role/index', 'pre_role', '/pre/role/index', 2, 0, 1, 2, '2021-07-09 12:30:00', 19980817, '2021-07-22 18:38:15', 19980817); -INSERT INTO `sys_menu` VALUES (10006, '菜单管理', 10003, 'pre:menu', 'pre/menu/index', 'pre_perm', '/pre/menu/index', 3, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-06-27 20:40:07', 19980817); -INSERT INTO `sys_menu` VALUES (10007, '部门管理', 10003, 'pre:dept', 'pre/dept/index', 'pre_dept', '/pre/dept/index', 4, 0, 1, 2, '2021-07-09 12:30:00', 19980817, '2021-07-27 16:46:09', 19980817); -INSERT INTO `sys_menu` VALUES (10008, '字典管理', 10001, 'sys:dict', 'sys/dict/index', 'sys_dictionary', '/sys/dict', 3, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-06-30 12:10:37', 19980817); -INSERT INTO `sys_menu` VALUES (10009, '参数设置', 10001, 'sys:config', 'sys/config/index', 'config', '/sys/config', 4, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-05-07 17:48:19', 19980817); -INSERT INTO `sys_menu` VALUES (10010, '通知公告', 10001, 'sys:notice', 'sys/notice/index', 'notice', '/sys/notice', 5, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2021-10-09 10:39:14', 19980817); -INSERT INTO `sys_menu` VALUES (10011, '服务监控', 10002, 'monitor:server', 'monitor/server/index', 'server_monitor', '/monitor/server', 1, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-05-26 17:07:01', 19980817); -INSERT INTO `sys_menu` VALUES (10012, '系统API', 10001, 'sys:swagger', 'sys/swagger/index', 'interface', '/sys/swagger', 6, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-05-26 17:07:26', 19980817); -INSERT INTO `sys_menu` VALUES (10013, '操作日志', 10002, 'monitor:operlog', 'monitor/operlog/index', 'sys_oper_log', '/monitor/operlog', 3, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2021-10-26 17:22:22', 19980817); -INSERT INTO `sys_menu` VALUES (10014, '登录日志', 10002, 'monitor:logininfor', 'monitor/logininfor/index', 'sys_login_log', '/monitor/logininfor', 4, 0, 1, 1, '2021-07-09 12:30:00', 19980817, '2022-04-02 11:03:47', 19980817); -INSERT INTO `sys_menu` VALUES (10015, '租户模板', 10001, 'sys:template', 'sys/template/index', 'template', '/sys/template', 1, 0, 1, 1, '2021-08-17 14:02:42', 19980817, '2021-08-17 14:03:32', 19980817); -INSERT INTO `sys_menu` VALUES (10016, '租户管理', 10001, 'sys:tenant', 'sys/tenant/index', 'peoples', '/sys/tenant', 2, 0, 1, 1, '2021-08-24 16:20:54', 19980817, '2021-08-24 16:21:30', 19980817); -INSERT INTO `sys_menu` VALUES (10017, '新增', 10004, 'pre_user:create', '#', '', '', 2, 1, 1, 2, '2022-06-25 15:01:56', 19980817, '2022-06-25 15:01:56', 19980817); -INSERT INTO `sys_menu` VALUES (10018, '视图', 10004, 'pre_user:view', '#', '', '', 1, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10019, '修改', 10004, 'pre_user:update', '#', '', '', 3, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10020, '删除', 10004, 'pre_user:delete', '#', '', '', 4, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10021, '重置密码', 10004, 'pre_user:reset:password', '#', '', '', 5, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10023, '视图', 10005, 'pre_role:view', '#', '', '', 1, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10024, '新增', 10005, 'pre_role:create', '#', '', '', 2, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10025, '修改', 10005, 'pre_role:update', '#', '', '', 3, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10026, '删除', 10005, 'pre_role:delete', '#', '', '', 4, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10027, '修改权限', 10005, 'pre_role:update:permissions', '#', '', '', 5, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10028, '视图', 10007, 'pre_dept:view', '#', '', '', 1, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10029, '新增', 10007, 'pre_dept:create', '#', '', '', 2, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10030, '修改', 10007, 'pre_dept:update', '#', '', '', 3, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10031, '删除', 10007, 'pre_dept:delete', '#', '', '', 4, 1, 1, 2, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); -INSERT INTO `sys_menu` VALUES (10032, '视图', 10006, 'pre_menu:view', '#', '', '', 1, 1, 1, 1, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:13', 19980817); -INSERT INTO `sys_menu` VALUES (10033, '新增', 10006, 'pre_menu:create', '#', '', '', 2, 1, 1, 1, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:43', 19980817); -INSERT INTO `sys_menu` VALUES (10034, '修改', 10006, 'pre_menu:update', '#', '', '', 3, 1, 1, 1, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:53', 19980817); -INSERT INTO `sys_menu` VALUES (10035, '删除', 10006, 'pre_menu:delete', '#', '', '', 4, 1, 1, 1, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:25', 19980817); -INSERT INTO `sys_menu` VALUES (10036, '字典数据', 10001, 'sys:dict:data', 'sys/dict/dictData', '#', '/sys/dict/data', 7, 0, 0, 1, '2022-06-27 20:36:39', 19980817, '2022-06-30 12:10:50', 19980817); -INSERT INTO `sys_menu` VALUES (10038, '数据统计', 0, 'statistics', 'Layout', 'statistics', '/statistics', 1, 0, 1, 2, '2022-07-30 18:17:42', 19980817, '2022-07-30 18:17:42', 19980817); -INSERT INTO `sys_menu` VALUES (10039, '能耗统计', 10038, 'statistics:energy', 'statistics/energy/index', 'statistics_energy', '/statistics/energy', 5, 0, 1, 2, '2022-07-30 18:18:27', 19980817, '2022-07-30 18:18:27', 19980817); -INSERT INTO `sys_menu` VALUES (10040, '趋势分析', 10038, 'statistics:trend', 'statistics/trend/index', 'statistics_trend', '/statistics/trend', 10, 0, 1, 2, '2022-07-30 18:19:12', 19980817, '2022-07-30 18:19:12', 19980817); -INSERT INTO `sys_menu` VALUES (10041, '设备管理', 0, 'device', 'Layout', 'device', '/device', 3, 0, 1, 2, '2022-07-30 18:19:45', 19980817, '2022-07-30 18:19:45', 19980817); -INSERT INTO `sys_menu` VALUES (10042, '设备列表', 10041, 'device:list', 'device/list/index', 'device_list', '/device/list', 5, 0, 1, 2, '2022-07-30 18:20:24', 19980817, '2022-07-30 18:20:24', 19980817); -INSERT INTO `sys_menu` VALUES (10043, '设备规划', 10041, 'device:deploy', 'device/deploy/index', 'device_deploy', '/device/deploy', 3, 0, 1, 2, '2022-07-30 18:20:56', 19980817, '2022-07-30 18:20:56', 19980817); - - +INSERT INTO `sys_menu` VALUES (10001, '系统管理', 0, 'sys', 'Layout', 'sys', '/sys', 8, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:20', 19980817); +INSERT INTO `sys_menu` VALUES (10002, '系统监控', 0, 'monitor', 'Layout', 'monitor', '/monitor', 10, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:13', 19980817); +INSERT INTO `sys_menu` VALUES (10003, '权限管理', 0, 'pre', 'Layout', 'pre', '/pre', 6, 0, 1, 2, 0, '2021-07-09 12:30:00', 19980817, '2022-06-30 10:28:30', 19980817); +INSERT INTO `sys_menu` VALUES (10004, '用户管理', 10003, 'pre:user', 'pre/user/index', 'pre_user', '/pre/user/index', 1, 0, 1, 2, 0, '2021-07-09 12:30:00', 19980817, '2022-03-29 11:30:48', 19980817); +INSERT INTO `sys_menu` VALUES (10005, '角色管理', 10003, 'pre:role', 'pre/role/index', 'pre_role', '/pre/role/index', 2, 0, 1, 2, 0, '2021-07-09 12:30:00', 19980817, '2021-07-22 18:38:15', 19980817); +INSERT INTO `sys_menu` VALUES (10006, '菜单管理', 10003, 'pre:menu', 'pre/menu/index', 'pre_perm', '/pre/menu/index', 3, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-06-27 20:40:07', 19980817); +INSERT INTO `sys_menu` VALUES (10007, '部门管理', 10003, 'pre:dept', 'pre/dept/index', 'pre_dept', '/pre/dept/index', 4, 0, 1, 2, 0, '2021-07-09 12:30:00', 19980817, '2021-07-27 16:46:09', 19980817); +INSERT INTO `sys_menu` VALUES (10008, '字典管理', 10001, 'sys:dict', 'sys/dict/index', 'sys_dictionary', '/sys/dict', 3, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-06-30 12:10:37', 19980817); +INSERT INTO `sys_menu` VALUES (10009, '参数设置', 10001, 'sys:config', 'sys/config/index', 'config', '/sys/config', 4, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-05-07 17:48:19', 19980817); +INSERT INTO `sys_menu` VALUES (10010, '通知公告', 10001, 'sys:notice', 'sys/notice/index', 'notice', '/sys/notice', 5, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2021-10-09 10:39:14', 19980817); +INSERT INTO `sys_menu` VALUES (10011, '服务监控', 10002, 'monitor:server', 'monitor/server/index', 'server_monitor', '/monitor/server', 1, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-05-26 17:07:01', 19980817); +INSERT INTO `sys_menu` VALUES (10012, '系统API', 10001, 'sys:swagger', 'sys/swagger/index', 'interface', '/sys/swagger', 6, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-05-26 17:07:26', 19980817); +INSERT INTO `sys_menu` VALUES (10013, '操作日志', 10002, 'monitor:operlog', 'monitor/operlog/index', 'sys_oper_log', '/monitor/operlog', 3, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2021-10-26 17:22:22', 19980817); +INSERT INTO `sys_menu` VALUES (10014, '登录日志', 10002, 'monitor:logininfor', 'monitor/logininfor/index', 'sys_login_log', '/monitor/logininfor', 4, 0, 1, 1, 0, '2021-07-09 12:30:00', 19980817, '2022-04-02 11:03:47', 19980817); +INSERT INTO `sys_menu` VALUES (10015, '租户模板', 10001, 'sys:template', 'sys/template/index', 'template', '/sys/template', 1, 0, 1, 1, 0, '2021-08-17 14:02:42', 19980817, '2021-08-17 14:03:32', 19980817); +INSERT INTO `sys_menu` VALUES (10016, '租户管理', 10001, 'sys:tenant', 'sys/tenant/index', 'peoples', '/sys/tenant', 2, 0, 1, 1, 0, '2021-08-24 16:20:54', 19980817, '2021-08-24 16:21:30', 19980817); +INSERT INTO `sys_menu` VALUES (10017, '新增', 10004, 'pre_user:create', '#', '', '', 2, 1, 1, 2, 0, '2022-06-25 15:01:56', 19980817, '2022-06-25 15:01:56', 19980817); +INSERT INTO `sys_menu` VALUES (10018, '视图', 10004, 'pre_user:view', '#', '', '', 1, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10019, '修改', 10004, 'pre_user:update', '#', '', '', 3, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10020, '删除', 10004, 'pre_user:delete', '#', '', '', 4, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10021, '重置密码', 10004, 'pre_user:reset:password', '#', '', '', 5, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10023, '视图', 10005, 'pre_role:view', '#', '', '', 1, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10024, '新增', 10005, 'pre_role:create', '#', '', '', 2, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10025, '修改', 10005, 'pre_role:update', '#', '', '', 3, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10026, '删除', 10005, 'pre_role:delete', '#', '', '', 4, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10027, '修改权限', 10005, 'pre_role:update:permissions', '#', '', '', 5, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10028, '视图', 10007, 'pre_dept:view', '#', '', '', 1, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10029, '新增', 10007, 'pre_dept:create', '#', '', '', 2, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10030, '修改', 10007, 'pre_dept:update', '#', '', '', 3, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10031, '删除', 10007, 'pre_dept:delete', '#', '', '', 4, 1, 1, 2, 0, '2022-06-25 15:03:42', 19980817, '2022-06-25 15:03:42', 19980817); +INSERT INTO `sys_menu` VALUES (10032, '视图', 10006, 'pre_menu:view', '#', '', '', 1, 1, 1, 1, 0, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:13', 19980817); +INSERT INTO `sys_menu` VALUES (10033, '新增', 10006, 'pre_menu:create', '#', '', '', 2, 1, 1, 1, 0, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:43', 19980817); +INSERT INTO `sys_menu` VALUES (10034, '修改', 10006, 'pre_menu:update', '#', '', '', 3, 1, 1, 1, 0, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:53', 19980817); +INSERT INTO `sys_menu` VALUES (10035, '删除', 10006, 'pre_menu:delete', '#', '', '', 4, 1, 1, 1, 0, '2022-06-25 15:03:42', 19980817, '2022-06-27 20:39:25', 19980817); +INSERT INTO `sys_menu` VALUES (10036, '字典数据', 10001, 'sys:dict:data', 'sys/dict/dictData', '#', '/sys/dict/data', 7, 0, 0, 1, 0, '2022-06-27 20:36:39', 19980817, '2022-06-30 12:10:50', 19980817); +INSERT INTO `sys_menu` VALUES (10038, '数据统计', 0, 'statistics', 'Layout', 'statistics', '/statistics', 1, 0, 1, 2, 0, '2022-07-30 18:17:42', 19980817, '2022-07-30 18:17:42', 19980817); +INSERT INTO `sys_menu` VALUES (10039, '能耗统计', 10038, 'statistics:energy', 'statistics/energy/index', 'statistics_energy', '/statistics/energy', 5, 0, 1, 2, 0, '2022-07-30 18:18:27', 19980817, '2022-07-30 18:18:27', 19980817); +INSERT INTO `sys_menu` VALUES (10040, '趋势分析', 10038, 'statistics:trend', 'statistics/trend/index', 'statistics_trend', '/statistics/trend', 10, 0, 1, 2, 0, '2022-07-30 18:19:12', 19980817, '2022-07-30 18:19:12', 19980817); +INSERT INTO `sys_menu` VALUES (10041, '设备管理', 0, 'device', 'Layout', 'device', '/device', 3, 0, 1, 2, 0, '2022-07-30 18:19:45', 19980817, '2022-07-30 18:19:45', 19980817); +INSERT INTO `sys_menu` VALUES (10042, '设备列表', 10041, 'device:list', 'device/list/index', 'device_list', '/device/list', 5, 0, 1, 2, 0, '2022-07-30 18:20:24', 19980817, '2022-07-30 18:20:24', 19980817); +INSERT INTO `sys_menu` VALUES (10043, '设备规划', 10041, 'device:deploy', 'device/deploy/index', 'device_deploy', '/device/deploy', 3, 0, 1, 2, 0, '2022-07-30 18:20:56', 19980817, '2022-07-30 18:20:56', 19980817); +INSERT INTO `sys_menu` VALUES (10044, '项目管理', 0, 'project', 'Layout', 'project', '/project', 3, 0, 1, 2, 0, '2022-07-30 18:19:45', 19980817, '2022-07-30 18:19:45', 19980817); +INSERT INTO `sys_menu` VALUES (10045, '项目列表', 10044, 'project:list', 'project/list/index', 'project_list', '/project/list', 5, 0, 1, 2, 0, '2022-07-30 18:20:24', 19980817, '2022-07-30 18:20:24', 19980817); SET FOREIGN_KEY_CHECKS = 1; diff --git a/server/molly-service/src/main/resources/db/changelog/sys.xml b/server/molly-service/src/main/resources/db/changelog/sys.xml index bbe386d..429ba2c 100644 --- a/server/molly-service/src/main/resources/db/changelog/sys.xml +++ b/server/molly-service/src/main/resources/db/changelog/sys.xml @@ -19,7 +19,7 @@ `contact_number` varchar(50) NOT NULL COMMENT '联系电话', `area_code` bigint(20) NOT NULL COMMENT '行政区域', `address` varchar(255) NOT NULL COMMENT '联系地址', - `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '租户状态 0.不可用 1.正常', + `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '租户状态 0.禁用 1.正常', `expired` datetime NOT NULL COMMENT '过期时间。默认是 10 年', `create_time` datetime NOT NULL COMMENT '添加时间', `create_user` bigint(20) NOT NULL COMMENT '创建人', @@ -210,6 +210,7 @@ `menu_type` tinyint(1) NOT NULL DEFAULT '1' COMMENT '菜单类型（1.菜单 2.按钮）', `visible` tinyint(1) NOT NULL DEFAULT '1' COMMENT '菜单状态（1.显示 0.隐藏）', `target` tinyint(1) NOT NULL DEFAULT '2' COMMENT '0.租户用户 1. 系统用户 2.全部用户', + `keep_alive` tinyint(1) NOT NULL DEFAULT '0' COMMENT '保持状态（1.保持 0.不保持）', `create_time` datetime NOT NULL COMMENT '创建时间', `create_user` bigint(20) NOT NULL COMMENT '创建人', `last_update_time` datetime NOT NULL COMMENT '最后一次修改时间', @@ -226,14 +227,6 @@ - - - - ALTER TABLE sys_menu ADD keep_alive tinyint(1) NOT NULL DEFAULT '0' COMMENT '保持状态（1.保持 0.不保持）'; - - - - @@ -258,7 +251,7 @@ `attr` text NULL COMMENT '附加属性', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '[ 通用 ] 文件记录表' ROW_FORMAT = DYNAMIC; + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '[ 通用 ] 文件记录表' ROW_FORMAT = DYNAMIC; diff --git a/server/pom.xml b/server/pom.xml index a222010..c9ea84d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -30,23 +30,23 @@ - 17 - 17 - 17 + 21 + 21 + 21 3.11.0 UTF-8 UTF-8 - 1.0.2 + 1.0.3 7.14.0 - 6.4.4 + 6.4.6 - 5.8.21 + 5.8.22 4.3.0 4.23.0 3.5.3.2 - 3.1.2 + 3.1.5