diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 52e015c4..dc4309c5 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -8,7 +8,7 @@ use `xxl_job`; SET NAMES utf8mb4; CREATE TABLE `xxl_job_info` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `job_group` int(11) NOT NULL COMMENT '执行器主键ID', `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON', `job_desc` varchar(255) NOT NULL, @@ -55,7 +55,7 @@ CREATE TABLE `xxl_job_log` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `xxl_job_log_report` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) 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 '执行成功-日志数量', @@ -65,7 +65,7 @@ CREATE TABLE `xxl_job_log_report` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `xxl_job_logglue` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `job_id` int(11) NOT NULL COMMENT '任务,主键ID', `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型', `glue_source` mediumtext COMMENT 'GLUE源代码', @@ -76,7 +76,7 @@ CREATE TABLE `xxl_job_logglue` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `xxl_job_registry` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `registry_group` varchar(50) NOT NULL, `registry_key` varchar(255) NOT NULL, `registry_value` varchar(255) NOT NULL, @@ -86,7 +86,7 @@ CREATE TABLE `xxl_job_registry` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `xxl_job_group` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `app_name` varchar(64) NOT NULL COMMENT '执行器AppName', `title` varchar(12) NOT NULL COMMENT '执行器名称', `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型:0=自动注册、1=手动录入', @@ -95,7 +95,7 @@ CREATE TABLE `xxl_job_group` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `xxl_job_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `username` varchar(50) NOT NULL COMMENT '账号', `password` varchar(50) NOT NULL COMMENT '密码', `role` tinyint(4) NOT NULL COMMENT '角色:0-普通用户、1-管理员', @@ -109,6 +109,14 @@ CREATE TABLE `xxl_job_lock` ( PRIMARY KEY (`lock_name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +CREATE TABLE `xxl_job_machine` ( + `machine_ip` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主机IP', + `machine_id` int(11) NOT NULL COMMENT '主机IP对应的机器码', + `add_time` datetime NOT NULL COMMENT '创建时间', + `heart_last_time` datetime NOT NULL COMMENT '最后一次心跳时间', + PRIMARY KEY (`machine_ip`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL); INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`) VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', ''); diff --git a/doc/db/tables_xxl_job_oracle.sql b/doc/db/tables_xxl_job_oracle.sql index 0a288ae2..6f8569f6 100644 --- a/doc/db/tables_xxl_job_oracle.sql +++ b/doc/db/tables_xxl_job_oracle.sql @@ -8,7 +8,7 @@ -- ---------------------------- DROP TABLE XXL_JOB_GROUP; CREATE TABLE XXL_JOB_GROUP ( - ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , APP_NAME NVARCHAR2(64) NOT NULL , TITLE NVARCHAR2(12) NOT NULL , ADDRESS_TYPE NUMBER(4) NOT NULL , @@ -35,7 +35,7 @@ ALTER TABLE XXL_JOB_GROUP ADD CONSTRAINT SYS_C0026588 PRIMARY KEY (ID); -- ---------------------------- DROP TABLE XXL_JOB_INFO; CREATE TABLE XXL_JOB_INFO ( - ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , JOB_GROUP NUMBER(11) NOT NULL , JOB_CRON NVARCHAR2(128) NOT NULL , JOB_DESC NVARCHAR2(255) NOT NULL , @@ -157,7 +157,7 @@ CREATE INDEX I_TRIGGER_TIME -- ---------------------------- DROP TABLE XXL_JOB_LOG_REPORT; CREATE TABLE XXL_JOB_LOG_REPORT ( - ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , TRIGGER_DAY DATE , RUNNING_COUNT NUMBER(11) NOT NULL , SUC_COUNT NUMBER(11) NOT NULL , @@ -185,8 +185,8 @@ CREATE UNIQUE INDEX I_TRIGGER_DAY -- ---------------------------- DROP TABLE XXL_JOB_LOGGLUE; CREATE TABLE XXL_JOB_LOGGLUE ( - ID NUMBER(11) NOT NULL , - JOB_ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , + JOB_ID NUMBER(20) NOT NULL , GLUE_TYPE NVARCHAR2(50) , GLUE_SOURCE NCLOB , GLUE_REMARK NVARCHAR2(128) NOT NULL , @@ -210,7 +210,7 @@ ALTER TABLE XXL_JOB_LOGGLUE ADD CONSTRAINT SYS_C0026593 PRIMARY KEY (ID); -- ---------------------------- DROP TABLE XXL_JOB_REGISTRY; CREATE TABLE XXL_JOB_REGISTRY ( - ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , REGISTRY_GROUP NVARCHAR2(50) NOT NULL , REGISTRY_KEY NVARCHAR2(255) NOT NULL , REGISTRY_VALUE NVARCHAR2(255) NOT NULL , @@ -235,7 +235,7 @@ CREATE INDEX I_G_K_V -- ---------------------------- DROP TABLE XXL_JOB_USER; CREATE TABLE XXL_JOB_USER ( - ID NUMBER(11) NOT NULL , + ID NUMBER(20) NOT NULL , USERNAME NVARCHAR2(50) NOT NULL , PASSWORD NVARCHAR2(50) NOT NULL , ROLE NUMBER(4) NOT NULL , @@ -261,3 +261,33 @@ ALTER TABLE XXL_JOB_USER ADD CONSTRAINT SYS_C0026595 PRIMARY KEY (ID); -- ---------------------------- CREATE UNIQUE INDEX I_USERNAME ON XXL_JOB_USER (USERNAME ASC); + + + +-- ---------------------------- +-- Table structure for XXL_JOB_MACHINE +-- ---------------------------- +DROP TABLE XXL_JOB_MACHINE; +CREATE TABLE XXL_JOB_MACHINE ( + MACHINE_IP NVARCHAR2(16) NOT NULL , + MACHINE_ID NUMBER(11) NOT NULL , + ADD_TIME DATE NOT NULL , + HEART_LAST_TIME DATE NOT NULL +); +COMMENT ON COLUMN XXL_JOB_MACHINE.MACHINE_IP IS '主机IP'; +COMMENT ON COLUMN XXL_JOB_MACHINE.MACHINE_ID IS '主机IP对应的机器码'; +COMMENT ON COLUMN XXL_JOB_MACHINE.ADD_TIME IS '创建时间'; +COMMENT ON COLUMN XXL_JOB_MACHINE.HEART_LAST_TIME IS '最后一次心跳时间'; + +-- ---------------------------- +-- Primary Key structure for table XXL_JOB_MACHINE +-- ---------------------------- +ALTER TABLE XXL_JOB_MACHINE ADD CONSTRAINT SYS_C0026684 PRIMARY KEY (MACHINE_IP); + +-- ---------------------------- +-- Checks structure for table XXL_JOB_MACHINE +-- ---------------------------- +ALTER TABLE XXL_JOB_MACHINE ADD CONSTRAINT SYS_C0026680 CHECK (MACHINE_IP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; +ALTER TABLE XXL_JOB_MACHINE ADD CONSTRAINT SYS_C0026681 CHECK (MACHINE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; +ALTER TABLE XXL_JOB_MACHINE ADD CONSTRAINT SYS_C0026682 CHECK (ADD_TIME IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE; +ALTER TABLE XXL_JOB_MACHINE ADD CONSTRAINT SYS_C0026683 CHECK (HEART_LAST_TIME IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE;