From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
script/sql/ry_job.sql | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/script/sql/snail_job.sql b/script/sql/ry_job.sql
similarity index 97%
rename from script/sql/snail_job.sql
rename to script/sql/ry_job.sql
index c3aa760..c6ec01b 100644
--- a/script/sql/snail_job.sql
+++ b/script/sql/ry_job.sql
@@ -40,13 +40,14 @@
DEFAULT CHARSET = utf8mb4 COMMENT ='缁勯厤缃�';
INSERT INTO `sj_group_config` VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now());
+INSERT INTO `sj_group_config` VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now());
CREATE TABLE `sj_notify_config`
(
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
`namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id',
`group_name` varchar(64) NOT NULL COMMENT '缁勫悕绉�',
- `business_id` varchar(64) NOT NULL COMMENT '涓氬姟id (job_id鎴杦orkflow_id鎴杝cene_name)',
+ `notify_name` varchar(64) NOT NULL DEFAULT '' COMMENT '閫氱煡鍚嶇О',
`system_task_type` tinyint(4) NOT NULL DEFAULT 3 COMMENT '浠诲姟绫诲瀷 1. 閲嶈瘯浠诲姟 2. 閲嶈瘯鍥炶皟 3銆丣OB浠诲姟 4銆乄ORKFLOW浠诲姟',
`notify_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '閫氱煡鐘舵�� 0銆佹湭鍚敤 1銆佸惎鐢�',
`recipient_ids` varchar(128) NOT NULL COMMENT '鎺ユ敹浜篿d鍒楄〃',
@@ -58,7 +59,7 @@
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
`update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
PRIMARY KEY (`id`),
- KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `business_id`)
+ KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`)
) ENGINE = InnoDB
AUTO_INCREMENT = 0
DEFAULT CHARSET = utf8mb4 COMMENT ='閫氱煡閰嶇疆';
@@ -187,6 +188,7 @@
`max_retry_count` int(11) NOT NULL DEFAULT 5 COMMENT '鏈�澶ч噸璇曟鏁�',
`back_off` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1銆侀粯璁ょ瓑绾� 2銆佸浐瀹氶棿闅旀椂闂� 3銆丆RON 琛ㄨ揪寮�',
`trigger_interval` varchar(16) NOT NULL DEFAULT '' COMMENT '闂撮殧鏃堕暱',
+ `notify_ids` varchar(128) NOT NULL DEFAULT '' COMMENT '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
`deadline_request` bigint(20) unsigned NOT NULL DEFAULT 60000 COMMENT 'Deadline Request 璋冪敤閾捐秴鏃� 鍗曚綅姣',
`executor_timeout` int(11) unsigned NOT NULL DEFAULT 5 COMMENT '浠诲姟鎵ц瓒呮椂鏃堕棿锛屽崟浣嶇',
`route_key` tinyint(4) NOT NULL DEFAULT 4 COMMENT '璺敱绛栫暐',
@@ -299,6 +301,8 @@
`retry_interval` int(11) NOT NULL DEFAULT 0 COMMENT '閲嶈瘯闂撮殧(s)',
`bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket',
`resident` tinyint(4) NOT NULL DEFAULT 0 COMMENT '鏄惁鏄父椹讳换鍔�',
+ `notify_ids` varchar(128) NOT NULL DEFAULT '' COMMENT '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
+ `owner_id` bigint(20) NULL COMMENT '璐熻矗浜篿d',
`description` varchar(256) NOT NULL DEFAULT '' COMMENT '鎻忚堪',
`ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '鎵╁睍瀛楁',
`deleted` tinyint(4) NOT NULL DEFAULT 0 COMMENT '閫昏緫鍒犻櫎 1銆佸垹闄�',
@@ -312,7 +316,7 @@
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, '', '', 0 , now(), now());
+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());
CREATE TABLE `sj_job_log_message`
(
@@ -450,6 +454,7 @@
`description` varchar(256) NOT NULL DEFAULT '' COMMENT '鎻忚堪',
`flow_info` text DEFAULT NULL COMMENT '娴佺▼淇℃伅',
`wf_context` text DEFAULT NULL COMMENT '涓婁笅鏂�',
+ `notify_ids` varchar(128) NOT NULL DEFAULT '' COMMENT '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
`bucket_index` int(11) NOT NULL DEFAULT 0 COMMENT 'bucket',
`version` int(11) NOT NULL COMMENT '鐗堟湰鍙�',
`ext_attrs` varchar(256) NULL DEFAULT '' COMMENT '鎵╁睍瀛楁',
--
Gitblit v1.9.3