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/sqlserver/sqlserver_ry_job.sql | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/script/sql/sqlserver/snail_job_sqlserver.sql b/script/sql/sqlserver/sqlserver_ry_job.sql
similarity index 97%
rename from script/sql/sqlserver/snail_job_sqlserver.sql
rename to script/sql/sqlserver/sqlserver_ry_job.sql
index 249842b..97addc3 100644
--- a/script/sql/sqlserver/snail_job_sqlserver.sql
+++ b/script/sql/sqlserver/sqlserver_ry_job.sql
@@ -2,7 +2,7 @@
SnailJob Database Transfer Tool
Source Server Type : MySQL
Target Server Type : Microsoft SQL Server
- Date: 2024-07-06 12:55:47
+ Date: 2024-12-27 22:24:37
*/
@@ -203,6 +203,8 @@
INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate())
GO
+INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt) VALUES (N'prod', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate())
+GO
-- sj_notify_config
CREATE TABLE sj_notify_config
@@ -210,7 +212,7 @@
id bigint NOT NULL PRIMARY KEY IDENTITY,
namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
group_name nvarchar(64) NOT NULL,
- business_id nvarchar(64) NOT NULL,
+ notify_name nvarchar(64) NOT NULL DEFAULT '',
system_task_type tinyint NOT NULL DEFAULT 3,
notify_status tinyint NOT NULL DEFAULT 0,
recipient_ids nvarchar(128) NOT NULL,
@@ -224,7 +226,7 @@
)
GO
-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)
GO
EXEC sp_addextendedproperty
@@ -249,10 +251,10 @@
GO
EXEC sp_addextendedproperty
- 'MS_Description', N'涓氬姟id ( job_id鎴杦orkflow_id鎴杝cene_name ) ',
+ 'MS_Description', N'閫氱煡鍚嶇О',
'SCHEMA', N'dbo',
'TABLE', N'sj_notify_config',
- 'COLUMN', N'business_id'
+ 'COLUMN', N'notify_name'
GO
EXEC sp_addextendedproperty
@@ -915,6 +917,7 @@
max_retry_count int NOT NULL DEFAULT 5,
back_off tinyint NOT NULL DEFAULT 1,
trigger_interval nvarchar(16) NOT NULL DEFAULT '',
+ notify_ids nvarchar(128) NOT NULL DEFAULT '',
deadline_request bigint NOT NULL DEFAULT 60000,
executor_timeout int NOT NULL DEFAULT 5,
route_key tinyint NOT NULL DEFAULT 4,
@@ -981,6 +984,13 @@
'SCHEMA', N'dbo',
'TABLE', N'sj_retry_scene_config',
'COLUMN', N'trigger_interval'
+GO
+
+EXEC sp_addextendedproperty
+ 'MS_Description', N'閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'sj_retry_scene_config',
+ 'COLUMN', N'notify_ids'
GO
EXEC sp_addextendedproperty
@@ -1413,6 +1423,8 @@
retry_interval int NOT NULL DEFAULT 0,
bucket_index int NOT NULL DEFAULT 0,
resident tinyint NOT NULL DEFAULT 0,
+ notify_ids nvarchar(128) NOT NULL DEFAULT '',
+ owner_id bigint NULL,
description nvarchar(256) NOT NULL DEFAULT '',
ext_attrs nvarchar(256) NULL DEFAULT '',
deleted tinyint NOT NULL DEFAULT 0,
@@ -1576,6 +1588,20 @@
GO
EXEC sp_addextendedproperty
+ 'MS_Description', N'閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'sj_job',
+ 'COLUMN', N'notify_ids'
+GO
+
+EXEC sp_addextendedproperty
+ 'MS_Description', N'璐熻矗浜篿d',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'sj_job',
+ 'COLUMN', N'owner_id'
+GO
+
+EXEC sp_addextendedproperty
'MS_Description', N'鎻忚堪',
'SCHEMA', N'dbo',
'TABLE', N'sj_job',
@@ -1616,7 +1642,7 @@
'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, 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'', N'', 0, getdate(), getdate())
+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, 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'', 0, getdate(), getdate())
GO
-- sj_job_log_message
@@ -2306,6 +2332,7 @@
description nvarchar(256) NOT NULL DEFAULT '',
flow_info nvarchar(max) NULL DEFAULT NULL,
wf_context nvarchar(max) NULL DEFAULT NULL,
+ notify_ids nvarchar(128) NOT NULL DEFAULT '',
bucket_index int NOT NULL DEFAULT 0,
version int NOT NULL,
ext_attrs nvarchar(256) NULL DEFAULT '',
@@ -2409,6 +2436,13 @@
'SCHEMA', N'dbo',
'TABLE', N'sj_workflow',
'COLUMN', N'wf_context'
+GO
+
+EXEC sp_addextendedproperty
+ 'MS_Description', N'閫氱煡鍛婅鍦烘櫙閰嶇疆id鍒楄〃',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'sj_workflow',
+ 'COLUMN', N'notify_ids'
GO
EXEC sp_addextendedproperty
@@ -2742,4 +2776,3 @@
'SCHEMA', N'dbo',
'TABLE', N'sj_workflow_task_batch'
GO
-
--
Gitblit v1.9.3