From 4845159dba8b828fbe40fecd88302ed383a52671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 9 Dec 2019 21:24:43 +0800 Subject: [PATCH] :arrow_up: Upgrading dependencies. xxl-job-admin 2.1.1 --- db/4pigxx_job.sql | 112 ++++++++++++++++------------ docker-compose.yml | 6 +- pigx-common/pigx-common-bom/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 71 insertions(+), 51 deletions(-) diff --git a/db/4pigxx_job.sql b/db/4pigxx_job.sql index 542f3d491..6f01f4aab 100644 --- a/db/4pigxx_job.sql +++ b/db/4pigxx_job.sql @@ -4,7 +4,6 @@ */ USE pigxx_job; - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -174,7 +173,7 @@ CREATE TABLE `qrtz_scheduler_state` ( -- Records of qrtz_scheduler_state -- ---------------------------- BEGIN; -INSERT INTO `qrtz_scheduler_state` VALUES ('clusteredScheduler', '06058beed3f01566469581339', 1566884710721, 10000); +INSERT INTO `qrtz_scheduler_state` VALUES ('clusteredScheduler', 'pigx-register1575868076313', 1575897450356, 10000); COMMIT; -- ---------------------------- @@ -304,21 +303,19 @@ CREATE TABLE `sys_job_log` ( PRIMARY KEY (`job_log_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务执行日志表'; -SET FOREIGN_KEY_CHECKS = 1; - -- ---------------------------- -- Table structure for xxl_job_group -- ---------------------------- DROP TABLE IF EXISTS `xxl_job_group`; CREATE TABLE `xxl_job_group` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `app_name` varchar(64) DEFAULT NULL, - `title` varchar(12) DEFAULT NULL, + `app_name` varchar(64) NOT NULL COMMENT '执行器AppName', + `title` varchar(12) NOT NULL COMMENT '执行器名称', `order` int(11) NOT NULL DEFAULT '0' COMMENT '排序', `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', - `address_list` varchar(512) DEFAULT NULL, + `address_list` varchar(512) DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of xxl_job_group @@ -334,28 +331,28 @@ DROP TABLE IF EXISTS `xxl_job_info`; CREATE TABLE `xxl_job_info` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_group` int(11) NOT NULL COMMENT '执行器主键ID', - `job_cron` varchar(128) DEFAULT NULL, - `job_desc` varchar(255) DEFAULT NULL, + `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON', + `job_desc` varchar(255) NOT NULL, `add_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, - `author` varchar(64) DEFAULT NULL, - `alarm_email` varchar(255) DEFAULT NULL, - `executor_route_strategy` varchar(50) DEFAULT NULL, - `executor_handler` varchar(255) DEFAULT NULL, - `executor_param` varchar(512) DEFAULT NULL, - `executor_block_strategy` varchar(50) DEFAULT NULL, + `author` varchar(64) DEFAULT NULL COMMENT '作者', + `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件', + `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略', + `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', + `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', + `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略', `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒', `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `glue_type` varchar(50) DEFAULT NULL, - `glue_source` mediumtext CHARACTER SET utf8 COMMENT 'GLUE源代码', - `glue_remark` varchar(128) DEFAULT NULL, + `glue_type` varchar(50) NOT NULL COMMENT 'GLUE类型', + `glue_source` mediumtext COMMENT 'GLUE源代码', + `glue_remark` varchar(128) DEFAULT NULL COMMENT 'GLUE备注', `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间', - `child_jobid` varchar(255) DEFAULT NULL, + `child_jobid` varchar(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行', `trigger_last_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '上次调度时间', `trigger_next_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '下次调度时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of xxl_job_info @@ -369,9 +366,9 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS `xxl_job_lock`; CREATE TABLE `xxl_job_lock` ( - `lock_name` varchar(50) NOT NULL, + `lock_name` varchar(50) NOT NULL COMMENT '锁名称', PRIMARY KEY (`lock_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of xxl_job_lock @@ -388,22 +385,45 @@ CREATE TABLE `xxl_job_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `job_group` int(11) NOT NULL COMMENT '执行器主键ID', `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `executor_address` varchar(255) DEFAULT NULL, - `executor_handler` varchar(255) DEFAULT NULL, - `executor_param` varchar(512) DEFAULT NULL, - `executor_sharding_param` varchar(20) DEFAULT NULL, + `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', + `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', + `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', + `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2', `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', `trigger_code` int(11) NOT NULL COMMENT '调度-结果', - `trigger_msg` mediumtext, + `trigger_msg` text COMMENT '调度-日志', `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', `handle_code` int(11) NOT NULL COMMENT '执行-状态', - `handle_msg` mediumtext, + `handle_msg` text COMMENT '执行-日志', `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', PRIMARY KEY (`id`), KEY `I_trigger_time` (`trigger_time`), KEY `I_handle_code` (`handle_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- ---------------------------- +-- Table structure for xxl_job_log_report +-- ---------------------------- +DROP TABLE IF EXISTS `xxl_job_log_report`; +CREATE TABLE `xxl_job_log_report` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `trigger_day` datetime DEFAULT NULL COMMENT '调度-时间', + `running_count` int(11) NOT NULL DEFAULT '0' COMMENT '运行中-日志数量', + `suc_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', + `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', + PRIMARY KEY (`id`), + UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- ---------------------------- +-- Records of xxl_job_log_report +-- ---------------------------- +BEGIN; +INSERT INTO `xxl_job_log_report` VALUES (1, '2019-12-09 00:00:00', 0, 0, 0); +INSERT INTO `xxl_job_log_report` VALUES (2, '2019-12-08 00:00:00', 0, 0, 0); +INSERT INTO `xxl_job_log_report` VALUES (3, '2019-12-07 00:00:00', 0, 0, 0); +COMMIT; -- ---------------------------- -- Table structure for xxl_job_logglue @@ -412,13 +432,13 @@ DROP TABLE IF EXISTS `xxl_job_logglue`; CREATE TABLE `xxl_job_logglue` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `glue_type` varchar(50) DEFAULT NULL, - `glue_source` mediumtext CHARACTER SET utf8 COMMENT 'GLUE源代码', - `glue_remark` varchar(128) DEFAULT NULL, - `add_time` timestamp NULL DEFAULT NULL, - `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型', + `glue_source` mediumtext COMMENT 'GLUE源代码', + `glue_remark` varchar(128) NOT NULL COMMENT 'GLUE备注', + `add_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Table structure for xxl_job_registry @@ -426,13 +446,13 @@ CREATE TABLE `xxl_job_logglue` ( DROP TABLE IF EXISTS `xxl_job_registry`; CREATE TABLE `xxl_job_registry` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `registry_group` varchar(255) DEFAULT NULL, - `registry_key` varchar(255) DEFAULT NULL, - `registry_value` varchar(255) DEFAULT NULL, - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `registry_group` varchar(50) NOT NULL, + `registry_key` varchar(255) NOT NULL, + `registry_value` varchar(255) NOT NULL, + `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Table structure for xxl_job_user @@ -440,13 +460,13 @@ CREATE TABLE `xxl_job_registry` ( DROP TABLE IF EXISTS `xxl_job_user`; CREATE TABLE `xxl_job_user` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `username` varchar(50) DEFAULT NULL, - `password` varchar(50) DEFAULT NULL, + `username` varchar(50) NOT NULL COMMENT '账号', + `password` varchar(50) NOT NULL COMMENT '密码', `role` tinyint(4) NOT NULL COMMENT '角色：0-普通用户、1-管理员', - `permission` varchar(255) DEFAULT NULL, + `permission` varchar(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', PRIMARY KEY (`id`), UNIQUE KEY `i_username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of xxl_job_user @@ -455,4 +475,4 @@ BEGIN; INSERT INTO `xxl_job_user` VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); COMMIT; -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; diff --git a/docker-compose.yml b/docker-compose.yml index c5236a933..e678de0a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,12 +25,12 @@ services: restart: always pigx-xxl: - image: pig4cloud/xxl-job-admin:2.1.0 + image: xuxueli/xxl-job-admin:2.1.1 restart: always environment: - - PARAMS="--xxl.admin.login=false" + - PARAMS="--spring.datasource.url=jdbc:mysql://pigx-mysql:3306/pigxx_job?Unicode=true&characterEncoding=UTF-8 --spring.datasource.username=root --spring.datasource.password=root" ports: - - 9080:9080 + - 9080:8080 pigx-redis: image: redis:5.0.4 diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 26a248a35..5c5b85317 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -6,7 +6,7 @@ pigx-cloud-dependencies-parent com.pig4cloud - Greenwich.RELEASE + Hoxton.RELEASE diff --git a/pom.xml b/pom.xml index b011e8fc4..c2912c778 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 2.10.2 6.0.8 2.1.5 - 2.1.0 + 2.1.1 2.3.6.RELEASE 5.22.0 http://192.168.0.13:4243