From ecb38391410ecb0563b08309e02bb322198ffa02 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 11 Jul 2023 20:56:14 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20quartz=20=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E5=AE=98=E6=96=B9=E8=84=9A=E6=9C=AC=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=BC=BA=E5=88=B6=E5=A4=A7=E5=B0=8F=E5=86=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/pig_job.sql | 581 +++++------------- .../pig/daemon/quartz/entity/SysJobLog.java | 5 - 2 files changed, 153 insertions(+), 433 deletions(-) diff --git a/db/pig_job.sql b/db/pig_job.sql index d48f2106..106d1ddd 100644 --- a/db/pig_job.sql +++ b/db/pig_job.sql @@ -4,248 +4,6 @@ CREATE DATABASE `pig_job` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; USE pig_job; -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for qrtz_blob_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_blob_triggers`; -CREATE TABLE `qrtz_blob_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `blob_data` blob, - PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`) USING BTREE, - CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `qrtz_triggers` (`sched_name`, `trigger_name`, `trigger_group`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_blob_triggers --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_calendars --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_calendars`; -CREATE TABLE `qrtz_calendars` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `calendar_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `calendar` blob NOT NULL, - PRIMARY KEY (`sched_name`,`calendar_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_calendars --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_cron_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_cron_triggers`; -CREATE TABLE `qrtz_cron_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `cron_expression` varchar(200) CHARACTER SET utf8 NOT NULL, - `time_zone_id` varchar(80) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`) USING BTREE, - CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `qrtz_triggers` (`sched_name`, `trigger_name`, `trigger_group`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_cron_triggers --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_fired_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_fired_triggers`; -CREATE TABLE `qrtz_fired_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `entry_id` varchar(95) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `instance_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `fired_time` bigint NOT NULL, - `sched_time` bigint NOT NULL, - `priority` int NOT NULL, - `state` varchar(16) CHARACTER SET utf8 NOT NULL, - `job_name` varchar(200) CHARACTER SET utf8 DEFAULT NULL, - `job_group` varchar(200) CHARACTER SET utf8 DEFAULT NULL, - `is_nonconcurrent` varchar(1) CHARACTER SET utf8 DEFAULT NULL, - `requests_recovery` varchar(1) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`sched_name`,`entry_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_fired_triggers --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_job_details --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_job_details`; -CREATE TABLE `qrtz_job_details` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `job_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `job_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `description` varchar(250) CHARACTER SET utf8 DEFAULT NULL, - `job_class_name` varchar(250) CHARACTER SET utf8 NOT NULL, - `is_durable` varchar(1) CHARACTER SET utf8 NOT NULL, - `is_nonconcurrent` varchar(1) CHARACTER SET utf8 NOT NULL, - `is_update_data` varchar(1) CHARACTER SET utf8 NOT NULL, - `requests_recovery` varchar(1) CHARACTER SET utf8 NOT NULL, - `job_data` blob, - PRIMARY KEY (`sched_name`,`job_name`,`job_group`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_job_details --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_locks --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_locks`; -CREATE TABLE `qrtz_locks` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `lock_name` varchar(40) CHARACTER SET utf8 NOT NULL, - PRIMARY KEY (`sched_name`,`lock_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_locks --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_paused_trigger_grps --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_paused_trigger_grps`; -CREATE TABLE `qrtz_paused_trigger_grps` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - PRIMARY KEY (`sched_name`,`trigger_group`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_paused_trigger_grps --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_scheduler_state --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_scheduler_state`; -CREATE TABLE `qrtz_scheduler_state` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `instance_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `last_checkin_time` bigint NOT NULL, - `checkin_interval` bigint NOT NULL, - PRIMARY KEY (`sched_name`,`instance_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_scheduler_state --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_simple_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_simple_triggers`; -CREATE TABLE `qrtz_simple_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `repeat_count` bigint NOT NULL, - `repeat_interval` bigint NOT NULL, - `times_triggered` bigint NOT NULL, - PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`) USING BTREE, - CONSTRAINT `QRTZ_SIMPLE_TRIGGERS_IBFK_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `qrtz_triggers` (`sched_name`, `trigger_name`, `trigger_group`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_simple_triggers --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_simprop_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_simprop_triggers`; -CREATE TABLE `qrtz_simprop_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `str_prop_1` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - `str_prop_2` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - `str_prop_3` varchar(512) CHARACTER SET utf8 DEFAULT NULL, - `int_prop_1` int DEFAULT NULL, - `int_prop_2` int DEFAULT NULL, - `long_prop_1` bigint DEFAULT NULL, - `long_prop_2` bigint DEFAULT NULL, - `dec_prop_1` decimal(13,4) DEFAULT NULL, - `dec_prop_2` decimal(13,4) DEFAULT NULL, - `bool_prop_1` varchar(1) CHARACTER SET utf8 DEFAULT NULL, - `bool_prop_2` varchar(1) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`) USING BTREE, - CONSTRAINT `QRTZ_SIMPROP_TRIGGERS_IBFK_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `qrtz_triggers` (`sched_name`, `trigger_name`, `trigger_group`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_simprop_triggers --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for qrtz_triggers --- ---------------------------- -DROP TABLE IF EXISTS `qrtz_triggers`; -CREATE TABLE `qrtz_triggers` ( - `sched_name` varchar(120) CHARACTER SET utf8 NOT NULL, - `trigger_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `trigger_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `job_name` varchar(200) CHARACTER SET utf8 NOT NULL, - `job_group` varchar(200) CHARACTER SET utf8 NOT NULL, - `description` varchar(250) CHARACTER SET utf8 DEFAULT NULL, - `next_fire_time` bigint DEFAULT NULL, - `prev_fire_time` bigint DEFAULT NULL, - `priority` int DEFAULT NULL, - `trigger_state` varchar(16) CHARACTER SET utf8 NOT NULL, - `trigger_type` varchar(8) CHARACTER SET utf8 NOT NULL, - `start_time` bigint NOT NULL, - `end_time` bigint DEFAULT NULL, - `calendar_name` varchar(200) CHARACTER SET utf8 DEFAULT NULL, - `misfire_instr` smallint DEFAULT NULL, - `job_data` blob, - PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`) USING BTREE, - KEY `sched_name` (`sched_name`,`job_name`,`job_group`) USING BTREE, - CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`sched_name`, `job_name`, `job_group`) REFERENCES `qrtz_job_details` (`sched_name`, `job_name`, `job_group`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - --- ---------------------------- --- Records of qrtz_triggers --- ---------------------------- -BEGIN; -COMMIT; - -- ---------------------------- -- Table structure for sys_job -- ---------------------------- @@ -276,14 +34,6 @@ CREATE TABLE `sys_job` ( PRIMARY KEY (`job_id`,`job_name`,`job_group`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务调度表'; --- ---------------------------- --- Records of sys_job --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for sys_job_log -- ---------------------------- DROP TABLE IF EXISTS `sys_job_log`; CREATE TABLE `sys_job_log` ( @@ -306,197 +56,172 @@ CREATE TABLE `sys_job_log` ( PRIMARY KEY (`job_log_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务执行日志表'; --- ---------------------------- --- Records of sys_job_log --- ---------------------------- -BEGIN; -COMMIT; --- ---------------------------- --- Table structure for xxl_job_group --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_group`; -CREATE TABLE `xxl_job_group` ( - `id` int NOT NULL AUTO_INCREMENT, - `app_name` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '执行器AppName', - `title` varchar(12) CHARACTER SET utf8mb4 NOT NULL COMMENT '执行器名称', - `address_type` tinyint NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', - `address_list` text CHARACTER SET utf8mb4 COMMENT '执行器地址列表，多地址逗号分隔', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +# +# Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar +# +# PLEASE consider using mysql with innodb tables to avoid locking issues +# +# In your Quartz properties file, you'll need to set +# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate +# --- ---------------------------- --- Records of xxl_job_group --- ---------------------------- -BEGIN; -COMMIT; +DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; +DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; +DROP TABLE IF EXISTS QRTZ_LOCKS; +DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; +DROP TABLE IF EXISTS QRTZ_CALENDARS; --- ---------------------------- --- Table structure for xxl_job_info --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_info`; -CREATE TABLE `xxl_job_info` ( - `id` int NOT NULL AUTO_INCREMENT, - `job_group` int NOT NULL COMMENT '执行器主键ID', - `job_desc` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - `author` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '作者', - `alarm_email` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '报警邮件', - `schedule_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL DEFAULT 'NONE' COMMENT '调度类型', - `schedule_conf` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型', - `misfire_strategy` varchar(50) CHARACTER SET utf8mb4 NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略', - `executor_route_strategy` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器路由策略', - `executor_handler` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器任务参数', - `executor_block_strategy` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '阻塞处理策略', - `executor_timeout` int NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒', - `executor_fail_retry_count` int NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `glue_type` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext CHARACTER SET utf8mb4 COMMENT 'GLUE源代码', - `glue_remark` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'GLUE备注', - `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间', - `child_jobid` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', - `trigger_status` tinyint NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行', - `trigger_last_time` bigint NOT NULL DEFAULT '0' COMMENT '上次调度时间', - `trigger_next_time` bigint NOT NULL DEFAULT '0' COMMENT '下次调度时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; --- ---------------------------- --- Records of xxl_job_info --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_JOB_DETAILS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + JOB_NAME VARCHAR(200) NOT NULL, + JOB_GROUP VARCHAR(200) NOT NULL, + DESCRIPTION VARCHAR(250) NULL, + JOB_CLASS_NAME VARCHAR(250) NOT NULL, + IS_DURABLE VARCHAR(1) NOT NULL, + IS_NONCONCURRENT VARCHAR(1) NOT NULL, + IS_UPDATE_DATA VARCHAR(1) NOT NULL, + REQUESTS_RECOVERY VARCHAR(1) NOT NULL, + JOB_DATA BLOB NULL, + PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) +); --- ---------------------------- --- Table structure for xxl_job_lock --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_lock`; -CREATE TABLE `xxl_job_lock` ( - `lock_name` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT '锁名称', - PRIMARY KEY (`lock_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +CREATE TABLE QRTZ_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + JOB_NAME VARCHAR(200) NOT NULL, + JOB_GROUP VARCHAR(200) NOT NULL, + DESCRIPTION VARCHAR(250) NULL, + NEXT_FIRE_TIME BIGINT(13) NULL, + PREV_FIRE_TIME BIGINT(13) NULL, + PRIORITY INTEGER NULL, + TRIGGER_STATE VARCHAR(16) NOT NULL, + TRIGGER_TYPE VARCHAR(8) NOT NULL, + START_TIME BIGINT(13) NOT NULL, + END_TIME BIGINT(13) NULL, + CALENDAR_NAME VARCHAR(200) NULL, + MISFIRE_INSTR SMALLINT(2) NULL, + JOB_DATA BLOB NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) + REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) +); --- ---------------------------- --- Records of xxl_job_lock --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_SIMPLE_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + REPEAT_COUNT BIGINT(7) NOT NULL, + REPEAT_INTERVAL BIGINT(12) NOT NULL, + TIMES_TRIGGERED BIGINT(10) NOT NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); --- ---------------------------- --- Table structure for xxl_job_log --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_log`; -CREATE TABLE `xxl_job_log` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `job_group` int NOT NULL COMMENT '执行器主键ID', - `job_id` int NOT NULL COMMENT '任务，主键ID', - `executor_address` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器地址，本次执行的地址', - `executor_handler` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器任务参数', - `executor_sharding_param` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2', - `executor_fail_retry_count` int NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', - `trigger_code` int NOT NULL COMMENT '调度-结果', - `trigger_msg` text CHARACTER SET utf8mb4 COMMENT '调度-日志', - `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', - `handle_code` int NOT NULL COMMENT '执行-状态', - `handle_msg` text CHARACTER SET utf8mb4 COMMENT '执行-日志', - `alarm_status` tinyint NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', - PRIMARY KEY (`id`) USING BTREE, - KEY `I_trigger_time` (`trigger_time`) USING BTREE, - KEY `I_handle_code` (`handle_code`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +CREATE TABLE QRTZ_CRON_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + CRON_EXPRESSION VARCHAR(200) NOT NULL, + TIME_ZONE_ID VARCHAR(80), + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); --- ---------------------------- --- Records of xxl_job_log --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_SIMPROP_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + STR_PROP_1 VARCHAR(512) NULL, + STR_PROP_2 VARCHAR(512) NULL, + STR_PROP_3 VARCHAR(512) NULL, + INT_PROP_1 INT NULL, + INT_PROP_2 INT NULL, + LONG_PROP_1 BIGINT NULL, + LONG_PROP_2 BIGINT NULL, + DEC_PROP_1 NUMERIC(13,4) NULL, + DEC_PROP_2 NUMERIC(13,4) NULL, + BOOL_PROP_1 VARCHAR(1) NULL, + BOOL_PROP_2 VARCHAR(1) NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); --- ---------------------------- --- Table structure for xxl_job_log_report --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_log_report`; -CREATE TABLE `xxl_job_log_report` ( - `id` int NOT NULL AUTO_INCREMENT, - `trigger_day` datetime DEFAULT NULL COMMENT '调度-时间', - `running_count` int NOT NULL DEFAULT '0' COMMENT '运行中-日志数量', - `suc_count` int NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', - `fail_count` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +CREATE TABLE QRTZ_BLOB_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + BLOB_DATA BLOB NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); --- ---------------------------- --- Records of xxl_job_log_report --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_CALENDARS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + CALENDAR_NAME VARCHAR(200) NOT NULL, + CALENDAR BLOB NOT NULL, + PRIMARY KEY (SCHED_NAME,CALENDAR_NAME) +); --- ---------------------------- --- Table structure for xxl_job_logglue --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_logglue`; -CREATE TABLE `xxl_job_logglue` ( - `id` int NOT NULL AUTO_INCREMENT, - `job_id` int NOT NULL COMMENT '任务，主键ID', - `glue_type` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext CHARACTER SET utf8mb4 COMMENT 'GLUE源代码', - `glue_remark` varchar(128) CHARACTER SET utf8mb4 NOT NULL COMMENT 'GLUE备注', - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP) +); --- ---------------------------- --- Records of xxl_job_logglue --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_FIRED_TRIGGERS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + ENTRY_ID VARCHAR(95) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + INSTANCE_NAME VARCHAR(200) NOT NULL, + FIRED_TIME BIGINT(13) NOT NULL, + SCHED_TIME BIGINT(13) NOT NULL, + PRIORITY INTEGER NOT NULL, + STATE VARCHAR(16) NOT NULL, + JOB_NAME VARCHAR(200) NULL, + JOB_GROUP VARCHAR(200) NULL, + IS_NONCONCURRENT VARCHAR(1) NULL, + REQUESTS_RECOVERY VARCHAR(1) NULL, + PRIMARY KEY (SCHED_NAME,ENTRY_ID) +); --- ---------------------------- --- Table structure for xxl_job_registry --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_registry`; -CREATE TABLE `xxl_job_registry` ( - `id` int NOT NULL AUTO_INCREMENT, - `registry_group` varchar(50) CHARACTER SET utf8mb4 NOT NULL, - `registry_key` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `registry_value` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE, - KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +CREATE TABLE QRTZ_SCHEDULER_STATE + ( + SCHED_NAME VARCHAR(120) NOT NULL, + INSTANCE_NAME VARCHAR(200) NOT NULL, + LAST_CHECKIN_TIME BIGINT(13) NOT NULL, + CHECKIN_INTERVAL BIGINT(13) NOT NULL, + PRIMARY KEY (SCHED_NAME,INSTANCE_NAME) +); --- ---------------------------- --- Records of xxl_job_registry --- ---------------------------- -BEGIN; -COMMIT; +CREATE TABLE QRTZ_LOCKS + ( + SCHED_NAME VARCHAR(120) NOT NULL, + LOCK_NAME VARCHAR(40) NOT NULL, + PRIMARY KEY (SCHED_NAME,LOCK_NAME) +); --- ---------------------------- --- Table structure for xxl_job_user --- ---------------------------- -DROP TABLE IF EXISTS `xxl_job_user`; -CREATE TABLE `xxl_job_user` ( - `id` int NOT NULL AUTO_INCREMENT, - `username` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT '账号', - `password` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT '密码', - `role` tinyint NOT NULL COMMENT '角色：0-普通用户、1-管理员', - `permission` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `i_username` (`username`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; --- ---------------------------- --- Records of xxl_job_user --- ---------------------------- -BEGIN; -INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; +commit; diff --git a/pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java b/pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java index ba577f40..9418e668 100644 --- a/pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java +++ b/pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java @@ -127,9 +127,4 @@ public class SysJobLog extends Model { @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; - /** - * 租户id - */ - private Long tenantId; - }