From 54606b05c0506466f34edcab9b1b1879034c3a5d Mon Sep 17 00:00:00 2001 From: Liang <545073804@qq.com> Date: 星期一, 08 四月 2024 10:56:35 +0800 Subject: [PATCH] update 更新EasyRetry v3.1.1 => v3.2.0 更新数据库sql脚本,添加表前缀er_支持 --- script/sql/easy_retry.sql | 124 +++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 71 deletions(-) diff --git a/script/sql/easy_retry.sql b/script/sql/easy_retry.sql index 23f5142..4289762 100644 --- a/script/sql/easy_retry.sql +++ b/script/sql/easy_retry.sql @@ -1,7 +1,6 @@ SET NAMES utf8mb4; -DROP TABLE IF EXISTS `namespace`; -CREATE TABLE `namespace` +CREATE TABLE `er_namespace` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `name` varchar(64) NOT NULL COMMENT '鍚嶇О', @@ -16,16 +15,17 @@ ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='鍛藉悕绌洪棿'; -INSERT INTO `namespace` VALUES (1, 'Development', 'dev', '', now(), now(), 0); -INSERT INTO `namespace` VALUES (2, 'Production', 'prod', '', now(), now(), 0); +INSERT INTO `er_namespace` VALUES (1, 'Development', 'dev', '', now(), now(), 0); +INSERT INTO `er_namespace` VALUES (2, 'Production', 'prod', '', now(), now(), 0); -DROP TABLE IF EXISTS `group_config`; -CREATE TABLE `group_config` + +CREATE TABLE `er_group_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 DEFAULT '' COMMENT '缁勫悕绉�', `description` varchar(256) NOT NULL DEFAULT '' COMMENT '缁勬弿杩�', + `token` varchar(64) NOT NULL DEFAULT 'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT' COMMENT 'token', `group_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '缁勭姸鎬� 0銆佹湭鍚敤 1銆佸惎鐢�', `version` int(11) NOT NULL COMMENT '鐗堟湰鍙�', `group_partition` int(11) NOT NULL COMMENT '鍒嗗尯', @@ -41,10 +41,10 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='缁勯厤缃�' ; -INSERT INTO `group_config` VALUES (1, 'dev', 'ruoyi_group', '', 1, 1, 0, 1, 1, 4, now(), now()); +INSERT INTO `er_group_config` VALUES (1, 'dev', 'ruoyi_group', '', 'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, now(), now()); -DROP TABLE IF EXISTS `notify_config`; -CREATE TABLE `notify_config` + +CREATE TABLE `er_notify_config` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -67,8 +67,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='閫氱煡閰嶇疆' ; -DROP TABLE IF EXISTS `retry_dead_letter_0`; -CREATE TABLE `retry_dead_letter_0` +CREATE TABLE `er_retry_dead_letter_0` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -93,8 +92,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='姝讳俊闃熷垪琛�' ; -DROP TABLE IF EXISTS `retry_task_0`; -CREATE TABLE `retry_task_0` +CREATE TABLE `er_retry_task_0` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -125,8 +123,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟琛�' ; -DROP TABLE IF EXISTS `retry_task_log`; -CREATE TABLE `retry_task_log` +CREATE TABLE `er_retry_task_log` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -141,6 +138,7 @@ `retry_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '閲嶈瘯鐘舵�� 0銆侀噸璇曚腑 1銆佹垚鍔� 2銆佹渶澶ф鏁�', `task_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '浠诲姟绫诲瀷 1銆侀噸璇曟暟鎹� 2銆佸洖璋冩暟鎹�', `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_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`), KEY `idx_retry_status` (`retry_status`), @@ -153,16 +151,16 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟鏃ュ織鍩虹淇℃伅琛�' ; -DROP TABLE IF EXISTS `retry_task_log_message`; -CREATE TABLE `retry_task_log_message` +CREATE TABLE `er_retry_task_log_message` ( `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 '缁勫悕绉�', `unique_id` varchar(64) NOT NULL COMMENT '鍚岀粍涓媔d鍞竴', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `message` text NOT NULL COMMENT '寮傚父淇℃伅', - `client_info` varchar(128) DEFAULT NULL COMMENT '瀹㈡埛绔湴鍧� clientId#ip:port', + `message` longtext NOT NULL COMMENT '寮傚父淇℃伅', + `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '鏃ュ織鏁伴噺', + `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '涓婃姤鏃堕棿', PRIMARY KEY (`id`), KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `unique_id`), KEY `idx_create_dt` (`create_dt`) @@ -171,8 +169,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟璋冨害鏃ュ織淇℃伅璁板綍琛�' ; -DROP TABLE IF EXISTS `scene_config`; -CREATE TABLE `scene_config` +CREATE TABLE `er_scene_config` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -195,8 +192,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='鍦烘櫙閰嶇疆' ; -DROP TABLE IF EXISTS `server_node`; -CREATE TABLE `server_node` +CREATE TABLE `er_server_node` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -219,8 +215,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='鏈嶅姟鍣ㄨ妭鐐�' ; -DROP TABLE IF EXISTS `distributed_lock`; -CREATE TABLE `distributed_lock` +CREATE TABLE `er_distributed_lock` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `name` varchar(64) NOT NULL COMMENT '閿佸悕绉�', @@ -236,8 +231,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='閿佸畾琛�' ; -DROP TABLE IF EXISTS `system_user`; -CREATE TABLE `system_user` +CREATE TABLE `er_system_user` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `username` varchar(64) NOT NULL COMMENT '璐﹀彿', @@ -251,10 +245,9 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='绯荤粺鐢ㄦ埛琛�'; -- pwd: admin -INSERT INTO `system_user` VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now()); +INSERT INTO `er_system_user` VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now()); -DROP TABLE IF EXISTS `system_user_permission`; -CREATE TABLE `system_user_permission` +CREATE TABLE `er_system_user_permission` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `group_name` varchar(64) NOT NULL COMMENT '缁勫悕绉�', @@ -267,8 +260,7 @@ ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='绯荤粺鐢ㄦ埛鏉冮檺琛�'; -DROP TABLE IF EXISTS `sequence_alloc`; -CREATE TABLE `sequence_alloc` +CREATE TABLE `er_sequence_alloc` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -282,8 +274,7 @@ DEFAULT CHARSET = utf8mb4 COMMENT ='鍙锋妯″紡搴忓彿ID鍒嗛厤琛�'; -- 鍒嗗竷寮忚皟搴DL -DROP TABLE IF EXISTS `job`; -CREATE TABLE `job` +CREATE TABLE `er_job` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -319,10 +310,7 @@ AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟淇℃伅'; -INSERT INTO `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, '', '', now(), now(), 0); - -DROP TABLE IF EXISTS `job_log_message`; -CREATE TABLE `job_log_message` +CREATE TABLE `er_job_log_message` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -343,8 +331,7 @@ AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='璋冨害鏃ュ織'; -DROP TABLE IF EXISTS `job_task`; -CREATE TABLE `job_task` +CREATE TABLE `er_job_task` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -369,8 +356,7 @@ AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟瀹炰緥'; -DROP TABLE IF EXISTS `job_task_batch`; -CREATE TABLE `job_task_batch` +CREATE TABLE `er_job_task_batch` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -392,13 +378,12 @@ KEY `idx_job_id_task_batch_status` (`job_id`, `task_batch_status`), KEY `idx_create_dt` (`create_dt`), KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), - KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`,`workflow_node_id`) + KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`, `workflow_node_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟鎵规'; -DROP TABLE IF EXISTS `job_notify_config`; -CREATE TABLE `job_notify_config` +CREATE TABLE `er_job_notify_config` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -420,32 +405,31 @@ AUTO_INCREMENT = 4 DEFAULT CHARSET = utf8mb4 COMMENT ='job閫氱煡閰嶇疆'; -DROP TABLE IF EXISTS `job_summary`; -CREATE TABLE `job_summary` +CREATE TABLE `er_job_summary` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', - `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', - `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '缁勫悕绉�', - `job_id` bigint NOT NULL COMMENT '浠诲姟淇℃伅id', - `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '缁熻鏃堕棿', - `success_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц鎴愬姛-鏃ュ織鏁伴噺', - `fail_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', - `fail_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', - `stop_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', - `stop_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', - `cancel_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', - `cancel_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', + `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', + `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '缁勫悕绉�', + `business_id` bigint NOT NULL COMMENT '涓氬姟id (job_id鎴杦orkflow_id)', + `system_task_type` tinyint(4) NOT NULL DEFAULT '3' COMMENT '浠诲姟绫诲瀷 3銆丣OB浠诲姟 4銆乄ORKFLOW浠诲姟', + `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '缁熻鏃堕棿', + `success_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц鎴愬姛-鏃ュ織鏁伴噺', + `fail_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', + `fail_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', + `stop_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', + `stop_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', + `cancel_num` int NOT NULL DEFAULT '0' COMMENT '鎵ц澶辫触-鏃ュ織鏁伴噺', + `cancel_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '澶辫触鍘熷洜', + `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_job_id` (`namespace_id`, `group_name`, job_id), - UNIQUE KEY `uk_job_id_trigger_at` (`job_id`, `trigger_at`) USING BTREE + KEY `idx_namespace_id_group_name_business_id` (`namespace_id`, `group_name`, business_id), + UNIQUE KEY `uk_trigger_at_system_task_type_business_id` (`trigger_at`, `system_task_type`, `business_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Job'; -DROP TABLE IF EXISTS `retry_summary`; -CREATE TABLE `retry_summary` +CREATE TABLE `er_retry_summary` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -459,13 +443,13 @@ `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_trigger_at` (`trigger_at`), UNIQUE KEY `uk_scene_name_trigger_at` (`namespace_id`, `group_name`, `scene_name`, `trigger_at`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Retry'; -DROP TABLE IF EXISTS `workflow`; -CREATE TABLE `workflow` +CREATE TABLE `er_workflow` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `workflow_name` varchar(64) NOT NULL COMMENT '宸ヤ綔娴佸悕绉�', @@ -492,8 +476,7 @@ AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='宸ヤ綔娴�'; -DROP TABLE IF EXISTS `workflow_node`; -CREATE TABLE `workflow_node` +CREATE TABLE `er_workflow_node` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', @@ -519,8 +502,7 @@ AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='宸ヤ綔娴佽妭鐐�'; -DROP TABLE IF EXISTS `workflow_task_batch`; -CREATE TABLE `workflow_task_batch` +CREATE TABLE `er_workflow_task_batch` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '鍛藉悕绌洪棿id', -- Gitblit v1.9.3