diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 32dbb5c0..7d7e71ef 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -9,13 +9,13 @@ USE `xxl_job`; CREATE TABLE `xxl_job_group` ( - `id` INT NOT NULL AUTO_INCREMENT, - `app_name` VARCHAR(64) NOT NULL COMMENT '执行器AppName', - `title` VARCHAR(64) NOT NULL COMMENT '执行器名称', - `address_type` TINYINT NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', - `address_list` TEXT DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', - `access_token` VARCHAR(255) DEFAULT NULL COMMENT '执行器AccessToken', - `update_time` DATETIME DEFAULT NULL, + `id` INT NOT NULL AUTO_INCREMENT, + `app_name` VARCHAR(64) NOT NULL COMMENT '执行器AppName', + `name` VARCHAR(64) NOT NULL COMMENT '执行器名称', + `address_type` TINYINT NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', + `address_list` TEXT DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', + `access_token` VARCHAR(255) DEFAULT NULL COMMENT '执行器AccessToken', + `update_time` DATETIME DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `i_app_name` (`app_name`) USING BTREE ) ENGINE = InnoDB @@ -23,11 +23,11 @@ CREATE TABLE `xxl_job_group` CREATE TABLE `xxl_job_registry` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `registry_group` VARCHAR(50) NOT NULL, - `registry_key` VARCHAR(255) NOT NULL, - `registry_value` VARCHAR(255) NOT NULL, - `update_time` DATETIME DEFAULT NULL, + `id` BIGINT NOT NULL AUTO_INCREMENT, + `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`), UNIQUE KEY `i_g_k_v` (`registry_group`, `registry_key`, `registry_value`) USING BTREE ) ENGINE = InnoDB @@ -37,43 +37,43 @@ CREATE TABLE `xxl_job_registry` CREATE TABLE `xxl_job_info` ( - `id` INT NOT NULL AUTO_INCREMENT, - `job_group` INT NOT NULL COMMENT '执行器主键ID', - `job_desc` VARCHAR(255) NOT NULL COMMENT '执行器名称', - `add_time` DATETIME DEFAULT NULL, - `update_time` DATETIME DEFAULT NULL, - `author` VARCHAR(64) DEFAULT NULL COMMENT '作者', - `alarm_email` VARCHAR(255) DEFAULT NULL COMMENT '报警邮件', - `schedule_type` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型', - `schedule_conf` VARCHAR(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型', - `misfire_strategy` VARCHAR(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略', - `executor_route_strategy` VARCHAR(50) DEFAULT NULL COMMENT '执行器路由策略', - `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', - `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', - `executor_block_strategy` VARCHAR(50) 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) NOT NULL COMMENT 'GLUE类型', - `glue_source` MEDIUMTEXT DEFAULT NULL COMMENT 'GLUE源代码', - `glue_remark` VARCHAR(128) DEFAULT NULL COMMENT 'GLUE备注', - `glue_updatetime` DATETIME DEFAULT NULL COMMENT 'GLUE更新时间', - `child_jobid` VARCHAR(255) 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 '下次调度时间', + `id` INT NOT NULL AUTO_INCREMENT, + `job_group` INT NOT NULL COMMENT '执行器主键ID', + `name` VARCHAR(255) NOT NULL COMMENT '执行器名称', + `author` VARCHAR(64) DEFAULT NULL COMMENT '作者', + `alarm_email` VARCHAR(255) DEFAULT NULL COMMENT '报警邮件', + `schedule_type` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型', + `schedule_conf` VARCHAR(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型', + `misfire_strategy` VARCHAR(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略', + `executor_route_strategy` VARCHAR(50) DEFAULT NULL COMMENT '执行器路由策略', + `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', + `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', + `executor_block_strategy` VARCHAR(50) 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) NOT NULL COMMENT 'GLUE类型', + `glue_source` MEDIUMTEXT DEFAULT NULL COMMENT 'GLUE源代码', + `glue_remark` VARCHAR(128) DEFAULT NULL COMMENT 'GLUE备注', + `glue_updatetime` DATETIME DEFAULT NULL COMMENT 'GLUE更新时间', + `child_jobid` VARCHAR(255) 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 '下次调度时间', + `add_time` DATETIME DEFAULT NULL, + `update_time` DATETIME DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; CREATE TABLE `xxl_job_logglue` ( - `id` INT NOT NULL AUTO_INCREMENT, - `job_id` INT NOT NULL COMMENT '任务，主键ID', - `glue_type` VARCHAR(50) DEFAULT NULL COMMENT 'GLUE类型', - `glue_source` MEDIUMTEXT DEFAULT NULL COMMENT 'GLUE源代码', - `glue_remark` VARCHAR(128) NOT NULL COMMENT 'GLUE备注', - `add_time` DATETIME DEFAULT NULL, - `update_time` DATETIME DEFAULT NULL, + `id` INT NOT NULL AUTO_INCREMENT, + `job_id` INT NOT NULL COMMENT '任务，主键ID', + `glue_type` VARCHAR(50) DEFAULT NULL COMMENT 'GLUE类型', + `glue_source` MEDIUMTEXT DEFAULT NULL 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; @@ -82,21 +82,21 @@ CREATE TABLE `xxl_job_logglue` 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) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', - `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', - `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', - `executor_sharding_param` VARCHAR(20) 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 DEFAULT NULL COMMENT '调度-日志', - `handle_time` DATETIME DEFAULT NULL COMMENT '执行-时间', - `handle_code` INT NOT NULL COMMENT '执行-状态', - `handle_msg` TEXT DEFAULT NULL COMMENT '执行-日志', - `alarm_status` TINYINT NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', + `id` BIGINT NOT NULL AUTO_INCREMENT, + `job_group` INT NOT NULL COMMENT '执行器主键ID', + `job_id` INT NOT NULL COMMENT '任务，主键ID', + `executor_address` VARCHAR(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', + `executor_handler` VARCHAR(255) DEFAULT NULL COMMENT '任务handler', + `executor_param` TEXT DEFAULT NULL COMMENT '任务参数', + `executor_sharding_param` VARCHAR(20) 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 DEFAULT NULL COMMENT '调度-日志', + `handle_time` DATETIME DEFAULT NULL COMMENT '执行-时间', + `handle_code` INT NOT NULL COMMENT '执行-状态', + `handle_msg` TEXT DEFAULT NULL COMMENT '执行-日志', + `alarm_status` TINYINT NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', PRIMARY KEY (`id`), KEY `i_trigger_time` (`trigger_time`), KEY `i_handle_code` (`handle_code`), @@ -107,12 +107,12 @@ CREATE TABLE `xxl_job_log` 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, + `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`), UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE ) ENGINE = InnoDB @@ -131,12 +131,12 @@ CREATE TABLE `xxl_job_lock` CREATE TABLE `xxl_job_user` ( - `id` INT NOT NULL AUTO_INCREMENT, - `username` VARCHAR(50) NOT NULL COMMENT '账号', - `password` VARCHAR(100) NOT NULL COMMENT '密码加密信息', - `token` VARCHAR(100) DEFAULT NULL COMMENT '登录token', - `role` TINYINT NOT NULL COMMENT '角色：0-普通用户、1-管理员', - `permission` VARCHAR(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', + `id` INT NOT NULL AUTO_INCREMENT, + `username` VARCHAR(50) NOT NULL COMMENT '账号', + `password` VARCHAR(100) NOT NULL COMMENT '密码加密信息', + `token` VARCHAR(100) DEFAULT NULL COMMENT '登录token', + `role` TINYINT NOT NULL COMMENT '角色：0-普通用户、1-管理员', + `permission` VARCHAR(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', PRIMARY KEY (`id`), UNIQUE KEY `i_username` (`username`) USING BTREE ) ENGINE = InnoDB @@ -147,11 +147,11 @@ CREATE TABLE `xxl_job_user` START TRANSACTION; -INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`, `access_token`, `update_time`) +INSERT INTO `xxl_job_group`(`id`, `app_name`, `name`, `address_type`, `address_list`, `access_token`, `update_time`) VALUES (1, 'xxl-job-executor-sample', '通用执行器Sample', 0, NULL, 'default_token', now()), (2, 'xxl-job-executor-sample-ai', 'AI执行器Sample', 0, NULL, 'default_token', now()); -INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, +INSERT INTO `xxl_job_info`(`id`, `job_group`, `name`, `add_time`, `update_time`, `author`, `alarm_email`, `schedule_type`, `schedule_conf`, `misfire_strategy`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java index 57347ba1..fdec671f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobGroup.java @@ -15,8 +15,10 @@ public class XxlJobGroup { private int id; private String appname; private String title; + private int addressType; // 执行器地址类型：0=自动注册、1=手动录入 private String addressList; // 执行器地址列表，多地址逗号分隔(手动录入) + private String accessToken; private Date updateTime; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java index d576320a..5368aca4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobInfo.java @@ -13,10 +13,7 @@ public class XxlJobInfo { private int jobGroup; // 执行器主键ID private String jobDesc; - - private Date addTime; - private Date updateTime; - + private String author; // 负责人 private String alarmEmail; // 报警邮件 @@ -42,6 +39,9 @@ public class XxlJobInfo { private long triggerLastTime; // 上次调度时间 private long triggerNextTime; // 下次调度时间 + private Date addTime; + private Date updateTime; + public int getId() { return id; @@ -67,22 +67,6 @@ public class XxlJobInfo { this.jobDesc = jobDesc; } - public Date getAddTime() { - return addTime; - } - - public void setAddTime(Date addTime) { - this.addTime = addTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - public String getAuthor() { return author; } @@ -234,4 +218,21 @@ public class XxlJobInfo { public void setTriggerNextTime(long triggerNextTime) { this.triggerNextTime = triggerNextTime; } + + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java index 90c1b6c0..d909a79a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/XxlJobRegistry.java @@ -8,9 +8,11 @@ import java.util.Date; public class XxlJobRegistry { private long id; + private String registryGroup; private String registryKey; private String registryValue; + private Date updateTime; public long getId() {