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/postgres/postgres_ry_job.sql |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/script/sql/postgres/snail_job_postgre.sql b/script/sql/postgres/postgres_ry_job.sql
similarity index 97%
rename from script/sql/postgres/snail_job_postgre.sql
rename to script/sql/postgres/postgres_ry_job.sql
index c8abc68..1a08a99 100644
--- a/script/sql/postgres/snail_job_postgre.sql
+++ b/script/sql/postgres/postgres_ry_job.sql
@@ -2,7 +2,7 @@
  SnailJob Database Transfer Tool
  Source Server Type    : MySQL
  Target Server Type    : PostgreSQL
- Date: 2024-07-06 11:45:40
+ Date: 2024-12-27 22:13:49
 */
 
 
@@ -68,6 +68,7 @@
 COMMENT ON TABLE sj_group_config IS '缁勯厤缃�';
 
 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());
 
 -- sj_notify_config
 CREATE TABLE sj_notify_config
@@ -75,7 +76,7 @@
     id                     bigserial PRIMARY KEY,
     namespace_id           varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
     group_name             varchar(64)  NOT NULL,
-    business_id            varchar(64)  NOT NULL,
+    notify_name            varchar(64)  NOT NULL DEFAULT '',
     system_task_type       smallint     NOT NULL DEFAULT 3,
     notify_status          smallint     NOT NULL DEFAULT 0,
     recipient_ids          varchar(128) NOT NULL,
@@ -88,12 +89,12 @@
     update_dt              timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
-CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name, business_id);
+CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name);
 
 COMMENT ON COLUMN sj_notify_config.id IS '涓婚敭';
 COMMENT ON COLUMN sj_notify_config.namespace_id IS '鍛藉悕绌洪棿id';
 COMMENT ON COLUMN sj_notify_config.group_name IS '缁勫悕绉�';
-COMMENT ON COLUMN sj_notify_config.business_id IS '涓氬姟id  ( job_id鎴杦orkflow_id鎴杝cene_name ) ';
+COMMENT ON COLUMN sj_notify_config.notify_name IS '閫氱煡鍚嶇О';
 COMMENT ON COLUMN sj_notify_config.system_task_type IS '浠诲姟绫诲瀷 1. 閲嶈瘯浠诲姟 2. 閲嶈瘯鍥炶皟 3銆丣OB浠诲姟 4銆乄ORKFLOW浠诲姟';
 COMMENT ON COLUMN sj_notify_config.notify_status IS '閫氱煡鐘舵�� 0銆佹湭鍚敤 1銆佸惎鐢�';
 COMMENT ON COLUMN sj_notify_config.recipient_ids IS '鎺ユ敹浜篿d鍒楄〃';
@@ -296,6 +297,7 @@
     max_retry_count  int          NOT NULL DEFAULT 5,
     back_off         smallint     NOT NULL DEFAULT 1,
     trigger_interval varchar(16)  NOT NULL DEFAULT '',
+    notify_ids       varchar(128) NOT NULL DEFAULT '',
     deadline_request bigint       NOT NULL DEFAULT 60000,
     executor_timeout int          NOT NULL DEFAULT 5,
     route_key        smallint     NOT NULL DEFAULT 4,
@@ -314,6 +316,7 @@
 COMMENT ON COLUMN sj_retry_scene_config.max_retry_count IS '鏈�澶ч噸璇曟鏁�';
 COMMENT ON COLUMN sj_retry_scene_config.back_off IS '1銆侀粯璁ょ瓑绾� 2銆佸浐瀹氶棿闅旀椂闂� 3銆丆RON 琛ㄨ揪寮�';
 COMMENT ON COLUMN sj_retry_scene_config.trigger_interval IS '闂撮殧鏃堕暱';
+COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃';
 COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 璋冪敤閾捐秴鏃� 鍗曚綅姣';
 COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '浠诲姟鎵ц瓒呮椂鏃堕棿锛屽崟浣嶇';
 COMMENT ON COLUMN sj_retry_scene_config.route_key IS '璺敱绛栫暐';
@@ -463,6 +466,8 @@
     retry_interval   int          NOT NULL DEFAULT 0,
     bucket_index     int          NOT NULL DEFAULT 0,
     resident         smallint     NOT NULL DEFAULT 0,
+    notify_ids       varchar(128) NOT NULL DEFAULT '',
+    owner_id         bigint       NULL,
     description      varchar(256) NOT NULL DEFAULT '',
     ext_attrs        varchar(256) NULL     DEFAULT '',
     deleted          smallint     NOT NULL DEFAULT 0,
@@ -495,6 +500,8 @@
 COMMENT ON COLUMN sj_job.retry_interval IS '閲嶈瘯闂撮殧 ( s ) ';
 COMMENT ON COLUMN sj_job.bucket_index IS 'bucket';
 COMMENT ON COLUMN sj_job.resident IS '鏄惁鏄父椹讳换鍔�';
+COMMENT ON COLUMN sj_job.notify_ids IS '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃';
+COMMENT ON COLUMN sj_job.owner_id IS '璐熻矗浜篿d';
 COMMENT ON COLUMN sj_job.description IS '鎻忚堪';
 COMMENT ON COLUMN sj_job.ext_attrs IS '鎵╁睍瀛楁';
 COMMENT ON COLUMN sj_job.deleted IS '閫昏緫鍒犻櫎 1銆佸垹闄�';
@@ -502,7 +509,7 @@
 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, '', '', 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());
 
 -- sj_job_log_message
 CREATE TABLE sj_job_log_message
@@ -720,6 +727,7 @@
     description      varchar(256) NOT NULL DEFAULT '',
     flow_info        text         NULL     DEFAULT NULL,
     wf_context       text         NULL     DEFAULT NULL,
+    notify_ids       varchar(128) NOT NULL DEFAULT '',
     bucket_index     int          NOT NULL DEFAULT 0,
     version          int          NOT NULL,
     ext_attrs        varchar(256) NULL     DEFAULT '',
@@ -744,6 +752,7 @@
 COMMENT ON COLUMN sj_workflow.description IS '鎻忚堪';
 COMMENT ON COLUMN sj_workflow.flow_info IS '娴佺▼淇℃伅';
 COMMENT ON COLUMN sj_workflow.wf_context IS '涓婁笅鏂�';
+COMMENT ON COLUMN sj_workflow.notify_ids IS '閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃';
 COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket';
 COMMENT ON COLUMN sj_workflow.version IS '鐗堟湰鍙�';
 COMMENT ON COLUMN sj_workflow.ext_attrs IS '鎵╁睍瀛楁';

--
Gitblit v1.9.3