From 401f25319cd9ec66d272b3448ad86f5d68852acc Mon Sep 17 00:00:00 2001 From: pigxcloud <2270033969@qq.com> Date: Mon, 24 Jun 2019 16:37:24 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=82=20=E7=AE=80=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2pigxx.sql | 9 ++++----- .../pig4cloud/pigx/admin/api/dto/MenuTree.java | 2 -- .../pigx/admin/api/entity/SysMenu.java | 5 ----- .../pig4cloud/pigx/admin/api/vo/MenuVO.java | 4 ---- .../pig4cloud/pigx/admin/api/vo/TreeUtil.java | 1 - .../main/resources/mapper/SysMenuMapper.xml | 2 -- .../src/main/resources/template/index.vue.vm | 18 ++++-------------- 7 files changed, 8 insertions(+), 33 deletions(-) diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 8bb542279..5375ff40f 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -205,27 +205,26 @@ CREATE TABLE `sys_log` ( -- ---------------------------- DROP TABLE IF EXISTS `sys_menu`; CREATE TABLE `sys_menu` ( - `menu_id` int(11) NOT NULL COMMENT '菜单ID', + `menu_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', `name` varchar(32) NOT NULL COMMENT '菜单名称', `permission` varchar(32) DEFAULT NULL COMMENT '菜单权限标识', `path` varchar(128) DEFAULT NULL COMMENT '前端URL', `parent_id` int(11) DEFAULT NULL COMMENT '父菜单ID', `icon` varchar(32) DEFAULT NULL COMMENT '图标', - `component` varchar(64) DEFAULT NULL COMMENT 'VUE页面', `sort` int(11) DEFAULT '1' COMMENT '排序值', `keep_alive` char(1) DEFAULT '0' COMMENT '0-开启，1- 关闭', `type` char(1) DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `del_flag` char(1) DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)', - PRIMARY KEY (`menu_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; + PRIMARY KEY (`menu_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; -- ---------------------------- -- Records of `sys_menu` -- ---------------------------- BEGIN; -INSERT INTO `sys_menu` VALUES ('1000', '权限管理', null, '/upms', '-1', 'icon-quanxianguanli', 'Layout', '0', '0', '0', '2018-09-28 08:29:53', '2018-09-28 08:53:01', '0'), ('1100', '用户管理', null, 'user', '1000', 'icon-yonghuguanli', 'views/admin/user/index', '1', '1', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0'), ('1101', '用户新增', 'sys_user_add', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0'), ('1102', '用户修改', 'sys_user_edit', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0'), ('1103', '用户删除', 'sys_user_del', null, '1100', null, null, null, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0'), ('1200', '菜单管理', null, 'menu', '1000', 'icon-caidanguanli', 'views/admin/menu/index', '2', '0', '0', '2017-11-08 09:57:27', '2018-09-28 09:00:45', '0'), ('1201', '菜单新增', 'sys_menu_add', null, '1200', null, null, null, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0'), ('1202', '菜单修改', 'sys_menu_edit', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0'), ('1203', '菜单删除', 'sys_menu_del', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0'), ('1300', '角色管理', null, 'role', '1000', 'icon-jiaoseguanli', 'views/admin/role/index', '3', '0', '0', '2017-11-08 10:13:37', '2018-09-28 09:00:48', '0'), ('1301', '角色新增', 'sys_role_add', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0'), ('1302', '角色修改', 'sys_role_edit', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0'), ('1303', '角色删除', 'sys_role_del', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0'), ('1304', '分配权限', 'sys_role_perm', null, '1300', null, null, null, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0'), ('1400', '部门管理', null, 'dept', '1000', 'icon-web-icon-', 'views/admin/dept/index', '4', '0', '0', '2018-01-20 13:17:19', '2018-12-09 16:35:12', '0'), ('1401', '部门新增', 'sys_dept_add', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0'), ('1402', '部门修改', 'sys_dept_edit', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0'), ('1403', '部门删除', 'sys_dept_del', null, '1400', null, null, null, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0'), ('1500', '租户管理', '', 'systenant', '1000', 'icon-erji-zuhushouye', 'views/admin/tenant/index', '5', '0', '0', '2018-01-20 13:17:19', '2019-05-17 15:36:11', '0'), ('1501', '租户新增', 'admin_systenant_add', null, '1500', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:36:34', '0'), ('1502', '租户修改', 'admin_systenant_edit', null, '1500', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:36:53', '0'), ('1503', '租户删除', 'admin_systenant_del', null, '1500', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:37:00', '0'), ('2000', '系统管理', null, '/admin', '-1', 'icon-xitongguanli', 'Layout', '1', '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0'), ('2100', '日志管理', null, 'log', '2000', 'icon-rizhiguanli', 'views/admin/log/index', '5', '0', '0', '2017-11-20 14:06:22', '2018-09-28 09:01:52', '0'), ('2101', '日志删除', 'sys_log_del', null, '2100', null, null, null, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0'), ('2200', '字典管理', null, 'dict', '2000', 'icon-navicon-zdgl', 'views/admin/dict/index', '6', '0', '0', '2017-11-29 11:30:52', '2018-09-28 09:01:47', '0'), ('2201', '字典删除', 'sys_dict_del', null, '2200', null, null, null, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0'), ('2202', '字典新增', 'sys_dict_add', null, '2200', null, null, null, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0'), ('2203', '字典修改', 'sys_dict_edit', null, '2200', null, null, null, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0'), ('2210', '参数管理', null, 'param', '2000', 'icon-canshu', 'views/admin/param/index', '7', '1', '0', '2019-04-29 22:16:50', null, '0'), ('2211', '参数新增', 'admin_syspublicparam_add', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:36', null, '0'), ('2212', '参数删除', 'admin_syspublicparam_del', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:55', null, '0'), ('2213', '参数编辑', 'admin_syspublicparam_edit', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:18:14', '2019-04-29 22:19:25', '0'), ('2300', '代码生成', '', 'gen', '2000', 'icon-weibiaoti46', 'views/gen/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 05:21:01', '0'), ('2400', '终端管理', '', 'client', '2000', 'icon-shouji', 'views/admin/client/index', '9', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:43', '0'), ('2401', '客户端新增', 'sys_client_add', null, '2400', '1', null, null, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0'), ('2402', '客户端修改', 'sys_client_edit', null, '2400', null, null, null, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0'), ('2403', '客户端删除', 'sys_client_del', null, '2400', null, null, null, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0'), ('2500', '密钥管理', '', 'social', '2000', 'icon-miyue', 'views/admin/social/index', '10', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:41', '0'), ('2501', '密钥新增', 'sys_social_details_add', null, '2500', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:52:18', '0'), ('2502', '密钥修改', 'sys_social_details_edit', null, '2500', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:36', '0'), ('2503', '密钥删除', 'sys_social_details_del', null, '2500', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:30', '0'), ('2600', '令牌管理', null, 'token', '2000', 'icon-denglvlingpai', 'views/admin/token/index', '11', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2601', '令牌删除', 'sys_token_del', null, '2600', null, null, '1', '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0'), ('2700', '动态路由', null, 'route', '2000', 'icon-luyou', 'views/admin/route/index', '12', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2800', 'Quartz管理', '', 'job-manage', '2000', 'icon-guanwangfangwen', 'views/daemon/job-manage/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:14', '0'), ('2810', '任务新增', 'job_sys_job_add', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:23', '0'), ('2820', '任务修改', 'job_sys_job_edit', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:26', '0'), ('2830', '任务删除', 'job_sys_job_del', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:30', '0'), ('2840', '任务暂停', 'job_sys_job_shutdown_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:18', '0'), ('2850', '任务开始', 'job_sys_job_start_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:35', '0'), ('2860', '任务刷新', 'job_sys_job_refresh_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:39', '0'), ('2900', '文件管理', '', 'sys-file', '2000', 'icon-wendang', 'views/admin/file/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-18 17:53:24', '0'),('2901', '文件管理新增', 'sys_file_add', NULL, '2900', '1', NULL, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'),('2902', '文件管理修改', 'sys_file_edit', NULL, '2900', '1', NULL, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'),('2903', '文件管理删除', 'sys_file_del', NULL, '2900', '1', NULL, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'),('3000', '系统监控', null, '/daemon', '-1', 'icon-msnui-supervise', 'Layout', '2', '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0'), ('3100', '服务监控', null, 'http://127.0.0.1:5001', '3000', 'icon-server', null, '0', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:54:05', '0'), ('3110', '缓存监控', null, 'redis', '3000', 'icon-qingchuhuancun', 'views/monitor/redis/index', '1', '1', '0', '2019-05-08 23:51:27', '2019-05-08 23:52:23', '0'), ('3200', '接口文档', null, 'http://127.0.0.1:9999/swagger-ui.html', '3000', 'icon-wendang', null, '1', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:11', '0'), ('3300', '事务监控', null, 'tx', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/tx/index', '5', '0', '0', '2018-08-19 11:02:39', '2018-11-23 14:25:08', '0'), ('3400', '在线事务', null, 'model', '3000', 'icon-online', 'views/tx/model', '6', '0', '0', '2018-08-19 11:32:04', '2018-11-23 14:25:14', '0'), ('3500', '文档扩展', null, 'http://127.0.0.1:9999/doc.html', '3000', 'icon-wendang', null, '2', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:42', '0'), ('3600', '任务轨迹', '', 'status-trace-log', '3000', 'icon-guiji', 'views/daemon/status-trace-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 06:34:52', '0'), ('3601', '删除轨迹', 'daemon_status_trace_log_del', null, '3600', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:31:06', '0'), ('3620', 'Quartz日志', '', 'joblog', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/daemon/job-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 11:49:36', '0'), ('3630', '任务日志', '', 'execution-log', '3000', 'icon-wendang', 'views/daemon/execution-log/index', '7', '0', '0', '2018-01-20 13:17:19', '2019-03-30 09:30:33', '0'), ('3631', '删除日志', 'daemon_execution_log_del', null, '3900', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:30:45', '0'), ('3700', '注册配置', null, 'nacos', '3000', 'icon-line', 'views/admin/nacos/index', '10', '0', '0', '2018-01-25 11:08:52', '2019-05-01 22:52:21', '1'), ('4000', '协同管理', null, '/activti', '-1', 'icon-kuaisugongzuoliu_o', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('4100', '模型管理', null, 'activiti', '4000', 'icon-weibiaoti13', 'views/activiti/index', '1', '0', '0', '2018-09-26 01:39:07', '2018-12-09 16:35:16', '0'), ('4101', '模型管理', 'act_model_manage', null, '4100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4200', '流程管理', null, 'process', '4000', 'icon-liucheng', 'views/activiti/process', '2', '0', '0', '2018-09-26 06:41:05', '2018-11-23 14:25:33', '0'), ('4201', '流程管理', 'act_process_manage', null, '4200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4300', '请假管理', '', 'leave-bill', '4000', 'icon-qingjia', 'views/activiti/leave', '3', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:10', '0'), ('4301', '请假新增', 'act_leavebill_add', null, '4300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4302', '请假修改', 'act_leavebill_edit', null, '4300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0'), ('4303', '请假删除', 'act_leavebill_del', null, '4300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0'), ('4400', '待办任务', null, 'task', '4000', 'icon-renwu', 'views/activiti/task', '4', '0', '0', '2018-09-27 09:52:31', '2018-12-09 16:35:26', '0'), ('4401', '流程管理', 'act_task_manage', null, '4400', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('6000', '微信管理', null, '/mp', '-1', 'icon-gongzhonghao', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('6100', '账号管理', '', 'wxaccount', '6000', 'icon-weixincaidan', 'views/mp/wxaccount/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6101', '公众号新增', 'mp_wxaccount_add', null, '6100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6102', '公众号修改', 'mp_wxaccount_edit', null, '6100', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6103', '公众号删除', 'mp_wxaccount_del', null, '6100', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6200', '粉丝管理', '', 'wxaccountfans', '6000', 'icon-fensiguanli', 'views/mp/wxaccountfans/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6201', '粉丝新增', 'mp_wxaccountfans_add', null, '6200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6202', '粉丝修改', 'mp_wxaccountfans_edit', null, '6200', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6203', '粉丝删除', 'mp_wxaccountfans_del', null, '6200', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6300', '消息管理', '', 'wxfansmsg', '6000', 'icon-xiaoxiguanli', 'views/mp/wxfansmsg/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6301', '消息新增', 'mp_wxfansmsg_add', null, '6300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6302', '消息修改', 'mp_wxfansmsg_edit', null, '6300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6303', '消息删除', 'mp_wxfansmsg_del', null, '6300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6304', '消息回复', 'mp_wxfansmsgres_add', null, '6300', '1', null, '3', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6305', '回复删除', 'mp_wxfansmsgres_del', null, '6300', null, null, '1', '0', '1', '2019-03-28 22:53:49', null, '0'), ('6400', '菜单设置', null, 'menu', '6000', 'icon-anniu_weixincaidanlianjie', 'views/mp/wxmenu/index', '6', '1', '0', '2019-03-29 15:20:12', '2019-03-29 15:23:03', '0'), ('6401', '保存', 'mp_wxmenu_add', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:22', '2019-03-29 15:43:30', '0'), ('6402', '发布', 'mp_wxmenu_push', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:54', null, '0'), ('6500', '运营数据', null, 'wxstatistics', '6000', 'icon-zhexiantu', 'views/mp/wxstatistics/index', '7', '1', '0', '2019-04-14 00:15:35', null, '0'), ('9999', '系统官网', null, 'https://pig4cloud.com/#', '-1', 'icon-guanwangfangwen', null, '9', '0', '0', '2019-01-17 17:05:19', '2019-01-17 17:29:06', '0'); +INSERT INTO `sys_menu` VALUES ('1000', '权限管理', null, '/user', '-1', 'icon-quanxianguanli', '0', '0', '0', '2018-09-28 08:29:53', '2018-09-28 08:53:01', '0'), ('1100', '用户管理', null, '/admin/user/index', '1000', 'icon-yonghuguanli', '1', '1', '0', '2017-11-02 22:24:37', '2019-06-24 14:36:36', '0'), ('1101', '用户新增', 'sys_user_add', null, '1100', null, null, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0'), ('1102', '用户修改', 'sys_user_edit', null, '1100', null, null, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0'), ('1103', '用户删除', 'sys_user_del', null, '1100', null, null, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0'), ('1200', '菜单管理', null, '/admin/menu/index', '1000', 'icon-caidanguanli', '2', '0', '0', '2017-11-08 09:57:27', '2019-06-24 14:42:07', '0'), ('1201', '菜单新增', 'sys_menu_add', null, '1200', null, null, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0'), ('1202', '菜单修改', 'sys_menu_edit', null, '1200', null, null, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0'), ('1203', '菜单删除', 'sys_menu_del', null, '1200', null, null, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0'), ('1300', '角色管理', null, '/admin/role/index', '1000', 'icon-jiaoseguanli', '3', '0', '0', '2017-11-08 10:13:37', '2018-09-28 09:00:48', '0'), ('1301', '角色新增', 'sys_role_add', null, '1300', null, null, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0'), ('1302', '角色修改', 'sys_role_edit', null, '1300', null, null, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0'), ('1303', '角色删除', 'sys_role_del', null, '1300', null, null, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0'), ('1304', '分配权限', 'sys_role_perm', null, '1300', null, null, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0'), ('1400', '部门管理', null, '/admin/dept/index', '1000', 'icon-web-icon-', '4', '0', '0', '2018-01-20 13:17:19', '2018-12-09 16:35:12', '0'), ('1401', '部门新增', 'sys_dept_add', null, '1400', null, null, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0'), ('1402', '部门修改', 'sys_dept_edit', null, '1400', null, null, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0'), ('1403', '部门删除', 'sys_dept_del', null, '1400', null, null, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0'), ('1500', '租户管理', '', '/admin/tenant/index', '1000', 'icon-erji-zuhushouye', '5', '0', '0', '2018-01-20 13:17:19', '2019-05-17 15:36:11', '0'), ('1501', '租户新增', 'admin_systenant_add', null, '1500', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:36:34', '0'), ('1502', '租户修改', 'admin_systenant_edit', null, '1500', '1', '1', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:36:53', '0'), ('1503', '租户删除', 'admin_systenant_del', null, '1500', '1', '2', '0', '1', '2018-05-15 21:35:18', '2019-05-17 15:37:00', '0'), ('2000', '系统管理', null, '/admin', '-1', 'icon-xitongguanli', '1', '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0'), ('2100', '日志管理', null, '/admin/log/index', '2000', 'icon-rizhiguanli', '5', '0', '0', '2017-11-20 14:06:22', '2018-09-28 09:01:52', '0'), ('2101', '日志删除', 'sys_log_del', null, '2100', null, null, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0'), ('2200', '字典管理', null, '/admin/dict/index', '2000', 'icon-navicon-zdgl', '6', '0', '0', '2017-11-29 11:30:52', '2018-09-28 09:01:47', '0'), ('2201', '字典删除', 'sys_dict_del', null, '2200', null, null, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0'), ('2202', '字典新增', 'sys_dict_add', null, '2200', null, null, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0'), ('2203', '字典修改', 'sys_dict_edit', null, '2200', null, null, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0'), ('2210', '参数管理', null, '/admin/param/index', '2000', 'icon-canshu', '7', '1', '0', '2019-04-29 22:16:50', '2019-06-24 14:52:00', '0'), ('2211', '参数新增', 'admin_syspublicparam_add', null, '2210', null, '1', '0', '1', '2019-04-29 22:17:36', null, '0'), ('2212', '参数删除', 'admin_syspublicparam_del', null, '2210', null, '1', '0', '1', '2019-04-29 22:17:55', null, '0'), ('2213', '参数编辑', 'admin_syspublicparam_edit', null, '2210', null, '1', '0', '1', '2019-04-29 22:18:14', '2019-04-29 22:19:25', '0'), ('2300', '代码生成', '', '/admin/gen/index', '2000', 'icon-weibiaoti46', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 05:21:01', '0'), ('2400', '终端管理', '', '/admin/client/index', '2000', 'icon-shouji', '9', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:43', '0'), ('2401', '客户端新增', 'sys_client_add', null, '2400', '1', null, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0'), ('2402', '客户端修改', 'sys_client_edit', null, '2400', null, null, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0'), ('2403', '客户端删除', 'sys_client_del', null, '2400', null, null, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0'), ('2500', '密钥管理', '', '/admin/social/index', '2000', 'icon-miyue', '10', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:41', '0'), ('2501', '密钥新增', 'sys_social_details_add', null, '2500', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:52:18', '0'), ('2502', '密钥修改', 'sys_social_details_edit', null, '2500', '1', '1', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:36', '0'), ('2503', '密钥删除', 'sys_social_details_del', null, '2500', '1', '2', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:30', '0'), ('2600', '令牌管理', null, '/admin/token/index', '2000', 'icon-denglvlingpai', '11', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2601', '令牌删除', 'sys_token_del', null, '2600', null, '1', '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0'), ('2700', '动态路由', null, '/admin/route/index', '2000', 'icon-luyou', '12', '0', '0', '2018-09-04 05:58:41', '2019-06-24 15:14:28', '0'), ('2800', 'Quartz管理', '', '/daemon/job-manage/index', '2000', 'icon-guanwangfangwen', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:14', '0'), ('2810', '任务新增', 'job_sys_job_add', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:23', '0'), ('2820', '任务修改', 'job_sys_job_edit', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:26', '0'), ('2830', '任务删除', 'job_sys_job_del', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:30', '0'), ('2840', '任务暂停', 'job_sys_job_shutdown_job', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:18', '0'), ('2850', '任务开始', 'job_sys_job_start_job', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:35', '0'), ('2860', '任务刷新', 'job_sys_job_refresh_job', null, '2800', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:39', '0'), ('3000', '系统监控', null, '/daemon', '-1', 'icon-msnui-supervise', '2', '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0'), ('3100', '服务监控', null, 'http://127.0.0.1:5001', '3000', 'icon-server', '0', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:54:05', '0'), ('3110', '缓存监控', null, '/monitor/redis/index', '3000', 'icon-qingchuhuancun', '1', '1', '0', '2019-05-08 23:51:27', '2019-06-24 15:17:45', '0'), ('3200', '接口文档', null, 'http://127.0.0.1:9999/swagger-ui.html', '3000', 'icon-wendang', '1', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:11', '0'), ('3300', '事务监控', null, '/tx/index', '3000', 'icon-gtsquanjushiwufuwuGTS', '5', '0', '0', '2018-08-19 11:02:39', '2019-06-24 15:18:04', '0'), ('3400', '在线事务', null, '/tx/model', '3000', 'icon-online', '6', '0', '0', '2018-08-19 11:32:04', '2019-06-24 15:18:13', '0'), ('3500', '文档扩展', null, 'http://127.0.0.1:9999/doc.html', '3000', 'icon-wendang', '2', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:42', '0'), ('3600', '任务轨迹', '', '/daemon/status-trace-log/index', '3000', 'icon-guiji', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:18:41', '0'), ('3601', '删除轨迹', 'daemon_status_trace_log_del', null, '3600', '1', '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:31:06', '0'), ('3620', 'Quartz日志', '', '/daemon/joblog/index', '3000', 'icon-gtsquanjushiwufuwuGTS', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:18:54', '0'), ('3630', '任务日志', '', '/daemon/execution-log/index', '3000', 'icon-wendang', '7', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:19:07', '0'), ('3631', '删除日志', 'daemon_execution_log_del', null, '3900', '1', '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:30:45', '0'), ('3700', '注册配置', null, '', '3000', 'icon-line', '10', '0', '0', '2018-01-25 11:08:52', '2019-06-24 15:35:10', '1'), ('4000', '协同管理', null, '/activti', '-1', 'icon-kuaisugongzuoliu_o', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('4100', '模型管理', null, '/activiti/index', '4000', 'icon-weibiaoti13', '1', '0', '0', '2018-09-26 01:39:07', '2019-06-24 15:20:00', '0'), ('4101', '模型管理', 'act_model_manage', null, '4100', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4200', '流程管理', '/activiti/process', '/activiti/process', '4000', 'icon-liucheng', '2', '0', '0', '2018-09-26 06:41:05', '2019-06-24 08:31:07', '0'), ('4201', '流程管理', 'act_process_manage', null, '4200', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4300', '请假管理', '/activiti/leave', '/activiti/leave-bill', '4000', 'icon-qingjia', '3', '0', '0', '2018-01-20 13:17:19', '2019-06-24 08:31:11', '0'), ('4301', '请假新增', 'act_leavebill_add', null, '4300', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4302', '请假修改', 'act_leavebill_edit', null, '4300', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0'), ('4303', '请假删除', 'act_leavebill_del', null, '4300', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0'), ('4400', '待办任务', '/activiti/task', '/activiti/task', '4000', 'icon-renwu', '4', '0', '0', '2018-09-27 09:52:31', '2019-06-24 08:31:18', '0'), ('4401', '流程管理', 'act_task_manage', null, '4400', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('5000', '支付管理', null, '/pay', '-1', 'icon-pay6zhifu', '4', '1', '0', '2019-05-30 15:28:03', '2019-06-20 16:13:23', '0'), ('5100', '渠道管理', null, '/pay/paychannel/index', '5000', 'icon-zhifuqudaoguanli', '1', '1', '0', '2019-05-30 15:32:17', '2019-05-30 19:43:27', '0'), ('5110', '增加渠道', 'pay_paychannel_add', null, '5100', null, '1', '0', '1', '2019-05-30 15:46:14', null, '0'), ('5120', '编辑渠道', 'pay_paychannel_edit', null, '5100', null, '1', '0', '1', '2019-05-30 15:46:35', null, '0'), ('5130', '删除渠道', 'pay_paychannel_del', null, '5100', null, '1', '0', '1', '2019-05-30 15:47:08', null, '0'), ('5200', '收银台', null, '/pay/cd/index', '5000', 'icon-shouyintai', '0', '1', '0', '2019-05-30 19:44:00', '2019-05-30 19:45:05', '0'), ('5300', '商品订单', '', '/pay/goods/index', '5000', 'icon-dingdan', '2', '0', '0', '2018-01-20 13:17:19', '2019-06-16 18:02:21', '0'), ('5310', '商品订单新增', 'generator_paygoodsorder_add', null, '5300', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5320', '商品订单修改', 'generator_paygoodsorder_edit', null, '5300', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5330', '商品订单删除', 'generator_paygoodsorder_del', null, '5300', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5400', '支付订单', '', '/pay/orders/index', '5000', 'icon-zhifu', '3', '0', '0', '2018-01-20 13:17:19', '2019-06-16 18:02:06', '0'), ('5410', '支付订单新增', 'generator_paytradeorder_add', null, '5400', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5420', '支付订单修改', 'generator_paytradeorder_edit', null, '5400', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5430', '支付订单删除', 'generator_paytradeorder_del', null, '5400', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5500', '回调记录', '', '/pay/notify/index', '5000', 'icon-huitiao', '4', '0', '0', '2018-01-20 13:17:19', '2019-06-16 18:01:49', '0'), ('5510', '记录新增', 'generator_paynotifyrecord_add', null, '5500', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5520', '记录修改', 'generator_paynotifyrecord_edit', null, '5500', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('5530', '记录删除', 'generator_paynotifyrecord_del', null, '5500', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6000', '微信管理', null, '/mp', '-1', 'icon-gongzhonghao', '4', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('6100', '账号管理', '', '/mp/wxaccount/index', '6000', 'icon-weixincaidan', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:24:36', '0'), ('6101', '公众号新增', 'mp_wxaccount_add', '', '6100', '1', '0', '0', '1', '2018-05-15 21:35:18', '2019-06-24 15:24:33', '0'), ('6102', '公众号修改', 'mp_wxaccount_edit', null, '6100', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6103', '公众号删除', 'mp_wxaccount_del', null, '6100', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6200', '粉丝管理', '', '/mp/wxaccountfans/index', '6000', 'icon-fensiguanli', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:24:46', '0'), ('6201', '粉丝新增', 'mp_wxaccountfans_add', null, '6200', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6202', '粉丝修改', 'mp_wxaccountfans_edit', null, '6200', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6203', '粉丝删除', 'mp_wxaccountfans_del', null, '6200', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6300', '消息管理', '', '/mp/wxfansmsg/index', '6000', 'icon-xiaoxiguanli', '8', '0', '0', '2018-01-20 13:17:19', '2019-06-24 15:24:57', '0'), ('6301', '消息新增', 'mp_wxfansmsg_add', null, '6300', '1', '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6302', '消息修改', 'mp_wxfansmsg_edit', null, '6300', '1', '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6303', '消息删除', 'mp_wxfansmsg_del', null, '6300', '1', '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6304', '消息回复', 'mp_wxfansmsgres_add', null, '6300', '1', '3', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6305', '回复删除', 'mp_wxfansmsgres_del', null, '6300', null, '1', '0', '1', '2019-03-28 22:53:49', null, '0'), ('6400', '菜单设置', null, '/mp/wxmenu/index', '6000', 'icon-anniu_weixincaidanlianjie', '6', '1', '0', '2019-03-29 15:20:12', '2019-06-24 15:25:07', '0'), ('6401', '保存', 'mp_wxmenu_add', null, '6400', null, '1', '0', '1', '2019-03-29 15:43:22', '2019-03-29 15:43:30', '0'), ('6402', '发布', 'mp_wxmenu_push', null, '6400', null, '1', '0', '1', '2019-03-29 15:43:54', null, '0'), ('6500', '运营数据', null, '/mp/wxstatistics/index', '6000', 'icon-zhexiantu', '7', '1', '0', '2019-04-14 00:15:35', '2019-06-24 15:25:15', '0'), ('9999', '系统官网', null, 'https://pig4cloud.com/#', '-1', 'icon-guanwangfangwen', '9', '0', '0', '2019-01-17 17:05:19', '2019-01-17 17:29:06', '0'); COMMIT; -- ---------------------------- diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java index 87904b866..b2ee60729 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java @@ -34,7 +34,6 @@ public class MenuTree extends TreeNode { private String name; private boolean spread = false; private String path; - private String component; private String authority; private String redirect; private String keepAlive; @@ -66,7 +65,6 @@ public class MenuTree extends TreeNode { this.icon = menuVo.getIcon(); this.name = menuVo.getName(); this.path = menuVo.getPath(); - this.component = menuVo.getComponent(); this.type = menuVo.getType(); this.label = menuVo.getName(); this.sort = menuVo.getSort(); diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index d81010a2a..19836c775 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -67,16 +67,11 @@ public class SysMenu extends Model { * 图标 */ private String icon; - /** - * VUE页面 - */ - private String component; /** * 前端路由标识路径，默认和 comment 保持一致 * 过期 */ - @Deprecated private String path; /** * 排序值 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java index 3c7da89fd..dc8732829 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java @@ -61,10 +61,6 @@ public class MenuVO implements Serializable { * 一个路径 */ private String path; - /** - * VUE页面 - */ - private String component; /** * 排序值 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java index f8ec25ae9..cab02e059 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java @@ -114,7 +114,6 @@ public class TreeUtil { node.setPath(menu.getPath()); node.setCode(menu.getPermission()); node.setLabel(menu.getName()); - node.setComponent(menu.getComponent()); node.setIcon(menu.getIcon()); node.setKeepAlive(menu.getKeepAlive()); trees.add(node); diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index a89d0707f..194f65bcc 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -29,7 +29,6 @@ - @@ -45,7 +44,6 @@ - diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index 3e3e77dc0..2e43cb9f0 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -35,19 +35,9 @@