diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index d65a5efe..f0e8dec9 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -12,7 +12,7 @@ 0 1.0 0 - 2448 + 2336 128 128 @@ -2135,6 +2135,38 @@ job_name varchar(n) + + 0df87bea13bcc1124ee431e889e9b29ea727ea2e + 10 + null + false + null + false + false + false + + false + + 触发器优先级 + job_priority + decimal(p) + + + cd93d2f441250c1031f3d635ee017149af3e9681 + 10 + null + false + null + false + false + false + + false + + 任务触发类型 + job_type + nvarchar(n) + 8afadc1ddabcb75c4b83d8bef5401cd464ddb03b 50 @@ -3415,6 +3447,38 @@ remote_addr varchar(n) + + ac9fb6bc74bddd46b83a1e5da50df90ffe16f6e7 + 10 + null + false + null + false + false + false + + false + + 循环次数（ -1 无期限） + repeat_count + decimal(p) + + + 459f778740213fe1f4a3910edd7856b546d6ed84 + 19 + null + false + null + false + false + false + + false + + 循环间隔时间（毫秒） + repeat_interval + decimal(p) + f8908cec8baf4ee5432e22045703bd123a10f6f8 10 @@ -3527,6 +3591,22 @@ role_type varchar(n) + + 57734613d526c9dc4e67ab60829a3898b126f745 + 255 + null + false + null + false + false + false + + false + + 自定义规则表达式 + rule_expression + varchar(n) + 5e197b7f106763a6952e72203fcc902cea793853 null @@ -3671,6 +3751,38 @@ sign nvarchar(n) + + 7092958a5ef392360a90ecb480b8e5731aecc115 + 19 + null + false + null + false + false + false + + false + + 触发器延迟启动时间 + start_delay + decimal(p) + + + 36a54f9351d9ed766e7c174c17a4d2a59191b05c + null + null + false + null + false + false + false + + false + + 触发器启动时间 + start_time + datetime + cae139cc445b5d645601b0ef865245c1a57ac0cb 1 @@ -5658,7 +5770,7 @@ - f6fe4091f16d65b5cd4e05129fd4970d48b70a90 + 834a0cad944f84b46a0f2d6248dfa3f1c18cc6d1 525b18e0d2c940bf132733cfaba411fb84ddf255 319e4091b704702c77deaf7621a231f6cdd5a814 -1 @@ -5723,7 +5835,7 @@ 6d5f3e5ef4d28e57966c33c4b4ef424f1dc42b7b 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - f6fe4091f16d65b5cd4e05129fd4970d48b70a90 + 834a0cad944f84b46a0f2d6248dfa3f1c18cc6d1 @@ -5757,7 +5869,7 @@ 91110163a8a31ee61a4153360707026b5498dd65 443772d4627c23aef484c324c8e431121b921a44 - f6fe4091f16d65b5cd4e05129fd4970d48b70a90 + 834a0cad944f84b46a0f2d6248dfa3f1c18cc6d1 @@ -14501,348 +14613,6 @@ - - 525b18e0d2c940bf132733cfaba411fb84ddf255 - 412 - 426 - Segoe UI - 9 - 1320 - 2388 - - 128 - 128 - 192 - - - - js_sys_job - 作业调度表 - - - - - - - 70abca97f16eab0d562a2104ec1a0ede326b1c46 - 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2fe17467ad48944f125de4abf28e973234a9bcb4 - 443772d4627c23aef484c324c8e431121b921a44 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 - 225e6d868b8d45320dc7f79db6296db64985b308 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2663716e6af40682333d3e8495a04bceff16647 - c5abf897611d8a927582d1dcb3deceef5c164614 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 - d8ece7f15423d813de0dc100fa1c67e047ca4a08 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 44ce4edd5ad45896934d6f90f14af5884b98ba5b - 7041a843a37e89ce935ad9309fa1a3b2548920e5 - - - - - decimal(p) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261aca14bc2dd0bef97fa78a1256a95b5cb94171 - 91c2e73c20940e4a715ffb02148e2f3a1bb72334 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f - 599b9798d287db98af97bda02a378aa97b0c62c4 - - - - - varchar(n) - - JeeSiteScheduler - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 481c1a6225e0f2a86dbf4f752e9455afac57f897 - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_job_status - - - - - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - false - - - - - - - - - -
5fc45ff72e5a63eee633a54948970a8c9e0d17fb542 @@ -17464,6 +17234,579 @@
+ + 525b18e0d2c940bf132733cfaba411fb84ddf255 + 412 + 426 + Segoe UI + 9 + 1320 + 2388 + + 128 + 128 + 192 + + + + js_sys_job + 作业调度表 + + + + + + + 70abca97f16eab0d562a2104ec1a0ede326b1c46 + 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fe17467ad48944f125de4abf28e973234a9bcb4 + 443772d4627c23aef484c324c8e431121b921a44 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 + 225e6d868b8d45320dc7f79db6296db64985b308 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2663716e6af40682333d3e8495a04bceff16647 + c5abf897611d8a927582d1dcb3deceef5c164614 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cd93d2f441250c1031f3d635ee017149af3e9681 + 6fdd1749ca9ddc0b137bc0b4414d86c002e8a651 + + + + + nvarchar(n) + + cron + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 0df87bea13bcc1124ee431e889e9b29ea727ea2e + 3ae0a5f2c442024d1ebcc0ac59aa4c8c1f38117f + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 36a54f9351d9ed766e7c174c17a4d2a59191b05c + 3c47924e4bdfdbe48dea64097d07ed6e4108b83a + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7092958a5ef392360a90ecb480b8e5731aecc115 + 672e06b274bd7083d5ee27aa879f4aab103af64d + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 459f778740213fe1f4a3910edd7856b546d6ed84 + 8fe56dd63ce04a043f0bf69af44a758a66b336e1 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac9fb6bc74bddd46b83a1e5da50df90ffe16f6e7 + a2da33bd03b834895f7e7a4938dca0e1e0b95edf + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 + d8ece7f15423d813de0dc100fa1c67e047ca4a08 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 57734613d526c9dc4e67ab60829a3898b126f745 + e64c44da2b2ba15ca1591bb9b4fb701ef7041fee + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 44ce4edd5ad45896934d6f90f14af5884b98ba5b + 7041a843a37e89ce935ad9309fa1a3b2548920e5 + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261aca14bc2dd0bef97fa78a1256a95b5cb94171 + 91c2e73c20940e4a715ffb02148e2f3a1bb72334 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f + 599b9798d287db98af97bda02a378aa97b0c62c4 + + + + + varchar(n) + + JeeSiteScheduler + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 481c1a6225e0f2a86dbf4f752e9455afac57f897 + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_job_status + + + + + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 3c0316a7..44d4e23e 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -348,7 +348,14 @@ CREATE TABLE js_sys_job job_group varchar(64) NOT NULL, description vargraphic(100) NOT NULL, invoke_target vargraphic(1000) NOT NULL, + job_type vargraphic(10) DEFAULT 'cron' NOT NULL, + job_priority decimal(10), + start_time timestamp, + start_delay decimal(19), + repeat_interval decimal(19), + repeat_count decimal(10), cron_expression varchar(255) NOT NULL, + rule_expression varchar(255), misfire_instruction decimal(1) NOT NULL, concurrent char(1) NOT NULL, instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, diff --git a/modules/core/db/h2/core.sql b/modules/core/db/h2/core.sql index 944f2069..2bfdd746 100644 --- a/modules/core/db/h2/core.sql +++ b/modules/core/db/h2/core.sql @@ -348,7 +348,14 @@ CREATE TABLE js_sys_job job_group varchar(64) NOT NULL, description varchar(100) NOT NULL, invoke_target varchar(1000) NOT NULL, + job_type varchar(10) DEFAULT 'cron' NOT NULL, + job_priority decimal(10), + start_time datetime, + start_delay decimal(19), + repeat_interval decimal(19), + repeat_count decimal(10), cron_expression varchar(255) NOT NULL, + rule_expression varchar(255), misfire_instruction decimal(1) NOT NULL, concurrent char(1) NOT NULL, instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 5b304c0d..07fce112 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -348,7 +348,14 @@ CREATE TABLE [js_sys_job] [job_group] varchar(64) NOT NULL, [description] nvarchar(100) NOT NULL, [invoke_target] nvarchar(1000) NOT NULL, + [job_type] nvarchar(10) DEFAULT 'cron' NOT NULL, + [job_priority] decimal(10), + [start_time] datetime, + [start_delay] decimal(19), + [repeat_interval] decimal(19), + [repeat_count] decimal(10), [cron_expression] varchar(255) NOT NULL, + [rule_expression] varchar(255), [misfire_instruction] decimal(1) NOT NULL, [concurrent] char(1) NOT NULL, [instance_name] varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 52a6cd16..03556e89 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -349,7 +349,14 @@ CREATE TABLE js_sys_job job_group varchar(64) NOT NULL COMMENT '任务组名', description varchar(100) NOT NULL COMMENT '任务描述', invoke_target varchar(1000) NOT NULL COMMENT '调用目标字符串', + job_type varchar(10) DEFAULT 'cron' NOT NULL COMMENT '任务触发类型', + job_priority decimal(10) COMMENT '触发器优先级', + start_time datetime COMMENT '触发器启动时间', + start_delay decimal(19) COMMENT '触发器延迟启动时间', + repeat_interval decimal(19) COMMENT '循环间隔时间（毫秒）', + repeat_count decimal(10) COMMENT '循环次数（ -1 无期限）', cron_expression varchar(255) NOT NULL COMMENT 'Cron执行表达式', + rule_expression varchar(255) COMMENT '自定义规则表达式', misfire_instruction decimal(1) NOT NULL COMMENT '计划执行错误策略', concurrent char(1) NOT NULL COMMENT '是否并发执行', instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL COMMENT '集群的实例名字', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 86f021b1..c15ba164 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -348,7 +348,14 @@ CREATE TABLE js_sys_job job_group varchar2(64) NOT NULL, description nvarchar2(100) NOT NULL, invoke_target nvarchar2(1000) NOT NULL, + job_type nvarchar2(10) DEFAULT 'cron' NOT NULL, + job_priority number(10), + start_time timestamp, + start_delay number(19), + repeat_interval number(19), + repeat_count number(10), cron_expression varchar2(255) NOT NULL, + rule_expression varchar2(255), misfire_instruction number(1) NOT NULL, concurrent char(1) NOT NULL, instance_name varchar2(64) DEFAULT 'JeeSiteScheduler' NOT NULL, @@ -1233,7 +1240,14 @@ COMMENT ON COLUMN js_sys_job.job_name IS '任务名称'; COMMENT ON COLUMN js_sys_job.job_group IS '任务组名'; COMMENT ON COLUMN js_sys_job.description IS '任务描述'; COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串'; +COMMENT ON COLUMN js_sys_job.job_type IS '任务触发类型'; +COMMENT ON COLUMN js_sys_job.job_priority IS '触发器优先级'; +COMMENT ON COLUMN js_sys_job.start_time IS '触发器启动时间'; +COMMENT ON COLUMN js_sys_job.start_delay IS '触发器延迟启动时间'; +COMMENT ON COLUMN js_sys_job.repeat_interval IS '循环间隔时间（毫秒）'; +COMMENT ON COLUMN js_sys_job.repeat_count IS '循环次数（ -1 无期限）'; COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式'; +COMMENT ON COLUMN js_sys_job.rule_expression IS '自定义规则表达式'; COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略'; COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行'; COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 5ccd1d1d..9a1a70cb 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -348,7 +348,14 @@ CREATE TABLE js_sys_job job_group varchar(64) NOT NULL, description varchar(100) NOT NULL, invoke_target varchar(1000) NOT NULL, + job_type varchar(10) DEFAULT 'cron' NOT NULL, + job_priority decimal(10), + start_time timestamp, + start_delay decimal(19), + repeat_interval decimal(19), + repeat_count decimal(10), cron_expression varchar(255) NOT NULL, + rule_expression varchar(255), misfire_instruction decimal(1) NOT NULL, concurrent char(1) NOT NULL, instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, @@ -1233,7 +1240,14 @@ COMMENT ON COLUMN js_sys_job.job_name IS '任务名称'; COMMENT ON COLUMN js_sys_job.job_group IS '任务组名'; COMMENT ON COLUMN js_sys_job.description IS '任务描述'; COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串'; +COMMENT ON COLUMN js_sys_job.job_type IS '任务触发类型'; +COMMENT ON COLUMN js_sys_job.job_priority IS '触发器优先级'; +COMMENT ON COLUMN js_sys_job.start_time IS '触发器启动时间'; +COMMENT ON COLUMN js_sys_job.start_delay IS '触发器延迟启动时间'; +COMMENT ON COLUMN js_sys_job.repeat_interval IS '循环间隔时间（毫秒）'; +COMMENT ON COLUMN js_sys_job.repeat_count IS '循环次数（ -1 无期限）'; COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式'; +COMMENT ON COLUMN js_sys_job.rule_expression IS '自定义规则表达式'; COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略'; COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行'; COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字';