From 22b0e364dc0a354ac43f6a277d5fd626ae64033a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 15 Apr 2019 17:59:16 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E3=80=82=20=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=20:memo:=20=E4=BF=AE=E6=94=B9=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E9=92=88=E5=AF=B9=E4=B8=8D?= =?UTF-8?q?=E4=BA=88=E8=A7=A3=E5=86=B3=E6=83=85=E5=86=B5=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81:=20=E4=BD=9C=E7=94=A8:=201.=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=8A=A0=E6=8C=81=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E8=AE=A9=E8=BF=90=E8=A1=8C=E6=9B=B4=E5=8A=A0=E7=81=B5=E6=B4=BB?= =?UTF-8?q?;=202.=E6=94=AF=E6=8C=81Docker=E5=AE=98=E6=96=B9=E7=9A=84Docker?= =?UTF-8?q?=20Swarm=E5=A4=9A=E4=B8=BB=E6=9C=BA=E7=9A=84=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=94=AF=E6=8C=81;=20=E8=AF=B4=E6=98=8E:=20defaultZone:=20http?= =?UTF-8?q?://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eurek?= =?UTF-8?q?a/=20=E5=A6=82=E6=9E=9C=E9=85=8D=E7=BD=AE=E4=BA=86=E5=A4=A7?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7=E9=87=8C=E9=9D=A2=E7=9A=84=E5=86=92=E5=8F=B7?= =?UTF-8?q?=E5=89=8D=E9=9D=A2=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=88=99=E4=BD=BF=E7=94=A8,=E5=90=A6=E5=88=99=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=86=92=E5=8F=B7=E5=90=8E=E9=9D=A2=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :wrench: 修改配置文件。支持环境变量设置参数支持 :whale: Work about Docker. 修改dockerfile :whale: Work about Docker. 修改dockerfile :whale: Work about Docker. 修改dockerfile :bug: Fixing a bug. 表名字处理 :bug: Fixing a bug. 修正租户表管理 :card_file_box: 执行数据库相关的变化。修改数据库数据 --- .gogs/ISSUE_TEMPLATE.md | 4 +- db/1schema.sql | 5 +- db/2pigxx.sql | 339 ++++++++++-------- db/6pigxx_mp.sql | 132 +++++++ db/Dockerfile | 4 +- docker-compose.yml | 8 + pigx-auth/src/main/resources/bootstrap.yml | 2 +- ...urceServerTokenRelayAutoConfiguration.java | 2 +- pigx-config/src/main/resources/bootstrap.yml | 2 +- .../main/resources/config/application-dev.yml | 10 +- .../resources/config/pigx-activiti-dev.yml | 6 +- .../main/resources/config/pigx-auth-dev.yml | 6 +- .../resources/config/pigx-codegen-dev.yml | 6 +- .../config/pigx-daemon-elastic-job-dev.yml | 8 +- .../config/pigx-daemon-quartz-dev.yml | 8 +- .../resources/config/pigx-gateway-dev.yml | 4 +- .../resources/config/pigx-mp-manager-dev.yml | 13 +- .../resources/config/pigx-upms-biz-dev.yml | 6 +- .../main/resources/config/pigx-zipkin-dev.yml | 6 +- pigx-gateway/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-mp-manager/Dockerfile | 2 +- .../pig4cloud/pigx/mp/entity/WxAccount.java | 2 - .../pigx/mp/entity/WxAccountFans.java | 1 - .../pig4cloud/pigx/mp/entity/WxFansMsg.java | 2 - .../pigx/mp/entity/WxFansMsgRes.java | 2 - .../pig4cloud/pigx/mp/entity/WxMpMenu.java | 2 - .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- 35 files changed, 387 insertions(+), 215 deletions(-) create mode 100644 db/6pigxx_mp.sql diff --git a/.gogs/ISSUE_TEMPLATE.md b/.gogs/ISSUE_TEMPLATE.md index 11f4fbb6b..115bb1a28 100644 --- a/.gogs/ISSUE_TEMPLATE.md +++ b/.gogs/ISSUE_TEMPLATE.md @@ -5,7 +5,7 @@ - 是否修改包名: -### 报错信息 +### 报错信息 （注意格式化） ``` @@ -13,7 +13,7 @@ ``` -### 问题描述（包括回显步骤、截图） +### 问题描述（包括回显步骤、截图 （此项没有直接关闭、不予解决）） diff --git a/db/1schema.sql b/db/1schema.sql index 6799feff7..d3f070ea0 100644 --- a/db/1schema.sql +++ b/db/1schema.sql @@ -8,4 +8,7 @@ create database `pigxx_ac` default character set utf8mb4 collate utf8mb4_general create database `pigxx_zipkin` default character set utf8mb4 collate utf8mb4_general_ci; -- pigx 任务相关库 -create database `pigxx_job` default character set utf8mb4 collate utf8mb4_general_ci; \ No newline at end of file +create database `pigxx_job` default character set utf8mb4 collate utf8mb4_general_ci; + +-- pigx 公众号管理模块 +create database `pigxx_mp` default character set utf8mb4 collate utf8mb4_general_ci; \ No newline at end of file diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 62e159115..ad9ef9877 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -18,20 +18,44 @@ USE pigxx; SET NAMES utf8; SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for `sys_datasource_conf` +-- ---------------------------- +DROP TABLE IF EXISTS `sys_datasource_conf`; +CREATE TABLE `sys_datasource_conf` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `url` varchar(255) DEFAULT NULL, + `username` varchar(255) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL, + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新', + `del_flag` char(50) DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COMMENT='数据源表'; + +-- ---------------------------- +-- Records of `sys_datasource_conf` +-- ---------------------------- +BEGIN; +INSERT INTO `sys_datasource_conf` VALUES ('3', 'pigxx', 'jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true', 'root', 'Cx+ocw0iFCpae4Qo4IoFmQ==', '2019-03-31 16:40:43', '2019-04-11 20:57:06', '0', '1'), ('4', 'pigxx_ac', 'jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8', 'root', 'uzmKfiW1J8dcen1BH+yf8g==', '2019-03-31 17:53:25', '2019-04-11 20:57:28', '0', '1'), ('5', 'pigxx_job', 'jdbc:mysql://pigx-mysql:3306/pigxx_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8', 'root', 'mSHzblMDiW3j/ZV+ZuDm1w==', '2019-03-31 17:53:25', '2019-04-11 20:57:54', '0', '1'), ('6', 'pigxx_zipkin', 'jdbc:mysql://pigx-mysql:3306/pigxx_zipkin?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8', 'root', 'fH5Skf0hP/6+HCNnJdQYKg==', '2019-03-31 17:53:25', '2019-04-11 20:57:57', '0', '1'), ('9', 'pigxx_', 'jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8', 'root', 'vZ/xtaHxCOxl/vvpbpboTQ==', '2019-03-31 19:56:12', '2019-04-11 20:58:16', '0', '1'); +COMMIT; + -- ---------------------------- -- Table structure for `sys_dept` -- ---------------------------- DROP TABLE IF EXISTS `sys_dept`; CREATE TABLE `sys_dept` ( - `dept_id` int(20) NOT NULL AUTO_INCREMENT, - `name` varchar(50) DEFAULT NULL COMMENT '部门名称', - `sort` int(11) DEFAULT NULL COMMENT '排序', - `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `del_flag` char(1) DEFAULT '0' COMMENT '是否删除 -1：已删除 0：正常', - `parent_id` int(11) DEFAULT NULL, - `tenant_id` int(11) DEFAULT NULL, - PRIMARY KEY (`dept_id`) USING BTREE + `dept_id` int(20) NOT NULL AUTO_INCREMENT, + `name` varchar(50) DEFAULT NULL COMMENT '部门名称', + `sort` int(11) DEFAULT NULL COMMENT '排序', + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `del_flag` char(1) DEFAULT '0' COMMENT '是否删除 -1：已删除 0：正常', + `parent_id` int(11) DEFAULT NULL, + `tenant_id` int(11) DEFAULT NULL, + PRIMARY KEY (`dept_id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门管理'; -- ---------------------------- @@ -46,11 +70,11 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_dept_relation`; CREATE TABLE `sys_dept_relation` ( - `ancestor` int(11) NOT NULL COMMENT '祖先节点', - `descendant` int(11) NOT NULL COMMENT '后代节点', - PRIMARY KEY (`ancestor`,`descendant`) USING BTREE, - KEY `idx1` (`ancestor`) USING BTREE, - KEY `idx2` (`descendant`) USING BTREE + `ancestor` int(11) NOT NULL COMMENT '祖先节点', + `descendant` int(11) NOT NULL COMMENT '后代节点', + PRIMARY KEY (`ancestor`,`descendant`) USING BTREE, + KEY `idx1` (`ancestor`) USING BTREE, + KEY `idx2` (`descendant`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC COMMENT='部门关系表'; -- ---------------------------- @@ -65,16 +89,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_dict`; CREATE TABLE `sys_dict` ( - `id` int(64) NOT NULL AUTO_INCREMENT COMMENT '编号', - `type` varchar(100) NOT NULL COMMENT '类型', - `description` varchar(100) NOT NULL COMMENT '描述', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', - `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`) USING BTREE, - KEY `sys_dict_del_flag` (`del_flag`) USING BTREE + `id` int(64) NOT NULL AUTO_INCREMENT COMMENT '编号', + `type` varchar(100) NOT NULL COMMENT '类型', + `description` varchar(100) NOT NULL COMMENT '描述', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', + `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + KEY `sys_dict_del_flag` (`del_flag`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='字典表'; -- ---------------------------- @@ -89,22 +113,22 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_dict_item`; CREATE TABLE `sys_dict_item` ( - `id` int(64) NOT NULL AUTO_INCREMENT COMMENT '编号', - `dict_id` int(11) NOT NULL, - `value` varchar(100) NOT NULL COMMENT '数据值', - `label` varchar(100) NOT NULL COMMENT '标签名', - `type` varchar(100) NOT NULL COMMENT '类型', - `description` varchar(100) NOT NULL COMMENT '描述', - `sort` int(10) NOT NULL COMMENT '排序（升序）', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', - `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`) USING BTREE, - KEY `sys_dict_value` (`value`) USING BTREE, - KEY `sys_dict_label` (`label`) USING BTREE, - KEY `sys_dict_del_flag` (`del_flag`) USING BTREE + `id` int(64) NOT NULL AUTO_INCREMENT COMMENT '编号', + `dict_id` int(11) NOT NULL, + `value` varchar(100) NOT NULL COMMENT '数据值', + `label` varchar(100) NOT NULL COMMENT '标签名', + `type` varchar(100) NOT NULL COMMENT '类型', + `description` varchar(100) NOT NULL COMMENT '描述', + `sort` int(10) NOT NULL COMMENT '排序（升序）', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', + `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + KEY `sys_dict_value` (`value`) USING BTREE, + KEY `sys_dict_label` (`label`) USING BTREE, + KEY `sys_dict_del_flag` (`del_flag`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='字典项'; -- ---------------------------- @@ -119,55 +143,62 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_log`; CREATE TABLE `sys_log` ( - `id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '编号', - `type` char(1) DEFAULT '1' COMMENT '日志类型', - `title` varchar(255) DEFAULT '' COMMENT '日志标题', - `service_id` varchar(32) DEFAULT NULL COMMENT '服务ID', - `create_by` varchar(64) DEFAULT NULL COMMENT '创建者', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remote_addr` varchar(255) DEFAULT NULL COMMENT '操作IP地址', - `user_agent` varchar(1000) DEFAULT NULL COMMENT '用户代理', - `request_uri` varchar(255) DEFAULT NULL COMMENT '请求URI', - `method` varchar(10) DEFAULT NULL COMMENT '操作方式', - `params` text COMMENT '操作提交的数据', - `time` mediumtext COMMENT '执行时间', - `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', - `exception` text COMMENT '异常信息', - `tenant_id` int(11) DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`) USING BTREE, - KEY `sys_log_create_by` (`create_by`) USING BTREE, - 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 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='日志表'; + `id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '编号', + `type` char(1) DEFAULT '1' COMMENT '日志类型', + `title` varchar(255) DEFAULT '' COMMENT '日志标题', + `service_id` varchar(32) DEFAULT NULL COMMENT '服务ID', + `create_by` varchar(64) DEFAULT NULL COMMENT '创建者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `remote_addr` varchar(255) DEFAULT NULL COMMENT '操作IP地址', + `user_agent` varchar(1000) DEFAULT NULL COMMENT '用户代理', + `request_uri` varchar(255) DEFAULT NULL COMMENT '请求URI', + `method` varchar(10) DEFAULT NULL COMMENT '操作方式', + `params` text COMMENT '操作提交的数据', + `time` mediumtext COMMENT '执行时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', + `exception` text COMMENT '异常信息', + `tenant_id` int(11) DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + KEY `sys_log_create_by` (`create_by`) USING BTREE, + 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=30 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='日志表'; + +-- ---------------------------- +-- Records of `sys_log` +-- ---------------------------- +BEGIN; +INSERT INTO `sys_log` VALUES ('1', '0', '启动全部定时任务', 'pig', 'admin', '2019-04-11 09:33: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', '/sys-job/start-jobs', 'POST', '', '79', '0', null, '1'), ('2', '0', '启动全部定时任务', 'pig', 'admin', '2019-04-11 09:35: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', '/sys-job/start-jobs', 'POST', '', '16', '0', null, '1'), ('3', '0', '刷新全部定时任务', 'pig', 'admin', '2019-04-11 09:36: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', '/sys-job/refresh-jobs', 'POST', '', '65', '0', null, '1'), ('4', '0', '刷新全部定时任务', 'pig', 'admin', '2019-04-11 09:36: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', '/sys-job/refresh-jobs', 'POST', '', '18', '0', null, '1'), ('5', '0', '刷新全部定时任务', 'pig', 'admin', '2019-04-11 09:54:48', 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', '/sys-job/refresh-jobs', 'POST', '', '3080', '0', null, '1'), ('6', '0', '新增定时任务', 'pig', 'admin', '2019-04-11 09:56:51', 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', '/sys-job', 'POST', '', '22', '0', null, '1'), ('7', '0', '刷新全部定时任务', 'pig', 'admin', '2019-04-11 09:57:53', 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', '/sys-job/refresh-jobs', 'POST', '', '3125', '0', null, '1'), ('8', '0', '启动定时任务', 'pig', 'admin', '2019-04-11 09:58:00', 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', '/sys-job/start-job/2', 'POST', '', '34', '0', null, '1'), ('9', '0', '暂停定时任务', 'pig', 'admin', '2019-04-11 09:58: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', '/sys-job/shutdown-job/2', 'POST', '', '17', '0', null, '1'), ('10', '0', '启动定时任务', 'pig', 'admin', '2019-04-11 10:00: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', '/sys-job/start-job/2', 'POST', '', '29', '0', null, '1'), ('11', '0', '暂停定时任务', 'pig', 'admin', '2019-04-11 10:00: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', '/sys-job/shutdown-job/2', 'POST', '', '10', '0', null, '1'), ('12', '0', '暂停定时任务', 'pig', 'admin', '2019-04-11 10:00:38', 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', '/sys-job/shutdown-job/1', 'POST', '', '11', '0', null, '1'), ('13', '0', '修改定时任务', 'pig', 'admin', '2019-04-11 10:00:48', 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', '/sys-job', 'PUT', '', '25', '0', null, '1'), ('14', '0', '修改定时任务', 'pig', 'admin', '2019-04-11 10:01:39', 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', '/sys-job', 'PUT', '', '28', '0', null, '1'), ('15', '0', '修改定时任务', 'pig', 'admin', '2019-04-11 10:02: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', '/sys-job', 'PUT', '', '22', '0', null, '1'), ('16', '0', '刷新全部定时任务', 'pig', 'admin', '2019-04-11 10:07:30', 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', '/sys-job/refresh-jobs', 'POST', '', '4565', '0', null, '1'), ('17', '0', '新增定时任务', 'pig', 'admin', '2019-04-11 10:10: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', '/sys-job', 'POST', '', '10', '0', null, '1'), ('18', '0', '启动定时任务', 'pig', 'admin', '2019-04-11 10:10:47', 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', '/sys-job/start-job/3', 'POST', '', '22', '0', null, '1'), ('19', '0', '更新角色菜单', 'pig', 'admin', '2019-04-14 00:00:57', 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%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%2C9999%2C%5D', '194', '0', null, '1'), ('20', '0', '修改路由', 'pig', 'admin', '2019-04-14 00:02:58', 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', '/route', 'PUT', '', '166', '0', null, '1'), ('21', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:12: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', '/menu', 'PUT', '', '48', '0', null, '1'), ('22', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:12:51', 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', '', '9', '0', null, '1'), ('23', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:12:59', 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', '', '7', '0', null, '1'), ('24', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:13: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', '/menu', 'PUT', '', '11', '0', null, '1'), ('25', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:13: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', '/menu', 'PUT', '', '13', '0', null, '1'), ('26', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:13:34', 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', '', '9', '0', null, '1'), ('27', '0', '更新菜单', 'pig', 'admin', '2019-04-14 00:14: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', '/menu', 'PUT', '', '7', '0', null, '1'), ('28', '0', '新增菜单', 'pig', 'admin', '2019-04-14 00:15:35', 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', '', '22', '0', null, '1'), ('29', '0', '更新角色菜单', 'pig', 'admin', '2019-04-14 00:15:46', 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%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', '60', '0', null, '1'); +COMMIT; -- ---------------------------- -- Table structure for `sys_menu` -- ---------------------------- DROP TABLE IF EXISTS `sys_menu`; CREATE TABLE `sys_menu` ( - `menu_id` int(11) NOT NULL COMMENT '菜单ID', - `name` varchar(32) NOT NULL COMMENT '菜单名称', - `permission` varchar(32) DEFAULT NULL COMMENT '菜单权限标识', - `path` varchar(128) DEFAULT NULL COMMENT '前端URL', - `parent_id` int(11) DEFAULT NULL COMMENT '父菜单ID', - `icon` varchar(32) DEFAULT NULL COMMENT '图标', - `component` varchar(64) DEFAULT NULL COMMENT 'VUE页面', - `sort` int(11) DEFAULT '1' COMMENT '排序值', - `keep_alive` char(1) DEFAULT '0' COMMENT '0-开启，1- 关闭', - `type` char(1) DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', - `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `del_flag` char(1) DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)', - PRIMARY KEY (`menu_id`) USING BTREE + `menu_id` int(11) NOT NULL COMMENT '菜单ID', + `name` varchar(32) NOT NULL COMMENT '菜单名称', + `permission` varchar(32) DEFAULT NULL COMMENT '菜单权限标识', + `path` varchar(128) DEFAULT NULL COMMENT '前端URL', + `parent_id` int(11) DEFAULT NULL COMMENT '父菜单ID', + `icon` varchar(32) DEFAULT NULL COMMENT '图标', + `component` varchar(64) DEFAULT NULL COMMENT 'VUE页面', + `sort` int(11) DEFAULT '1' COMMENT '排序值', + `keep_alive` char(1) DEFAULT '0' COMMENT '0-开启，1- 关闭', + `type` char(1) DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)', + PRIMARY KEY (`menu_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; -- ---------------------------- -- 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'), ('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'), ('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'), ('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'); COMMIT; -- ---------------------------- @@ -175,19 +206,19 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_oauth_client_details`; CREATE TABLE `sys_oauth_client_details` ( - `client_id` varchar(32) NOT NULL, - `resource_ids` varchar(256) DEFAULT NULL, - `client_secret` varchar(256) DEFAULT NULL, - `scope` varchar(256) DEFAULT NULL, - `authorized_grant_types` varchar(256) DEFAULT NULL, - `web_server_redirect_uri` varchar(256) DEFAULT NULL, - `authorities` varchar(256) DEFAULT NULL, - `access_token_validity` int(11) DEFAULT NULL, - `refresh_token_validity` int(11) DEFAULT NULL, - `additional_information` varchar(4096) DEFAULT NULL, - `autoapprove` varchar(256) DEFAULT NULL, - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`client_id`) USING BTREE + `client_id` varchar(32) NOT NULL, + `resource_ids` varchar(256) DEFAULT NULL, + `client_secret` varchar(256) DEFAULT NULL, + `scope` varchar(256) DEFAULT NULL, + `authorized_grant_types` varchar(256) DEFAULT NULL, + `web_server_redirect_uri` varchar(256) DEFAULT NULL, + `authorities` varchar(256) DEFAULT NULL, + `access_token_validity` int(11) DEFAULT NULL, + `refresh_token_validity` int(11) DEFAULT NULL, + `additional_information` varchar(4096) DEFAULT NULL, + `autoapprove` varchar(256) DEFAULT NULL, + `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`client_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='终端信息表'; -- ---------------------------- @@ -202,18 +233,18 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_role`; CREATE TABLE `sys_role` ( - `role_id` int(11) NOT NULL AUTO_INCREMENT, - `role_name` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `role_code` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `role_desc` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, - `ds_type` char(1) COLLATE utf8mb4_bin NOT NULL DEFAULT '2' COMMENT '数据权限类型', - `ds_scope` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据权限范围', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '删除标识（0-正常,1-删除）', - `tenant_id` int(11) DEFAULT NULL, - PRIMARY KEY (`role_id`) USING BTREE, - UNIQUE KEY `role_idx1_role_code` (`role_code`) USING BTREE + `role_id` int(11) NOT NULL AUTO_INCREMENT, + `role_name` varchar(64) COLLATE utf8mb4_bin NOT NULL, + `role_code` varchar(64) COLLATE utf8mb4_bin NOT NULL, + `role_desc` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, + `ds_type` char(1) COLLATE utf8mb4_bin NOT NULL DEFAULT '2' COMMENT '数据权限类型', + `ds_scope` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据权限范围', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '删除标识（0-正常,1-删除）', + `tenant_id` int(11) DEFAULT NULL, + PRIMARY KEY (`role_id`) USING BTREE, + UNIQUE KEY `role_idx1_role_code` (`role_code`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='系统角色表'; -- ---------------------------- @@ -228,16 +259,16 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_role_menu`; CREATE TABLE `sys_role_menu` ( - `role_id` int(11) NOT NULL COMMENT '角色ID', - `menu_id` int(11) NOT NULL COMMENT '菜单ID', - PRIMARY KEY (`role_id`,`menu_id`) USING BTREE + `role_id` int(11) NOT NULL COMMENT '角色ID', + `menu_id` int(11) NOT NULL COMMENT '菜单ID', + PRIMARY KEY (`role_id`,`menu_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色菜单表'; -- ---------------------------- -- Records of `sys_role_menu` -- ---------------------------- BEGIN; -INSERT INTO `sys_role_menu` VALUES ('1', '1000'), ('1', '1100'), ('1', '1101'), ('1', '1102'), ('1', '1103'), ('1', '1200'), ('1', '1201'), ('1', '1202'), ('1', '1203'), ('1', '1300'), ('1', '1301'), ('1', '1302'), ('1', '1303'), ('1', '1304'), ('1', '1400'), ('1', '1401'), ('1', '1402'), ('1', '1403'), ('1', '2000'), ('1', '2100'), ('1', '2101'), ('1', '2200'), ('1', '2201'), ('1', '2202'), ('1', '2203'), ('1', '2300'), ('1', '2400'), ('1', '2401'), ('1', '2402'), ('1', '2403'), ('1', '2500'), ('1', '2501'), ('1', '2502'), ('1', '2503'), ('1', '2600'), ('1', '2601'), ('1', '2700'), ('1', '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', '3631'), ('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', '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'); +INSERT INTO `sys_role_menu` VALUES ('1', '1000'), ('1', '1100'), ('1', '1101'), ('1', '1102'), ('1', '1103'), ('1', '1200'), ('1', '1201'), ('1', '1202'), ('1', '1203'), ('1', '1300'), ('1', '1301'), ('1', '1302'), ('1', '1303'), ('1', '1304'), ('1', '1400'), ('1', '1401'), ('1', '1402'), ('1', '1403'), ('1', '2000'), ('1', '2100'), ('1', '2101'), ('1', '2200'), ('1', '2201'), ('1', '2202'), ('1', '2203'), ('1', '2300'), ('1', '2400'), ('1', '2401'), ('1', '2402'), ('1', '2403'), ('1', '2500'), ('1', '2501'), ('1', '2502'), ('1', '2503'), ('1', '2600'), ('1', '2601'), ('1', '2700'), ('1', '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'); COMMIT; -- ---------------------------- @@ -245,24 +276,24 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_route_conf`; CREATE TABLE `sys_route_conf` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `route_name` varchar(30) DEFAULT NULL COMMENT '路由名称', - `route_id` varchar(30) NOT NULL DEFAULT '' COMMENT '路由ID', - `predicates` json DEFAULT NULL COMMENT '断言', - `filters` json DEFAULT NULL COMMENT '过滤器', - `uri` varchar(50) DEFAULT NULL, - `order` int(2) DEFAULT '0' COMMENT '排序', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='路由配置表'; + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `route_name` varchar(30) DEFAULT NULL COMMENT '路由名称', + `route_id` varchar(30) NOT NULL DEFAULT '' COMMENT '路由ID', + `predicates` json DEFAULT NULL COMMENT '断言', + `filters` json DEFAULT NULL COMMENT '过滤器', + `uri` varchar(50) DEFAULT NULL, + `order` int(2) DEFAULT '0' COMMENT '排序', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='路由配置表'; -- ---------------------------- -- 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-03-26 22:47:46', '0'), ('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-03-26 22:47:48', '0'), ('3', '代码生成模块', 'pigx-codegen', '[{\"args\": {\"_genkey_0\": \"/gen/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-codegen', '0', '2019-03-26 22:46:09', '2019-03-26 22:47:52', '0'), ('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-03-26 22:47:59', '0'), ('5', 'quartz定时任务模块', 'pigx-daemon-quartz', '[{\"args\": {\"_genkey_0\": \"/job/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-daemon-quartz', '0', '2019-03-26 22:46:09', '2019-03-26 22:48:02', '0'), ('6', '分布式事务模块', 'pigx-tx-manager', '[{\"args\": {\"_genkey_0\": \"/tx/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-tx-manager', '0', '2019-03-26 22:46:09', '2019-03-26 22:48:04', '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-03-26 22:46:09', '2019-03-26 22:48:07', '0'), ('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-03-26 22:48:10', '0'), ('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-03-26 22:48:13', '0'); +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'); COMMIT; -- ---------------------------- @@ -270,17 +301,17 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_social_details`; CREATE TABLE `sys_social_details` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主鍵', - `type` varchar(16) NOT NULL COMMENT '类型', - `remark` varchar(64) DEFAULT NULL COMMENT '描述', - `app_id` varchar(64) NOT NULL COMMENT 'appid', - `app_secret` varchar(64) NOT NULL COMMENT 'app_secret', - `redirect_url` varchar(128) DEFAULT NULL COMMENT '回调地址', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`id`) USING BTREE + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主鍵', + `type` varchar(16) NOT NULL COMMENT '类型', + `remark` varchar(64) DEFAULT NULL COMMENT '描述', + `app_id` varchar(64) NOT NULL COMMENT 'appid', + `app_secret` varchar(64) NOT NULL COMMENT 'app_secret', + `redirect_url` varchar(128) DEFAULT NULL COMMENT '回调地址', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统社交登录账号表'; -- ---------------------------- @@ -295,31 +326,33 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_user`; CREATE TABLE `sys_user` ( - `user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `username` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '用户名', - `password` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `salt` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '随机盐', - `phone` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '简介', - `avatar` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '头像', - `dept_id` int(11) DEFAULT NULL COMMENT '部门ID', - `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `lock_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，9-锁定', - `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，1-删除', - `wx_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '微信openid', - `qq_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'QQ openid', - `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', - PRIMARY KEY (`user_id`) USING BTREE, - KEY `user_wx_openid` (`wx_openid`) USING BTREE, - KEY `user_qq_openid` (`qq_openid`) USING BTREE, - KEY `user_idx1_username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户表'; + `user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `username` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '用户名', + `password` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `salt` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '随机盐', + `phone` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '简介', + `avatar` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '头像', + `dept_id` int(11) DEFAULT NULL COMMENT '部门ID', + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `lock_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，9-锁定', + `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '0-正常，1-删除', + `wx_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '微信openid', + `qq_openid` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'QQ openid', + `gitee_login` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL, + `osc_id` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL, + `tenant_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属租户', + PRIMARY KEY (`user_id`) USING BTREE, + KEY `user_wx_openid` (`wx_openid`) USING BTREE, + KEY `user_qq_openid` (`qq_openid`) USING BTREE, + KEY `user_idx1_username` (`username`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户表'; -- ---------------------------- -- 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, '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, '2'); +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'); COMMIT; -- ---------------------------- @@ -327,9 +360,9 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `sys_user_role`; CREATE TABLE `sys_user_role` ( - `user_id` int(11) NOT NULL COMMENT '用户ID', - `role_id` int(11) NOT NULL COMMENT '角色ID', - PRIMARY KEY (`user_id`,`role_id`) USING BTREE + `user_id` int(11) NOT NULL COMMENT '用户ID', + `role_id` int(11) NOT NULL COMMENT '角色ID', + PRIMARY KEY (`user_id`,`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='用户角色表'; -- ---------------------------- diff --git a/db/6pigxx_mp.sql b/db/6pigxx_mp.sql new file mode 100644 index 000000000..2acd2f83b --- /dev/null +++ b/db/6pigxx_mp.sql @@ -0,0 +1,132 @@ +/* + Navicat Premium Data Transfer + + Source Server : localhost + Source Server Type : MySQL + Source Server Version : 50723 + Source Host : localhost + Source Database : pigxx_mp + + Target Server Type : MySQL + Target Server Version : 50723 + File Encoding : utf-8 + + Date: 04/15/2019 22:16:01 PM +*/ +USE pigxx_mp; + +SET NAMES utf8; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for `wx_account` +-- ---------------------------- +DROP TABLE IF EXISTS `wx_account`; +CREATE TABLE `wx_account` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(100) DEFAULT NULL COMMENT '公众号名称', + `account` varchar(100) DEFAULT NULL COMMENT '公众号账户', + `appid` varchar(100) DEFAULT NULL COMMENT '公众号appid', + `appsecret` varchar(100) DEFAULT NULL COMMENT '公众号密钥', + `url` varchar(100) DEFAULT NULL COMMENT '公众号url', + `token` varchar(100) DEFAULT NULL COMMENT '公众号token', + `aeskey` varchar(300) DEFAULT NULL COMMENT '加密密钥', + `qr_url` varchar(200) DEFAULT NULL COMMENT '二维码图片URL', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户Id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='公众号账户表'; + +-- ---------------------------- +-- Table structure for `wx_account_fans` +-- ---------------------------- +DROP TABLE IF EXISTS `wx_account_fans`; +CREATE TABLE `wx_account_fans` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `openid` varchar(100) CHARACTER SET utf8 DEFAULT NULL COMMENT '用户标识', + `subscribe_status` char(1) CHARACTER SET utf8 DEFAULT NULL COMMENT '订阅状态，0未关注，1已关注', + `subscribe_time` datetime DEFAULT NULL COMMENT '订阅时间', + `nickname` varchar(255) DEFAULT NULL COMMENT '昵称', + `gender` varchar(10) CHARACTER SET utf8 DEFAULT NULL COMMENT '性别，1男，2女，0未知', + `language` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '语言', + `country` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '国家', + `province` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '省份', + `city` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '城市', + `headimg_url` varchar(500) CHARACTER SET utf8 DEFAULT NULL COMMENT '头像地址', + `remark` varchar(500) CHARACTER SET utf8 DEFAULT NULL COMMENT '备注', + `wx_account_id` int(11) DEFAULT NULL COMMENT '微信公众号ID', + `wx_account_name` varchar(32) CHARACTER SET utf8 DEFAULT NULL, + `wx_account_appid` varchar(100) CHARACTER SET utf8 DEFAULT NULL COMMENT '微信公众号appid', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) CHARACTER SET utf8 NOT NULL DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_1` (`openid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='微信公众号粉丝表'; + +-- ---------------------------- +-- Table structure for `wx_fans_msg` +-- ---------------------------- +DROP TABLE IF EXISTS `wx_fans_msg`; +CREATE TABLE `wx_fans_msg` ( + `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键', + `openid` varchar(100) DEFAULT NULL COMMENT '用户标识', + `nickname` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '昵称', + `headimg_url` varchar(500) DEFAULT NULL COMMENT '头像地址', + `wx_account_appid` varchar(255) DEFAULT NULL, + `wx_account_name` varchar(255) DEFAULT NULL, + `wx_account_id` int(11) DEFAULT NULL COMMENT '微信账号ID', + `msg_id` bigint(20) DEFAULT NULL COMMENT '消息ID', + `msg_type` varchar(32) DEFAULT NULL COMMENT '消息类型', + `content` varchar(500) DEFAULT NULL COMMENT '内容', + `res_content` varchar(3000) DEFAULT NULL COMMENT '最近一条回复内容', + `is_res` char(1) DEFAULT '0' COMMENT '是否已回复', + `media_id` varchar(100) DEFAULT NULL COMMENT '微信素材ID', + `pic_url` varchar(500) DEFAULT NULL COMMENT '微信图片URL', + `pic_path` varchar(500) DEFAULT NULL COMMENT '本地图片路径', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='粉丝消息表 '; + +-- ---------------------------- +-- Table structure for `wx_fans_msg_res` +-- ---------------------------- +DROP TABLE IF EXISTS `wx_fans_msg_res`; +CREATE TABLE `wx_fans_msg_res` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `fans_msg_id` int(11) DEFAULT NULL COMMENT '粉丝消息ID', + `res_content` text COMMENT '回复内容', + `user_id` varchar(32) DEFAULT NULL COMMENT '用户ID', + `user_name` varchar(32) DEFAULT NULL COMMENT '用户名', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标识', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户表', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='回复粉丝消息历史表 '; + +-- ---------------------------- +-- Table structure for `wx_menu` +-- ---------------------------- +DROP TABLE IF EXISTS `wx_menu`; +CREATE TABLE `wx_menu` ( + `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键', + `menu` json DEFAULT NULL COMMENT '菜单', + `wx_account_id` int(11) DEFAULT NULL, + `wx_account_appid` varchar(100) DEFAULT NULL, + `wx_account_name` varchar(32) DEFAULT NULL, + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标记', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户ID', + `pub_flag` char(1) DEFAULT '0' COMMENT '发布标志', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微信菜单表'; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/db/Dockerfile b/db/Dockerfile index 71529b11f..9047aa555 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -12,4 +12,6 @@ COPY ./db/3pigxx_ac.sql /docker-entrypoint-initdb.d COPY ./db/4pigxx_zipkin.sql /docker-entrypoint-initdb.d -COPY ./db/5pigxx_job.sql /docker-entrypoint-initdb.d \ No newline at end of file +COPY ./db/5pigxx_job.sql /docker-entrypoint-initdb.d + +COPY ./db/6pigxx_mp.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b18be3c9b..09f83db6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,6 +115,14 @@ services: image: pigx-codegen container_name: pigx-codegen + pigx-mp-manager: + build: + context: ./ + dockerfile: ./pigx-visual/pigx-mp-manager/Dockerfile + restart: always + image: pigx-mp-manager + container_name: pigx-mp-manager + pigx-activiti: build: context: ./ diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index 94d440c21..b1accdfd4 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -21,4 +21,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerTokenRelayAutoConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerTokenRelayAutoConfiguration.java index 5615afaa9..9214749db 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerTokenRelayAutoConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerTokenRelayAutoConfiguration.java @@ -35,7 +35,7 @@ import java.lang.annotation.*; /** * @author lengleng - * @date 2018/9/5 + * @date 2019/4/14 * 注入AccessTokenContextRelay 解决feign 传递token 为空问题 */ @Configuration diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 02a8af2c5..3ff8e1a14 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ # 暴露监控端点 management: diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 3caf8d041..dee653d92 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -6,11 +6,11 @@ jasypt: spring: redis: password: - host: pigx-redis + host: ${REDIS-HOST:pigx-redis} # zipkin zipkin: enabled: true - base-url: http://pigx-zipkin + base-url: http://${ZIPKIN-HOST:pigx-zipkin} sleuth: web: client: @@ -75,7 +75,7 @@ mybatis-plus: #swagger公共信息 swagger: - host: pigx-gateway:9999 + host: ${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999} title: PigX Swagger API description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架 version: @project.version@ @@ -93,7 +93,7 @@ swagger: - scope: server description: server all token-url-list: - - http://pigx-gateway:9999/auth/oauth/token + - http://${GATEWAY-HOST:pigx-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token ## spring security 配置 security: @@ -105,4 +105,4 @@ security: - /v2/api-docs resource: loadBalanced: true - token-info-uri: http://pigx-auth/oauth/check_token \ No newline at end of file + token-info-uri: http://${AUTH-HOST:pigx-auth}/oauth/check_token \ No newline at end of file diff --git a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml index 2d49d15e0..bb970d668 100644 --- a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml @@ -19,9 +19,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 # 租户表维护 pigx: diff --git a/pigx-config/src/main/resources/config/pigx-auth-dev.yml b/pigx-config/src/main/resources/config/pigx-auth-dev.yml index c00ab0548..4582bbbba 100644 --- a/pigx-config/src/main/resources/config/pigx-auth-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-auth-dev.yml @@ -3,9 +3,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 freemarker: allow-request-override: false allow-session-override: false diff --git a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml index d8800e42a..3d08ff4a3 100644 --- a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml @@ -10,9 +10,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/coffeewx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 resources: static-locations: classpath:/static/,classpath:/views/ diff --git a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml index df43ac503..ee6aa3658 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml @@ -11,13 +11,13 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 elasticjob: # 分布式任务协调依赖zookeeper zookeeper: - server-lists: pigx-zookeeper:2181 + server-lists: ${ZOOKEEPER-HOST:pigx-zookeeper}:${ZOOKEEPER-PORT:2181} namespace: pigx-daemon # 普通任务 simples: diff --git a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml index b7cccd59b..dd862b095 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml @@ -11,9 +11,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_job?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 resources: static-locations: classpath:/static/,classpath:/views/ quartz: @@ -38,7 +38,7 @@ spring: threadsInheritContextClassLoaderOfInitializingThread: true #数据库方式 job-store-type: jdbc - #初始化表结构 + #初始化表结构 #jdbc: #initialize-schema: never diff --git a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml index 753171f79..508d0dd2a 100644 --- a/pigx-config/src/main/resources/config/pigx-gateway-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-gateway-dev.yml @@ -8,5 +8,5 @@ ignore: clients: - test swagger-providers: - - pigx-auth - - pigx-tx-manager + - ${AUTH-HOST:pigx-auth} + - ${TX-MGR-HOST:pigx-tx-manager} diff --git a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml index faa2c2d43..e6f941641 100644 --- a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml @@ -11,9 +11,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/coffeewx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 hikari: connection-init-sql: SET NAMES utf8mb4 resources: @@ -25,5 +25,8 @@ pigx: tenant: column: tenant_id tables: - - t_wx_account - - t_wx_account_fans \ No newline at end of file + - wx_menu + - wx_account + - wx_account_fans + - wx_fans_msg + - wx_fans_msg_res \ No newline at end of file diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index 476953e76..9e1bb082f 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -11,9 +11,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 # 文件系统 (提供测试环境，不要乱传) minio: diff --git a/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml b/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml index ddd466c11..2d3d0ed8b 100644 --- a/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-zipkin-dev.yml @@ -3,9 +3,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pigx-mysql:3306/pigxx_zipkin?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + username: ${MYSQL-USER:root} + password: ${MYSQL-PWD:root} + 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 management: metrics: web: diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index af561c083..4a5e6da8e 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index 6b94dc78f..d0c410875 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ \ No newline at end of file + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ \ No newline at end of file diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 881d420d0..542c3bba2 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 0327cd6ef..627df1188 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml index f45941677..43a3e4bed 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml index ebe734df3..90f2cbdaf 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml @@ -25,4 +25,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 3997029a9..d450bd060 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -22,7 +22,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ turbine: app-config: pigx-upms,pigx-auth cluster-name-expression: new String("default") diff --git a/pigx-visual/pigx-mp-manager/Dockerfile b/pigx-visual/pigx-mp-manager/Dockerfile index 702a7171c..07962fb57 100644 --- a/pigx-visual/pigx-mp-manager/Dockerfile +++ b/pigx-visual/pigx-mp-manager/Dockerfile @@ -8,7 +8,7 @@ RUN mkdir -p /pigx-mp-manager WORKDIR /pigx-mp-manager -EXPOSE 5003 +EXPOSE 6000 ADD ./pigx-visual/pigx-mp-manager/target/pigx-mp-manager.jar ./ diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java index 76b94ca73..0cd179e8c 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.mp.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,7 +31,6 @@ import java.time.LocalDateTime; * @date 2019-03-26 22:07:53 */ @Data -@TableName("t_wx_account") @EqualsAndHashCode(callSuper = true) public class WxAccount extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java index a6da434e1..6b3e2e8ab 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java @@ -32,7 +32,6 @@ import java.time.LocalDateTime; * @date 2019-03-26 22:08:08 */ @Data -@TableName("t_wx_account_fans") @EqualsAndHashCode(callSuper = true) public class WxAccountFans extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsg.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsg.java index e892019c5..8b5763a0b 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsg.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsg.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.mp.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,7 +31,6 @@ import java.time.LocalDateTime; * @date 2019-03-27 20:45:27 */ @Data -@TableName("t_wx_fans_msg") @EqualsAndHashCode(callSuper = true) public class WxFansMsg extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java index 31e853e91..d39115982 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.mp.entity; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,7 +30,6 @@ import java.time.LocalDateTime; * @date 2019-03-27 20:45:48 */ @Data -@TableName("t_wx_fans_msg_res") @EqualsAndHashCode(callSuper = true) public class WxFansMsgRes extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java index 97fbd79fc..2169c1a78 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.mp.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,7 +31,6 @@ import java.time.LocalDateTime; * @date 2019-03-27 20:45:18 */ @Data -@TableName("t_wx_menu") @EqualsAndHashCode(callSuper = true) public class WxMpMenu extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml index b604fa388..9b679494e 100644 --- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml @@ -24,4 +24,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml index c5e792c22..cf5124835 100644 --- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ diff --git a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml index 0344a0a47..9c33c3b23 100644 --- a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml @@ -22,4 +22,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ \ No newline at end of file + defaultZone: http://pig:pig@${EUREKA-HOST:pigx-eureka}:${EUREKA-PORT:8761}/eureka/ \ No newline at end of file