From e786f65ce262bc7dcde5a67bc4a4cd03d807faa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?=
Date: Wed, 1 May 2019 13:25:05 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20:tada:=20:tada:=20tag=203.0.0=20spring?=
=?UTF-8?q?=20cloud=20alibaba=20=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
db/2pigxx.sql | 25 +++++++------------
db/6pigxx_config.sql | 6 ++---
docker-compose.yml | 10 --------
pigx-auth/Dockerfile | 2 +-
pigx-auth/pom.xml | 2 +-
.../main/resources/templates/ftl/confirm.ftl | 2 +-
pigx-common/pigx-common-bom/pom.xml | 2 +-
pigx-common/pigx-common-core/pom.xml | 2 +-
pigx-common/pigx-common-data/pom.xml | 2 +-
pigx-common/pigx-common-gateway/pom.xml | 2 +-
pigx-common/pigx-common-job/pom.xml | 2 +-
pigx-common/pigx-common-log/pom.xml | 2 +-
pigx-common/pigx-common-minio/pom.xml | 2 +-
pigx-common/pigx-common-security/pom.xml | 2 +-
pigx-common/pigx-common-swagger/pom.xml | 2 +-
pigx-common/pigx-common-transaction/pom.xml | 2 +-
pigx-common/pom.xml | 2 +-
pigx-gateway/Dockerfile | 2 +-
pigx-gateway/pom.xml | 2 +-
pigx-register/pom.xml | 2 +-
pigx-upms/pigx-upms-api/pom.xml | 2 +-
pigx-upms/pigx-upms-biz/Dockerfile | 2 +-
pigx-upms/pigx-upms-biz/pom.xml | 2 +-
pigx-upms/pom.xml | 2 +-
pigx-visual/pigx-activiti/Dockerfile | 2 +-
pigx-visual/pigx-activiti/pom.xml | 2 +-
pigx-visual/pigx-codegen/Dockerfile | 2 +-
pigx-visual/pigx-codegen/pom.xml | 2 +-
.../pigx-daemon-elastic-job/Dockerfile | 2 +-
pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +-
pigx-visual/pigx-daemon-quartz/Dockerfile | 2 +-
pigx-visual/pigx-daemon-quartz/pom.xml | 2 +-
pigx-visual/pigx-monitor/Dockerfile | 2 +-
pigx-visual/pigx-monitor/pom.xml | 4 +--
pigx-visual/pigx-mp-manager/Dockerfile | 2 +-
pigx-visual/pigx-mp-manager/pom.xml | 2 +-
pigx-visual/pigx-sso-client-demo/pom.xml | 2 +-
pigx-visual/pigx-tx-manager/Dockerfile | 2 +-
pigx-visual/pigx-tx-manager/pom.xml | 2 +-
pigx-visual/pom.xml | 2 +-
pom.xml | 9 ++++++-
41 files changed, 58 insertions(+), 68 deletions(-)
diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index 1f85d04b3..e7e0fbf95 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -164,14 +164,7 @@ CREATE TABLE `sys_log` (
KEY `sys_log_request_uri` (`request_uri`) USING BTREE,
KEY `sys_log_type` (`type`) USING BTREE,
KEY `sys_log_create_date` (`create_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='日志表';
-
--- ----------------------------
--- Records of `sys_log`
--- ----------------------------
-BEGIN;
-INSERT INTO `sys_log` VALUES ('3', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:07:45', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/ca3691bb-9a5e-4dda-9410-2c32624a4413', 'DELETE', '', '40', '0', null, '1'), ('4', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:10:29', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/f8ea1bb1-a839-445e-9e76-bb16aecbfa13', 'DELETE', '', '60', '0', null, '1'), ('5', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:11:03', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/f8ea1bb1-a839-445e-9e76-bb16aecbfa13', 'DELETE', '', '9', '0', null, '1'), ('6', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:15:18', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/f8ea1bb1-a839-445e-9e76-bb16aecbfa13', 'DELETE', '', '2061', '0', null, '1'), ('7', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:20:01', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/f8ea1bb1-a839-445e-9e76-bb16aecbfa13', 'DELETE', '', '20945', '0', null, '1'), ('8', '0', '删除用户token', 'pig', 'admin', '2019-04-19 14:42:12', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/token/f8ea1bb1-a839-445e-9e76-bb16aecbfa13', 'DELETE', '', '2584', '0', null, '1'), ('9', '0', '添加部门', 'pig', 'admin', '2019-04-28 17:33:32', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/dept', 'POST', '', '63', '0', null, '1'), ('10', '0', '添加角色', 'pig', 'admin', '2019-04-28 17:34:07', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role', 'POST', '', '9', '0', null, '1'), ('11', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 17:34:24', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%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%2C2800%2C2810%2C2820%2C2830%2C2840%2C2850%2C2860%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3620%2C3630%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6100%2C6101%2C6102%2C6103%2C6200%2C6201%2C6202%2C6203%2C6300%2C6301%2C6302%2C6303%2C6304%2C6305%2C6400%2C6401%2C6402%2C6500%2C9999%2C%5D', '64', '0', null, '1'), ('12', '0', '添加用户', 'pig', 'admin', '2019-04-28 17:35:28', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/user', 'POST', '', '121', '0', null, '1'), ('13', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 17:38:40', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%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%2C2800%2C2810%2C2820%2C2830%2C2840%2C2850%2C2860%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3620%2C3630%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6100%2C6101%2C6102%2C6103%2C6200%2C6201%2C6202%2C6203%2C6300%2C6301%2C6302%2C6303%2C6304%2C6305%2C6400%2C6401%2C6402%2C6500%2C9999%2C%5D', '39', '0', null, '1'), ('14', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 17:39:17', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%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%2C2800%2C2810%2C2820%2C2830%2C2840%2C2850%2C2860%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3620%2C3630%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6100%2C6101%2C6102%2C6103%2C6200%2C6201%2C6202%2C6203%2C6300%2C6301%2C6302%2C6303%2C6304%2C6305%2C6400%2C6401%2C6402%2C6500%2C9999%2C%5D', '37', '0', null, '1'), ('15', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 17:40:22', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%5D&menuIds=%5B1000%2C1100%2C1101%2C1102%2C1103%2C1200%2C1201%2C1202%2C1203%2C1300%2C1301%2C1302%2C1303%2C1304%2C1400%2C1401%2C1402%2C1403%2C%5D', '16', '0', null, '1'), ('16', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 18:02:14', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%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%2C2800%2C2810%2C2820%2C2830%2C2840%2C2850%2C2860%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3620%2C3630%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6100%2C6101%2C6102%2C6103%2C6200%2C6201%2C6202%2C6203%2C6300%2C6301%2C6302%2C6303%2C6304%2C6305%2C6400%2C6401%2C6402%2C6500%2C9999%2C%5D', '110', '0', null, '1'), ('17', '0', '更新角色菜单', 'pig', 'admin', '2019-04-28 18:10:06', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B3%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%2C2800%2C2810%2C2820%2C2830%2C2840%2C2850%2C2860%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3600%2C3601%2C3620%2C3630%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6100%2C6101%2C6102%2C6103%2C6200%2C6201%2C6202%2C6203%2C6300%2C6301%2C6302%2C6303%2C6304%2C6305%2C6400%2C6401%2C6402%2C6500%2C%5D', '122', '0', null, '1'), ('18', '0', '新增菜单', 'pig', 'admin', '2019-04-29 22:16:50', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/menu', 'POST', '', '24', '0', null, '1'), ('19', '0', '新增菜单', 'pig', 'admin', '2019-04-29 22:17:36', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/menu', 'POST', '', '12', '0', null, '1'), ('20', '0', '新增菜单', 'pig', 'admin', '2019-04-29 22:17:55', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/menu', 'POST', '', '7', '0', null, '1'), ('21', '0', '新增菜单', 'pig', 'admin', '2019-04-29 22:18:14', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/menu', 'POST', '', '12', '0', null, '1'), ('22', '0', '更新角色菜单', 'pig', 'admin', '2019-04-29 22:19:04', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/menu', 'PUT', 'roleId=%5B1%5D&menuIds=%5B1000%2C1100%2C1101%2C1102%2C1103%2C1200%2C1201%2C1202%2C1203%2C1300%2C1301%2C1302%2C1303%2C1304%2C1400%2C1401%2C1402%2C1403%2C1700%2C1701%2C1702%2C1703%2C2100%2C2101%2C2200%2C2203%2C2202%2C2201%2C2800%2C2830%2C2860%2C2850%2C2840%2C2820%2C2810%2C2300%2C2400%2C2403%2C2402%2C2401%2C2500%2C2501%2C2502%2C2503%2C2600%2C2601%2C2700%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3630%2C3620%2C3600%2C3601%2C3700%2C3800%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C6000%2C6400%2C6401%2C6402%2C6500%2C6200%2C6201%2C6202%2C6203%2C6100%2C6101%2C6102%2C6103%2C6300%2C6301%2C6305%2C6302%2C6303%2C6304%2C9999%2C2000%5D', '137', '0', null, '1'), ('23', '0', '更新菜单', 'pig', 'admin', '2019-04-29 22:19:25', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/menu', 'PUT', '', '18', '0', null, '1'), ('24', '0', '更新角色菜单', 'pig', 'admin', '2019-04-29 22:20:37', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/role/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%2C2203%2C2202%2C2201%2C2210%2C2211%2C2212%2C2213%2C2800%2C2850%2C2860%2C2840%2C2830%2C2820%2C2810%2C2300%2C2400%2C2403%2C2402%2C2401%2C2500%2C2501%2C2502%2C2503%2C2600%2C2601%2C2700%2C3000%2C3100%2C3200%2C3300%2C3400%2C3500%2C3630%2C3620%2C3600%2C3601%2C3700%2C3800%2C6000%2C6400%2C6401%2C6402%2C6500%2C6200%2C6201%2C6202%2C6203%2C6100%2C6101%2C6102%2C6103%2C6300%2C6301%2C6305%2C6302%2C6303%2C6304%2C4000%2C4100%2C4101%2C4200%2C4201%2C4300%2C4301%2C4302%2C4303%2C4400%2C4401%2C9999%2C%5D', '44', '0', null, '1'), ('25', '0', '新增公共参数', 'pig', 'admin', '2019-04-29 22:25:15', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param', 'POST', '', '11', '0', null, '1'), ('26', '0', '修改公共参数', 'pig', 'admin', '2019-04-29 22:25:26', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param', 'PUT', '', '10', '0', null, '1'), ('27', '0', '删除公共参数', 'pig', 'admin', '2019-04-29 22:25:29', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param/5', 'DELETE', '', '6', '0', null, '1'), ('28', '0', '新增公共参数', 'pig', 'admin', '2019-04-29 22:32:44', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param', 'POST', '', '15', '0', null, '1'), ('29', '0', '修改公共参数', 'pig', 'admin', '2019-04-29 22:34:05', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param', 'PUT', '', '18', '0', null, '1'), ('30', '0', '修改公共参数', 'pig', 'admin', '2019-04-29 22:34:10', null, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36', '/param', 'PUT', '', '5', '0', null, '1');
-COMMIT;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='日志表';
-- ----------------------------
-- Table structure for `sys_menu`
@@ -198,7 +191,7 @@ CREATE TABLE `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'), ('1100', '用户管理', null, 'user', '1000', 'icon-yonghuguanli', 'views/admin/user/index', '1', '1', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0'), ('1101', '用户新增', 'sys_user_add', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0'), ('1102', '用户修改', 'sys_user_edit', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0'), ('1103', '用户删除', 'sys_user_del', null, '1100', null, null, null, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0'), ('1200', '菜单管理', null, 'menu', '1000', 'icon-caidanguanli', 'views/admin/menu/index', '2', '0', '0', '2017-11-08 09:57:27', '2018-09-28 09:00:45', '0'), ('1201', '菜单新增', 'sys_menu_add', null, '1200', null, null, null, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0'), ('1202', '菜单修改', 'sys_menu_edit', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0'), ('1203', '菜单删除', 'sys_menu_del', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0'), ('1300', '角色管理', null, 'role', '1000', 'icon-jiaoseguanli', 'views/admin/role/index', '3', '0', '0', '2017-11-08 10:13:37', '2018-09-28 09:00:48', '0'), ('1301', '角色新增', 'sys_role_add', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0'), ('1302', '角色修改', 'sys_role_edit', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0'), ('1303', '角色删除', 'sys_role_del', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0'), ('1304', '分配权限', 'sys_role_perm', null, '1300', null, null, null, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0'), ('1400', '部门管理', null, 'dept', '1000', 'icon-web-icon-', 'views/admin/dept/index', '4', '0', '0', '2018-01-20 13:17:19', '2018-12-09 16:35:12', '0'), ('1401', '部门新增', 'sys_dept_add', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0'), ('1402', '部门修改', 'sys_dept_edit', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0'), ('1403', '部门删除', 'sys_dept_del', null, '1400', null, null, null, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0'), ('2000', '系统管理', null, '/admin', '-1', 'icon-xitongguanli', 'Layout', '1', '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0'), ('2100', '日志管理', null, 'log', '2000', 'icon-rizhiguanli', 'views/admin/log/index', '5', '0', '0', '2017-11-20 14:06:22', '2018-09-28 09:01:52', '0'), ('2101', '日志删除', 'sys_log_del', null, '2100', null, null, null, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0'), ('2200', '字典管理', null, 'dict', '2000', 'icon-navicon-zdgl', 'views/admin/dict/index', '6', '0', '0', '2017-11-29 11:30:52', '2018-09-28 09:01:47', '0'), ('2201', '字典删除', 'sys_dict_del', null, '2200', null, null, null, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0'), ('2202', '字典新增', 'sys_dict_add', null, '2200', null, null, null, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0'), ('2203', '字典修改', 'sys_dict_edit', null, '2200', null, null, null, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0'), ('2210', '参数管理', null, 'param', '2000', 'icon-canshu', 'views/admin/param/index', '7', '1', '0', '2019-04-29 22:16:50', null, '0'), ('2211', '参数新增', 'admin_syspublicparam_add', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:36', null, '0'), ('2212', '参数删除', 'admin_syspublicparam_del', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:55', null, '0'), ('2213', '参数编辑', 'admin_syspublicparam_edit', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:18:14', '2019-04-29 22:19:25', '0'), ('2300', '代码生成', '', 'gen', '2000', 'icon-weibiaoti46', 'views/gen/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 05:21:01', '0'), ('2400', '终端管理', '', 'client', '2000', 'icon-shouji', 'views/admin/client/index', '9', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:43', '0'), ('2401', '客户端新增', 'sys_client_add', null, '2400', '1', null, null, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0'), ('2402', '客户端修改', 'sys_client_edit', null, '2400', null, null, null, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0'), ('2403', '客户端删除', 'sys_client_del', null, '2400', null, null, null, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0'), ('2500', '密钥管理', '', 'social', '2000', 'icon-miyue', 'views/admin/social/index', '10', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:41', '0'), ('2501', '密钥新增', 'sys_social_details_add', null, '2500', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:52:18', '0'), ('2502', '密钥修改', 'sys_social_details_edit', null, '2500', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:36', '0'), ('2503', '密钥删除', 'sys_social_details_del', null, '2500', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:30', '0'), ('2600', '令牌管理', null, 'token', '2000', 'icon-denglvlingpai', 'views/admin/token/index', '11', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2601', '令牌删除', 'sys_token_del', null, '2600', null, null, '1', '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0'), ('2700', '动态路由', null, 'route', '2000', 'icon-luyou', 'views/admin/route/index', '12', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2800', 'Quartz管理', '', 'job-manage', '2000', 'icon-guanwangfangwen', 'views/daemon/job-manage/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:14', '0'), ('2810', '任务新增', 'job_sys_job_add', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:23', '0'), ('2820', '任务修改', 'job_sys_job_edit', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:26', '0'), ('2830', '任务删除', 'job_sys_job_del', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:30', '0'), ('2840', '任务暂停', 'job_sys_job_shutdown_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:18', '0'), ('2850', '任务开始', 'job_sys_job_start_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:35', '0'), ('2860', '任务刷新', 'job_sys_job_refresh_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:39', '0'), ('3000', '系统监控', null, '/daemon', '-1', 'icon-msnui-supervise', 'Layout', '2', '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0'), ('3100', '服务监控', null, 'https://monitor.pig4cloud.com', '3000', 'icon-server', null, '0', '0', '0', '2018-06-26 10:50:32', '2018-12-11 17:17:07', '0'), ('3200', '接口文档', null, 'https://swagger.pig4cloud.com/swagger-ui.html', '3000', 'icon-wendang', null, '1', '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:05:16', '0'), ('3300', '事务监控', null, 'tx', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/tx/index', '5', '0', '0', '2018-08-19 11:02:39', '2018-11-23 14:25:08', '0'), ('3400', '在线事务', null, 'model', '3000', 'icon-online', 'views/tx/model', '6', '0', '0', '2018-08-19 11:32:04', '2018-11-23 14:25:14', '0'), ('3500', '任务监控', null, 'https://task.pig4cloud.com', '3000', 'icon-msnui-supervise', null, '7', '0', '0', '2018-06-26 10:50:32', '2018-09-28 09:03:33', '0'), ('3600', '任务轨迹', '', 'status-trace-log', '3000', 'icon-guiji', 'views/daemon/status-trace-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 06:34:52', '0'), ('3601', '删除轨迹', 'daemon_status_trace_log_del', null, '3600', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:31:06', '0'), ('3620', 'Quartz日志', '', 'joblog', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/daemon/job-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 11:49:36', '0'), ('3630', '任务日志', '', 'execution-log', '3000', 'icon-wendang', 'views/daemon/execution-log/index', '7', '0', '0', '2018-01-20 13:17:19', '2019-03-30 09:30:33', '0'), ('3631', '删除日志', 'daemon_execution_log_del', null, '3900', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:30:45', '0'), ('3700', '调用拓扑', null, 'https://zipkin.pig4cloud.com', '3000', 'icon-line', null, '10', '0', '0', '2018-01-25 11:08:52', '2018-09-28 09:04:29', '0'), ('3800', '缓存状态', null, 'https://cache.pig4cloud.com', '3000', 'icon-qingchuhuancun', null, '12', '0', '0', '2018-01-23 10:56:11', '2018-09-28 09:13:56', '0'), ('4000', '协同管理', null, '/activti', '-1', 'icon-kuaisugongzuoliu_o', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('4100', '模型管理', null, 'activiti', '4000', 'icon-weibiaoti13', 'views/activiti/index', '1', '0', '0', '2018-09-26 01:39:07', '2018-12-09 16:35:16', '0'), ('4101', '模型管理', 'act_model_manage', null, '4100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4200', '流程管理', null, 'process', '4000', 'icon-liucheng', 'views/activiti/process', '2', '0', '0', '2018-09-26 06:41:05', '2018-11-23 14:25:33', '0'), ('4201', '流程管理', 'act_process_manage', null, '4200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4300', '请假管理', '', 'leave-bill', '4000', 'icon-qingjia', 'views/activiti/leave', '3', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:10', '0'), ('4301', '请假新增', 'act_leavebill_add', null, '4300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4302', '请假修改', 'act_leavebill_edit', null, '4300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0'), ('4303', '请假删除', 'act_leavebill_del', null, '4300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0'), ('4400', '待办任务', null, 'task', '4000', 'icon-renwu', 'views/activiti/task', '4', '0', '0', '2018-09-27 09:52:31', '2018-12-09 16:35:26', '0'), ('4401', '流程管理', 'act_task_manage', null, '4400', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('6000', '微信管理', null, '/mp', '-1', 'icon-gongzhonghao', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('6100', '账号管理', '', 'wxaccount', '6000', 'icon-weixincaidan', 'views/mp/wxaccount/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6101', '公众号新增', 'mp_wxaccount_add', null, '6100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6102', '公众号修改', 'mp_wxaccount_edit', null, '6100', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6103', '公众号删除', 'mp_wxaccount_del', null, '6100', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6200', '粉丝管理', '', 'wxaccountfans', '6000', 'icon-fensiguanli', 'views/mp/wxaccountfans/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6201', '粉丝新增', 'mp_wxaccountfans_add', null, '6200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6202', '粉丝修改', 'mp_wxaccountfans_edit', null, '6200', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6203', '粉丝删除', 'mp_wxaccountfans_del', null, '6200', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6300', '消息管理', '', 'wxfansmsg', '6000', 'icon-xiaoxiguanli', 'views/mp/wxfansmsg/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6301', '消息新增', 'mp_wxfansmsg_add', null, '6300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6302', '消息修改', 'mp_wxfansmsg_edit', null, '6300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6303', '消息删除', 'mp_wxfansmsg_del', null, '6300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6304', '消息回复', 'mp_wxfansmsgres_add', null, '6300', '1', null, '3', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6305', '回复删除', 'mp_wxfansmsgres_del', null, '6300', null, null, '1', '0', '1', '2019-03-28 22:53:49', null, '0'), ('6400', '菜单设置', null, 'menu', '6000', 'icon-anniu_weixincaidanlianjie', 'views/mp/wxmenu/index', '6', '1', '0', '2019-03-29 15:20:12', '2019-03-29 15:23:03', '0'), ('6401', '保存', 'mp_wxmenu_add', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:22', '2019-03-29 15:43:30', '0'), ('6402', '发布', 'mp_wxmenu_push', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:54', null, '0'), ('6500', '运营数据', null, 'wxstatistics', '6000', 'icon-zhexiantu', 'views/mp/wxstatistics/index', '7', '1', '0', '2019-04-14 00:15:35', null, '0'), ('9999', '系统官网', null, 'https://pig4cloud.com/#', '-1', 'icon-guanwangfangwen', null, '9', '0', '0', '2019-01-17 17:05:19', '2019-01-17 17:29:06', '0');
+INSERT INTO `sys_menu` VALUES ('1000', '权限管理', null, '/upms', '-1', 'icon-quanxianguanli', 'Layout', '0', '0', '0', '2018-09-28 08:29:53', '2018-09-28 08:53:01', '0'), ('1100', '用户管理', null, 'user', '1000', 'icon-yonghuguanli', 'views/admin/user/index', '1', '1', '0', '2017-11-02 22:24:37', '2018-09-28 09:00:41', '0'), ('1101', '用户新增', 'sys_user_add', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:09', '2018-09-28 09:06:34', '0'), ('1102', '用户修改', 'sys_user_edit', null, '1100', null, null, null, '0', '1', '2017-11-08 09:52:48', '2018-09-28 09:06:37', '0'), ('1103', '用户删除', 'sys_user_del', null, '1100', null, null, null, '0', '1', '2017-11-08 09:54:01', '2018-09-28 09:06:42', '0'), ('1200', '菜单管理', null, 'menu', '1000', 'icon-caidanguanli', 'views/admin/menu/index', '2', '0', '0', '2017-11-08 09:57:27', '2018-09-28 09:00:45', '0'), ('1201', '菜单新增', 'sys_menu_add', null, '1200', null, null, null, '0', '1', '2017-11-08 10:15:53', '2018-09-28 09:07:16', '0'), ('1202', '菜单修改', 'sys_menu_edit', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:23', '2018-09-28 09:07:18', '0'), ('1203', '菜单删除', 'sys_menu_del', null, '1200', null, null, null, '0', '1', '2017-11-08 10:16:43', '2018-09-28 09:07:22', '0'), ('1300', '角色管理', null, 'role', '1000', 'icon-jiaoseguanli', 'views/admin/role/index', '3', '0', '0', '2017-11-08 10:13:37', '2018-09-28 09:00:48', '0'), ('1301', '角色新增', 'sys_role_add', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:18', '2018-09-28 09:07:46', '0'), ('1302', '角色修改', 'sys_role_edit', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:41', '2018-09-28 09:07:49', '0'), ('1303', '角色删除', 'sys_role_del', null, '1300', null, null, null, '0', '1', '2017-11-08 10:14:59', '2018-09-28 09:07:53', '0'), ('1304', '分配权限', 'sys_role_perm', null, '1300', null, null, null, '0', '1', '2018-04-20 07:22:55', '2018-09-28 09:13:23', '0'), ('1400', '部门管理', null, 'dept', '1000', 'icon-web-icon-', 'views/admin/dept/index', '4', '0', '0', '2018-01-20 13:17:19', '2018-12-09 16:35:12', '0'), ('1401', '部门新增', 'sys_dept_add', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:16', '2018-09-28 09:08:13', '0'), ('1402', '部门修改', 'sys_dept_edit', null, '1400', null, null, null, '0', '1', '2018-01-20 14:56:59', '2018-09-28 09:08:16', '0'), ('1403', '部门删除', 'sys_dept_del', null, '1400', null, null, null, '0', '1', '2018-01-20 14:57:28', '2018-09-28 09:08:18', '0'), ('2000', '系统管理', null, '/admin', '-1', 'icon-xitongguanli', 'Layout', '1', '0', '0', '2017-11-07 20:56:00', '2018-09-28 08:53:18', '0'), ('2100', '日志管理', null, 'log', '2000', 'icon-rizhiguanli', 'views/admin/log/index', '5', '0', '0', '2017-11-20 14:06:22', '2018-09-28 09:01:52', '0'), ('2101', '日志删除', 'sys_log_del', null, '2100', null, null, null, '0', '1', '2017-11-20 20:37:37', '2018-09-28 09:08:44', '0'), ('2200', '字典管理', null, 'dict', '2000', 'icon-navicon-zdgl', 'views/admin/dict/index', '6', '0', '0', '2017-11-29 11:30:52', '2018-09-28 09:01:47', '0'), ('2201', '字典删除', 'sys_dict_del', null, '2200', null, null, null, '0', '1', '2017-11-29 11:30:11', '2018-09-28 09:09:10', '0'), ('2202', '字典新增', 'sys_dict_add', null, '2200', null, null, null, '0', '1', '2018-05-11 22:34:55', '2018-09-28 09:09:12', '0'), ('2203', '字典修改', 'sys_dict_edit', null, '2200', null, null, null, '0', '1', '2018-05-11 22:36:03', '2018-09-28 09:09:16', '0'), ('2210', '参数管理', null, 'param', '2000', 'icon-canshu', 'views/admin/param/index', '7', '1', '0', '2019-04-29 22:16:50', null, '0'), ('2211', '参数新增', 'admin_syspublicparam_add', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:36', null, '0'), ('2212', '参数删除', 'admin_syspublicparam_del', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:17:55', null, '0'), ('2213', '参数编辑', 'admin_syspublicparam_edit', null, '2210', null, null, '1', '0', '1', '2019-04-29 22:18:14', '2019-04-29 22:19:25', '0'), ('2300', '代码生成', '', 'gen', '2000', 'icon-weibiaoti46', 'views/gen/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 05:21:01', '0'), ('2400', '终端管理', '', 'client', '2000', 'icon-shouji', 'views/admin/client/index', '9', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:43', '0'), ('2401', '客户端新增', 'sys_client_add', null, '2400', '1', null, null, '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:10:25', '0'), ('2402', '客户端修改', 'sys_client_edit', null, '2400', null, null, null, '0', '1', '2018-05-15 21:37:06', '2018-09-28 09:10:27', '0'), ('2403', '客户端删除', 'sys_client_del', null, '2400', null, null, null, '0', '1', '2018-05-15 21:39:16', '2018-09-28 09:10:30', '0'), ('2500', '密钥管理', '', 'social', '2000', 'icon-miyue', 'views/admin/social/index', '10', '0', '0', '2018-01-20 13:17:19', '2018-09-28 09:01:41', '0'), ('2501', '密钥新增', 'sys_social_details_add', null, '2500', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:52:18', '0'), ('2502', '密钥修改', 'sys_social_details_edit', null, '2500', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:36', '0'), ('2503', '密钥删除', 'sys_social_details_del', null, '2500', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:51:30', '0'), ('2600', '令牌管理', null, 'token', '2000', 'icon-denglvlingpai', 'views/admin/token/index', '11', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2601', '令牌删除', 'sys_token_del', null, '2600', null, null, '1', '0', '1', '2018-09-04 05:59:50', '2018-09-28 09:11:24', '0'), ('2700', '动态路由', null, 'route', '2000', 'icon-luyou', 'views/admin/route/index', '12', '0', '0', '2018-09-04 05:58:41', '2018-09-28 09:01:38', '0'), ('2800', 'Quartz管理', '', 'job-manage', '2000', 'icon-guanwangfangwen', 'views/daemon/job-manage/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:14', '0'), ('2810', '任务新增', 'job_sys_job_add', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:23', '0'), ('2820', '任务修改', 'job_sys_job_edit', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:26', '0'), ('2830', '任务删除', 'job_sys_job_del', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:30', '0'), ('2840', '任务暂停', 'job_sys_job_shutdown_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:18', '0'), ('2850', '任务开始', 'job_sys_job_start_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:35', '0'), ('2860', '任务刷新', 'job_sys_job_refresh_job', null, '2800', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2019-03-25 11:50:39', '0'), ('3000', '系统监控', null, '/daemon', '-1', 'icon-msnui-supervise', 'Layout', '2', '0', '0', '2018-07-27 01:13:21', '2018-09-28 08:53:24', '0'), ('3100', '服务监控', null, 'http://127.0.0.1:5001', '3000', 'icon-server', null, '0', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:54:05', '0'), ('3200', '接口文档', null, 'http://127.0.0.1:9999/swagger-ui.html', '3000', 'icon-wendang', null, '1', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:11', '0'), ('3300', '事务监控', null, 'tx', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/tx/index', '5', '0', '0', '2018-08-19 11:02:39', '2018-11-23 14:25:08', '0'), ('3400', '在线事务', null, 'model', '3000', 'icon-online', 'views/tx/model', '6', '0', '0', '2018-08-19 11:32:04', '2018-11-23 14:25:14', '0'), ('3500', '文档扩展', null, 'http://127.0.0.1:9999/doc.html', '3000', 'icon-wendang', null, '2', '0', '0', '2018-06-26 10:50:32', '2019-05-01 23:57:42', '0'), ('3600', '任务轨迹', '', 'status-trace-log', '3000', 'icon-guiji', 'views/daemon/status-trace-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-11-24 06:34:52', '0'), ('3601', '删除轨迹', 'daemon_status_trace_log_del', null, '3600', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:31:06', '0'), ('3620', 'Quartz日志', '', 'joblog', '3000', 'icon-gtsquanjushiwufuwuGTS', 'views/daemon/job-log/index', '8', '0', '0', '2018-01-20 13:17:19', '2019-03-25 11:49:36', '0'), ('3630', '任务日志', '', 'execution-log', '3000', 'icon-wendang', 'views/daemon/execution-log/index', '7', '0', '0', '2018-01-20 13:17:19', '2019-03-30 09:30:33', '0'), ('3631', '删除日志', 'daemon_execution_log_del', null, '3900', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2019-03-30 09:30:45', '0'), ('3700', '注册配置', null, 'nacos', '3000', 'icon-line', 'views/admin/nacos/index', '10', '0', '0', '2018-01-25 11:08:52', '2019-05-01 22:52:21', '1'), ('4000', '协同管理', null, '/activti', '-1', 'icon-kuaisugongzuoliu_o', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('4100', '模型管理', null, 'activiti', '4000', 'icon-weibiaoti13', 'views/activiti/index', '1', '0', '0', '2018-09-26 01:39:07', '2018-12-09 16:35:16', '0'), ('4101', '模型管理', 'act_model_manage', null, '4100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4200', '流程管理', null, 'process', '4000', 'icon-liucheng', 'views/activiti/process', '2', '0', '0', '2018-09-26 06:41:05', '2018-11-23 14:25:33', '0'), ('4201', '流程管理', 'act_process_manage', null, '4200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4300', '请假管理', '', 'leave-bill', '4000', 'icon-qingjia', 'views/activiti/leave', '3', '0', '0', '2018-01-20 13:17:19', '2019-03-25 13:52:10', '0'), ('4301', '请假新增', 'act_leavebill_add', null, '4300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('4302', '请假修改', 'act_leavebill_edit', null, '4300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:09', '0'), ('4303', '请假删除', 'act_leavebill_del', null, '4300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:14', '0'), ('4400', '待办任务', null, 'task', '4000', 'icon-renwu', 'views/activiti/task', '4', '0', '0', '2018-09-27 09:52:31', '2018-12-09 16:35:26', '0'), ('4401', '流程管理', 'act_task_manage', null, '4400', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-09-28 09:12:07', '0'), ('6000', '微信管理', null, '/mp', '-1', 'icon-gongzhonghao', 'Layout', '3', '0', '0', '2018-09-26 01:38:13', '2018-09-28 08:58:24', '0'), ('6100', '账号管理', '', 'wxaccount', '6000', 'icon-weixincaidan', 'views/mp/wxaccount/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6101', '公众号新增', 'mp_wxaccount_add', null, '6100', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6102', '公众号修改', 'mp_wxaccount_edit', null, '6100', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6103', '公众号删除', 'mp_wxaccount_del', null, '6100', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6200', '粉丝管理', '', 'wxaccountfans', '6000', 'icon-fensiguanli', 'views/mp/wxaccountfans/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6201', '粉丝新增', 'mp_wxaccountfans_add', null, '6200', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6202', '粉丝修改', 'mp_wxaccountfans_edit', null, '6200', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6203', '粉丝删除', 'mp_wxaccountfans_del', null, '6200', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6300', '消息管理', '', 'wxfansmsg', '6000', 'icon-xiaoxiguanli', 'views/mp/wxfansmsg/index', '8', '0', '0', '2018-01-20 13:17:19', '2018-07-29 13:38:19', '0'), ('6301', '消息新增', 'mp_wxfansmsg_add', null, '6300', '1', null, '0', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6302', '消息修改', 'mp_wxfansmsg_edit', null, '6300', '1', null, '1', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6303', '消息删除', 'mp_wxfansmsg_del', null, '6300', '1', null, '2', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6304', '消息回复', 'mp_wxfansmsgres_add', null, '6300', '1', null, '3', '0', '1', '2018-05-15 21:35:18', '2018-07-29 13:38:59', '0'), ('6305', '回复删除', 'mp_wxfansmsgres_del', null, '6300', null, null, '1', '0', '1', '2019-03-28 22:53:49', null, '0'), ('6400', '菜单设置', null, 'menu', '6000', 'icon-anniu_weixincaidanlianjie', 'views/mp/wxmenu/index', '6', '1', '0', '2019-03-29 15:20:12', '2019-03-29 15:23:03', '0'), ('6401', '保存', 'mp_wxmenu_add', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:22', '2019-03-29 15:43:30', '0'), ('6402', '发布', 'mp_wxmenu_push', null, '6400', null, null, '1', '0', '1', '2019-03-29 15:43:54', null, '0'), ('6500', '运营数据', null, 'wxstatistics', '6000', 'icon-zhexiantu', 'views/mp/wxstatistics/index', '7', '1', '0', '2019-04-14 00:15:35', null, '0'), ('9999', '系统官网', null, 'https://pig4cloud.com/#', '-1', 'icon-guanwangfangwen', null, '9', '0', '0', '2019-01-17 17:05:19', '2019-01-17 17:29:06', '0');
COMMIT;
-- ----------------------------
@@ -225,7 +218,7 @@ CREATE TABLE `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,client_credentials', 'http://localhost:4040/sso1/login,http://localhost:4041/sso1/login', null, null, null, null, 'true', '1'), ('test', null, 'test', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1');
+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'), ('mp', null, 'mp', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1'), ('pig', null, 'pig', 'server', 'password,refresh_token,authorization_code,client_credentials', 'http://localhost:4040/sso1/login,http://localhost:4041/sso1/login', null, null, null, '{"website":"https://pig4cloud.com","appName":"pig官网"}', 'false', '1'), ('test', null, 'test', 'server', 'password,refresh_token', null, null, null, null, null, 'true', '1');
COMMIT;
-- ----------------------------
@@ -251,7 +244,7 @@ CREATE TABLE `sys_public_param` (
-- Records of `sys_public_param`
-- ----------------------------
BEGIN;
-INSERT INTO `sys_public_param` VALUES ('1', '系统首页参数配置', 'INDEX_MSG_CONFIG', '运维电话: 18888888888', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '9', '0', null), ('2', '版本信息说明', 'VERSION_INSTRUCTIONS', 'PIGX平台3.1版本', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '9', '0', null), ('3', '办公安全支持文件类型', 'OFFICE_SAFETY_FILETYPE', 'PDF,CEB,CEBX,DOC,DOCX,XLS,XLSX,PPT,PPTX,WPS', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '4', '0', null), ('6', 'TESTTEST', 'TESTTESTKEY', 'TESTTESTVALUE', '1', 'TESTTEST', '2019-04-29 22:32:43', '2019-04-29 22:33:52', '1', '0', '1');
+INSERT INTO `sys_public_param` VALUES ('1', '系统首页参数配置', 'INDEX_MSG_CONFIG', '运维电话: 18888888888', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '9', '0', '1'), ('2', '版本信息说明', 'VERSION_INSTRUCTIONS', 'PIGX平台3.1版本', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '9', '0', '1'), ('3', '办公安全支持文件类型', 'OFFICE_SAFETY_FILETYPE', 'PDF,CEB,CEBX,DOC,DOCX,XLS,XLSX,PPT,PPTX,WPS', '0', null, '2019-04-28 18:24:38', '2019-04-28 18:31:10', '4', '0', '1');
COMMIT;
-- ----------------------------
@@ -277,7 +270,7 @@ CREATE TABLE `sys_role` (
-- Records of `sys_role`
-- ----------------------------
BEGIN;
-INSERT INTO `sys_role` VALUES ('1', '管理员', 'ROLE_ADMIN', '管理员', '0', '2', '2017-10-29 15:45:51', '2018-12-26 14:09:11', '0', '1'), ('2', 'ROLE_CQQ', 'ROLE_CQQ', 'ROLE_CQQ', '2', null, '2018-11-11 19:42:26', '2018-12-26 14:09:07', '0', '2'), ('3', '测试角色', 'ROLE_TEST', '测试角色发版删除', '2', '', '2019-04-28 17:34:07', null, '0', '1');
+INSERT INTO `sys_role` VALUES ('1', '管理员', 'ROLE_ADMIN', '管理员', '0', '2', '2017-10-29 15:45:51', '2018-12-26 14:09:11', '0', '1'), ('2', 'ROLE_CQQ', 'ROLE_CQQ', '租户2管理员', '2', null, '2018-11-11 19:42:26', '2019-05-02 00:13:44', '0', '2');
COMMIT;
-- ----------------------------
@@ -294,7 +287,7 @@ CREATE TABLE `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', '2210'), ('1', '2211'), ('1', '2212'), ('1', '2213'), ('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', '2800'), ('1', '2810'), ('1', '2820'), ('1', '2830'), ('1', '2840'), ('1', '2850'), ('1', '2860'), ('1', '3000'), ('1', '3100'), ('1', '3200'), ('1', '3300'), ('1', '3400'), ('1', '3500'), ('1', '3600'), ('1', '3601'), ('1', '3620'), ('1', '3630'), ('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', '6000'), ('1', '6100'), ('1', '6101'), ('1', '6102'), ('1', '6103'), ('1', '6200'), ('1', '6201'), ('1', '6202'), ('1', '6203'), ('1', '6300'), ('1', '6301'), ('1', '6302'), ('1', '6303'), ('1', '6304'), ('1', '6305'), ('1', '6400'), ('1', '6401'), ('1', '6402'), ('1', '6500'), ('1', '9999'), ('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', '1000'), ('3', '1100'), ('3', '1101'), ('3', '1102'), ('3', '1103'), ('3', '1200'), ('3', '1201'), ('3', '1202'), ('3', '1203'), ('3', '1300'), ('3', '1301'), ('3', '1302'), ('3', '1303'), ('3', '1304'), ('3', '1400'), ('3', '1401'), ('3', '1402'), ('3', '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'), ('3', '2800'), ('3', '2810'), ('3', '2820'), ('3', '2830'), ('3', '2840'), ('3', '2850'), ('3', '2860'), ('3', '3000'), ('3', '3100'), ('3', '3200'), ('3', '3300'), ('3', '3400'), ('3', '3500'), ('3', '3600'), ('3', '3601'), ('3', '3620'), ('3', '3630'), ('3', '3700'), ('3', '3800'), ('3', '4000'), ('3', '4100'), ('3', '4101'), ('3', '4200'), ('3', '4201'), ('3', '4300'), ('3', '4301'), ('3', '4302'), ('3', '4303'), ('3', '4400'), ('3', '4401'), ('3', '6000'), ('3', '6100'), ('3', '6101'), ('3', '6102'), ('3', '6103'), ('3', '6200'), ('3', '6201'), ('3', '6202'), ('3', '6203'), ('3', '6300'), ('3', '6301'), ('3', '6302'), ('3', '6303'), ('3', '6304'), ('3', '6305'), ('3', '6400'), ('3', '6401'), ('3', '6402'), ('3', '6500');
+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', '2210'), ('1', '2211'), ('1', '2212'), ('1', '2213'), ('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', '2800'), ('1', '2810'), ('1', '2820'), ('1', '2830'), ('1', '2840'), ('1', '2850'), ('1', '2860'), ('1', '3000'), ('1', '3100'), ('1', '3200'), ('1', '3300'), ('1', '3400'), ('1', '3500'), ('1', '3600'), ('1', '3601'), ('1', '3620'), ('1', '3630'), ('1', '4000'), ('1', '4100'), ('1', '4101'), ('1', '4200'), ('1', '4201'), ('1', '4300'), ('1', '4301'), ('1', '4302'), ('1', '4303'), ('1', '4400'), ('1', '4401'), ('1', '6000'), ('1', '6100'), ('1', '6101'), ('1', '6102'), ('1', '6103'), ('1', '6200'), ('1', '6201'), ('1', '6202'), ('1', '6203'), ('1', '6300'), ('1', '6301'), ('1', '6302'), ('1', '6303'), ('1', '6304'), ('1', '6305'), ('1', '6400'), ('1', '6401'), ('1', '6402'), ('1', '6500'), ('1', '9999'), ('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');
COMMIT;
-- ----------------------------
@@ -319,7 +312,7 @@ CREATE TABLE `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', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('2', '认证中心', 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('3', '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('4', 'elastic-job定时任务模块', 'pigx-daemon-elastic-job', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-elastic-job', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('5', 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('6', '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('7', '通用权限模块', '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', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('8', '工作流长链接支持1', 'pigx-activiti-ws-1', '[{\"args\": {\"_genkey_0\": \"/act/ws/info/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('9', '工作流长链接支持2', 'pigx-activiti-ws-2', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-activiti', '100', '2019-03-26 22:46:09', '2019-04-14 00:02:58', '1'), ('10', '工作流管理模块', 'pigx-activiti', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2019-04-14 00:02:58', null, '0'), ('11', '认证中心', 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', '0', '2019-04-14 00:02:58', null, '0'), ('12', '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', '0', '2019-04-14 00:02:58', null, '0'), ('13', 'elastic-job定时任务模块', 'pigx-daemon-elastic-job', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-elastic-job', '0', '2019-04-14 00:02:58', null, '0'), ('14', 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', '0', '2019-04-14 00:02:58', null, '0'), ('15', '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', '0', '2019-04-14 00:02:58', null, '0'), ('16', '通用权限模块', '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', '2019-04-14 00:02:58', null, '0'), ('17', '工作流长链接支持1', 'pigx-activiti-ws-1', '[{\"args\": {\"_genkey_0\": \"/act/ws/info/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2019-04-14 00:02:58', null, '0'), ('18', '工作流长链接支持2', 'pigx-activiti-ws-2', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-activiti', '100', '2019-04-14 00:02:58', null, '0'), ('19', '微信公众号管理', 'pigx-mp-manager', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-manager', '0', '2019-04-14 00:02:58', null, '0');
+INSERT INTO `sys_route_conf` VALUES ('1', '工作流管理模块', 'pigx-activiti', '[{\"args\": {\"_genkey_0\": \"/act/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:33', '0'), ('2', '认证中心', 'pigx-auth', '[{\"args\": {\"_genkey_0\": \"/auth/**\"}, \"name\": \"Path\"}]', '[{\"args\": {}, \"name\": \"ValidateCodeGatewayFilter\"}, {\"args\": {}, \"name\": \"PasswordDecoderFilter\"}]', 'lb://pigx-auth', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:35', '0'), ('3', '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:37', '0'), ('4', 'elastic-job定时任务模块', 'pigx-daemon-elastic-job', '[{\"args\": {\"_genkey_0\": \"/daemon/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-elastic-job', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:39', '0'), ('5', 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:41', '0'), ('6', '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:45', '0'), ('7', '通用权限模块', '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', '2019-04-14 00:02:58', '2019-05-02 00:00:47', '0'), ('8', '工作流长链接支持1', 'pigx-activiti-ws-1', '[{\"args\": {\"_genkey_0\": \"/act/ws/info/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-activiti', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:49', '0'), ('9', '工作流长链接支持2', 'pigx-activiti-ws-2', '[{\"args\": {\"_genkey_0\": \"/act/ws/**\"}, \"name\": \"Path\"}]', '[]', 'lb:ws://pigx-activiti', '100', '2019-04-14 00:02:58', '2019-05-02 00:00:52', '0'), ('10', '微信公众号管理', 'pigx-mp-manager', '[{\"args\": {\"_genkey_0\": \"/mp/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-mp-manager', '0', '2019-04-14 00:02:58', '2019-05-02 00:00:55', '0');
COMMIT;
-- ----------------------------
@@ -378,7 +371,7 @@ CREATE TABLE `sys_user` (
-- Records of `sys_user`
-- ----------------------------
BEGIN;
-INSERT INTO `sys_user` VALUES ('1', 'admin', '$2a$10$QOfWxxFyAMmEEmnuw9UI/..1s4B4eF/u9PzE2ZaGO.ij9YfmcUy.u', '', '17034642889', 'lengleng-6f69b3917f1a47c58e805e3f0f33894c.jpeg', '1', '2018-04-20 07:15:18', '2019-03-30 08:23:55', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, null, null, '1'), ('2', 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', null, '17034642887', 'lengleng-6f69b3917f1a47c58e805e3f0f33894c.jpeg', '10', '2018-04-20 07:15:18', '2019-01-09 11:06:24', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, null, null, '2'), ('3', 'HHH', '$2a$10$fVh1KjZAVRtPEEp6/FFZXOReybXTDei35Ag5AgO2581R.yfthK7I6', null, '15315244022', null, '12', '2019-04-28 17:35:28', null, '0', '0', null, null, null, null, '1');
+INSERT INTO `sys_user` VALUES ('1', 'admin', '$2a$10$QOfWxxFyAMmEEmnuw9UI/..1s4B4eF/u9PzE2ZaGO.ij9YfmcUy.u', '', '17034642889', 'lengleng-5b87318016954b6384e07ce10ba45030.jpg', '1', '2018-04-20 07:15:18', '2019-04-30 12:37:44', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, null, null, '1'), ('2', 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', null, '17034642887', 'lengleng-6f69b3917f1a47c58e805e3f0f33894c.jpeg', '10', '2018-04-20 07:15:18', '2019-01-09 11:06:24', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', null, null, null, '2');
COMMIT;
-- ----------------------------
@@ -395,7 +388,7 @@ CREATE TABLE `sys_user_role` (
-- Records of `sys_user_role`
-- ----------------------------
BEGIN;
-INSERT INTO `sys_user_role` VALUES ('1', '1'), ('2', '2'), ('3', '3');
+INSERT INTO `sys_user_role` VALUES ('1', '1'), ('2', '2');
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/db/6pigxx_config.sql b/db/6pigxx_config.sql
index 3c57201ae..1edf02ec6 100644
--- a/db/6pigxx_config.sql
+++ b/db/6pigxx_config.sql
@@ -42,13 +42,13 @@ CREATE TABLE `config_info` (
`c_schema` text COLLATE utf8_bin,
PRIMARY KEY (`id`),
UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
-- ----------------------------
-- Records of `config_info`
-- ----------------------------
BEGIN;
-INSERT INTO `config_info` VALUES ('1', 'application-dev.yml', 'DEFAULT_GROUP', '# 加解密根密码\njasypt:\n encryptor:\n password: pigx #根密码\n# redis 相关\nspring:\n redis:\n password:\n host: ${REDIS-HOST:pigx-redis}\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\n# feign 配置\nfeign:\n hystrix:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n# hystrix If you need to use ThreadLocal bound variables in your RequestInterceptor`s\n# you will need to either set the thread isolation strategy for Hystrix to `SEMAPHORE or disable Hystrix in Feign.\nhystrix:\n command:\n default:\n execution:\n isolation:\n strategy: SEMAPHORE\n thread:\n timeoutInMilliseconds: 60000\n shareSecurityContext: true\n\n#请求处理的超时时间\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n# mybaits-plus配置\nmybatis-plus:\n # MyBatis Mapper所对应的XML文件位置\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n # 关闭MP3.0自带的banner\n banner: false\n db-config:\n # 主键类型\n id-type: auto\n\n#swagger公共信息\nswagger:\n title: PigX Swagger API\n description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架\n license: Powered By PigX\n licenseUrl: https://pig4cloud.com/\n terms-of-service-url: https://pig4cloud.com/\n contact:\n name: 冷冷\n email: wangiegie@gmail.com\n url: https://pig4cloud.com/about.html\n authorization:\n name: pigX OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token\n\n## spring security 配置\nsecurity:\n oauth2:\n client:\n # 默认放行url,如果子模块重写这里的配置就会被覆盖\n ignore-urls:\n - /actuator/**\n - /v2/api-docs\n resource:\n loadBalanced: true\n token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token', '92a87c04f00b0ea3186ab8384a974154', '2019-04-18 02:10:20', '2019-04-26 20:42:58', null, '127.0.0.1', '', '', '通用配置文件', null, null, 'yaml', null), ('2', 'pigx-activiti-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n ignore-urls:\n - \'/actuator/**\'\n - \'/v2/api-docs\'\n - \'/editor-app/**\'\n - \'/modeler.html\'\n - \'/ws/**\'\nspring:\n autoconfigure:\n exclude: org.activiti.spring.boot.SecurityAutoConfiguration\n activiti:\n check-process-definitions: false\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_ac}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - oa_leave_bill', '9ba263596903db9dba9c812a06ebd3b3', '2019-04-18 02:10:56', '2019-04-18 02:10:56', null, '127.0.0.1', '', '', '工作流配置文件', null, null, 'yaml', null), ('3', 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', '2a84033a4e652efaa427b1869f276cea', '2019-04-18 02:11:32', '2019-04-18 02:11:32', null, '127.0.0.1', '', '', '认证中心配置文件', null, null, 'yaml', null), ('4', 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_datasource_conf', '822e94558a8c507bf73d6843ae5ca7ad', '2019-04-18 02:12:10', '2019-04-18 02:12:10', null, '127.0.0.1', '', '', '代码生成', null, null, 'yaml', null), ('5', 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\nspring:\n # 保存定时任务的数据源\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n elasticjob:\n # 分布式任务协调依赖zookeeper\n zookeeper:\n server-lists: ${ZOOKEEPER-HOST:pigx-zookeeper}:${ZOOKEEPER-PORT:2181}\n namespace: pigx-daemon\n # 普通任务\n simples:\n spring-simple-job:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener\n spring-simple-job2:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob2\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener\n # 简单任务\n dataflows:\n spring-dataflow-job:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxDataflowJob\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n streaming-process: true\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n distributed-listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxDistributeElasticJobListener\n started-timeout-milliseconds: 5000\n completed-timeout-milliseconds: 10000', 'e491142fc720dea9e8acb67d3b89f017', '2019-04-18 02:12:57', '2019-04-18 02:12:57', null, '127.0.0.1', '', '', '定时任务-elastic-job配置', null, null, 'yaml', null), ('7', 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'security:\n encode:\n # 前端密码密钥,必须16位\n key: \'pigxpigxpigxpigx\'\n\n# 不校验验证码终端\nignore:\n clients:\n - test\n swagger-providers:\n - ${AUTH-HOST:pigx-auth}\n - ${TX-MGR-HOST:pigx-tx-manager}', '4a1833d875a5e008837cf36f5c0f4c41', '2019-04-18 02:13:52', '2019-04-18 02:13:52', null, '127.0.0.1', '', '', '网关配置文件', null, null, 'yaml', null), ('8', 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n boot:\n admin:\n ui:\n resource-locations: \'classpath:/ui/,classpath:/static/\'\n template-location: \'classpath:/ui/\'\n title: \'pigx 服务状态监控\'\n brand: \'pigx 服务状态监控\'', 'd4caef8a7cad3d357ad2fcb9f57e9982', '2019-04-18 02:14:17', '2019-04-18 02:14:17', null, '127.0.0.1', '', '', '监控配置文件', null, null, 'yaml', null), ('12', 'pigx-zipkin-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 数据源\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_zipkin}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\nmanagement:\n metrics:\n web:\n server:\n auto-time-requests: false\nzipkin:\n storage:\n type: mysql\nsleuth:\n enabled: true', 'd8390c0b219b97d5cad2776c651be9bd', '2019-04-18 02:16:50', '2019-04-18 02:16:50', null, '127.0.0.1', '', '', '链路跟踪配置文件', null, null, 'yaml', null), ('14', 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n\n# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true\n\n# 文件系统 (提供测试环境,不要乱传)\nminio:\n url: http://minio.pig4cloud.com\n access-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)\n secret-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log', '30039e95839fd8062679460ebec783d2', '2019-04-18 02:32:44', '2019-04-29 09:36:08', null, '127.0.0.1', '', '', 'admin 服务配置', null, null, 'yaml', null), ('15', 'pigx-tx-manager-dev.yml', 'DEFAULT_GROUP', '# 页面配置\nspring:\n mvc:\n static-path-pattern: /**\n resources:\n static-locations: classpath:/static/\n\n\n# LCN 配置\ntm:\n transaction:\n netty:\n delaytime: 5 # 客户端链接最大通讯时间 (秒)\n hearttime: 15 # 客户端心跳时间 (秒)\n redis:\n savemaxtime: 30 # redis 保存时间 (秒)\n socket:\n port: 9998 # 通讯端口\n maxconnection: 1000 #最大链接数\n compensate:\n auto: false #是否自动补偿\n notifyUrl: http://ip:port/path #补偿结果通知(配消息总线里面)\n tryTime: 30 # z再次重试时间间隔\n maxWaitTime: 5000 # 请求超时的最大时间 (毫秒)', '885f5c125f2df7a08692929ccce154be', '2019-04-18 02:54:03', '2019-04-18 02:54:03', null, '127.0.0.1', '', '', '分布式事务协调模块', null, null, 'yaml', null), ('17', 'pigx-mp-manager-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n hikari:\n connection-init-sql: SET NAMES utf8mb4\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - wx_menu\n - wx_account\n - wx_account_fans\n - wx_fans_msg_res', '4c1b373da87269fec9059221002618de', '2019-04-18 03:00:10', '2019-04-18 03:00:10', null, '127.0.0.1', '', '', '公众号管理模块', null, null, 'yaml', null), ('18', 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n resources:\n static-locations: classpath:/static/,classpath:/views/\n quartz:\n #相关属性配置\n properties:\n org:\n quartz:\n scheduler:\n instanceName: clusteredScheduler\n instanceId: AUTO\n jobStore:\n class: org.quartz.impl.jdbcjobstore.JobStoreTX\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n clusterCheckinInterval: 10000\n useProperties: false\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 50\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n #数据库方式\n job-store-type: jdbc\n #初始化表结构\n #jdbc:\n #initialize-schema: never\n\n', '30d64fb3f5f60ee25558d42bc3d3210e', '2019-04-18 03:08:34', '2019-04-18 03:08:34', null, '127.0.0.1', '', '', 'quartz 配置文件', null, null, 'yaml', null);
+INSERT INTO `config_info` VALUES ('1', 'application-dev.yml', 'DEFAULT_GROUP', '# 加解密根密码\njasypt:\n encryptor:\n password: pigx #根密码\n# redis 相关\nspring:\n redis:\n password:\n host: ${REDIS-HOST:pigx-redis}\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\n# feign 配置\nfeign:\n hystrix:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n# hystrix If you need to use ThreadLocal bound variables in your RequestInterceptor`s\n# you will need to either set the thread isolation strategy for Hystrix to `SEMAPHORE or disable Hystrix in Feign.\nhystrix:\n command:\n default:\n execution:\n isolation:\n strategy: SEMAPHORE\n thread:\n timeoutInMilliseconds: 60000\n shareSecurityContext: true\n\n#请求处理的超时时间\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n# mybaits-plus配置\nmybatis-plus:\n # MyBatis Mapper所对应的XML文件位置\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n # 关闭MP3.0自带的banner\n banner: false\n db-config:\n # 主键类型\n id-type: auto\n\n#swagger公共信息\nswagger:\n title: PigX Swagger API\n description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架\n license: Powered By PigX\n licenseUrl: https://pig4cloud.com/\n terms-of-service-url: https://pig4cloud.com/\n contact:\n name: 冷冷\n email: wangiegie@gmail.com\n url: https://pig4cloud.com/about.html\n authorization:\n name: pigX OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token\n\n## spring security 配置\nsecurity:\n oauth2:\n client:\n # 默认放行url,如果子模块重写这里的配置就会被覆盖\n ignore-urls:\n - /actuator/**\n - /v2/api-docs\n resource:\n loadBalanced: true\n token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token', '92a87c04f00b0ea3186ab8384a974154', '2019-04-18 02:10:20', '2019-04-26 20:42:58', null, '127.0.0.1', '', '', '通用配置文件', null, null, 'yaml', null), ('2', 'pigx-activiti-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n ignore-urls:\n - \'/actuator/**\'\n - \'/v2/api-docs\'\n - \'/editor-app/**\'\n - \'/modeler.html\'\n - \'/ws/**\'\nspring:\n autoconfigure:\n exclude: org.activiti.spring.boot.SecurityAutoConfiguration\n activiti:\n check-process-definitions: false\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_ac}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - oa_leave_bill', '9ba263596903db9dba9c812a06ebd3b3', '2019-04-18 02:10:56', '2019-04-18 02:10:56', null, '127.0.0.1', '', '', '工作流配置文件', null, null, 'yaml', null), ('3', 'pigx-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', '2a84033a4e652efaa427b1869f276cea', '2019-04-18 02:11:32', '2019-04-18 02:11:32', null, '127.0.0.1', '', '', '认证中心配置文件', null, null, 'yaml', null), ('4', 'pigx-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n client-secret: ENC(gPFcUOmJm8WqM3k3eSqS0Q==)\n scope: server\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_datasource_conf', '822e94558a8c507bf73d6843ae5ca7ad', '2019-04-18 02:12:10', '2019-04-18 02:12:10', null, '127.0.0.1', '', '', '代码生成', null, null, 'yaml', null), ('5', 'pigx-daemon-elastic-job-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n## 定时任务\nspring:\n # 保存定时任务的数据源\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n elasticjob:\n # 分布式任务协调依赖zookeeper\n zookeeper:\n server-lists: ${ZOOKEEPER-HOST:pigx-zookeeper}:${ZOOKEEPER-PORT:2181}\n namespace: pigx-daemon\n # 普通任务\n simples:\n spring-simple-job:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener\n spring-simple-job2:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob2\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener\n # 简单任务\n dataflows:\n spring-dataflow-job:\n job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxDataflowJob\n cron: 0 0 0/1 * * ?\n sharding-total-count: 3\n sharding-item-parameters: 0=service1,1=service2,2=service3\n streaming-process: true\n eventTraceRdbDataSource: \'dataSource\'\n listener:\n distributed-listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxDistributeElasticJobListener\n started-timeout-milliseconds: 5000\n completed-timeout-milliseconds: 10000', 'e491142fc720dea9e8acb67d3b89f017', '2019-04-18 02:12:57', '2019-04-18 02:12:57', null, '127.0.0.1', '', '', '定时任务-elastic-job配置', null, null, 'yaml', null), ('7', 'pigx-gateway-dev.yml', 'DEFAULT_GROUP', 'security:\n encode:\n # 前端密码密钥,必须16位\n key: \'pigxpigxpigxpigx\'\n\n# 不校验验证码终端\nignore:\n clients:\n - test\n swagger-providers:\n - ${AUTH-HOST:pigx-auth}\n - ${TX-MGR-HOST:pigx-tx-manager}', '4a1833d875a5e008837cf36f5c0f4c41', '2019-04-18 02:13:52', '2019-04-18 02:13:52', null, '127.0.0.1', '', '', '网关配置文件', null, null, 'yaml', null), ('8', 'pigx-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx\n password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx\n boot:\n admin:\n ui:\n resource-locations: \'classpath:/ui/,classpath:/static/\'\n template-location: \'classpath:/ui/\'\n title: \'pigx 服务状态监控\'\n brand: \'pigx 服务状态监控\'', 'd4caef8a7cad3d357ad2fcb9f57e9982', '2019-04-18 02:14:17', '2019-04-18 02:14:17', null, '127.0.0.1', '', '', '监控配置文件', null, null, 'yaml', null), ('14', 'pigx-upms-biz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n scope: server\n\n# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true\n\n# 文件系统 (提供测试环境,不要乱传)\nminio:\n url: http://minio.pig4cloud.com\n access-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)\n secret-key: ENC(O4GgJmcJLQAnvfz+RRq65aps5HgbWQXZ)\n\n# Logger Config\nlogging:\n level:\n com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - sys_user\n - sys_role\n - sys_dept\n - sys_log\n - sys_social_details\n - sys_dict\n - sys_dict_item\n - sys_public_param\n - sys_log', '30039e95839fd8062679460ebec783d2', '2019-04-18 02:32:44', '2019-04-29 09:36:08', null, '127.0.0.1', '', '', 'admin 服务配置', null, null, 'yaml', null), ('15', 'pigx-tx-manager-dev.yml', 'DEFAULT_GROUP', '# 页面配置\nspring:\n mvc:\n static-path-pattern: /**\n resources:\n static-locations: classpath:/static/\n\n\n# LCN 配置\ntm:\n transaction:\n netty:\n delaytime: 5 # 客户端链接最大通讯时间 (秒)\n hearttime: 15 # 客户端心跳时间 (秒)\n redis:\n savemaxtime: 30 # redis 保存时间 (秒)\n socket:\n port: 9998 # 通讯端口\n maxconnection: 1000 #最大链接数\n compensate:\n auto: false #是否自动补偿\n notifyUrl: http://ip:port/path #补偿结果通知(配消息总线里面)\n tryTime: 30 # z再次重试时间间隔\n maxWaitTime: 5000 # 请求超时的最大时间 (毫秒)', '885f5c125f2df7a08692929ccce154be', '2019-04-18 02:54:03', '2019-04-18 02:54:03', null, '127.0.0.1', '', '', '分布式事务协调模块', null, null, 'yaml', null), ('17', 'pigx-mp-manager-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n client-secret: ENC(vW+Nup9LaTfIFwgufUBsYg==)\n scope: server\n\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n hikari:\n connection-init-sql: SET NAMES utf8mb4\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\n\n# 租户表维护\npigx:\n tenant:\n column: tenant_id\n tables:\n - wx_menu\n - wx_account\n - wx_account_fans\n - wx_fans_msg_res', 'e212d5b7ff3bbaf25ace2f801b351563', '2019-04-18 03:00:10', '2019-05-01 11:06:21', null, '127.0.0.1', '', '', '公众号管理模块', null, null, 'yaml', null), ('18', 'pigx-daemon-quartz-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n client-secret: ENC(tz2NM4GcmnE7sNJTYL8ZSg==)\n scope: server\n\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: ${MYSQL-USER:root}\n password: ${MYSQL-PWD:root}\n url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8\n resources:\n static-locations: classpath:/static/,classpath:/views/\n quartz:\n #相关属性配置\n properties:\n org:\n quartz:\n scheduler:\n instanceName: clusteredScheduler\n instanceId: AUTO\n jobStore:\n class: org.quartz.impl.jdbcjobstore.JobStoreTX\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n clusterCheckinInterval: 10000\n useProperties: false\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 50\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n #数据库方式\n job-store-type: jdbc\n #初始化表结构\n #jdbc:\n #initialize-schema: never\n\n', '30d64fb3f5f60ee25558d42bc3d3210e', '2019-04-18 03:08:34', '2019-04-18 03:08:34', null, '127.0.0.1', '', '', 'quartz 配置文件', null, null, 'yaml', null);
COMMIT;
-- ----------------------------
@@ -168,7 +168,7 @@ CREATE TABLE `his_config_info` (
KEY `idx_gmt_create` (`gmt_create`),
KEY `idx_gmt_modified` (`gmt_modified`),
KEY `idx_did` (`data_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造';
-- ----------------------------
-- Table structure for `roles`
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ab0fbdad..601ec505e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -90,16 +90,6 @@ services:
ports:
- 5001:5001
- pigx-zipkin:
- build:
- context: ./
- dockerfile: ./pigx-visual/pigx-zipkin/Dockerfile
- restart: always
- image: pigx-zipkin
- container_name: pigx-zipkin
- ports:
- - 5006:5006
-
pigx-daemon-quartz:
build:
context: ./
diff --git a/pigx-auth/Dockerfile b/pigx-auth/Dockerfile
index e65d1fb44..d9c10fdd6 100644
--- a/pigx-auth/Dockerfile
+++ b/pigx-auth/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 3000
ADD ./pigx-auth/target/pigx-auth.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar
diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 6a3fc385e..478f242af 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-auth
diff --git a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
index 63a204081..7059cc1cf 100644
--- a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
+++ b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
@@ -30,7 +30,7 @@
-
<#list scopeList as scope>
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 76a64821e..c4fe70d00 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -16,7 +16,7 @@
pigx 公共版本控制
- 2.8.0
+ 3.0.0
3.1.0
8.0.15
1.5.22
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index 1157ed73d..20bcde7cb 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-core
diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index 5b69ce245..7681cb3a3 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-data
diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index 7854a5bce..fb0530b99 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-gateway
diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml
index 68f866d29..f76d82892 100644
--- a/pigx-common/pigx-common-job/pom.xml
+++ b/pigx-common/pigx-common-job/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-job
diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml
index afc2b8813..9c47752d2 100644
--- a/pigx-common/pigx-common-log/pom.xml
+++ b/pigx-common/pigx-common-log/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-log
diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml
index d86c37e9d..10db5e14d 100755
--- a/pigx-common/pigx-common-minio/pom.xml
+++ b/pigx-common/pigx-common-minio/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-minio
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index 54fd01845..58095bc84 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-security
diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml
index 6bc15b33d..b59063b81 100644
--- a/pigx-common/pigx-common-swagger/pom.xml
+++ b/pigx-common/pigx-common-swagger/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-swagger
diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml
index e32c6d6a7..b165ce19d 100644
--- a/pigx-common/pigx-common-transaction/pom.xml
+++ b/pigx-common/pigx-common-transaction/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-common
- 2.8.0
+ 3.0.0
pigx-common-transaction
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index 5d238a181..829f9c872 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-common
diff --git a/pigx-gateway/Dockerfile b/pigx-gateway/Dockerfile
index c5dd6144f..987f63920 100644
--- a/pigx-gateway/Dockerfile
+++ b/pigx-gateway/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 9999
ADD ./pigx-gateway/target/pigx-gateway.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index 38ed0f749..ba9c39a12 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-gateway
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index 17e6a502a..323247d1a 100755
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -18,7 +18,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-register
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index cf377bc86..df9f82ff2 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-upms
- 2.8.0
+ 3.0.0
pigx-upms-api
diff --git a/pigx-upms/pigx-upms-biz/Dockerfile b/pigx-upms/pigx-upms-biz/Dockerfile
index cff154057..054e1c77c 100644
--- a/pigx-upms/pigx-upms-biz/Dockerfile
+++ b/pigx-upms/pigx-upms-biz/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 4000
ADD ./pigx-upms/pigx-upms-biz/target/pigx-upms-biz.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index 7925ea7f7..20c2a6620 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-upms
- 2.8.0
+ 3.0.0
pigx-upms-biz
diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml
index 27545bc74..d2b2c35d0 100644
--- a/pigx-upms/pom.xml
+++ b/pigx-upms/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-upms
diff --git a/pigx-visual/pigx-activiti/Dockerfile b/pigx-visual/pigx-activiti/Dockerfile
index 0f57bde9d..8c2251ee3 100644
--- a/pigx-visual/pigx-activiti/Dockerfile
+++ b/pigx-visual/pigx-activiti/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 5005
ADD ./pigx-visual/pigx-activiti/target/pigx-activiti.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-activiti.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-activiti.jar
diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml
index 24bac9efc..005f1b0fc 100644
--- a/pigx-visual/pigx-activiti/pom.xml
+++ b/pigx-visual/pigx-activiti/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-activiti
diff --git a/pigx-visual/pigx-codegen/Dockerfile b/pigx-visual/pigx-codegen/Dockerfile
index 00aade3fd..c218f2000 100644
--- a/pigx-visual/pigx-codegen/Dockerfile
+++ b/pigx-visual/pigx-codegen/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 5003
ADD ./pigx-visual/pigx-codegen/target/pigx-codegen.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index 4ca285166..d627f1ee3 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-codegen
diff --git a/pigx-visual/pigx-daemon-elastic-job/Dockerfile b/pigx-visual/pigx-daemon-elastic-job/Dockerfile
index f18c35c88..be93c6c4a 100644
--- a/pigx-visual/pigx-daemon-elastic-job/Dockerfile
+++ b/pigx-visual/pigx-daemon-elastic-job/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 5002
ADD ./pigx-visual/pigx-daemon-elastic-job/target/pigx-daemon-elastic-job.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar
diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml
index 9318a970e..77a891dbc 100644
--- a/pigx-visual/pigx-daemon-elastic-job/pom.xml
+++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-daemon-elastic-job
diff --git a/pigx-visual/pigx-daemon-quartz/Dockerfile b/pigx-visual/pigx-daemon-quartz/Dockerfile
index 966fbfae5..5351235c1 100644
--- a/pigx-visual/pigx-daemon-quartz/Dockerfile
+++ b/pigx-visual/pigx-daemon-quartz/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 5007
ADD ./pigx-visual/pigx-daemon-quartz/target/pigx-daemon-quartz.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar
diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml
index 62aa70cff..a682e1b8c 100644
--- a/pigx-visual/pigx-daemon-quartz/pom.xml
+++ b/pigx-visual/pigx-daemon-quartz/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
4.0.0
diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile
index f435a90f4..fd20b11ca 100644
--- a/pigx-visual/pigx-monitor/Dockerfile
+++ b/pigx-visual/pigx-monitor/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 5001
ADD ./pigx-visual/pigx-monitor/target/pigx-monitor.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar
diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index 5874e6f7c..03c1e4970 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-monitor
@@ -36,7 +36,7 @@
com.pig4cloud
pigx-common-core
- 2.8.0
+ 3.0.0
org.springframework.boot
diff --git a/pigx-visual/pigx-mp-manager/Dockerfile b/pigx-visual/pigx-mp-manager/Dockerfile
index 07962fb57..44d53ade8 100644
--- a/pigx-visual/pigx-mp-manager/Dockerfile
+++ b/pigx-visual/pigx-mp-manager/Dockerfile
@@ -12,4 +12,4 @@ EXPOSE 6000
ADD ./pigx-visual/pigx-mp-manager/target/pigx-mp-manager.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-mp-manager.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-mp-manager.jar
diff --git a/pigx-visual/pigx-mp-manager/pom.xml b/pigx-visual/pigx-mp-manager/pom.xml
index 9cfd3ebcb..8fa48ac31 100755
--- a/pigx-visual/pigx-mp-manager/pom.xml
+++ b/pigx-visual/pigx-mp-manager/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-mp-manager
diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml
index 852b22b78..44b5a2b3f 100644
--- a/pigx-visual/pigx-sso-client-demo/pom.xml
+++ b/pigx-visual/pigx-sso-client-demo/pom.xml
@@ -29,7 +29,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
diff --git a/pigx-visual/pigx-tx-manager/Dockerfile b/pigx-visual/pigx-tx-manager/Dockerfile
index 65908f86e..943f4c71d 100644
--- a/pigx-visual/pigx-tx-manager/Dockerfile
+++ b/pigx-visual/pigx-tx-manager/Dockerfile
@@ -13,4 +13,4 @@ EXPOSE 9998
ADD ./pigx-visual/pigx-tx-manager/target/pigx-tx-manager.jar ./
-CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-tx-manager.jar
+CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pigx-tx-manager.jar
diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml
index 4b59f96ee..ae5413a43 100644
--- a/pigx-visual/pigx-tx-manager/pom.xml
+++ b/pigx-visual/pigx-tx-manager/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-visual
- 2.8.0
+ 3.0.0
pigx-tx-manager
diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml
index 2c4400f31..aff244b75 100644
--- a/pigx-visual/pom.xml
+++ b/pigx-visual/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
pigx-visual
diff --git a/pom.xml b/pom.xml
index ded21890a..056a7539d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.8.0
+ 3.0.0
${project.artifactId}
pom
@@ -263,4 +263,11 @@
http://nexus.gitee.wang/repository/maven-releases/
+
+
+ gitee.wang
+ gitee.wang
+ http://nexus.gitee.wang/repository/maven-releases/
+
+