From 1ea00b5b72c87b5a423f1c90c6d15dc71141b3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 00:30:30 +0800 Subject: [PATCH 1/5] :recycle: Refactoring code.update dir and file structure --- doc/db/pigxx.sql | 138 +++++++++++++----- .../act/controller/LeaveBillController.java | 2 +- .../controller/ExecutionLogController.java | 2 +- .../controller/StatusTraceLogController.java | 2 +- 4 files changed, 106 insertions(+), 38 deletions(-) diff --git a/doc/db/pigxx.sql b/doc/db/pigxx.sql index b61ddc573..5eae094b5 100644 --- a/doc/db/pigxx.sql +++ b/doc/db/pigxx.sql @@ -163,32 +163,95 @@ INSERT INTO `sys_log` VALUES ('1', '0', '添加用户', 'pig', 'admin', '2018-11 COMMIT; -- ---------------------------- --- Table structure for `sys_menu` +-- Table structure for sys_menu -- ---------------------------- DROP TABLE IF EXISTS `sys_menu`; -CREATE TABLE `sys_menu` ( - `menu_id` int(11) NOT NULL 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 '排序值', - `keepalive` 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--删除', - `tenant_id` int(11) DEFAULT NULL, - PRIMARY KEY (`menu_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; +CREATE TABLE `sys_menu` ( + `menu_id` int(11) NOT NULL COMMENT '菜单ID', + `name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单名称', + `permission` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单权限标识', + `path` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端URL', + `parent_id` int(11) NULL DEFAULT NULL COMMENT '父菜单ID', + `icon` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标', + `component` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'VUE页面', + `sort` int(11) NULL DEFAULT 1 COMMENT '排序值', + `keepalive` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0-开启，1- 关闭', + `type` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', + `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0--正常 1--删除', + `tenant_id` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`menu_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_menu` +-- 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', '1'), ('1100', '用户管理', null, 'user', '1000', 'icon-yonghuguanli', 'views/admin/user/index', '1', '0', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0', '1'), ('1101', '用户新增', 'sys_user_add', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0', '1'), ('1102', '用户修改', 'sys_user_edit', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0', '1'), ('1103', '用户删除', 'sys_user_del', null, '1100', null, null, null, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0', '1'), ('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', '1'), ('1201', '菜单新增', 'sys_menu_add', null, '1200', null, null, null, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0', '1'), ('1202', '菜单修改', 'sys_menu_edit', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0', '1'), ('1203', '菜单删除', 'sys_menu_del', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0', '1'), ('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', '1'), ('1301', '角色新增', 'sys_role_add', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0', '1'), ('1302', '角色修改', 'sys_role_edit', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0', '1'), ('1303', '角色删除', 'sys_role_del', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0', '1'), ('1304', '分配权限', 'sys_role_perm', null, '1300', null, null, null, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0', '1'), ('1400', '部门管理', null, 'dept', '1000', 'icon-web-icon-', 'views/admin/dept/index', '4', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:00:52', '0', '1'), ('1401', '部门新增', 'sys_dept_add', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0', '1'), ('1402', '部门修改', 'sys_dept_edit', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0', '1'), ('1403', '部门删除', 'sys_dept_del', null, '1400', null, null, null, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0', '1'), ('2000', '系统管理', null, '/admin', '-1', 'icon-xitongguanli', 'Layout', '1', '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0', '1'), ('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', '1'), ('2101', '日志删除', 'sys_log_del', null, '2100', null, null, null, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0', '1'), ('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', '1'), ('2201', '字典删除', 'sys_dict_del', null, '2200', null, null, null, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0', '1'), ('2202', '字典新增', 'sys_dict_add', null, '2200', null, null, null, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0', '1'), ('2203', '字典修改', 'sys_dict_edit', null, '2200', null, null, null, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0', '1'), ('2300', '代码生成', '', 'gen', '2000', 'icon-weibiaoti46', 'views/admin/gen/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:02:54', '0', '1'), ('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', '1'), ('2401', '客户端新增', 'sys_client_add', null, '2400', '1', null, null, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0', '1'), ('2402', '客户端修改', 'sys_client_edit', null, '2400', null, null, null, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0', '1'), ('2403', '客户端删除', 'sys_client_del', null, '2400', null, null, null, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0', '1'), ('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', '1'), ('2501', '密钥新增', 'generator_syssocialdetails_add', null, '2500', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:02', '0', '1'), ('2502', '密钥修改', 'generator_syssocialdetails_edit', null, '2500', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:04', '0', '1'), ('2503', '密钥删除', 'generator_syssocialdetails_del', null, '2500', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:06', '0', '1'), ('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', '1'), ('2601', '令牌删除', 'sys_token_del', null, '2600', null, null, '1', '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0', '1'), ('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', '1'), ('3000', '系统监控', null, '/daemon', '-1', 'icon-msnui-supervise', 'Layout', '2', '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0', '1'), ('3100', '服务监控', null, 'http://139.224.200.249:15001', '3000', 'icon-server', null, '0', '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:40', '0', '1'), ('3200', '接口文档', null, 'http://139.224.200.249:19999/swagger-ui.html', '3000', 'icon-wendang', null, '1', '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:05:16', '0', '1'), ('3300', '事务监控', null, 'tx', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/admin/tx/index', '5', '0', '0', '2018-08-19 11:02:39', '2018-09-28 09:03:36', '0', '1'), ('3400', '在线事务', null, 'model', '3000', 'icon-online', 'views/admin/tx/model', '6', '0', '0', '2018-08-19 11:32:04', '2018-09-28 09:03:58', '0', '1'), ('3500', '任务监控', null, 'http://139.224.200.249:8899', '3000', 'icon-msnui-supervise', null, '7', '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:33', '0', '1'), ('3600', '任务轨迹', '', 'statustracelog', '3000', 'icon-guiji', 'views/daemon/statustracelog/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:04:15', '0', '1'), ('3601', '删除', 'daemon_statustracelog_del', null, '3600', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:13:45', '0', '1'), ('3700', '调用拓扑', null, 'http://139.224.200.249:8081', '3000', 'icon-line', null, '10', '0', '0', '2018-01-25 11:08:52', '2018-09-28 09:04:29', '0', '1'), ('3800', '缓存状态', null, 'http://139.224.200.249:8585', '3000', 'icon-qingchuhuancun', null, '12', '0', '0', '2018-01-23 10:56:11', '2018-09-28 09:13:56', '0', '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', '1'), ('4100', '模型管理', null, 'activiti', '4000', 'icon-weibiaoti13', 'views/admin/activiti/index', '1', '0', '0', '2018-09-26 01:39:07', '2018-09-28 09:00:57', '0', '1'), ('4101', '模型管理', 'act_model_manage', null, '4100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', '1'), ('4200', '流程管理', null, 'process', '4000', 'icon-liucheng', 'views/admin/activiti/process', '2', '0', '0', '2018-09-26 06:41:05', '2018-09-28 09:01:02', '0', '1'), ('4201', '流程管理', 'act_process_manage', null, '4200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', '1'), ('4300', '请假管理', '', 'leavebill', '4000', 'icon-qingjia', 'views/admin/activiti/leave', '3', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:07', '0', '1'), ('4301', '请假新增', 'act_leavebill_add', null, '4300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', '1'), ('4302', '请假修改', 'act_leavebill_edit', null, '4300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0', '1'), ('4303', '请假删除', 'act_leavebill_del', null, '4300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0', '1'), ('4400', '代办任务', null, 'task', '4000', 'icon-renwu', 'views/admin/activiti/task', '4', '0', '0', '2018-09-27 09:52:31', '2018-09-28 09:04:19', '0', '1'), ('4401', '流程管理', 'act_task_manage', null, '4400', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', '1'), ('5000', '多级菜单', null, '/crud', '-1', 'icon-caidanguanli', 'Layout', '4', '0', '0', '2018-08-28 01:50:22', '2018-09-28 08:58:20', '0', '1'), ('5001', '一级菜单', null, 'index', '5000', 'icon-caidanguanli', 'Layout', '1', '0', '0', '2018-08-28 01:50:48', '2018-09-28 09:12:54', '0', '1'), ('5002', '二级菜单', null, 'index', '5000', 'icon-caidanguanli', 'views/crud/index', '1', '0', '0', '2018-08-28 01:51:23', '2018-09-28 09:13:08', '0', '1'), ('6000', '系统官网', null, 'https://pig4cloud.com#', '-1', 'icon-guanwang', '', '5', '0', '0', '2018-09-27 02:26:36', '2018-11-17 16:18:50', '1', '1'); +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', 1); +INSERT INTO `sys_menu` VALUES (1100, '用户管理', NULL, 'user', 1000, 'icon-yonghuguanli', 'views/admin/user/index', 1, '0', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0', 1); +INSERT INTO `sys_menu` VALUES (1101, '用户新增', 'sys_user_add', NULL, 1100, NULL, NULL, NULL, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0', 1); +INSERT INTO `sys_menu` VALUES (1102, '用户修改', 'sys_user_edit', NULL, 1100, NULL, NULL, NULL, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0', 1); +INSERT INTO `sys_menu` VALUES (1103, '用户删除', 'sys_user_del', NULL, 1100, NULL, NULL, NULL, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (1201, '菜单新增', 'sys_menu_add', NULL, 1200, NULL, NULL, NULL, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0', 1); +INSERT INTO `sys_menu` VALUES (1202, '菜单修改', 'sys_menu_edit', NULL, 1200, NULL, NULL, NULL, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0', 1); +INSERT INTO `sys_menu` VALUES (1203, '菜单删除', 'sys_menu_del', NULL, 1200, NULL, NULL, NULL, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (1301, '角色新增', 'sys_role_add', NULL, 1300, NULL, NULL, NULL, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0', 1); +INSERT INTO `sys_menu` VALUES (1302, '角色修改', 'sys_role_edit', NULL, 1300, NULL, NULL, NULL, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0', 1); +INSERT INTO `sys_menu` VALUES (1303, '角色删除', 'sys_role_del', NULL, 1300, NULL, NULL, NULL, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0', 1); +INSERT INTO `sys_menu` VALUES (1304, '分配权限', 'sys_role_perm', NULL, 1300, NULL, NULL, NULL, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0', 1); +INSERT INTO `sys_menu` VALUES (1400, '部门管理', NULL, 'dept', 1000, 'icon-web-icon-', 'views/admin/dept/index', 4, '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:00:52', '0', 1); +INSERT INTO `sys_menu` VALUES (1401, '部门新增', 'sys_dept_add', NULL, 1400, NULL, NULL, NULL, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0', 1); +INSERT INTO `sys_menu` VALUES (1402, '部门修改', 'sys_dept_edit', NULL, 1400, NULL, NULL, NULL, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0', 1); +INSERT INTO `sys_menu` VALUES (1403, '部门删除', 'sys_dept_del', NULL, 1400, NULL, NULL, NULL, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0', 1); +INSERT INTO `sys_menu` VALUES (2000, '系统管理', NULL, '/admin', -1, 'icon-xitongguanli', 'Layout', 1, '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (2101, '日志删除', 'sys_log_del', NULL, 2100, NULL, NULL, NULL, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (2201, '字典删除', 'sys_dict_del', NULL, 2200, NULL, NULL, NULL, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0', 1); +INSERT INTO `sys_menu` VALUES (2202, '字典新增', 'sys_dict_add', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0', 1); +INSERT INTO `sys_menu` VALUES (2203, '字典修改', 'sys_dict_edit', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0', 1); +INSERT INTO `sys_menu` VALUES (2300, '代码生成', '', 'gen', 2000, 'icon-weibiaoti46', 'views/admin/gen/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:02:54', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (2401, '客户端新增', 'sys_client_add', NULL, 2400, '1', NULL, NULL, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0', 1); +INSERT INTO `sys_menu` VALUES (2402, '客户端修改', 'sys_client_edit', NULL, 2400, NULL, NULL, NULL, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0', 1); +INSERT INTO `sys_menu` VALUES (2403, '客户端删除', 'sys_client_del', NULL, 2400, NULL, NULL, NULL, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (2501, '密钥新增', 'generator_syssocialdetails_add', NULL, 2500, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:02', '0', 1); +INSERT INTO `sys_menu` VALUES (2502, '密钥修改', 'generator_syssocialdetails_edit', NULL, 2500, '1', NULL, 1, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:04', '0', 1); +INSERT INTO `sys_menu` VALUES (2503, '密钥删除', 'generator_syssocialdetails_del', NULL, 2500, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:11:06', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (2601, '令牌删除', 'sys_token_del', NULL, 2600, NULL, NULL, 1, '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (3000, '系统监控', NULL, '/daemon', -1, 'icon-msnui-supervise', 'Layout', 2, '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0', 1); +INSERT INTO `sys_menu` VALUES (3100, '服务监控', NULL, 'http://127.0.0.1:5001', 3000, 'icon-server', NULL, 0, '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:40', '0', 1); +INSERT INTO `sys_menu` VALUES (3200, '接口文档', NULL, 'http://139.224.200.249:19999/swagger-ui.html', 3000, 'icon-wendang', NULL, 1, '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:05:16', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (3500, '任务监控', NULL, 'http://139.224.200.249:8899', 3000, 'icon-msnui-supervise', NULL, 7, '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:33', '0', 1); +INSERT INTO `sys_menu` VALUES (3600, '任务轨迹', '', 'statustracelog', 3000, 'icon-guiji', 'views/daemon/status-trace-log/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-11-23 14:28:27', '0', 1); +INSERT INTO `sys_menu` VALUES (3601, '删除', 'daemon_statustracelog_del', NULL, 3600, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:13:45', '0', 1); +INSERT INTO `sys_menu` VALUES (3700, '调用拓扑', NULL, 'http://139.224.200.249:8081', 3000, 'icon-line', NULL, 10, '0', '0', '2018-01-25 11:08:52', '2018-09-28 09:04:29', '0', 1); +INSERT INTO `sys_menu` VALUES (3800, '缓存状态', NULL, 'http://139.224.200.249:8585', 3000, 'icon-qingchuhuancun', NULL, 12, '0', '0', '2018-01-23 10:56:11', '2018-09-28 09:13:56', '0', 1); +INSERT INTO `sys_menu` VALUES (4000, '协同管理', NULL, '/activti', -1, 'icon-kuaisugongzuoliu_o', 'Layout', 3, '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0', 1); +INSERT INTO `sys_menu` VALUES (4100, '模型管理', NULL, 'activiti', 4000, 'icon-weibiaoti13', 'views/activiti/index', 1, '0', '0', '2018-09-26 01:39:07', '2018-11-23 14:25:25', '0', 1); +INSERT INTO `sys_menu` VALUES (4101, '模型管理', 'act_model_manage', NULL, 4100, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (4201, '流程管理', 'act_process_manage', NULL, 4200, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', 1); +INSERT INTO `sys_menu` VALUES (4300, '请假管理', '', 'leavebill', 4000, 'icon-qingjia', 'views/activiti/leave', 3, '0', '0', '2018-01-20 13:17:19', '2018-11-23 14:25:37', '0', 1); +INSERT INTO `sys_menu` VALUES (4301, '请假新增', 'act_leavebill_add', NULL, 4300, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', 1); +INSERT INTO `sys_menu` VALUES (4302, '请假修改', 'act_leavebill_edit', NULL, 4300, '1', NULL, 1, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0', 1); +INSERT INTO `sys_menu` VALUES (4303, '请假删除', 'act_leavebill_del', NULL, 4300, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0', 1); +INSERT INTO `sys_menu` VALUES (4400, '代办任务', NULL, 'task', 4000, 'icon-renwu', 'views/activiti/task', 4, '0', '0', '2018-09-27 09:52:31', '2018-11-23 14:25:43', '0', 1); +INSERT INTO `sys_menu` VALUES (4401, '流程管理', 'act_task_manage', NULL, 4400, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', 1); +INSERT INTO `sys_menu` VALUES (5000, '多级菜单', NULL, '/crud', -1, 'icon-caidanguanli', '', 4, '0', '0', '2018-08-28 01:50:22', '2018-09-28 08:58:20', '0', 1); +INSERT INTO `sys_menu` VALUES (5001, '一级菜单', NULL, 'index', 5000, 'icon-caidanguanli', 'views/crud/index', 1, '0', '0', '2018-08-28 01:50:48', '2018-11-21 17:48:19', '1', 1); +INSERT INTO `sys_menu` VALUES (5002, '二级菜单', NULL, 'crud', 5001, 'icon-caidanguanli', 'views/crud/index', 1, '0', '0', '2018-08-28 01:51:23', '2018-11-21 17:47:40', '1', 1); +INSERT INTO `sys_menu` VALUES (5003, '一级菜单', NULL, '', 5000, 'icon-caidanguanli', '', 1, '0', '0', '2018-11-21 17:49:18', '2018-11-21 17:53:25', '0', NULL); +INSERT INTO `sys_menu` VALUES (5004, '二级菜单', NULL, 'index', 5003, 'icon-caidanguanli', 'views/crud/index', 1, '0', '0', '2018-11-21 17:53:51', '2018-11-21 17:54:04', '0', NULL); +INSERT INTO `sys_menu` VALUES (6000, '系统官网', NULL, 'https://pig4cloud.com#', -1, 'icon-guanwang', '', 5, '0', '0', '2018-09-27 02:26:36', '2018-11-17 16:18:50', '1', 1); COMMIT; -- ---------------------------- @@ -260,27 +323,32 @@ INSERT INTO `sys_role_menu` VALUES ('1', '1000'), ('1', '1100'), ('1', '1101'), COMMIT; -- ---------------------------- --- Table structure for `sys_route_conf` +-- Table structure for sys_route_conf -- ---------------------------- DROP TABLE IF EXISTS `sys_route_conf`; -CREATE TABLE `sys_route_conf` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `route_id` varchar(30) NOT NULL DEFAULT '' COMMENT '路由ID', - `predicates` text COMMENT '断言', - `filters` text COMMENT '过滤器', - `uri` varchar(50) DEFAULT NULL, - `order` int(2) DEFAULT '0' COMMENT '排序', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='路由配置表'; +CREATE TABLE `sys_route_conf` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `route_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '路由ID', + `predicates` json NULL COMMENT '断言', + `filters` json NULL COMMENT '过滤器', + `uri` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `order` int(2) NULL DEFAULT 0 COMMENT '排序', + `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '路由配置表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_route_conf` +-- Records of sys_route_conf -- ---------------------------- BEGIN; -INSERT INTO `sys_route_conf` VALUES ('1', 'pigx-activiti', '[{\"args\":{\"_genkey_0\":\"/act/**\"},\"name\":\"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:04', '0'), ('2', 'pigx-auth', '[{\"args\":{\"_genkey_0\":\"/auth/**\"},\"name\":\"Path\"}]', '[{\"args\":{},\"name\":\"ValidateCodeGatewayFilter\"},{\"args\":{},\"name\":\"PasswordDecoderFilter\"}]', 'lb://pigx-auth', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:13', '0'), ('3', 'pigx-codegen', '[{\"args\":{\"_genkey_0\":\"/gen/**\"},\"name\":\"Path\"}]', '[]', 'lb://pigx-codegen', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:16', '0'), ('4', 'pigx-daemon', '[{\"args\":{\"_genkey_0\":\"/daemon/**\"},\"name\":\"Path\"}]', '[]', 'lb://pigx-daemon', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:18', '0'), ('5', 'pigx-tx-manager', '[{\"args\":{\"_genkey_0\":\"/tx/**\"},\"name\":\"Path\"}]', '[]', 'lb://pigx-tx-manager', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:21', '0'), ('6', 'pigx-upms', '[{\"args\":{\"_genkey_0\":\"/admin/**\"},\"name\":\"Path\"}]', '[{\"args\":{\"key-resolver\":\"#{@remoteAddrKeyResolver}\",\"redis-rate-limiter.replenishRate\":\"10\",\"redis-rate-limiter.burstCapacity\":\"20\"},\"name\":\"RequestRateLimiter\"},{\"args\":{\"name\":\"default\",\"fallbackUri\":\"forward:/fallback\"},\"name\":\"Hystrix\"}]', 'lb://pigx-upms', '0', '2018-11-07 20:18:16', '2018-11-07 20:23:24', '0'); +INSERT INTO `sys_route_conf` VALUES (1, 'pigx-activiti', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:11', '0'); +INSERT INTO `sys_route_conf` VALUES (2, 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:13', '0'); +INSERT INTO `sys_route_conf` VALUES (3, 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:14', '0'); +INSERT INTO `sys_route_conf` VALUES (4, 'pigx-daemon', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:16', '0'); +INSERT INTO `sys_route_conf` VALUES (5, 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:17', '0'); +INSERT INTO `sys_route_conf` VALUES (6, 'pigx-upms-biz', '[{\"args\": {\"_genkey_0\": \"/admin/**\"}, \"name\": \"Path\"}]', '[{\"args\": {\"key-resolver\": \"#{@remoteAddrKeyResolver}\", \"redis-rate-limiter.burstCapacity\": \"20\", \"redis-rate-limiter.replenishRate\": \"10\"}, \"name\": \"RequestRateLimiter\"}, {\"args\": {\"name\": \"default\", \"fallbackUri\": \"forward:/fallback\"}, \"name\": \"Hystrix\"}]', 'lb://pigx-upms-biz', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:21', '0'); COMMIT; -- ---------------------------- diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index fdc2c0de9..a1b54e089 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @AllArgsConstructor -@RequestMapping("/leavebill") +@RequestMapping("/leave-bill") public class LeaveBillController { private final LeaveBillService leaveBillService; private final ProcessService processService; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java index b3e326c1b..4c0d68acf 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; * @date 2018-08-03 22:15:56 */ @RestController -@RequestMapping("/executionlog") +@RequestMapping("/execution-log") @AllArgsConstructor public class ExecutionLogController { diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java index 8460ee1b0..24286da10 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @AllArgsConstructor -@RequestMapping("/statustracelog") +@RequestMapping("/status-trace-log") public class StatusTraceLogController { private final StatusTraceLogService statusTraceLogService; From d232d4feb313bb836428920070429b1610fe1a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 14:21:32 +0800 Subject: [PATCH 2/5] :recycle: Refactoring code.Refactor method name according to Alibaba Java Coding Guidelines --- doc/db/pigxx.sql | 2 +- .../common/core/constant/CommonConstant.java | 9 +++++++ ...{EnumLoginType.java => LoginTypeEnum.java} | 2 +- ...cessStatus.java => ProcessStatusEnum.java} | 2 +- ...esourceType.java => ResourceTypeEnum.java} | 2 +- ...numTaskStatus.java => TaskStatusEnum.java} | 2 +- .../pig4cloud/pigx/common/core/util/R.java | 19 +++++++------- .../GlobalExceptionHandlerResolver.java | 26 +++++++++++-------- .../PigxWebResponseExceptionTranslator.java | 2 +- ...ed.java => MethodNotAllowedException.java} | 4 +-- .../admin/api/feign/RemoteTokenService.java | 4 +-- .../RemoteTokenServiceFallbackImpl.java | 4 +-- .../pigx/admin/controller/DeptController.java | 16 ++++++------ .../pigx/admin/controller/DictController.java | 12 ++++----- .../pigx/admin/controller/LogController.java | 10 +++---- .../pigx/admin/controller/MenuController.java | 14 +++++----- .../admin/controller/MobileController.java | 2 +- .../OauthClientDetailsController.java | 10 +++---- .../pigx/admin/controller/RoleController.java | 18 ++++++------- .../controller/SysRouteConfController.java | 6 ++--- .../SysSocialDetailsController.java | 17 ++++++------ .../admin/controller/TokenController.java | 12 ++++----- .../pigx/admin/controller/UserController.java | 10 +++---- .../admin/handler/WeChatLoginHandler.java | 4 +-- .../pigx/admin/mapper/SysDeptMapper.java | 3 +-- .../admin/mapper/SysDeptRelationMapper.java | 5 ++-- .../pigx/admin/mapper/SysMenuMapper.java | 4 +-- .../pigx/admin/mapper/SysRoleMapper.java | 2 +- .../pigx/admin/mapper/SysRouteConfMapper.java | 2 -- .../pigx/admin/mapper/SysUserMapper.java | 4 +-- .../pigx/admin/service/SysDeptService.java | 6 ++--- .../pigx/admin/service/SysLogService.java | 2 +- .../pigx/admin/service/SysMenuService.java | 2 +- .../service/SysOauthClientDetailsService.java | 2 +- .../admin/service/SysRoleMenuService.java | 2 +- .../pigx/admin/service/SysRoleService.java | 2 +- .../admin/service/SysRouteConfService.java | 2 +- .../service/SysSocialDetailsService.java | 2 +- .../pigx/admin/service/SysUserService.java | 2 +- .../admin/service/impl/MobileServiceImpl.java | 4 +-- .../impl/SysDeptRelationServiceImpl.java | 4 +-- .../service/impl/SysDeptServiceImpl.java | 6 ++--- .../admin/service/impl/SysLogServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 4 +-- .../SysOauthClientDetailsServiceImpl.java | 2 +- .../service/impl/SysRoleMenuServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 4 +-- .../service/impl/SysRouteConfServiceImpl.java | 2 +- .../impl/SysSocialDetailsServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 6 ++--- .../main/resources/mapper/SysDeptMapper.xml | 2 +- .../mapper/SysDeptRelationMapper.xml | 4 +-- .../main/resources/mapper/SysMenuMapper.xml | 4 +-- .../main/resources/mapper/SysRoleMapper.xml | 2 +- .../main/resources/mapper/SysUserMapper.xml | 4 +-- .../act/controller/LeaveBillController.java | 10 +++---- .../pigx/act/controller/ModelController.java | 8 +++--- .../act/controller/ProcessController.java | 8 +++--- .../pigx/act/controller/TaskController.java | 10 +++---- .../pigx/act/service/ActTaskService.java | 6 ++--- .../pigx/act/service/ModelService.java | 4 +-- .../pigx/act/service/ProcessService.java | 4 +-- .../act/service/impl/ActTaskServiceImpl.java | 14 +++++----- .../act/service/impl/ModelServiceImpl.java | 4 +-- .../act/service/impl/ProcessServiceImpl.java | 20 +++++++------- .../controller/SysGeneratorController.java | 6 ++--- .../codegen/service/SysGeneratorService.java | 2 +- .../service/impl/SysGeneratorServiceImpl.java | 2 +- .../resources/template/Controller.java.vm | 20 +++++++------- .../controller/ExecutionLogController.java | 6 ++--- .../controller/StatusTraceLogController.java | 4 +-- 71 files changed, 222 insertions(+), 211 deletions(-) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/{EnumLoginType.java => LoginTypeEnum.java} (97%) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/{EnumProcessStatus.java => ProcessStatusEnum.java} (97%) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/{EnumResourceType.java => ResourceTypeEnum.java} (97%) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/{EnumTaskStatus.java => TaskStatusEnum.java} (97%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/{MethodNotAllowed.java => MethodNotAllowedException.java} (91%) diff --git a/doc/db/pigxx.sql b/doc/db/pigxx.sql index 5eae094b5..3ff182670 100644 --- a/doc/db/pigxx.sql +++ b/doc/db/pigxx.sql @@ -213,7 +213,7 @@ INSERT INTO `sys_menu` VALUES (2200, '字典管理', NULL, 'dict', 2000, 'icon-n INSERT INTO `sys_menu` VALUES (2201, '字典删除', 'sys_dict_del', NULL, 2200, NULL, NULL, NULL, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0', 1); INSERT INTO `sys_menu` VALUES (2202, '字典新增', 'sys_dict_add', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0', 1); INSERT INTO `sys_menu` VALUES (2203, '字典修改', 'sys_dict_edit', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0', 1); -INSERT INTO `sys_menu` VALUES (2300, '代码生成', '', 'gen', 2000, 'icon-weibiaoti46', 'views/admin/gen/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:02:54', '0', 1); +INSERT INTO `sys_menu` VALUES (2300, '代码生成', '', 'gen', 2000, 'icon-weibiaoti46', 'views/gen/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:02:54', '0', 1); INSERT INTO `sys_menu` VALUES (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', 1); INSERT INTO `sys_menu` VALUES (2401, '客户端新增', 'sys_client_add', NULL, 2400, '1', NULL, NULL, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0', 1); INSERT INTO `sys_menu` VALUES (2402, '客户端修改', 'sys_client_edit', NULL, 2400, NULL, NULL, NULL, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0', 1); diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstant.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstant.java index da402196e..86e717227 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstant.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstant.java @@ -81,4 +81,13 @@ public interface CommonConstant { * 验证码前缀 */ String DEFAULT_CODE_KEY = "DEFAULT_CODE_KEY_"; + + /** + * 成功标记 + */ + Integer SUCCESS=0; + /** + * 失败标记 + */ + Integer FAIL=1; } diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumLoginType.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java similarity index 97% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumLoginType.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java index 6752cd802..33a245698 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumLoginType.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/LoginTypeEnum.java @@ -27,7 +27,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum EnumLoginType { +public enum LoginTypeEnum { /** * 账号密码登录 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumProcessStatus.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java similarity index 97% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumProcessStatus.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java index 2fbcaa66a..14790b8e4 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumProcessStatus.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java @@ -27,7 +27,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum EnumProcessStatus { +public enum ProcessStatusEnum { /** * 图片资源 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumResourceType.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ResourceTypeEnum.java similarity index 97% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumResourceType.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ResourceTypeEnum.java index 0fcc9f8d5..91142681d 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumResourceType.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ResourceTypeEnum.java @@ -27,7 +27,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum EnumResourceType { +public enum ResourceTypeEnum { /** * 图片资源 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumTaskStatus.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/TaskStatusEnum.java similarity index 97% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumTaskStatus.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/TaskStatusEnum.java index c53b744fe..7e0f2af77 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/EnumTaskStatus.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/TaskStatusEnum.java @@ -27,7 +27,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum EnumTaskStatus { +public enum TaskStatusEnum { /** * 未提交 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java index ae2387a92..b097d4e0a 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java @@ -19,9 +19,8 @@ package com.pig4cloud.pigx.common.core.util; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; +import lombok.*; import lombok.experimental.Accessors; import java.io.Serializable; @@ -34,17 +33,19 @@ import java.io.Serializable; */ @ToString @Accessors(chain=true) +@Builder +@AllArgsConstructor public class R implements Serializable { - private static final int SUCCESS = 0; - private static final int FAIL = 1; private static final long serialVersionUID = 1L; + + @Getter + @Setter + private int code = CommonConstant.SUCCESS; + @Getter @Setter private String msg = "success"; - @Getter - @Setter - private int code = SUCCESS; @Getter @Setter @@ -68,6 +69,6 @@ public class R implements Serializable { public R(Throwable e) { super(); this.msg = e.getMessage(); - this.code = FAIL; + this.code = CommonConstant.FAIL; } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java index 355c8b3fb..7a3b21fc7 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/GlobalExceptionHandlerResolver.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.common.security.component; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,11 +35,10 @@ import java.util.List; /** * @author lengleng * @date 2018/8/30 - * 全局的的异常处理器 + * 全局异常处理器 */ @Slf4j @RestControllerAdvice -@AllArgsConstructor public class GlobalExceptionHandlerResolver { /** @@ -49,7 +49,7 @@ public class GlobalExceptionHandlerResolver { */ @ExceptionHandler(Exception.class) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - public R exception(Exception e) { + public R handleGlobalException(Exception e) { log.error("全局异常信息 ex={}", e.getMessage(), e); return new R<>(e); } @@ -62,8 +62,12 @@ public class GlobalExceptionHandlerResolver { */ @ExceptionHandler(AccessDeniedException.class) @ResponseStatus(HttpStatus.FORBIDDEN) - public R exception(AccessDeniedException e) { - return new R<>(e.getLocalizedMessage()); + public R handleAccessDeniedException(AccessDeniedException e) { + log.error("拒绝授权异常信息 ex={}",e.getLocalizedMessage(),e); + return R.builder() + .msg(e.getLocalizedMessage()) + .code(CommonConstant.FAIL) + .build(); } /** @@ -74,12 +78,12 @@ public class GlobalExceptionHandlerResolver { */ @ExceptionHandler({MethodArgumentNotValidException.class, BindException.class}) @ResponseStatus(HttpStatus.BAD_REQUEST) - public R bodyValidExceptionHandler(MethodArgumentNotValidException exception) { + public R handleBodyValidException(MethodArgumentNotValidException exception) { List fieldErrors = exception.getBindingResult().getFieldErrors(); - R result = new R(); - result.setMsg(fieldErrors.get(0).getDefaultMessage()); - log.warn(fieldErrors.get(0).getDefaultMessage()); - return result; + log.error("参数绑定异常,ex = {}",fieldErrors.get(0).getDefaultMessage()); + return R.builder() + .msg(fieldErrors.get(0).getDefaultMessage()) + .code(CommonConstant.FAIL) + .build(); } - } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java index 0edb3f962..2583af912 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java @@ -71,7 +71,7 @@ public class PigxWebResponseExceptionTranslator implements WebResponseExceptionT ase = (HttpRequestMethodNotSupportedException) throwableAnalyzer .getFirstThrowableOfType(HttpRequestMethodNotSupportedException.class, causeChain); if (ase != null) { - return handleOAuth2Exception(new MethodNotAllowed(ase.getMessage(), ase)); + return handleOAuth2Exception(new MethodNotAllowedException(ase.getMessage(), ase)); } ase = (OAuth2Exception) throwableAnalyzer.getFirstThrowableOfType( diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowedException.java similarity index 91% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowedException.java index 6bf190275..489a9cb0f 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowed.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/MethodNotAllowedException.java @@ -26,9 +26,9 @@ import org.springframework.http.HttpStatus; * @date 2018/7/8 */ @JsonSerialize(using = PigxAuth2ExceptionSerializer.class) -public class MethodNotAllowed extends PigxAuth2Exception { +public class MethodNotAllowedException extends PigxAuth2Exception { - public MethodNotAllowed(String msg, Throwable t) { + public MethodNotAllowedException(String msg, Throwable t) { super(msg); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index d7396382d..0fda42327 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -41,7 +41,7 @@ public interface RemoteTokenService { * @return page */ @PostMapping("/token/page") - R selectPage(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM) String from); + R getTokenPage(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM) String from); /** * 删除token @@ -51,5 +51,5 @@ public interface RemoteTokenService { * @return */ @DeleteMapping("/token/{token}") - R deleteTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); + R removeTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java index 0896c5e06..1704621e6 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java @@ -45,7 +45,7 @@ public class RemoteTokenServiceFallbackImpl implements RemoteTokenService { * @return page */ @Override - public R selectPage(Map params, String from) { + public R getTokenPage(Map params, String from) { log.error("调用认证中心查询token 失败", cause); return null; } @@ -58,7 +58,7 @@ public class RemoteTokenServiceFallbackImpl implements RemoteTokenService { * @return */ @Override - public R deleteTokenById(String token, String from) { + public R removeTokenById(String token, String from) { log.error("删除token 失败 {}", token, cause); return null; } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index 5f6c97fb7..c701ea3b9 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -53,7 +53,7 @@ public class DeptController { * @return SysDept */ @GetMapping("/{id}") - public R get(@PathVariable Integer id) { + public R getById(@PathVariable Integer id) { return new R<>(sysDeptService.getById(id)); } @@ -74,8 +74,8 @@ public class DeptController { * @return 树形菜单 */ @GetMapping(value = "/user-tree") - public R userTree() { - return new R<>(sysDeptService.selectUserTree()); + public R getUserTree() { + return new R<>(sysDeptService.getUserTree()); } /** @@ -87,8 +87,8 @@ public class DeptController { @SysLog("添加部门") @PostMapping @PreAuthorize("@pms.hasPermission('sys_dept_add')") - public R add(@Valid @RequestBody SysDept sysDept) { - return new R<>(sysDeptService.insertDept(sysDept)); + public R save(@Valid @RequestBody SysDept sysDept) { + return new R<>(sysDeptService.saveDept(sysDept)); } /** @@ -100,8 +100,8 @@ public class DeptController { @SysLog("删除部门") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_dept_del')") - public R delete(@PathVariable Integer id) { - return new R<>(sysDeptService.deleteDeptById(id)); + public R removeById(@PathVariable Integer id) { + return new R<>(sysDeptService.removeDeptById(id)); } /** @@ -113,7 +113,7 @@ public class DeptController { @SysLog("编辑部门") @PutMapping @PreAuthorize("@pms.hasPermission('sys_dept_edit')") - public R edit(@Valid @RequestBody SysDept sysDept) { + public R update(@Valid @RequestBody SysDept sysDept) { sysDept.setUpdateTime(LocalDateTime.now()); return new R<>(sysDeptService.updateDeptById(sysDept)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index a38cc447e..f8a719d50 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -58,7 +58,7 @@ public class DictController { * @return 字典信息 */ @GetMapping("/{id}") - public R dict(@PathVariable Integer id) { + public R getById(@PathVariable Integer id) { return new R<>(sysDictService.getById(id)); } @@ -69,7 +69,7 @@ public class DictController { * @return 分页对象 */ @GetMapping("/page") - public R getSysDictPage(Page page, SysDict sysDict) { + public R getDictPage(Page page, SysDict sysDict) { return new R<>(sysDictService.page(page, Wrappers.query(sysDict))); } @@ -81,7 +81,7 @@ public class DictController { */ @GetMapping("/type/{type}") @Cacheable(value = "dict_details", key = "#type") - public R findDictByType(@PathVariable String type) { + public R getDictByType(@PathVariable String type) { return new R<>(sysDictService.list(Wrappers .query().lambda() .eq(SysDict::getType, type))); @@ -97,7 +97,7 @@ public class DictController { @PostMapping @CacheEvict(value = "dict_details", key = "#sysDict.type") @PreAuthorize("@pms.hasPermission('sys_dict_add')") - public R dict(@Valid @RequestBody SysDict sysDict) { + public R save(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.save(sysDict)); } @@ -112,7 +112,7 @@ public class DictController { @DeleteMapping("/{id}/{type}") @CacheEvict(value = "dict_details", key = "#type") @PreAuthorize("@pms.hasPermission('sys_dict_del')") - public R deleteDict(@PathVariable Integer id, @PathVariable String type) { + public R removeById(@PathVariable Integer id, @PathVariable String type) { return new R<>(sysDictService.removeById(id)); } @@ -126,7 +126,7 @@ public class DictController { @SysLog("修改字典") @CacheEvict(value = "dict_details", key = "#sysDict.type") @PreAuthorize("@pms.hasPermission('sys_dict_edit')") - public R editDict(@Valid @RequestBody SysDict sysDict) { + public R updateById(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.updateById(sysDict)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index 7f6ef932d..1757c9c5d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -57,7 +57,7 @@ public class LogController { * @return */ @GetMapping("/page") - public R getSysLogPage(Page page, SysLog sysLog) { + public R getLogPage(Page page, SysLog sysLog) { return new R<>(sysLogService.page(page, Wrappers.query(sysLog))); } @@ -69,7 +69,7 @@ public class LogController { */ @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_log_del')") - public R delete(@PathVariable Long id) { + public R removeById(@PathVariable Long id) { return new R<>(sysLogService.removeById(id)); } @@ -85,13 +85,13 @@ public class LogController { } /** - * 插入前端异常日志 + * 批量插入前端异常日志 * * @param preLogVoList 日志实体 * @return success/false */ @PostMapping("/logs") - public R saveLogs(@RequestBody List preLogVoList) { - return new R<>(sysLogService.insertLogs(preLogVoList)); + public R saveBatchLogs(@RequestBody List preLogVoList) { + return new R<>(sysLogService.saveBatchLogs(preLogVoList)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index beb431340..b62dd6bdf 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -58,7 +58,7 @@ public class MenuController { * @return 当前用户的树形菜单 */ @GetMapping - public R userMenu() { + public R getUserMenu() { // 获取符合条件的菜单 Set all = new HashSet<>(); SecurityUtils.getRoles() @@ -88,7 +88,7 @@ public class MenuController { * @return 属性集合 */ @GetMapping("/tree/{roleId}") - public List roleTree(@PathVariable Integer roleId) { + public List getRoleTree(@PathVariable Integer roleId) { return sysMenuService.findMenuByRoleId(roleId) .stream() .map(MenuVO::getMenuId) @@ -102,7 +102,7 @@ public class MenuController { * @return 菜单详细信息 */ @GetMapping("/{id}") - public R menu(@PathVariable Integer id) { + public R getById(@PathVariable Integer id) { return new R<>(sysMenuService.getById(id)); } @@ -115,7 +115,7 @@ public class MenuController { @SysLog("新增菜单") @PostMapping @PreAuthorize("@pms.hasPermission('sys_menu_add')") - public R menu(@Valid @RequestBody SysMenu sysMenu) { + public R save(@Valid @RequestBody SysMenu sysMenu) { return new R<>(sysMenuService.save(sysMenu)); } @@ -128,8 +128,8 @@ public class MenuController { @SysLog("删除菜单") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_menu_del')") - public R menuDel(@PathVariable Integer id) { - return new R<>(sysMenuService.deleteMenu(id)); + public R removeById(@PathVariable Integer id) { + return new R<>(sysMenuService.removeMenuById(id)); } /** @@ -141,7 +141,7 @@ public class MenuController { @SysLog("更新菜单") @PutMapping @PreAuthorize("@pms.hasPermission('sys_menu_edit')") - public R menuUpdate(@Valid @RequestBody SysMenu sysMenu) { + public R update(@Valid @RequestBody SysMenu sysMenu) { return new R<>(sysMenuService.updateMenuById(sysMenu)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java index 39424327b..d56eb679c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java @@ -42,7 +42,7 @@ public class MobileController { @SysLog("发送验证码") @GetMapping("/{mobile}") - public R code(@PathVariable String mobile) { + public R sendSmsCode(@PathVariable String mobile) { return mobileService.sendSmsCode(mobile); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index f80e514db..b751b15de 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -54,7 +54,7 @@ public class OauthClientDetailsController { * @return SysOauthClientDetails */ @GetMapping("/{id}") - public R get(@PathVariable Integer id) { + public R getById(@PathVariable Integer id) { return new R<>(sysOauthClientDetailsService.getById(id)); } @@ -67,7 +67,7 @@ public class OauthClientDetailsController { * @return */ @GetMapping("/page") - public R getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails) { + public R getOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails) { return new R<>(sysOauthClientDetailsService.page(page, Wrappers.query(sysOauthClientDetails))); } @@ -93,8 +93,8 @@ public class OauthClientDetailsController { @SysLog("删除终端") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_client_del')") - public R delete(@PathVariable String id) { - return new R<>(sysOauthClientDetailsService.deleteClientDetailsById(id)); + public R removeById(@PathVariable String id) { + return new R<>(sysOauthClientDetailsService.removeClientDetailsById(id)); } /** @@ -106,7 +106,7 @@ public class OauthClientDetailsController { @SysLog("编辑终端") @PutMapping @PreAuthorize("@pms.hasPermission('sys_client_edit')") - public R edit(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { + public R update(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { return new R<>(sysOauthClientDetailsService.updateClientDetailsById(sysOauthClientDetails)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index b214d2e21..eacdadc37 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -50,7 +50,7 @@ public class RoleController { * @return 角色信息 */ @GetMapping("/{id}") - public R role(@PathVariable Integer id) { + public R getById(@PathVariable Integer id) { return new R<>(sysRoleService.getById(id)); } @@ -63,7 +63,7 @@ public class RoleController { @SysLog("添加角色") @PostMapping @PreAuthorize("@pms.hasPermission('sys_role_add')") - public R role(@RequestBody SysRole sysRole) { + public R save(@RequestBody SysRole sysRole) { return new R<>(sysRoleService.save(sysRole)); } @@ -76,7 +76,7 @@ public class RoleController { @SysLog("修改角色") @PutMapping @PreAuthorize("@pms.hasPermission('sys_role_edit')") - public R roleUpdate(@RequestBody SysRole sysRole) { + public R update(@RequestBody SysRole sysRole) { return new R<>(sysRoleService.updateById(sysRole)); } @@ -89,8 +89,8 @@ public class RoleController { @SysLog("删除角色") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_role_del')") - public R roleDel(@PathVariable Integer id) { - return new R<>(sysRoleService.deleteRoleById(id)); + public R removeById(@PathVariable Integer id) { + return new R<>(sysRoleService.removeRoleById(id)); } /** @@ -99,7 +99,7 @@ public class RoleController { * @return 角色列表 */ @GetMapping("/list") - public R roleList() { + public R listRoles() { return new R<>(sysRoleService.list(Wrappers.emptyWrapper())); } @@ -110,7 +110,7 @@ public class RoleController { * @return 分页对象 */ @GetMapping("/page") - public R rolePage(Page page) { + public R getRolePage(Page page) { return new R<>(sysRoleService.page(page, Wrappers.emptyWrapper())); } @@ -124,8 +124,8 @@ public class RoleController { @SysLog("更新角色菜单") @PutMapping("/upd-menu") @PreAuthorize("@pms.hasPermission('sys_role_perm')") - public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { + public R saveRoleMenus(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { SysRole sysRole = sysRoleService.getById(roleId); - return new R<>(sysRoleMenuService.insertRoleMenus(sysRole.getRoleCode(), roleId, menuIds)); + return new R<>(sysRoleMenuService.saveRoleMenus(sysRole.getRoleCode(), roleId, menuIds)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java index 0380953d5..e6c93c1fb 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java @@ -46,7 +46,7 @@ public class SysRouteConfController { * @return */ @GetMapping - public R routes() { + public R listRoutes() { return new R<>(sysRouteConfService.list()); } @@ -58,8 +58,8 @@ public class SysRouteConfController { */ @SysLog("修改路由") @PutMapping - public R edit(@RequestBody JSONArray routes) { - return new R(sysRouteConfService.editRoutes(routes)); + public R updateRoutes(@RequestBody JSONArray routes) { + return new R(sysRouteConfService.updateRoutes(routes)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index 0ac463cce..fb9de4980 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -52,7 +52,7 @@ public class SysSocialDetailsController { * @return */ @GetMapping("/page") - public R getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { + public R getSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { return new R<>(sysSocialDetailsService.page(page, Wrappers.query(sysSocialDetails))); } @@ -64,7 +64,7 @@ public class SysSocialDetailsController { * @return R */ @GetMapping("/{id}") - public R info(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Integer id) { return new R<>(sysSocialDetailsService.getById(id)); } @@ -77,8 +77,7 @@ public class SysSocialDetailsController { @SysLog("保存三方信息") @PostMapping public R save(@Valid @RequestBody SysSocialDetails sysSocialDetails) { - sysSocialDetailsService.save(sysSocialDetails); - return new R<>(Boolean.TRUE); + return new R<>(sysSocialDetailsService.save(sysSocialDetails)); } /** @@ -89,7 +88,7 @@ public class SysSocialDetailsController { */ @SysLog("修改三方信息") @PutMapping - public R update(@Valid @RequestBody SysSocialDetails sysSocialDetails) { + public R updateById(@Valid @RequestBody SysSocialDetails sysSocialDetails) { sysSocialDetailsService.updateById(sysSocialDetails); return new R<>(Boolean.TRUE); } @@ -102,7 +101,7 @@ public class SysSocialDetailsController { */ @SysLog("删除三方信息") @DeleteMapping("/{id}") - public R delete(@PathVariable Integer id) { + public R removeById(@PathVariable Integer id) { return new R<>(sysSocialDetailsService.removeById(id)); } @@ -113,8 +112,8 @@ public class SysSocialDetailsController { * @return */ @GetMapping("/info/{inStr}") - public R social(@PathVariable String inStr) { - return new R<>(sysSocialDetailsService.findUserInfo(inStr)); + public R getUserInfo(@PathVariable String inStr) { + return new R<>(sysSocialDetailsService.getUserInfo(inStr)); } /** @@ -125,7 +124,7 @@ public class SysSocialDetailsController { * @return */ @PostMapping("/bind") - public R bind(String state, String code) { + public R bindSocial(String state, String code) { return new R<>(sysSocialDetailsService.bindSocial(state, code)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java index e7a6f0029..6c19b0b7e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java @@ -31,7 +31,7 @@ import java.util.Map; /** * @author lengleng * @date 2018/9/4 - * token 管理 + * getTokenPage 管理 */ @RestController @AllArgsConstructor @@ -47,20 +47,20 @@ public class TokenController { * @return token集合 */ @GetMapping("/page") - public R token(@RequestParam Map params) { - return remoteTokenService.selectPage(params, SecurityConstants.FROM_IN); + public R getTokenPage(@RequestParam Map params) { + return remoteTokenService.getTokenPage(params, SecurityConstants.FROM_IN); } /** * 删除 * - * @param token token + * @param token getTokenPage * @return success/false */ @SysLog("删除用户token") @DeleteMapping("/{token}") @PreAuthorize("@pms.hasPermission('sys_token_del')") - public R delete(@PathVariable String token) { - return remoteTokenService.deleteTokenById(token, SecurityConstants.FROM_IN); + public R removeById(@PathVariable String token) { + return remoteTokenService.removeTokenById(token, SecurityConstants.FROM_IN); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 534b7dca2..fae123067 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -139,7 +139,7 @@ public class UserController { @SysLog("更新用户信息") @PutMapping @PreAuthorize("@pms.hasPermission('sys_user_edit')") - public R userUpdate(@Valid @RequestBody UserDTO userDto) { + public R updateUser(@Valid @RequestBody UserDTO userDto) { return new R<>(userService.updateUser(userDto)); } @@ -151,7 +151,7 @@ public class UserController { * @return 用户集合 */ @GetMapping("/page") - public R userPage(Page page, UserDTO userDTO) { + public R getUserPage(Page page, UserDTO userDTO) { return new R<>(userService.getUsersWithRolePage(page, userDTO)); } @@ -163,7 +163,7 @@ public class UserController { */ @SysLog("修改个人信息") @PutMapping("/edit") - public R editInfo(@Valid @RequestBody UserDTO userDto) { + public R updateUserInfo(@Valid @RequestBody UserDTO userDto) { return userService.updateUserInfo(userDto); } @@ -172,7 +172,7 @@ public class UserController { * @return */ @GetMapping("/ancestor/{username}") - public R ancestorUsers(@PathVariable String username) { - return new R<>(userService.ancestorUsers(username)); + public R listAncestorUsers(@PathVariable String username) { + return new R<>(userService.listAncestorUsers(username)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java index 4d88274db..831e80242 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java @@ -26,7 +26,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.mapper.SysSocialDetailsMapper; import com.pig4cloud.pigx.admin.service.SysUserService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.constant.enums.EnumLoginType; +import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -55,7 +55,7 @@ public class WeChatLoginHandler extends AbstractLoginHandler { @Override public String identify(String code) { SysSocialDetails condition = new SysSocialDetails(); - condition.setType(EnumLoginType.WECHAT.getType()); + condition.setType(LoginTypeEnum.WECHAT.getType()); SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition)); String url = String.format(SecurityConstants.WX_AUTHORIZATION_CODE_URL diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java index a77724a30..6df92577f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java @@ -37,8 +37,7 @@ public interface SysDeptMapper extends BaseMapper { /** * 关联dept——relation * - * @param delFlag 删除标记 * @return 数据列表 */ - List selectDeptDtoList(String delFlag); + List listDepts(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java index 850ebeb3b..874c96756 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java @@ -36,12 +36,13 @@ public interface SysDeptRelationMapper extends BaseMapper { * * @param id 部门ID */ - void deleteAllDeptRealtion(Integer id); + void deleteDeptRelationsById(Integer id); /** * 更改部分关系表数据 * * @param deptRelation */ - void updateDeptRealtion(SysDeptRelation deptRelation); + void updateDeptRelations(SysDeptRelation deptRelation); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java index 26f7ca31e..6117d82ed 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java @@ -41,7 +41,7 @@ public interface SysMenuMapper extends BaseMapper { * @param roleId 角色ID * @return */ - List findMenuByRoleId(Integer roleId); + List listMenusByRoleId(Integer roleId); /** * 通过角色ID查询权限 @@ -49,5 +49,5 @@ public interface SysMenuMapper extends BaseMapper { * @param roleIds Ids * @return */ - List findPermissionsByRoleIds(String roleIds); + List listPermissionsByRoleIds(String roleIds); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index cc0cb9cb0..f9a6dd4dd 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -39,5 +39,5 @@ public interface SysRoleMapper extends BaseMapper { * @param userId * @return */ - List findRolesByUserId(Integer userId); + List listRolesByUserId(Integer userId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java index 73527d2c0..576d5f0a7 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; -import org.apache.ibatis.annotations.Mapper; /** * 路由 @@ -27,7 +26,6 @@ import org.apache.ibatis.annotations.Mapper; * @author lengleng * @date 2018-11-06 10:17:18 */ -@Mapper public interface SysRouteConfMapper extends BaseMapper { } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 589c89124..bb02e618b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -45,7 +45,7 @@ public interface SysUserMapper extends BaseMapper { * @param username 用户名 * @return userVo */ - UserVO selectUserVoByUsername(String username); + UserVO getUserVoByUsername(String username); /** * 分页查询用户信息（含角色） @@ -63,5 +63,5 @@ public interface SysUserMapper extends BaseMapper { * @param id 用户ID * @return userVo */ - UserVO selectUserVoById(Integer id); + UserVO getUserVoById(Integer id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java index 098d29959..d7cffea73 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java @@ -47,7 +47,7 @@ public interface SysDeptService extends IService { * * @return */ - List selectUserTree(); + List getUserTree(); /** * 添加信息部门 @@ -55,7 +55,7 @@ public interface SysDeptService extends IService { * @param sysDept * @return */ - Boolean insertDept(SysDept sysDept); + Boolean saveDept(SysDept sysDept); /** * 删除部门 @@ -63,7 +63,7 @@ public interface SysDeptService extends IService { * @param id 部门 ID * @return 成功、失败 */ - Boolean deleteDeptById(Integer id); + Boolean removeDeptById(Integer id); /** * 更新部门 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java index 97fcf19e1..bf869a19c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java @@ -42,5 +42,5 @@ public interface SysLogService extends IService { * @param preLogVoList 日志信息 * @return true/false */ - Boolean insertLogs(List preLogVoList); + Boolean saveBatchLogs(List preLogVoList); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java index 4224406cc..22f2930bb 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java @@ -49,7 +49,7 @@ public interface SysMenuService extends IService { * @param id 菜单ID * @return 成功、失败 */ - Boolean deleteMenu(Integer id); + Boolean removeMenuById(Integer id); /** * 更新菜单信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java index 8ce90a1f3..a4a09d511 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java @@ -37,7 +37,7 @@ public interface SysOauthClientDetailsService extends IService { * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔 * @return */ - Boolean insertRoleMenus(String role, Integer roleId, String menuIds); + Boolean saveRoleMenus(String role, Integer roleId, String menuIds); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java index 935948ee1..30d52d600 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java @@ -48,5 +48,5 @@ public interface SysRoleService extends IService { * @param id * @return */ - Boolean deleteRoleById(Integer id); + Boolean removeRoleById(Integer id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java index dd0b55ad1..06e38ae07 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java @@ -48,6 +48,6 @@ public interface SysRouteConfService extends IService { * @param routes 路由信息 * @return */ - Mono editRoutes(JSONArray routes); + Mono updateRoutes(JSONArray routes); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java index 90b21a2c6..cc0d07ebb 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java @@ -44,6 +44,6 @@ public interface SysSocialDetailsService extends IService { * @param inStr * @return */ - UserInfo findUserInfo(String inStr); + UserInfo getUserInfo(String inStr); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 1215a0044..506e4d30c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -90,7 +90,7 @@ public interface SysUserService extends IService { * @param username 用户名 * @return R */ - List ancestorUsers(String username); + List listAncestorUsers(String username); /** * 保存用户信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java index 1cca951ff..b820031e2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java @@ -25,7 +25,7 @@ import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.MobileService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.constant.enums.EnumLoginType; +import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -77,7 +77,7 @@ public class MobileServiceImpl implements MobileService { String code = RandomUtil.randomNumbers(Integer.parseInt(SecurityConstants.CODE_SIZE)); log.debug("手机号生成验证码成功:{},{}", mobile, code); redisTemplate.opsForValue().set( - CommonConstant.DEFAULT_CODE_KEY + EnumLoginType.SMS.getType() + "@" + mobile + CommonConstant.DEFAULT_CODE_KEY + LoginTypeEnum.SMS.getType() + "@" + mobile , code, SecurityConstants.CODE_TIME, TimeUnit.SECONDS); return new R<>(Boolean.TRUE, code); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index 5f386fba2..07eaaf39e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -82,7 +82,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertDept(SysDept dept) { + public Boolean saveDept(SysDept dept) { SysDept sysDept = new SysDept(); BeanUtils.copyProperties(dept, sysDept); this.save(sysDept); @@ -76,7 +76,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean deleteDeptById(Integer id) { + public Boolean removeDeptById(Integer id) { //级联删除部门 List idList = sysDeptRelationService .list(Wrappers.query().lambda() @@ -129,7 +129,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @return */ @Override - public List selectUserTree() { + public List getUserTree() { Integer deptId = SecurityUtils.getUser().getDeptId(); List descendantIdList = sysDeptRelationService .list(Wrappers.query().lambda() diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index 3012f456a..ce4d2a82b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -49,7 +49,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme * @return true/false */ @Override - public Boolean insertLogs(List preLogVoList) { + public Boolean saveBatchLogs(List preLogVoList) { List sysLogs = preLogVoList.stream() .map(pre -> { SysLog log = new SysLog(); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index 54c21e973..0db5a86f8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -52,13 +52,13 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override @Cacheable(value = "menu_details", key = "#roleId + '_menu'") public List findMenuByRoleId(Integer roleId) { - return baseMapper.findMenuByRoleId(roleId); + return baseMapper.listMenusByRoleId(roleId); } @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = "menu_details", allEntries = true) - public Boolean deleteMenu(Integer id) { + public Boolean removeMenuById(Integer id) { // 查询父节点为当前节点的节点 List menuIdList = this.list(Wrappers.query() .lambda().eq(SysMenu::getParentId, id)) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index fc85b91df..1d0a0c3ee 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -46,7 +46,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImplquery().lambda() .eq(SysRoleMenu::getRoleId, role)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index e631f9d01..5b0c8a634 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -54,7 +54,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override public List findRolesByUserId(Integer userId) { - return baseMapper.findRolesByUserId(userId); + return baseMapper.listRolesByUserId(userId); } /** @@ -66,7 +66,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = "menu_details", allEntries = true) @Transactional(rollbackFor = Exception.class) - public Boolean deleteRoleById(Integer id) { + public Boolean removeRoleById(Integer id) { sysRoleMenuMapper.delete(Wrappers .update().lambda() .eq(SysRoleMenu::getRoleId, id)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java index f3c715ac7..fff09d11f 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java @@ -80,7 +80,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl editRoutes(JSONArray routes) { + public Mono updateRoutes(JSONArray routes) { // 清空Redis 缓存 Boolean result = redisTemplate.delete(CommonConstant.ROUTE_KEY); log.info("清空网关路由 {} ", result); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java index 2a05f25d8..2f58ae4df 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java @@ -72,7 +72,7 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl impl */ @Override public UserVO selectUserVoById(Integer id) { - return baseMapper.selectUserVoById(id); + return baseMapper.getUserVoById(id); } /** @@ -172,7 +172,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = "user_details", key = "#userDto.username") public R updateUserInfo(UserDTO userDto) { - UserVO userVO = baseMapper.selectUserVoByUsername(userDto.getUsername()); + UserVO userVO = baseMapper.getUserVoByUsername(userDto.getUsername()); SysUser sysUser = new SysUser(); if (StrUtil.isNotBlank(userDto.getPassword()) && StrUtil.isNotBlank(userDto.getNewpassword1())) { @@ -219,7 +219,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return R */ @Override - public List ancestorUsers(String username) { + public List listAncestorUsers(String username) { SysUser sysUser = this.getOne(Wrappers.query().lambda() .eq(SysUser::getUsername, username)); diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml index ecbb83e12..667c55728 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -37,7 +37,7 @@ - SELECT t.* FROM diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml index b0e896621..e8124c7ce 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml @@ -33,7 +33,7 @@ - + DELETE FROM sys_dept_relation WHERE descendant IN ( SELECT temp.descendant FROM @@ -50,7 +50,7 @@ - + DELETE FROM sys_dept_relation 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 f46d22243..596e8518f 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 @@ -55,7 +55,7 @@ - SELECT sys_menu.* FROM @@ -69,7 +69,7 @@ - SELECT m.permission FROM diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml index 7694b2b81..020f05257 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -33,7 +33,7 @@ - SELECT r.* FROM diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 80999f068..a3fddcffd 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -113,7 +113,7 @@ d.dept_id AS deptId - SELECT FROM @@ -123,7 +123,7 @@ WHERE `user`.username = #{username} - SELECT FROM diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index a1b54e089..4b2e3813c 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.service.LeaveBillService; import com.pig4cloud.pigx.act.service.ProcessService; -import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; +import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; @@ -62,7 +62,7 @@ public class LeaveBillController { * @return R */ @GetMapping("/{leaveId}") - public R info(@PathVariable("leaveId") Integer leaveId) { + public R getById(@PathVariable("leaveId") Integer leaveId) { return new R<>(leaveBillService.getById(leaveId)); } @@ -75,7 +75,7 @@ public class LeaveBillController { @PostMapping public R save(@RequestBody LeaveBill leaveBill) { leaveBill.setUsername(SecurityUtils.getUsername()); - leaveBill.setState(EnumTaskStatus.UNSUBMIT.getStatus()); + leaveBill.setState(TaskStatusEnum.UNSUBMIT.getStatus()); return new R<>(leaveBillService.save(leaveBill)); } @@ -86,7 +86,7 @@ public class LeaveBillController { * @return R */ @PutMapping - public R update(@RequestBody LeaveBill leaveBill) { + public R updateById(@RequestBody LeaveBill leaveBill) { return new R<>(leaveBillService.updateById(leaveBill)); } @@ -97,7 +97,7 @@ public class LeaveBillController { * @return R */ @DeleteMapping("/{leaveId}") - public R delete(@PathVariable Integer leaveId) { + public R removeById(@PathVariable Integer leaveId) { return new R<>(leaveBillService.removeById(leaveId)); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java index 22ecfa857..e2468ef22 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java @@ -49,13 +49,13 @@ public class ModelController { } @GetMapping - public R list(@RequestParam Map params) { - return new R<>(modelService.selectPage(params)); + public R getModelPage(@RequestParam Map params) { + return new R<>(modelService.getModelPage(params)); } @DeleteMapping("/{id}") - public R delete(@PathVariable("id") String id) { - return new R<>(modelService.delete(id)); + public R removeModelById(@PathVariable("id") String id) { + return new R<>(modelService.removeModelById(id)); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java index ca241b225..cdea7af27 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.act.controller; import cn.hutool.core.io.IoUtil; import com.pig4cloud.pigx.act.service.ProcessService; -import com.pig4cloud.pigx.common.core.constant.enums.EnumResourceType; +import com.pig4cloud.pigx.common.core.constant.enums.ResourceTypeEnum; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; @@ -51,13 +51,13 @@ public class ProcessController { HttpHeaders headers = new HttpHeaders(); - if (EnumResourceType.XML.getType().equals(resType)) { + if (ResourceTypeEnum.XML.getType().equals(resType)) { headers.setContentType(MediaType.APPLICATION_XML); } else { headers.setContentType(MediaType.IMAGE_PNG); } - InputStream resourceAsStream = processService.resourceRead(procDefId, proInsId, resType); + InputStream resourceAsStream = processService.readResource(procDefId, proInsId, resType); return new ResponseEntity(IoUtil.readBytes(resourceAsStream), headers, HttpStatus.CREATED); } @@ -68,6 +68,6 @@ public class ProcessController { @DeleteMapping("/{deploymentId}") public R deleteProcIns(@PathVariable String deploymentId) { - return new R<>(processService.deleteProcIns(deploymentId)); + return new R<>(processService.removeProcIns(deploymentId)); } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java index 60a5c47c2..6fdb6694c 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java @@ -44,16 +44,16 @@ public class TaskController { @GetMapping("/todo") public R todo(@RequestParam Map params) { - return new R<>(actTaskService.findTaskByName(params, SecurityUtils.getUsername())); + return new R<>(actTaskService.getTaskByName(params, SecurityUtils.getUsername())); } @GetMapping("/{id}") - public R task(@PathVariable String id) { - return new R(actTaskService.findTaskByTaskId(id)); + public R getTaskById(@PathVariable String id) { + return new R(actTaskService.getTaskById(id)); } @PostMapping - public R task(@RequestBody LeaveBillDto leaveBillDto) { + public R submitTask(@RequestBody LeaveBillDto leaveBillDto) { return new R(actTaskService.submitTask(leaveBillDto)); } @@ -67,7 +67,7 @@ public class TaskController { @GetMapping("/comment/{id}") public R commitList(@PathVariable String id) { - return new R(actTaskService.findCommentByTaskId(id)); + return new R(actTaskService.getCommentByTaskId(id)); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java index 409f93e67..71d06191f 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java @@ -39,7 +39,7 @@ public interface ActTaskService { * @param name * @return */ - IPage findTaskByName(Map params, String name); + IPage getTaskByName(Map params, String name); /** * 通过任务ID查询任务信息关联申请单信息 @@ -47,7 +47,7 @@ public interface ActTaskService { * @param id * @return */ - LeaveBillDto findTaskByTaskId(String id); + LeaveBillDto getTaskById(String id); /** * 提交任务 @@ -63,7 +63,7 @@ public interface ActTaskService { * @param taskId 任务ID * @return */ - List findCommentByTaskId(String taskId); + List getCommentByTaskId(String taskId); /** * 追踪图片节点 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java index 13ce1d558..510f382bc 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java @@ -45,7 +45,7 @@ public interface ModelService { * @param params * @return */ - IPage selectPage(Map params); + IPage getModelPage(Map params); /** * 删除流程 @@ -53,7 +53,7 @@ public interface ModelService { * @param id * @return */ - Boolean delete(String id); + Boolean removeModelById(String id); /** * 部署流程 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java index fa0d79a99..93c29b17f 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java @@ -45,7 +45,7 @@ public interface ProcessService { * @param resType * @return */ - InputStream resourceRead(String procDefId, String proInsId, String resType); + InputStream readResource(String procDefId, String proInsId, String resType); /** * 更新状态 @@ -62,7 +62,7 @@ public interface ProcessService { * @param deploymentId * @return */ - Boolean deleteProcIns(String deploymentId); + Boolean removeProcIns(String deploymentId); /** * 启动流程、更新请假单状态 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index 679f050fb..a66c11af6 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -28,7 +28,7 @@ import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.ActTaskService; import com.pig4cloud.pigx.common.core.constant.PaginationConstant; -import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; +import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -70,7 +70,7 @@ public class ActTaskServiceImpl implements ActTaskService { private final ProcessEngineFactoryBean processEngine; @Override - public IPage findTaskByName(Map params, String name) { + public IPage getTaskByName(Map params, String name) { TaskQuery taskQuery = taskService.createTaskQuery() .taskCandidateOrAssigned(name) .orderByTaskCreateTime().asc(); @@ -102,7 +102,7 @@ public class ActTaskServiceImpl implements ActTaskService { * @return */ @Override - public LeaveBillDto findTaskByTaskId(String taskId) { + public LeaveBillDto getTaskById(String taskId) { Task task = taskService.createTaskQuery() .taskId(taskId) .singleResult(); @@ -158,16 +158,16 @@ public class ActTaskServiceImpl implements ActTaskService { if (pi == null) { LeaveBill bill = new LeaveBill(); bill.setLeaveId(id); - bill.setState(StrUtil.equals(EnumTaskStatus.OVERRULE.getDescription() - , leaveBillDto.getTaskFlag()) ? EnumTaskStatus.OVERRULE.getStatus() - : EnumTaskStatus.COMPLETED.getStatus()); + bill.setState(StrUtil.equals(TaskStatusEnum.OVERRULE.getDescription() + , leaveBillDto.getTaskFlag()) ? TaskStatusEnum.OVERRULE.getStatus() + : TaskStatusEnum.COMPLETED.getStatus()); leaveBillMapper.updateById(bill); } return null; } @Override - public List findCommentByTaskId(String taskId) { + public List getCommentByTaskId(String taskId) { //使用当前的任务ID，查询当前流程对应的历史任务ID //使用当前任务ID，获取当前任务对象 Task task = taskService.createTaskQuery() diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java index f9bbd4d5e..cd0c80ab6 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java @@ -108,7 +108,7 @@ public class ModelServiceImpl implements ModelService { * @return */ @Override - public IPage selectPage(Map params) { + public IPage getModelPage(Map params) { ModelQuery modelQuery = repositoryService.createModelQuery() .latestVersion().orderByLastUpdateTime().desc(); String category = (String) params.get("category"); @@ -132,7 +132,7 @@ public class ModelServiceImpl implements ModelService { * @return */ @Override - public Boolean delete(String id) { + public Boolean removeModelById(String id) { repositoryService.deleteModel(id); return Boolean.TRUE; } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java index d6a9331b5..08c8f94c7 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java @@ -26,9 +26,9 @@ import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.ProcessService; import com.pig4cloud.pigx.common.core.constant.PaginationConstant; -import com.pig4cloud.pigx.common.core.constant.enums.EnumProcessStatus; -import com.pig4cloud.pigx.common.core.constant.enums.EnumResourceType; -import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; +import com.pig4cloud.pigx.common.core.constant.enums.ProcessStatusEnum; +import com.pig4cloud.pigx.common.core.constant.enums.ResourceTypeEnum; +import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum; import com.pig4cloud.pigx.common.core.util.TenantUtils; import lombok.AllArgsConstructor; import org.activiti.engine.RepositoryService; @@ -96,7 +96,7 @@ public class ProcessServiceImpl implements ProcessService { * @return */ @Override - public InputStream resourceRead(String procDefId, String proInsId, String resType) { + public InputStream readResource(String procDefId, String proInsId, String resType) { if (StrUtil.isBlank(procDefId)) { ProcessInstance processInstance = runtimeService @@ -111,9 +111,9 @@ public class ProcessServiceImpl implements ProcessService { .singleResult(); String resourceName = ""; - if (EnumResourceType.IMAGE.getType().equals(resType)) { + if (ResourceTypeEnum.IMAGE.getType().equals(resType)) { resourceName = processDefinition.getDiagramResourceName(); - } else if (EnumResourceType.XML.getType().equals(resType)) { + } else if (ResourceTypeEnum.XML.getType().equals(resType)) { resourceName = processDefinition.getResourceName(); } @@ -131,9 +131,9 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public Boolean updateStatus(String status, String procDefId) { - if (EnumProcessStatus.ACTIVE.getStatus().equals(status)) { + if (ProcessStatusEnum.ACTIVE.getStatus().equals(status)) { repositoryService.activateProcessDefinitionById(procDefId, true, null); - } else if (EnumProcessStatus.SUSPEND.getStatus().equals(status)) { + } else if (ProcessStatusEnum.SUSPEND.getStatus().equals(status)) { repositoryService.suspendProcessDefinitionById(procDefId, true, null); } return Boolean.TRUE; @@ -146,7 +146,7 @@ public class ProcessServiceImpl implements ProcessService { * @return */ @Override - public Boolean deleteProcIns(String deploymentId) { + public Boolean removeProcIns(String deploymentId) { repositoryService.deleteDeployment(deploymentId, true); return Boolean.TRUE; } @@ -160,7 +160,7 @@ public class ProcessServiceImpl implements ProcessService { @Override public Boolean saveStartProcess(Integer leaveId) { LeaveBill leaveBill = leaveBillMapper.selectById(leaveId); - leaveBill.setState(EnumTaskStatus.CHECK.getStatus()); + leaveBill.setState(TaskStatusEnum.CHECK.getStatus()); String key = leaveBill.getClass().getSimpleName(); String businessKey = key + "_" + leaveBill.getLeaveId(); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java index b5717cb7d..10e295136 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java @@ -48,15 +48,15 @@ public class SysGeneratorController { * @return 数据库表 */ @GetMapping("/page") - public R list(Page page, String tableName) { - return new R<>(sysGeneratorService.queryPage(page, tableName)); + public R getPage(Page page, String tableName) { + return new R<>(sysGeneratorService.getPage(page, tableName)); } /** * 生成代码 */ @PostMapping("/code") - public void code(@RequestBody GenConfig genConfig, HttpServletResponse response) throws IOException { + public void generatorCode(@RequestBody GenConfig genConfig, HttpServletResponse response) throws IOException { byte[] data = sysGeneratorService.generatorCode(genConfig); response.reset(); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java index 36b544471..08b943e28 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java @@ -42,5 +42,5 @@ public interface SysGeneratorService { * @param tableName 表名 * @return */ - IPage>> queryPage(Page page, String tableName); + IPage>> getPage(Page page, String tableName); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java index 34e5c45b1..339485532 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java @@ -51,7 +51,7 @@ public class SysGeneratorServiceImpl implements SysGeneratorService { * @return */ @Override - public IPage>> queryPage(Page page, String tableName) { + public IPage>> getPage(Page page, String tableName) { return sysGeneratorMapper.queryList(page,tableName); } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm index 322f372bf..958d72980 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm @@ -43,7 +43,7 @@ public class ${className}Controller { private final ${className}Service ${classname}Service; /** - * 简单分页查询 + * 分页查询 * @param page 分页对象 * @param ${classname} ${comments} * @return @@ -55,8 +55,8 @@ public class ${className}Controller { /** - * 通过id查询单条记录 - * @param ${pk.lowerAttrName} + * 通过id查询${comments} + * @param ${pk.lowerAttrName} id * @return R */ @GetMapping("/{${pk.lowerAttrName}}") @@ -65,8 +65,8 @@ public class ${className}Controller { } /** - * 新增记录 - * @param ${classname} + * 新增${comments} + * @param ${classname} ${comments} * @return R */ @SysLog("新增${comments}") @@ -76,19 +76,19 @@ public class ${className}Controller { } /** - * 修改记录 - * @param ${classname} + * 修改${comments} + * @param ${classname} ${comments} * @return R */ @SysLog("修改${comments}") @PutMapping - public R update(@RequestBody ${className} ${classname}){ + public R updateById(@RequestBody ${className} ${classname}){ return new R<>(${classname}Service.updateById(${classname})); } /** - * 通过id删除一条记录 - * @param ${pk.lowerAttrName} + * 通过id删除${comments} + * @param ${pk.lowerAttrName} id * @return R */ @SysLog("删除${comments}") diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java index 4c0d68acf..a96125e8a 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java @@ -52,13 +52,13 @@ public class ExecutionLogController { /** - * 信息 + * 通过id查询一条记录 * * @param id * @return R */ @GetMapping("/{id}") - public R info(@PathVariable("id") String id) { + public R getById(@PathVariable("id") String id) { return new R<>(executionLogService.getById(id)); } @@ -91,7 +91,7 @@ public class ExecutionLogController { * @return R */ @DeleteMapping("/{id}") - public R delete(@PathVariable String id) { + public R removeById(@PathVariable String id) { return new R<>(executionLogService.removeById(id)); } diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java index 24286da10..eeb3467c0 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java @@ -56,7 +56,7 @@ public class StatusTraceLogController { * @return R */ @GetMapping("/{id}") - public R info(@PathVariable("id") String id) { + public R getById(@PathVariable("id") String id) { return new R<>(statusTraceLogService.getById(id)); } @@ -89,7 +89,7 @@ public class StatusTraceLogController { * @return R */ @DeleteMapping("/{id}") - public R delete(@PathVariable("id") String id) { + public R removeById(@PathVariable("id") String id) { return new R<>(statusTraceLogService.removeById(id)); } From 7d7d686775c5f7bde8d9c02ab5f0b5e309007b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 15:14:33 +0800 Subject: [PATCH 3/5] :bug: Fixing a bug.fixed fail to update role permission --- .../com/pig4cloud/pigx/admin/controller/RoleController.java | 2 +- .../pigx/admin/service/impl/SysRoleMenuServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index eacdadc37..cf42d5438 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -122,7 +122,7 @@ public class RoleController { * @return success、false */ @SysLog("更新角色菜单") - @PutMapping("/upd-menu") + @PutMapping("/menu") @PreAuthorize("@pms.hasPermission('sys_role_perm')") public R saveRoleMenus(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { SysRole sysRole = sysRoleService.getById(roleId); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index 7bcc44208..ce99b1843 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -22,6 +22,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; @@ -59,7 +60,7 @@ public class SysRoleMenuServiceImpl extends ServiceImplquery().lambda() - .eq(SysRoleMenu::getRoleId, role)); + .eq(SysRoleMenu::getRoleId, roleId)); if (StrUtil.isBlank(menuIds)) { return Boolean.TRUE; From 7fb3ad0de6a56528a36a4c256c175c1b13ae9ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 16:44:15 +0800 Subject: [PATCH 4/5] :sparkles: Introducing new features.Make swagger provider ignorance configurable --- doc/db/pigxx.sql | 587 +++++++++++------- .../resources/config/pigx-gateway-dev.yml | 3 + .../config/FilterIgnorePropertiesConfig.java | 1 + .../pigx/gateway/config/SwaggerProvider.java | 3 +- 4 files changed, 356 insertions(+), 238 deletions(-) diff --git a/doc/db/pigxx.sql b/doc/db/pigxx.sql index 3ff182670..f4bb73422 100644 --- a/doc/db/pigxx.sql +++ b/doc/db/pigxx.sql @@ -1,193 +1,212 @@ /* Navicat Premium Data Transfer - Source Server : localhost + Source Server : docker-mysql Source Server Type : MySQL Source Server Version : 50723 - Source Host : localhost - Source Database : pigxx + Source Host : localhost:3306 + Source Schema : pigxx Target Server Type : MySQL Target Server Version : 50723 - File Encoding : utf-8 + File Encoding : 65001 - Date: 11/19/2018 00:57:56 AM + Date: 24/11/2018 15:26:16 */ -SET NAMES utf8; +SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- --- Table structure for `JOB_EXECUTION_LOG` +-- Table structure for job_execution_log -- ---------------------------- -DROP TABLE IF EXISTS `JOB_EXECUTION_LOG`; -CREATE TABLE `JOB_EXECUTION_LOG` ( - `id` varchar(40) NOT NULL, - `job_name` varchar(100) NOT NULL, - `task_id` varchar(255) NOT NULL, - `hostname` varchar(255) NOT NULL, - `ip` varchar(50) NOT NULL, +DROP TABLE IF EXISTS `job_execution_log`; +CREATE TABLE `job_execution_log` ( + `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `job_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `task_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `hostname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `sharding_item` int(11) NOT NULL, - `execution_source` varchar(20) NOT NULL, - `failure_cause` varchar(4000) DEFAULT NULL, + `execution_source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `failure_cause` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `is_success` int(11) NOT NULL, - `start_time` timestamp NULL DEFAULT NULL, - `complete_time` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; + `start_time` timestamp(0) NULL DEFAULT NULL, + `complete_time` timestamp(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- --- Table structure for `JOB_STATUS_TRACE_LOG` +-- Table structure for job_status_trace_log -- ---------------------------- -DROP TABLE IF EXISTS `JOB_STATUS_TRACE_LOG`; -CREATE TABLE `JOB_STATUS_TRACE_LOG` ( - `id` varchar(40) NOT NULL, - `job_name` varchar(100) NOT NULL, - `original_task_id` varchar(255) NOT NULL, - `task_id` varchar(255) NOT NULL, - `slave_id` varchar(50) NOT NULL, - `source` varchar(50) NOT NULL, - `execution_type` varchar(20) NOT NULL, - `sharding_item` varchar(100) NOT NULL, - `state` varchar(20) NOT NULL, - `message` varchar(4000) DEFAULT NULL, - `creation_time` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `TASK_ID_STATE_INDEX` (`task_id`,`state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; +DROP TABLE IF EXISTS `job_status_trace_log`; +CREATE TABLE `job_status_trace_log` ( + `id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `job_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `original_task_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `task_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `slave_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `source` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `execution_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `sharding_item` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `message` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `creation_time` timestamp(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `TASK_ID_STATE_INDEX`(`task_id`, `state`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- --- Table structure for `sys_dept` +-- Table structure for sys_dept -- ---------------------------- DROP TABLE IF EXISTS `sys_dept`; -CREATE TABLE `sys_dept` ( +CREATE TABLE `sys_dept` ( `dept_id` int(20) NOT NULL AUTO_INCREMENT, - `name` varchar(50) DEFAULT NULL COMMENT '部门名称', - `sort` int(11) DEFAULT NULL COMMENT '排序', - `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 '是否删除 -1：已删除 0：正常', - `parent_id` int(11) DEFAULT NULL, - `tenant_id` int(11) DEFAULT NULL, - PRIMARY KEY (`dept_id`) -) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门管理'; + `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门名称', + `sort` int(11) NULL DEFAULT NULL COMMENT '排序', + `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否删除 -1：已删除 0：正常', + `parent_id` int(11) NULL DEFAULT NULL, + `tenant_id` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`dept_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门管理' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_dept` +-- Records of sys_dept -- ---------------------------- -BEGIN; -INSERT INTO `sys_dept` VALUES ('1', '山东农信', null, '2018-01-22 19:00:23', '2018-09-13 01:46:29', '0', '0', '1'), ('2', '沙县国际', null, '2018-01-22 19:00:38', '2018-09-13 01:46:30', '0', '0', '1'), ('3', '潍坊农信', null, '2018-01-22 19:00:44', '2018-09-13 01:46:31', '0', '1', '1'), ('4', '高新农信', null, '2018-01-22 19:00:52', '2018-10-06 10:41:52', '0', '3', '1'), ('5', '院校农信', null, '2018-01-22 19:00:57', '2018-10-06 10:42:51', '0', '4', '1'), ('6', '潍坊学院农信', null, '2018-01-22 19:01:06', '2018-09-13 03:29:10', '1', '5', '1'), ('7', '山东沙县', null, '2018-01-22 19:01:57', '2018-09-13 01:46:42', '0', '2', '1'), ('8', '潍坊沙县', null, '2018-01-22 19:02:03', '2018-09-13 01:46:43', '0', '7', '1'), ('9', '高新沙县', null, '2018-01-22 19:02:14', '2018-09-13 01:46:44', '1', '8', '1'), ('10', '租户2', null, '2018-11-18 13:27:11', '2018-11-18 13:42:19', '0', '0', '2'); -COMMIT; +INSERT INTO `sys_dept` VALUES (1, '山东农信', NULL, '2018-01-22 19:00:23', '2018-09-13 01:46:29', '0', 0, 1); +INSERT INTO `sys_dept` VALUES (2, '沙县国际', NULL, '2018-01-22 19:00:38', '2018-09-13 01:46:30', '0', 0, 1); +INSERT INTO `sys_dept` VALUES (3, '潍坊农信', NULL, '2018-01-22 19:00:44', '2018-09-13 01:46:31', '0', 1, 1); +INSERT INTO `sys_dept` VALUES (4, '高新农信', NULL, '2018-01-22 19:00:52', '2018-10-06 10:41:52', '0', 3, 1); +INSERT INTO `sys_dept` VALUES (5, '院校农信', NULL, '2018-01-22 19:00:57', '2018-10-06 10:42:51', '0', 4, 1); +INSERT INTO `sys_dept` VALUES (6, '潍坊学院农信', NULL, '2018-01-22 19:01:06', '2018-09-13 03:29:10', '1', 5, 1); +INSERT INTO `sys_dept` VALUES (7, '山东沙县', NULL, '2018-01-22 19:01:57', '2018-09-13 01:46:42', '0', 2, 1); +INSERT INTO `sys_dept` VALUES (8, '潍坊沙县', NULL, '2018-01-22 19:02:03', '2018-09-13 01:46:43', '0', 7, 1); +INSERT INTO `sys_dept` VALUES (9, '高新沙县', NULL, '2018-01-22 19:02:14', '2018-09-13 01:46:44', '1', 8, 1); +INSERT INTO `sys_dept` VALUES (10, '租户2', NULL, '2018-11-18 13:27:11', '2018-11-18 13:42:19', '0', 0, 2); -- ---------------------------- --- Table structure for `sys_dept_relation` +-- Table structure for sys_dept_relation -- ---------------------------- DROP TABLE IF EXISTS `sys_dept_relation`; -CREATE TABLE `sys_dept_relation` ( +CREATE TABLE `sys_dept_relation` ( `ancestor` int(11) NOT NULL COMMENT '祖先节点', `descendant` int(11) NOT NULL COMMENT '后代节点', - PRIMARY KEY (`ancestor`,`descendant`), - KEY `idx1` (`ancestor`), - KEY `idx2` (`descendant`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; + PRIMARY KEY (`ancestor`, `descendant`) USING BTREE, + INDEX `idx1`(`ancestor`) USING BTREE, + INDEX `idx2`(`descendant`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_dept_relation` +-- Records of sys_dept_relation -- ---------------------------- -BEGIN; -INSERT INTO `sys_dept_relation` VALUES ('1', '1'), ('1', '3'), ('1', '4'), ('1', '5'), ('2', '2'), ('2', '7'), ('2', '8'), ('3', '3'), ('3', '4'), ('3', '5'), ('4', '4'), ('4', '5'), ('5', '5'), ('7', '7'), ('7', '8'), ('8', '8'), ('10', '10'); -COMMIT; +INSERT INTO `sys_dept_relation` VALUES (1, 1); +INSERT INTO `sys_dept_relation` VALUES (1, 3); +INSERT INTO `sys_dept_relation` VALUES (1, 4); +INSERT INTO `sys_dept_relation` VALUES (1, 5); +INSERT INTO `sys_dept_relation` VALUES (2, 2); +INSERT INTO `sys_dept_relation` VALUES (2, 7); +INSERT INTO `sys_dept_relation` VALUES (2, 8); +INSERT INTO `sys_dept_relation` VALUES (3, 3); +INSERT INTO `sys_dept_relation` VALUES (3, 4); +INSERT INTO `sys_dept_relation` VALUES (3, 5); +INSERT INTO `sys_dept_relation` VALUES (4, 4); +INSERT INTO `sys_dept_relation` VALUES (4, 5); +INSERT INTO `sys_dept_relation` VALUES (5, 5); +INSERT INTO `sys_dept_relation` VALUES (7, 7); +INSERT INTO `sys_dept_relation` VALUES (7, 8); +INSERT INTO `sys_dept_relation` VALUES (8, 8); +INSERT INTO `sys_dept_relation` VALUES (10, 10); -- ---------------------------- --- Table structure for `sys_dict` +-- Table structure for sys_dict -- ---------------------------- DROP TABLE IF EXISTS `sys_dict`; -CREATE TABLE `sys_dict` ( +CREATE TABLE `sys_dict` ( `id` int(64) NOT NULL AUTO_INCREMENT COMMENT '编号', - `value` varchar(100) NOT NULL COMMENT '数据值', - `label` varchar(100) NOT NULL COMMENT '标签名', - `type` varchar(100) NOT NULL COMMENT '类型', - `description` varchar(100) NOT NULL COMMENT '描述', + `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据值', + `label` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签名', + `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型', + `description` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '描述', `sort` int(10) NOT NULL COMMENT '排序（升序）', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', - `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`), - KEY `sys_dict_value` (`value`), - KEY `sys_dict_label` (`label`), - KEY `sys_dict_del_flag` (`del_flag`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='字典表'; + `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', + `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) NOT NULL DEFAULT 0 COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + INDEX `sys_dict_value`(`value`) USING BTREE, + INDEX `sys_dict_label`(`label`) USING BTREE, + INDEX `sys_dict_del_flag`(`del_flag`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_dict` +-- Records of sys_dict -- ---------------------------- -BEGIN; -INSERT INTO `sys_dict` VALUES ('2', '9', '异常', 'log_type', '日志异常', '1', '2018-07-09 06:16:14', '2018-09-13 08:10:58', '日志异常', '0', '1'), ('3', '0', '正常', 'log_type', '正常', '0', '2018-07-09 06:15:40', '2018-07-09 06:15:40', '正常', '0', '0'), ('4', '123', '123', '1234', '123', '123', '2018-08-09 07:16:47', '2018-08-16 14:01:03', '123', '1', '0'), ('5', 'WX', '微信', 'social_type', '微信登录', '0', '2018-08-16 14:01:45', '2018-08-16 14:01:45', '微信登录', '0', '0'), ('6', 'QQ', 'QQ', 'social_type', 'QQ登录', '1', '2018-07-09 06:15:40', '2018-07-09 06:15:40', 'QQ登录', '0', '0'), ('7', '0', '正常', 'log_type', '日志类型', '0', '2018-09-30 02:33:53', '2018-09-30 02:33:53', '日志正常', '0', '1'), ('8', '0', '未提交', 'leave_status', '请假状态', '0', '2018-09-30 02:34:45', '2018-09-30 02:34:45', '请假状态', '0', '1'), ('9', '1', '审批中', 'leave_status', '请假状态', '1', '2018-09-30 02:35:16', '2018-09-30 02:35:16', '请假状态', '0', '1'), ('10', '2', '完成', 'leave_status', '请假状态', '2', '2018-09-30 02:35:58', '2018-09-30 02:35:58', '请假状态', '0', '1'), ('11', '9', '驳回', 'leave_status', '请假状态', '9', '2018-09-30 02:36:31', '2018-09-30 02:36:31', '请假状态', '0', '1'); -COMMIT; +INSERT INTO `sys_dict` VALUES (1, '9', '异常', 'log_type', '日志异常', 1, '2018-07-09 06:16:14', '2018-11-24 07:25:11', '日志异常', '0', 1); +INSERT INTO `sys_dict` VALUES (2, '0', '正常', 'log_type', '正常', 0, '2018-07-09 06:15:40', '2018-11-24 07:25:14', '正常', '0', 0); +INSERT INTO `sys_dict` VALUES (3, 'WX', '微信', 'social_type', '微信登录', 0, '2018-08-16 14:01:45', '2018-11-24 07:25:16', '微信登录', '0', 0); +INSERT INTO `sys_dict` VALUES (4, 'QQ', 'QQ', 'social_type', 'QQ登录', 1, '2018-07-09 06:15:40', '2018-11-24 07:25:18', 'QQ登录', '0', 0); +INSERT INTO `sys_dict` VALUES (5, '0', '正常', 'log_type', '日志类型', 0, '2018-09-30 02:33:53', '2018-11-24 07:25:20', '日志正常', '0', 1); +INSERT INTO `sys_dict` VALUES (6, '0', '未提交', 'leave_status', '请假状态', 0, '2018-09-30 02:34:45', '2018-11-24 07:25:23', '请假状态', '0', 1); +INSERT INTO `sys_dict` VALUES (7, '1', '审批中', 'leave_status', '请假状态', 1, '2018-09-30 02:35:16', '2018-11-24 07:25:25', '请假状态', '0', 1); +INSERT INTO `sys_dict` VALUES (8, '2', '完成', 'leave_status', '请假状态', 2, '2018-09-30 02:35:58', '2018-11-24 07:25:28', '请假状态', '0', 1); +INSERT INTO `sys_dict` VALUES (9, '9', '驳回', 'leave_status', '请假状态', 9, '2018-09-30 02:36:31', '2018-11-24 07:25:31', '请假状态', '0', 1); -- ---------------------------- --- Table structure for `sys_log` +-- Table structure for sys_log -- ---------------------------- DROP TABLE IF EXISTS `sys_log`; -CREATE TABLE `sys_log` ( +CREATE TABLE `sys_log` ( `id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '编号', - `type` char(1) DEFAULT '1' COMMENT '日志类型', - `title` varchar(255) DEFAULT '' COMMENT '日志标题', - `service_id` varchar(32) DEFAULT NULL COMMENT '服务ID', - `create_by` varchar(64) DEFAULT NULL COMMENT '创建者', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remote_addr` varchar(255) DEFAULT NULL COMMENT '操作IP地址', - `user_agent` varchar(1000) DEFAULT NULL COMMENT '用户代理', - `request_uri` varchar(255) DEFAULT NULL COMMENT '请求URI', - `method` varchar(10) DEFAULT NULL COMMENT '操作方式', - `params` text COMMENT '操作提交的数据', - `time` mediumtext COMMENT '执行时间', - `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', - `exception` text COMMENT '异常信息', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`), - KEY `sys_log_create_by` (`create_by`), - KEY `sys_log_request_uri` (`request_uri`), - KEY `sys_log_type` (`type`), - KEY `sys_log_create_date` (`create_time`) -) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='日志表'; - --- ---------------------------- --- Records of `sys_log` --- ---------------------------- -BEGIN; -INSERT INTO `sys_log` VALUES ('1', '0', '添加用户', 'pig', 'admin', '2018-11-14 12:43:47', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36', '/user', 'POST', '', '122', '0', null, '1'), ('2', '0', '添加角色', 'pig', 'admin', '2018-11-17 23:58:45', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/role', 'POST', '', '98', '0', null, '1'), ('3', '0', '删除角色', 'pig', 'admin', '2018-11-17 23:58:48', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/role/5', 'DELETE', '', '46', '0', null, '1'), ('4', '0', '更新角色菜单', 'pig', 'admin', '2018-11-18 00:29:51', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/role/upd-menu', 'PUT', 'roleId=%5B1%5D&menuIds=%5B1000%2C1100%2C1101%2C1102%2C1103%2C1200%2C1201%2C1202%2C1203%2C1300%2C1301%2C1302%2C1303%2C1304%2C1400%2C1401%2C1402%2C1403%2C2000%2C2100%2C2101%2C2200%2C2201%2C2202%2C2203%2C2300%2C2400%2C2401%2C2402%2C2403%2C2500%2C2501%2C2502%2C2503%2C2600%2C2601%2C2700%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C5000%2C5001%2C5002%2C%5D', '226', '0', null, '1'), ('5', '0', '修改字典', 'pig', 'admin', '2018-11-18 01:06:22', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dict', 'PUT', '', '42', '0', null, '1'), ('6', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:27:16', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '4455', '0', null, '2'), ('7', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:28:12', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '13124', '0', null, '2'), ('8', '0', '删除部门', 'pig', 'admin', '2018-11-18 13:28:44', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept/14', 'DELETE', '', '20', '0', null, '2'), ('9', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:32:18', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '17', '0', null, '2'), ('10', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:32:31', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '13', '0', null, '2'), ('11', '0', '删除部门', 'pig', 'admin', '2018-11-18 13:33:25', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept/15', 'DELETE', '', '10', '0', null, '2'), ('12', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:43:46', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '58', '0', null, '2'), ('13', '0', '添加部门', 'pig', 'admin', '2018-11-18 13:43:55', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept', 'POST', '', '12', '0', null, '2'), ('14', '0', '删除部门', 'pig', 'admin', '2018-11-18 13:44:32', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/dept/11', 'DELETE', '', '20', '0', null, '2'), ('15', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:05:14', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642119', 'GET', '', '23', '0', null, '2'), ('16', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:05:39', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '19', '0', null, '2'), ('17', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:06:55', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '21', '0', null, '2'), ('18', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:09:03', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '14', '0', null, '2'), ('19', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:11:52', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '23', '0', null, '2'), ('20', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:14:08', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034242888', 'GET', '', '11', '0', null, '2'), ('21', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:14:39', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '8', '0', null, '2'), ('22', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:15:08', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '19', '0', null, '2'), ('23', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:15:40', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '14', '0', null, '2'), ('24', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:16:09', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '8', '0', null, '1'), ('25', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:18:11', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '8', '0', null, '1'), ('26', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:24:32', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642119', 'GET', '', '43', '0', null, '1'), ('27', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 15:41:39', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642119', 'GET', '', '11', '0', null, '1'), ('28', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:19:53', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '108', '0', null, '1'), ('29', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:22:12', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '44', '0', null, '1'), ('30', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:25:58', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '29', '0', null, '1'), ('31', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:28:28', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '18', '0', null, '1'), ('32', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:29:29', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '14', '0', null, '1'), ('33', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:30:47', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '32', '0', null, '1'), ('34', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:33:05', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '10', '0', null, '1'), ('35', '0', '发送验证码', null, 'anonymousUser', '2018-11-18 16:37:11', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/mobile/17034642888', 'GET', '', '60', '0', null, '1'), ('36', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:36:48', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '24', '0', null, '1'), ('37', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:36:56', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '5', '0', null, '1'), ('38', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:38:39', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '7', '0', null, '1'), ('39', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:38:43', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '4', '0', null, '1'), ('40', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:39:28', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '5', '0', null, '1'), ('41', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:40:25', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '5', '0', null, '1'), ('42', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:45:58', null, '192.168.2.214', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '21', '0', null, '1'), ('43', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:53:57', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '23', '0', null, '1'), ('44', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:55:35', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '4', '0', null, '1'), ('45', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:56:48', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '9', '0', null, '1'), ('46', '0', '更新菜单', 'pig', 'admin', '2018-11-18 20:57:33', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '7', '0', null, '1'), ('47', '0', '更新菜单', 'pig', 'admin', '2018-11-18 22:02:31', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '21', '0', null, '1'), ('48', '0', '更新菜单', 'pig', 'admin', '2018-11-18 22:05:52', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '8', '0', null, '1'), ('49', '0', '更新菜单', 'pig', 'admin', '2018-11-18 22:06:43', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '9', '0', null, '1'), ('50', '0', '更新菜单', 'pig', 'admin', '2018-11-18 22:07:05', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '5', '0', null, '1'), ('51', '0', '更新菜单', 'pig', 'admin', '2018-11-18 22:10:55', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36', '/menu', 'PUT', '', '10', '0', null, '1'); -COMMIT; + `type` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '1' COMMENT '日志类型', + `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '日志标题', + `service_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务ID', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', + `remote_addr` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作IP地址', + `user_agent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户代理', + `request_uri` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '请求URI', + `method` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作方式', + `params` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '操作提交的数据', + `time` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '执行时间', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标记', + `exception` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常信息', + `tenant_id` int(11) NOT NULL DEFAULT 0 COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + INDEX `sys_log_create_by`(`create_by`) USING BTREE, + INDEX `sys_log_request_uri`(`request_uri`) USING BTREE, + INDEX `sys_log_type`(`type`) USING BTREE, + INDEX `sys_log_create_date`(`create_time`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日志表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for sys_menu -- ---------------------------- DROP TABLE IF EXISTS `sys_menu`; CREATE TABLE `sys_menu` ( - `menu_id` int(11) NOT NULL COMMENT '菜单ID', - `name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单名称', - `permission` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单权限标识', - `path` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端URL', - `parent_id` int(11) NULL DEFAULT NULL COMMENT '父菜单ID', - `icon` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标', - `component` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'VUE页面', - `sort` int(11) NULL DEFAULT 1 COMMENT '排序值', - `keepalive` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0-开启，1- 关闭', - `type` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', - `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0--正常 1--删除', - `tenant_id` int(11) NULL DEFAULT NULL, - PRIMARY KEY (`menu_id`) USING BTREE + `menu_id` int(11) NOT NULL COMMENT '菜单ID', + `name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单名称', + `permission` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单权限标识', + `path` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端URL', + `parent_id` int(11) NULL DEFAULT NULL COMMENT '父菜单ID', + `icon` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标', + `component` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'VUE页面', + `sort` int(11) NULL DEFAULT 1 COMMENT '排序值', + `keepalive` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0-开启，1- 关闭', + `type` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', + `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0--正常 1--删除', + `tenant_id` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`menu_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic; -- ---------------------------- -- 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', 1); INSERT INTO `sys_menu` VALUES (1100, '用户管理', NULL, 'user', 1000, 'icon-yonghuguanli', 'views/admin/user/index', 1, '0', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0', 1); INSERT INTO `sys_menu` VALUES (1101, '用户新增', 'sys_user_add', NULL, 1100, NULL, NULL, NULL, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0', 1); @@ -213,7 +232,7 @@ INSERT INTO `sys_menu` VALUES (2200, '字典管理', NULL, 'dict', 2000, 'icon-n INSERT INTO `sys_menu` VALUES (2201, '字典删除', 'sys_dict_del', NULL, 2200, NULL, NULL, NULL, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0', 1); INSERT INTO `sys_menu` VALUES (2202, '字典新增', 'sys_dict_add', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0', 1); INSERT INTO `sys_menu` VALUES (2203, '字典修改', 'sys_dict_edit', NULL, 2200, NULL, NULL, NULL, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0', 1); -INSERT INTO `sys_menu` VALUES (2300, '代码生成', '', 'gen', 2000, 'icon-weibiaoti46', 'views/gen/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:02:54', '0', 1); +INSERT INTO `sys_menu` VALUES (2300, '代码生成', '', 'gen', 2000, 'icon-weibiaoti46', 'views/gen/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-11-24 05:21:01', '0', 1); INSERT INTO `sys_menu` VALUES (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', 1); INSERT INTO `sys_menu` VALUES (2401, '客户端新增', 'sys_client_add', NULL, 2400, '1', NULL, NULL, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0', 1); INSERT INTO `sys_menu` VALUES (2402, '客户端修改', 'sys_client_edit', NULL, 2400, NULL, NULL, NULL, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0', 1); @@ -231,10 +250,12 @@ INSERT INTO `sys_menu` VALUES (3200, '接口文档', NULL, 'http://139.224.200.2 INSERT INTO `sys_menu` VALUES (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', 1); INSERT INTO `sys_menu` VALUES (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', 1); INSERT INTO `sys_menu` VALUES (3500, '任务监控', NULL, 'http://139.224.200.249:8899', 3000, 'icon-msnui-supervise', NULL, 7, '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:33', '0', 1); -INSERT INTO `sys_menu` VALUES (3600, '任务轨迹', '', 'statustracelog', 3000, 'icon-guiji', 'views/daemon/status-trace-log/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-11-23 14:28:27', '0', 1); -INSERT INTO `sys_menu` VALUES (3601, '删除', 'daemon_statustracelog_del', NULL, 3600, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:13:45', '0', 1); +INSERT INTO `sys_menu` VALUES (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', 1); +INSERT INTO `sys_menu` VALUES (3601, '删除任务轨迹', 'daemon_status_trace_log_del', NULL, 3600, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-11-24 06:37:31', '0', 1); INSERT INTO `sys_menu` VALUES (3700, '调用拓扑', NULL, 'http://139.224.200.249:8081', 3000, 'icon-line', NULL, 10, '0', '0', '2018-01-25 11:08:52', '2018-09-28 09:04:29', '0', 1); INSERT INTO `sys_menu` VALUES (3800, '缓存状态', NULL, 'http://139.224.200.249:8585', 3000, 'icon-qingchuhuancun', NULL, 12, '0', '0', '2018-01-23 10:56:11', '2018-09-28 09:13:56', '0', 1); +INSERT INTO `sys_menu` VALUES (3900, '任务执行日志', '', 'execution-log', 3000, 'icon-guiji', 'views/daemon/execution-log/index', 8, '0', '0', '2018-01-20 13:17:19', '2018-11-24 06:34:52', '0', 1); +INSERT INTO `sys_menu` VALUES (3901, '删除任务执行日志', 'daemon_execution_log_del', NULL, 3900, '1', NULL, 2, '0', '1', '2018-05-15 21:35:18', '2018-11-24 06:39:03', '0', 1); INSERT INTO `sys_menu` VALUES (4000, '协同管理', NULL, '/activti', -1, 'icon-kuaisugongzuoliu_o', 'Layout', 3, '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0', 1); INSERT INTO `sys_menu` VALUES (4100, '模型管理', NULL, 'activiti', 4000, 'icon-weibiaoti13', 'views/activiti/index', 1, '0', '0', '2018-09-26 01:39:07', '2018-11-23 14:25:25', '0', 1); INSERT INTO `sys_menu` VALUES (4101, '模型管理', 'act_model_manage', NULL, 4100, '1', NULL, 0, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0', 1); @@ -252,177 +273,269 @@ INSERT INTO `sys_menu` VALUES (5002, '二级菜单', NULL, 'crud', 5001, 'icon-c INSERT INTO `sys_menu` VALUES (5003, '一级菜单', NULL, '', 5000, 'icon-caidanguanli', '', 1, '0', '0', '2018-11-21 17:49:18', '2018-11-21 17:53:25', '0', NULL); INSERT INTO `sys_menu` VALUES (5004, '二级菜单', NULL, 'index', 5003, 'icon-caidanguanli', 'views/crud/index', 1, '0', '0', '2018-11-21 17:53:51', '2018-11-21 17:54:04', '0', NULL); INSERT INTO `sys_menu` VALUES (6000, '系统官网', NULL, 'https://pig4cloud.com#', -1, 'icon-guanwang', '', 5, '0', '0', '2018-09-27 02:26:36', '2018-11-17 16:18:50', '1', 1); -COMMIT; -- ---------------------------- --- Table structure for `sys_oauth_client_details` +-- Table structure for sys_oauth_client_details -- ---------------------------- DROP TABLE IF EXISTS `sys_oauth_client_details`; -CREATE TABLE `sys_oauth_client_details` ( - `client_id` varchar(32) NOT NULL, - `resource_ids` varchar(256) DEFAULT NULL, - `client_secret` varchar(256) DEFAULT NULL, - `scope` varchar(256) DEFAULT NULL, - `authorized_grant_types` varchar(256) DEFAULT NULL, - `web_server_redirect_uri` varchar(256) DEFAULT NULL, - `authorities` varchar(256) DEFAULT NULL, - `access_token_validity` int(11) DEFAULT NULL, - `refresh_token_validity` int(11) DEFAULT NULL, - `additional_information` varchar(4096) DEFAULT NULL, - `autoapprove` varchar(256) DEFAULT NULL, - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`client_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; +CREATE TABLE `sys_oauth_client_details` ( + `client_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `resource_ids` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `client_secret` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `scope` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `authorized_grant_types` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `web_server_redirect_uri` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `authorities` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `access_token_validity` int(11) NULL DEFAULT NULL, + `refresh_token_validity` int(11) NULL DEFAULT NULL, + `additional_information` varchar(4096) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `autoapprove` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `tenant_id` int(11) NOT NULL DEFAULT 0 COMMENT '所属租户', + PRIMARY KEY (`client_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_oauth_client_details` +-- Records of sys_oauth_client_details -- ---------------------------- -BEGIN; -INSERT INTO `sys_oauth_client_details` VALUES ('app', null, 'app', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1'), ('daemon', null, 'daemon', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1'), ('gen', null, 'gen', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1'), ('pig', null, 'pig', 'server', 'password,refresh_token,authorization_code', 'http://127.0.0.1:4040/sso1/login', null, null, null, null, 'true', '1'), ('test', null, 'test', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1'); -COMMIT; +INSERT INTO `sys_oauth_client_details` VALUES ('app', NULL, 'app', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', 1); +INSERT INTO `sys_oauth_client_details` VALUES ('daemon', NULL, 'daemon', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', 1); +INSERT INTO `sys_oauth_client_details` VALUES ('gen', NULL, 'gen', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', 1); +INSERT INTO `sys_oauth_client_details` VALUES ('pig', NULL, 'pig', 'server', 'password,refresh_token,authorization_code', 'http://127.0.0.1:4040/sso1/login', NULL, NULL, NULL, NULL, 'true', 1); +INSERT INTO `sys_oauth_client_details` VALUES ('test', NULL, 'test', 'server', 'password,refresh_token', NULL, NULL, NULL, NULL, NULL, 'true', 1); -- ---------------------------- --- Table structure for `sys_role` +-- Table structure for sys_role -- ---------------------------- DROP TABLE IF EXISTS `sys_role`; -CREATE TABLE `sys_role` ( +CREATE TABLE `sys_role` ( `role_id` int(11) NOT NULL AUTO_INCREMENT, - `role_name` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `role_code` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `role_desc` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '删除标识（0-正常,1-删除）', - `tenant_id` int(11) DEFAULT NULL, - PRIMARY KEY (`role_id`), - UNIQUE KEY `role_idx1_role_code` (`role_code`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC; + `role_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `role_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `role_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, + `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0), + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '0' COMMENT '删除标识（0-正常,1-删除）', + `tenant_id` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`role_id`) USING BTREE, + UNIQUE INDEX `role_idx1_role_code`(`role_code`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统角色表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_role` +-- Records of sys_role -- ---------------------------- -BEGIN; -INSERT INTO `sys_role` VALUES ('1', 'admin', 'ROLE_ADMIN', '超级管理员', '2017-10-29 15:45:51', '2018-09-13 01:46:01', '0', '1'), ('2', 'ROLE_CQQ', 'ROLE_CQQ', 'ROLE_CQQ', '2018-11-11 19:42:26', '2018-11-11 20:26:01', '0', '2'), ('3', '测试角色', 'ROLE_TEST', '测试专用角色', '2018-11-14 12:43:18', null, '0', '1'), ('4', 'TOLE_TEST1', 'ROLE_TEST1', 'ROLE_TEST1', '2018-11-17 15:49:13', '2018-11-17 16:06:08', '1', '1'); -COMMIT; +INSERT INTO `sys_role` VALUES (1, 'admin', 'ROLE_ADMIN', '超级管理员', '2017-10-29 15:45:51', '2018-09-13 01:46:01', '0', 1); +INSERT INTO `sys_role` VALUES (2, 'ROLE_CQQ', 'ROLE_CQQ', 'ROLE_CQQ', '2018-11-11 19:42:26', '2018-11-11 20:26:01', '0', 2); +INSERT INTO `sys_role` VALUES (3, '测试角色', 'ROLE_TEST', '测试专用角色', '2018-11-14 12:43:18', NULL, '0', 1); +INSERT INTO `sys_role` VALUES (4, 'TOLE_TEST1', 'ROLE_TEST1', 'ROLE_TEST1', '2018-11-17 15:49:13', '2018-11-17 16:06:08', '1', 1); -- ---------------------------- --- Table structure for `sys_role_menu` +-- Table structure for sys_role_menu -- ---------------------------- DROP TABLE IF EXISTS `sys_role_menu`; -CREATE TABLE `sys_role_menu` ( +CREATE TABLE `sys_role_menu` ( `role_id` int(11) NOT NULL COMMENT '角色ID', `menu_id` int(11) NOT NULL COMMENT '菜单ID', - PRIMARY KEY (`role_id`,`menu_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色菜单表'; + PRIMARY KEY (`role_id`, `menu_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色菜单表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_role_menu` +-- Records of sys_role_menu -- ---------------------------- -BEGIN; -INSERT INTO `sys_role_menu` VALUES ('1', '1000'), ('1', '1100'), ('1', '1101'), ('1', '1102'), ('1', '1103'), ('1', '1200'), ('1', '1201'), ('1', '1202'), ('1', '1203'), ('1', '1300'), ('1', '1301'), ('1', '1302'), ('1', '1303'), ('1', '1304'), ('1', '1400'), ('1', '1401'), ('1', '1402'), ('1', '1403'), ('1', '2000'), ('1', '2100'), ('1', '2101'), ('1', '2200'), ('1', '2201'), ('1', '2202'), ('1', '2203'), ('1', '2300'), ('1', '2400'), ('1', '2401'), ('1', '2402'), ('1', '2403'), ('1', '2500'), ('1', '2501'), ('1', '2502'), ('1', '2503'), ('1', '2600'), ('1', '2601'), ('1', '2700'), ('1', '3000'), ('1', '3100'), ('1', '3200'), ('1', '3300'), ('1', '3400'), ('1', '3500'), ('1', '3600'), ('1', '3601'), ('1', '3700'), ('1', '3800'), ('1', '4000'), ('1', '4100'), ('1', '4101'), ('1', '4200'), ('1', '4201'), ('1', '4300'), ('1', '4301'), ('1', '4302'), ('1', '4303'), ('1', '4400'), ('1', '4401'), ('1', '5000'), ('1', '5001'), ('1', '5002'), ('2', '1000'), ('2', '1100'), ('2', '1101'), ('2', '1102'), ('2', '1103'), ('2', '1200'), ('2', '1201'), ('2', '1202'), ('2', '1203'), ('2', '1300'), ('2', '1301'), ('2', '1302'), ('2', '1303'), ('2', '1304'), ('2', '1400'), ('2', '1401'), ('2', '1402'), ('2', '1403'), ('3', '2000'), ('3', '2100'), ('3', '2101'), ('3', '2200'), ('3', '2201'), ('3', '2202'), ('3', '2203'), ('3', '2300'), ('3', '2400'), ('3', '2401'), ('3', '2402'), ('3', '2403'), ('3', '2500'), ('3', '2501'), ('3', '2502'), ('3', '2503'), ('3', '2600'), ('3', '2601'), ('3', '2700'); -COMMIT; +INSERT INTO `sys_role_menu` VALUES (1, 1000); +INSERT INTO `sys_role_menu` VALUES (1, 1100); +INSERT INTO `sys_role_menu` VALUES (1, 1101); +INSERT INTO `sys_role_menu` VALUES (1, 1102); +INSERT INTO `sys_role_menu` VALUES (1, 1103); +INSERT INTO `sys_role_menu` VALUES (1, 1200); +INSERT INTO `sys_role_menu` VALUES (1, 1201); +INSERT INTO `sys_role_menu` VALUES (1, 1202); +INSERT INTO `sys_role_menu` VALUES (1, 1203); +INSERT INTO `sys_role_menu` VALUES (1, 1300); +INSERT INTO `sys_role_menu` VALUES (1, 1301); +INSERT INTO `sys_role_menu` VALUES (1, 1302); +INSERT INTO `sys_role_menu` VALUES (1, 1303); +INSERT INTO `sys_role_menu` VALUES (1, 1304); +INSERT INTO `sys_role_menu` VALUES (1, 1400); +INSERT INTO `sys_role_menu` VALUES (1, 1401); +INSERT INTO `sys_role_menu` VALUES (1, 1402); +INSERT INTO `sys_role_menu` VALUES (1, 1403); +INSERT INTO `sys_role_menu` VALUES (1, 2000); +INSERT INTO `sys_role_menu` VALUES (1, 2100); +INSERT INTO `sys_role_menu` VALUES (1, 2101); +INSERT INTO `sys_role_menu` VALUES (1, 2200); +INSERT INTO `sys_role_menu` VALUES (1, 2201); +INSERT INTO `sys_role_menu` VALUES (1, 2202); +INSERT INTO `sys_role_menu` VALUES (1, 2203); +INSERT INTO `sys_role_menu` VALUES (1, 2300); +INSERT INTO `sys_role_menu` VALUES (1, 2400); +INSERT INTO `sys_role_menu` VALUES (1, 2401); +INSERT INTO `sys_role_menu` VALUES (1, 2402); +INSERT INTO `sys_role_menu` VALUES (1, 2403); +INSERT INTO `sys_role_menu` VALUES (1, 2500); +INSERT INTO `sys_role_menu` VALUES (1, 2501); +INSERT INTO `sys_role_menu` VALUES (1, 2502); +INSERT INTO `sys_role_menu` VALUES (1, 2503); +INSERT INTO `sys_role_menu` VALUES (1, 2600); +INSERT INTO `sys_role_menu` VALUES (1, 2601); +INSERT INTO `sys_role_menu` VALUES (1, 2700); +INSERT INTO `sys_role_menu` VALUES (1, 3000); +INSERT INTO `sys_role_menu` VALUES (1, 3100); +INSERT INTO `sys_role_menu` VALUES (1, 3200); +INSERT INTO `sys_role_menu` VALUES (1, 3300); +INSERT INTO `sys_role_menu` VALUES (1, 3400); +INSERT INTO `sys_role_menu` VALUES (1, 3500); +INSERT INTO `sys_role_menu` VALUES (1, 3600); +INSERT INTO `sys_role_menu` VALUES (1, 3601); +INSERT INTO `sys_role_menu` VALUES (1, 3700); +INSERT INTO `sys_role_menu` VALUES (1, 3800); +INSERT INTO `sys_role_menu` VALUES (1, 3900); +INSERT INTO `sys_role_menu` VALUES (1, 3901); +INSERT INTO `sys_role_menu` VALUES (1, 4000); +INSERT INTO `sys_role_menu` VALUES (1, 4100); +INSERT INTO `sys_role_menu` VALUES (1, 4101); +INSERT INTO `sys_role_menu` VALUES (1, 4200); +INSERT INTO `sys_role_menu` VALUES (1, 4201); +INSERT INTO `sys_role_menu` VALUES (1, 4300); +INSERT INTO `sys_role_menu` VALUES (1, 4301); +INSERT INTO `sys_role_menu` VALUES (1, 4302); +INSERT INTO `sys_role_menu` VALUES (1, 4303); +INSERT INTO `sys_role_menu` VALUES (1, 4400); +INSERT INTO `sys_role_menu` VALUES (1, 4401); +INSERT INTO `sys_role_menu` VALUES (2, 1000); +INSERT INTO `sys_role_menu` VALUES (2, 1100); +INSERT INTO `sys_role_menu` VALUES (2, 1101); +INSERT INTO `sys_role_menu` VALUES (2, 1102); +INSERT INTO `sys_role_menu` VALUES (2, 1103); +INSERT INTO `sys_role_menu` VALUES (2, 1200); +INSERT INTO `sys_role_menu` VALUES (2, 1201); +INSERT INTO `sys_role_menu` VALUES (2, 1202); +INSERT INTO `sys_role_menu` VALUES (2, 1203); +INSERT INTO `sys_role_menu` VALUES (2, 1300); +INSERT INTO `sys_role_menu` VALUES (2, 1301); +INSERT INTO `sys_role_menu` VALUES (2, 1302); +INSERT INTO `sys_role_menu` VALUES (2, 1303); +INSERT INTO `sys_role_menu` VALUES (2, 1304); +INSERT INTO `sys_role_menu` VALUES (2, 1400); +INSERT INTO `sys_role_menu` VALUES (2, 1401); +INSERT INTO `sys_role_menu` VALUES (2, 1402); +INSERT INTO `sys_role_menu` VALUES (2, 1403); +INSERT INTO `sys_role_menu` VALUES (3, 2000); +INSERT INTO `sys_role_menu` VALUES (3, 2100); +INSERT INTO `sys_role_menu` VALUES (3, 2101); +INSERT INTO `sys_role_menu` VALUES (3, 2200); +INSERT INTO `sys_role_menu` VALUES (3, 2201); +INSERT INTO `sys_role_menu` VALUES (3, 2202); +INSERT INTO `sys_role_menu` VALUES (3, 2203); +INSERT INTO `sys_role_menu` VALUES (3, 2300); +INSERT INTO `sys_role_menu` VALUES (3, 2400); +INSERT INTO `sys_role_menu` VALUES (3, 2401); +INSERT INTO `sys_role_menu` VALUES (3, 2402); +INSERT INTO `sys_role_menu` VALUES (3, 2403); +INSERT INTO `sys_role_menu` VALUES (3, 2500); +INSERT INTO `sys_role_menu` VALUES (3, 2501); +INSERT INTO `sys_role_menu` VALUES (3, 2502); +INSERT INTO `sys_role_menu` VALUES (3, 2503); +INSERT INTO `sys_role_menu` VALUES (3, 2600); +INSERT INTO `sys_role_menu` VALUES (3, 2601); +INSERT INTO `sys_role_menu` VALUES (3, 2700); -- ---------------------------- -- Table structure for sys_route_conf -- ---------------------------- DROP TABLE IF EXISTS `sys_route_conf`; CREATE TABLE `sys_route_conf` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `route_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '路由ID', - `predicates` json NULL COMMENT '断言', - `filters` json NULL COMMENT '过滤器', - `uri` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `order` int(2) NULL DEFAULT 0 COMMENT '排序', - `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标记', - PRIMARY KEY (`id`) USING BTREE + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `route_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '路由ID', + `predicates` json NULL COMMENT '断言', + `filters` json NULL COMMENT '过滤器', + `uri` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `order` int(2) NULL DEFAULT 0 COMMENT '排序', + `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '路由配置表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_route_conf -- ---------------------------- -BEGIN; INSERT INTO `sys_route_conf` VALUES (1, 'pigx-activiti', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:11', '0'); INSERT INTO `sys_route_conf` VALUES (2, 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:13', '0'); INSERT INTO `sys_route_conf` VALUES (3, 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:14', '0'); INSERT INTO `sys_route_conf` VALUES (4, 'pigx-daemon', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:16', '0'); INSERT INTO `sys_route_conf` VALUES (5, 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:17', '0'); INSERT INTO `sys_route_conf` VALUES (6, 'pigx-upms-biz', '[{\"args\": {\"_genkey_0\": \"/admin/**\"}, \"name\": \"Path\"}]', '[{\"args\": {\"key-resolver\": \"#{@remoteAddrKeyResolver}\", \"redis-rate-limiter.burstCapacity\": \"20\", \"redis-rate-limiter.replenishRate\": \"10\"}, \"name\": \"RequestRateLimiter\"}, {\"args\": {\"name\": \"default\", \"fallbackUri\": \"forward:/fallback\"}, \"name\": \"Hystrix\"}]', 'lb://pigx-upms-biz', 0, '2018-11-07 20:18:16', '2018-11-22 18:39:21', '0'); -COMMIT; -- ---------------------------- --- Table structure for `sys_social_details` +-- Table structure for sys_social_details -- ---------------------------- DROP TABLE IF EXISTS `sys_social_details`; -CREATE TABLE `sys_social_details` ( +CREATE TABLE `sys_social_details` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主鍵', - `type` varchar(16) NOT NULL COMMENT '类型', - `remark` varchar(64) DEFAULT NULL COMMENT '描述', - `app_id` varchar(64) NOT NULL COMMENT 'appid', - `app_secret` varchar(64) NOT NULL COMMENT 'app_secret', - `redirect_url` varchar(128) DEFAULT NULL COMMENT '回调地址', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `del_flag` char(50) NOT NULL DEFAULT '0' COMMENT '删除标记', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统社交登录账号表'; + `type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', + `remark` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + `app_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'appid', + `app_secret` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'app_secret', + `redirect_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', + `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', + `del_flag` char(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) NOT NULL DEFAULT 0 COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统社交登录账号表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_social_details` +-- Records of sys_social_details -- ---------------------------- -BEGIN; -INSERT INTO `sys_social_details` VALUES ('1', 'WX', '微信互联参数', 'wxd1678d3f83b1d83a', '6ddb043f94da5d2172926abe8533504f', 'daoweicloud.com', '2018-08-16 14:24:25', '2018-08-16 14:24:25', '0', '0'); -COMMIT; +INSERT INTO `sys_social_details` VALUES (1, 'WX', '微信互联参数', 'wxd1678d3f83b1d83a', '6ddb043f94da5d2172926abe8533504f', 'daoweicloud.com', '2018-08-16 14:24:25', '2018-08-16 14:24:25', '0', 0); -- ---------------------------- --- Table structure for `sys_user` +-- Table structure for sys_user -- ---------------------------- DROP TABLE IF EXISTS `sys_user`; -CREATE TABLE `sys_user` ( +CREATE TABLE `sys_user` ( `user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `username` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '用户名', - `password` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `salt` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '随机盐', - `phone` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '简介', - `avatar` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '头像', - `dept_id` int(11) DEFAULT NULL COMMENT '部门ID', - `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `lock_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，9-锁定', - `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，1-删除', - `wx_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '微信openid', - `qq_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'QQ openid', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`user_id`), - KEY `user_wx_openid` (`wx_openid`), - KEY `user_qq_openid` (`qq_openid`), - KEY `user_idx1_username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户表'; + `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '用户名', + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, + `salt` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '随机盐', + `phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '简介', + `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '头像', + `dept_id` int(11) NULL DEFAULT NULL COMMENT '部门ID', + `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `lock_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '0' COMMENT '0-正常，9-锁定', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '0' COMMENT '0-正常，1-删除', + `wx_openid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '微信openid', + `qq_openid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT 'QQ openid', + `tenant_id` int(11) NOT NULL DEFAULT 0 COMMENT '所属租户', + PRIMARY KEY (`user_id`) USING BTREE, + INDEX `user_wx_openid`(`wx_openid`) USING BTREE, + INDEX `user_qq_openid`(`qq_openid`) USING BTREE, + INDEX `user_idx1_username`(`username`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_user` +-- Records of sys_user -- ---------------------------- -BEGIN; -INSERT INTO `sys_user` VALUES ('1', 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', null, '17034642888', null, '1', '2018-04-20 07:15:18', '2018-11-16 23:31:30', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, '1'), ('2', 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', null, '17034642888', null, '10', '2018-04-20 07:15:18', '2018-11-18 13:43:03', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, '2'), ('3', 'test', '$2a$10$vb.AEz6fpVVdiwr3m8H29.Qc8.GsP6fGW9vZFTsUhgvzg2zpsl5p2', null, null, null, '1', '2018-11-14 12:43:47', '2018-11-17 17:23:27', '1', '0', null, null, '1'); -COMMIT; +INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', NULL, '17034642888', NULL, 1, '2018-04-20 07:15:18', '2018-11-16 23:31:30', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', NULL, 1); +INSERT INTO `sys_user` VALUES (2, 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', NULL, '17034642888', NULL, 10, '2018-04-20 07:15:18', '2018-11-18 13:43:03', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', NULL, 2); +INSERT INTO `sys_user` VALUES (3, 'test', '$2a$10$vb.AEz6fpVVdiwr3m8H29.Qc8.GsP6fGW9vZFTsUhgvzg2zpsl5p2', NULL, NULL, NULL, 1, '2018-11-14 12:43:47', '2018-11-17 17:23:27', '1', '0', NULL, NULL, 1); -- ---------------------------- --- Table structure for `sys_user_role` +-- Table structure for sys_user_role -- ---------------------------- DROP TABLE IF EXISTS `sys_user_role`; -CREATE TABLE `sys_user_role` ( +CREATE TABLE `sys_user_role` ( `user_id` int(11) NOT NULL COMMENT '用户ID', `role_id` int(11) NOT NULL COMMENT '角色ID', - PRIMARY KEY (`user_id`,`role_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='用户角色表'; + PRIMARY KEY (`user_id`, `role_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户角色表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of `sys_user_role` +-- Records of sys_user_role -- ---------------------------- -BEGIN; -INSERT INTO `sys_user_role` VALUES ('1', '1'), ('2', '2'), ('3', '3'); -COMMIT; +INSERT INTO `sys_user_role` VALUES (1, 1); +INSERT INTO `sys_user_role` VALUES (2, 2); +INSERT INTO `sys_user_role` VALUES (3, 3); SET FOREIGN_KEY_CHECKS = 1; diff --git a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml index e6d1b3528..d4495d82e 100644 --- a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml @@ -13,3 +13,6 @@ security: ignore: clients: - test + swagger-providers: + - pigx-auth + - pigx-tx-manager diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/FilterIgnorePropertiesConfig.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/FilterIgnorePropertiesConfig.java index e9116b89e..97ca68881 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/FilterIgnorePropertiesConfig.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/FilterIgnorePropertiesConfig.java @@ -38,4 +38,5 @@ import java.util.List; @ConfigurationProperties(prefix = "ignore") public class FilterIgnorePropertiesConfig { private List clients = new ArrayList<>(); + private List swaggerProviders=new ArrayList<>(); } diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java index 19f98b90e..dc8f84b4f 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java @@ -39,6 +39,7 @@ import java.util.List; public class SwaggerProvider implements SwaggerResourcesProvider { private static final String API_URI = "/v2/api-docs"; private final RouteDefinitionRepository routeDefinitionRepository; + private final FilterIgnorePropertiesConfig filterIgnorePropertiesConfig; @Override @@ -48,7 +49,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider { routeDefinitionRepository.getRouteDefinitions().subscribe(route -> routes.add(route)); routes.forEach(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) - .filter(predicateDefinition -> !"pigx-auth".equalsIgnoreCase(routeDefinition.getId())) + .filter(predicateDefinition -> !filterIgnorePropertiesConfig.getSwaggerProviders().contains(routeDefinition.getId())) .forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0") .replace("/**", API_URI))))); From 3432ded7171043d49858c09759a3e5cb5b4a57be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 17:46:29 +0800 Subject: [PATCH 5/5] :wrench: Changing configuration files.use default eureka port and default config server port --- doc/md/modules.md | 6 ++++-- docker-compose.yml | 2 +- pigx-auth/src/main/resources/bootstrap.yml | 2 +- pigx-config/Dockerfile | 2 +- pigx-config/src/main/resources/bootstrap.yml | 4 ++-- pigx-eureka/Dockerfile | 2 +- pigx-eureka/src/main/resources/bootstrap.yml | 2 +- pigx-gateway/src/main/resources/bootstrap.yml | 2 +- pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml | 2 +- .../pigx-sso-client-demo/src/main/resources/bootstrap.yml | 2 +- .../pigx-tx-manager/src/main/resources/bootstrap.yml | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/doc/md/modules.md b/doc/md/modules.md index d0df7dae0..f6383a648 100644 --- a/doc/md/modules.md +++ b/doc/md/modules.md @@ -5,13 +5,14 @@ pigx ├── pigx-auth -- 授权服务提供[3000] ├── pigx-common -- 系统公共模块 ├ ├── pigx-common-core -- 公共工具类核心包 +├ ├── pigx-common-cache -- 缓存 ├ ├── pigx-common-job -- 定时任务 ├ ├── pigx-common-log -- 日志服务 ├ └── pigx-common-security -- 安全工具类 ├ └── pigx-common-swagger -- Swagger Api文档生成 ├ └── pigx-common-transaction -- 分布式事务工具包 -├── pigx-config -- 配置中心[4001] -├── pigx-eureka -- 服务注册与发现[1025] +├── pigx-config -- 配置中心[8888] +├── pigx-eureka -- 服务注册与发现[8761] ├── pigx-gateway -- Spring Cloud Gateway网关[9999] ├── pigx-upms -- 通用用户权限管理模块 ├ └── pigx-upms-api -- 通用用户权限管理系统公共api模块 @@ -21,5 +22,6 @@ pigx ├ ├── pigx-daemon -- 分布式调度中心[5002] ├ └── pigx-code-gen -- 图形化代码生成[5003] ├ └── pigx-tx-manager -- pigx分布式事务解决方案[5004] +├ └── pigx-activiti -- 工作流模块[5005] ``` diff --git a/docker-compose.yml b/docker-compose.yml index ea432c59b..9a5745ccc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: dockerfile: ./pigx-eureka/Dockerfile restart: always ports: - - 1025:1025 + - 8761:8761 pigx-config: build: diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index d1ad7b973..d3e1e4ffd 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-config/Dockerfile b/pigx-config/Dockerfile index fead92d09..59cffdb98 100644 --- a/pigx-config/Dockerfile +++ b/pigx-config/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-config WORKDIR /pigx/bin/com.pig4cloud/pigx-config -EXPOSE 4001 +EXPOSE 8888 ADD ./pigx-config/target/pigx-config.jar ./ diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 66b989783..02a8af2c5 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 4001 + port: 8888 spring: application: @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ # 暴露监控端点 management: diff --git a/pigx-eureka/Dockerfile b/pigx-eureka/Dockerfile index e05fb249b..5d75a4129 100644 --- a/pigx-eureka/Dockerfile +++ b/pigx-eureka/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-eureka WORKDIR /pigx/bin/com.pig4cloud/pigx-eureka -EXPOSE 1025 +EXPOSE 8761 ADD ./pigx-eureka/target/pigx-eureka.jar ./ diff --git a/pigx-eureka/src/main/resources/bootstrap.yml b/pigx-eureka/src/main/resources/bootstrap.yml index 582202b2a..a7a7b60bd 100644 --- a/pigx-eureka/src/main/resources/bootstrap.yml +++ b/pigx-eureka/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 1025 + port: 8761 spring: security: diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index a3191ee0d..af561c083 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index de3c57d38..d9752c7ba 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -25,4 +25,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 059f6bdc9..881d420d0 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@lengleng:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 7455228c7..4f9b128a8 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml index 7e03bd6dd..57012f4a4 100644 --- a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 938fd81d1..293c48e9e 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -20,7 +20,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ turbine: app-config: pigx-upms,pigx-auth cluster-name-expression: new String("default") diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml index 44ffe7402..b604fa388 100644 --- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml @@ -24,4 +24,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml index 1bea72f6b..763d12f9c 100644 --- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml @@ -20,5 +20,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/