diff --git a/pom.xml b/pom.xml index fa7295f6f..ec8c0b5dd 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 3.52.0 2.2.7 4.3.1 - 1.9.0 + 1.10.0 1.5.0 0.2.0 1.18.42 diff --git a/script/sql/oracle/oracle_ry_job.sql b/script/sql/oracle/oracle_ry_job.sql index 2a7f11f9a..7a9080666 100644 --- a/script/sql/oracle/oracle_ry_job.sql +++ b/script/sql/oracle/oracle_ry_job.sql @@ -484,6 +484,7 @@ CREATE TABLE sj_job ( id number GENERATED ALWAYS AS IDENTITY, namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + biz_id varchar2(64) NOT NULL, group_name varchar2(64) NULL, job_name varchar2(64) NULL, args_str clob DEFAULT NULL NULL, @@ -519,9 +520,11 @@ ALTER TABLE sj_job CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name); CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index); CREATE INDEX idx_sj_job_03 ON sj_job (create_dt); +CREATE UNIQUE INDEX uk_sj_job_01 ON sj_job (namespace_id, biz_id); COMMENT ON COLUMN sj_job.id IS '主键'; COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_job.biz_id IS '业务ID'; COMMENT ON COLUMN sj_job.group_name IS '组名称'; COMMENT ON COLUMN sj_job.job_name IS '名称'; COMMENT ON COLUMN sj_job.args_str IS '执行方法参数'; @@ -551,7 +554,7 @@ COMMENT ON COLUMN sj_job.create_dt IS '创建时间'; COMMENT ON COLUMN sj_job.update_dt IS '修改时间'; COMMENT ON TABLE sj_job IS '任务信息'; -INSERT INTO sj_job(namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, labels, description, ext_attrs, deleted, create_dt, update_dt) VALUES ('dev', 'ruoyi_group', 'demo-job', NULL, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '','', '', 0, sysdate, sysdate); +INSERT INTO sj_job(namespace_id, biz_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, labels, description, ext_attrs, deleted, create_dt, update_dt) VALUES ('dev', 'demo-job', 'ruoyi_group', 'demo-job', NULL, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '','', '', 0, sysdate, sysdate); -- sj_job_log_message CREATE TABLE sj_job_log_message @@ -738,7 +741,7 @@ CREATE TABLE sj_retry_summary id number GENERATED ALWAYS AS IDENTITY, namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, group_name varchar2(64) DEFAULT '' NULL, - scene_name varchar2(64) DEFAULT '' NULL, + scene_name varchar2(50) DEFAULT '' NULL, trigger_at date DEFAULT CURRENT_TIMESTAMP NOT NULL, running_num number DEFAULT 0 NOT NULL, finish_num number DEFAULT 0 NOT NULL, @@ -774,6 +777,7 @@ CREATE TABLE sj_workflow id number GENERATED ALWAYS AS IDENTITY, workflow_name varchar2(64) NULL, namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + biz_id varchar2(64) NOT NULL, group_name varchar2(64) NULL, workflow_status smallint DEFAULT 1 NOT NULL, trigger_type smallint NOT NULL, @@ -799,10 +803,12 @@ ALTER TABLE sj_workflow CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt); CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name); +CREATE UNIQUE INDEX uk_sj_workflow_01 ON sj_workflow (namespace_id, biz_id); COMMENT ON COLUMN sj_workflow.id IS '主键'; COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称'; COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_workflow.biz_id IS '业务ID'; COMMENT ON COLUMN sj_workflow.group_name IS '组名称'; COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启'; COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; diff --git a/script/sql/postgres/postgres_ry_job.sql b/script/sql/postgres/postgres_ry_job.sql index 9980c3b43..f355632c0 100644 --- a/script/sql/postgres/postgres_ry_job.sql +++ b/script/sql/postgres/postgres_ry_job.sql @@ -445,6 +445,7 @@ CREATE TABLE sj_job ( id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + biz_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, job_name varchar(64) NOT NULL, args_str text NULL DEFAULT NULL, @@ -477,9 +478,11 @@ CREATE TABLE sj_job CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name); CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index); CREATE INDEX idx_sj_job_03 ON sj_job (create_dt); +CREATE UNIQUE INDEX uk_sj_job_01 ON sj_job (namespace_id, biz_id); COMMENT ON COLUMN sj_job.id IS '主键'; COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_job.biz_id IS '业务ID'; COMMENT ON COLUMN sj_job.group_name IS '组名称'; COMMENT ON COLUMN sj_job.job_name IS '名称'; COMMENT ON COLUMN sj_job.args_str IS '执行方法参数'; @@ -509,7 +512,7 @@ COMMENT ON COLUMN sj_job.create_dt IS '创建时间'; COMMENT ON COLUMN sj_job.update_dt IS '修改时间'; COMMENT ON TABLE sj_job IS '任务信息'; -INSERT INTO sj_job VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '', '', '', 0, now(), now()); +INSERT INTO sj_job VALUES (1, 'dev', 'demo-job', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '', '', '', 0, now(), now()); -- sj_job_log_message CREATE TABLE sj_job_log_message @@ -684,7 +687,7 @@ CREATE TABLE sj_retry_summary id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', group_name varchar(64) NOT NULL DEFAULT '', - scene_name varchar(64) NOT NULL DEFAULT '', + scene_name varchar(50) NOT NULL DEFAULT '', trigger_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, running_num int NOT NULL DEFAULT 0, finish_num int NOT NULL DEFAULT 0, @@ -717,6 +720,7 @@ CREATE TABLE sj_workflow id bigserial PRIMARY KEY, workflow_name varchar(64) NOT NULL, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + biz_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, workflow_status smallint NOT NULL DEFAULT 1, trigger_type smallint NOT NULL, @@ -739,10 +743,12 @@ CREATE TABLE sj_workflow CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt); CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name); +CREATE UNIQUE INDEX uk_sj_workflow_01 ON sj_workflow (namespace_id, biz_id); COMMENT ON COLUMN sj_workflow.id IS '主键'; COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称'; COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_workflow.biz_id IS '业务ID'; COMMENT ON COLUMN sj_workflow.group_name IS '组名称'; COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启'; COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; diff --git a/script/sql/ry_job.sql b/script/sql/ry_job.sql index dd8124cf5..e7b627f49 100644 --- a/script/sql/ry_job.sql +++ b/script/sql/ry_job.sql @@ -280,6 +280,7 @@ CREATE TABLE `sj_job` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `biz_id` varchar(64) NOT NULL COMMENT '业务ID', `group_name` varchar(64) NOT NULL COMMENT '组名称', `job_name` varchar(64) NOT NULL COMMENT '名称', `args_str` text DEFAULT NULL COMMENT '执行方法参数', @@ -310,12 +311,13 @@ CREATE TABLE `sj_job` PRIMARY KEY (`id`), KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), KEY `idx_job_status_bucket_index` (`job_status`, `bucket_index`), - KEY `idx_create_dt` (`create_dt`) + KEY `idx_create_dt` (`create_dt`), + UNIQUE KEY `uk_sj_job_01` (`namespace_id`, `biz_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务信息'; -INSERT INTO `sj_job` VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '','', '', 0 , now(), now()); +INSERT INTO `sj_job` VALUES (1, 'dev', 'demo-job', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '','', '', 0 , now(), now()); CREATE TABLE `sj_job_log_message` ( @@ -443,6 +445,7 @@ CREATE TABLE `sj_workflow` `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', `workflow_name` varchar(64) NOT NULL COMMENT '工作流名称', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `biz_id` varchar(64) NOT NULL COMMENT '业务ID', `group_name` varchar(64) NOT NULL COMMENT '组名称', `workflow_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '工作流状态 0、关闭、1、开启', `trigger_type` tinyint(4) NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间', @@ -463,7 +466,8 @@ CREATE TABLE `sj_workflow` `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), KEY `idx_create_dt` (`create_dt`), - KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`) + KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), + UNIQUE KEY `uk_sj_workflow_01` (`namespace_id`, `biz_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='工作流'; diff --git a/script/sql/sqlserver/sqlserver_ry_job.sql b/script/sql/sqlserver/sqlserver_ry_job.sql index ceb8c459b..6fbf7a6d2 100644 --- a/script/sql/sqlserver/sqlserver_ry_job.sql +++ b/script/sql/sqlserver/sqlserver_ry_job.sql @@ -1428,6 +1428,7 @@ CREATE TABLE sj_job ( id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + biz_id nvarchar(64) NOT NULL, group_name nvarchar(64) NOT NULL, job_name nvarchar(64) NOT NULL, args_str nvarchar(max) NULL DEFAULT NULL, @@ -1464,6 +1465,8 @@ CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index) GO CREATE INDEX idx_sj_job_03 ON sj_job (create_dt) GO +CREATE UNIQUE INDEX uk_sj_job_01 ON sj_job (namespace_id, biz_id) +GO EXEC sp_addextendedproperty 'MS_Description', N'主键', @@ -1479,6 +1482,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'namespace_id' GO +EXEC sp_addextendedproperty + 'MS_Description', N'业务ID', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_job', + 'COLUMN', N'biz_id' +GO + EXEC sp_addextendedproperty 'MS_Description', N'组名称', 'SCHEMA', N'dbo', @@ -1674,7 +1684,7 @@ EXEC sp_addextendedproperty 'TABLE', N'sj_job' GO -INSERT INTO sj_job (namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, labels, description, ext_attrs, deleted, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, N'testJobExecutor', 2, N'60', 1, 60, 3, 1, 1, 116, 0, N'', 1, N'', N'', N'', 0, getdate(), getdate()) +INSERT INTO sj_job (namespace_id, biz_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, labels, description, ext_attrs, deleted, create_dt, update_dt) VALUES (N'dev', N'demo-job', N'ruoyi_group', N'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, N'testJobExecutor', 2, N'60', 1, 60, 3, 1, 1, 116, 0, N'', 1, N'', N'', N'', 0, getdate(), getdate()) GO -- sj_job_log_message @@ -2248,7 +2258,7 @@ CREATE TABLE sj_retry_summary id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', group_name nvarchar(64) NOT NULL DEFAULT '', - scene_name nvarchar(64) NOT NULL DEFAULT '', + scene_name nvarchar(50) NOT NULL DEFAULT '', trigger_at datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, running_num int NOT NULL DEFAULT 0, finish_num int NOT NULL DEFAULT 0, @@ -2354,6 +2364,7 @@ CREATE TABLE sj_workflow id bigint NOT NULL PRIMARY KEY IDENTITY, workflow_name nvarchar(64) NOT NULL, namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + biz_id nvarchar(64) NOT NULL, group_name nvarchar(64) NOT NULL, workflow_status tinyint NOT NULL DEFAULT 1, trigger_type tinyint NOT NULL, @@ -2379,6 +2390,8 @@ CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt) GO CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name) GO +CREATE UNIQUE INDEX uk_sj_workflow_01 ON sj_workflow (namespace_id, biz_id) +GO EXEC sp_addextendedproperty 'MS_Description', N'主键', @@ -2401,6 +2414,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'namespace_id' GO +EXEC sp_addextendedproperty + 'MS_Description', N'业务ID', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_workflow', + 'COLUMN', N'biz_id' +GO + EXEC sp_addextendedproperty 'MS_Description', N'组名称', 'SCHEMA', N'dbo',