From 6438f805266954874a2ddf345cd6e776f5854b0d Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: 星期一, 08 四月 2024 13:57:14 +0800
Subject: [PATCH] fix: easy-retry 3.2.0升级修复 1. SQLServer,Oracle的IDENTITY字段不能插入值 2. SQLServer er_system_user_=> er_system_user 3. ruoyi-admin增加token配置
---
script/sql/easy_retry.sql | 4 +-
ruoyi-admin/src/main/resources/application-prod.yml | 3 +
script/sql/oracle/easy_retry_oracle.sql | 21 +++++-----
script/sql/sqlserver/easy_retry_sqlserver.sql | 30 +++++++-------
ruoyi-admin/src/main/resources/application-dev.yml | 3 +
5 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index b6d3db8..35f7a5a 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -29,10 +29,11 @@
enabled: true
# 闇�瑕佸湪EasyRetry鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
group-name: "ruoyi_group"
+ token: "ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
host: 127.0.0.1
port: 1788
- # 璇﹁ script/sql/easy_retry.sql `namespace` 琛�
+ # 璇﹁ script/sql/easy_retry.sql `er_namespace` 琛�
namespace: ${spring.profiles.active}
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 69701ff..abe2362 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -32,10 +32,11 @@
enabled: false
# 闇�瑕佸湪EasyRetry鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
group-name: "ruoyi_group"
+ token: "ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
host: 127.0.0.1
port: 1788
- # 璇﹁ script/sql/easy_retry.sql `namespace` 琛�
+ # 璇﹁ script/sql/easy_retry.sql `er_namespace` 琛�
namespace: ${spring.profiles.active}
--- # 鏁版嵁婧愰厤缃�
diff --git a/script/sql/easy_retry.sql b/script/sql/easy_retry.sql
index 4289762..c884c88 100644
--- a/script/sql/easy_retry.sql
+++ b/script/sql/easy_retry.sql
@@ -25,7 +25,7 @@
`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',
+ `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 '鍒嗗尯',
@@ -158,7 +158,7 @@
`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` longtext NOT NULL COMMENT '寮傚父淇℃伅',
+ `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`),
diff --git a/script/sql/oracle/easy_retry_oracle.sql b/script/sql/oracle/easy_retry_oracle.sql
index 06f7662..4c8c062 100644
--- a/script/sql/oracle/easy_retry_oracle.sql
+++ b/script/sql/oracle/easy_retry_oracle.sql
@@ -23,8 +23,9 @@
COMMENT ON COLUMN er_namespace.update_dt IS '淇敼鏃堕棿';
COMMENT ON COLUMN er_namespace.deleted IS '閫昏緫鍒犻櫎 1銆佸垹闄�';
-INSERT INTO er_namespace VALUES (1, 'Development', 'dev', '', sysdate, sysdate, 0);
-INSERT INTO er_namespace VALUES (2, 'Production', 'prod', '', sysdate, sysdate, 0);
+-- id 涓� IDENTITY 绫诲瀷, 涓嶈兘鎻掑叆
+INSERT INTO er_namespace(name, unique_id, description, create_dt, update_dt, deleted) VALUES('Development', 'dev', '', SYSDATE, SYSDATE, 0 );
+INSERT INTO er_namespace(name, unique_id, description, create_dt, update_dt, deleted) VALUES ('Production', 'prod', '', sysdate, sysdate, 0);
-- er_group_config
CREATE TABLE er_group_config
@@ -61,7 +62,7 @@
COMMENT ON COLUMN er_group_config.create_dt IS '鍒涘缓鏃堕棿';
COMMENT ON COLUMN er_group_config.update_dt IS '淇敼鏃堕棿';
-INSERT INTO er_group_config VALUES (1, 'dev', 'ruoyi_group', '', 'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, sysdate, sysdate);
+INSERT INTO er_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 ('dev', 'ruoyi_group', '', 'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1, 4, SYSDATE, SYSDATE );
-- er_notify_config
CREATE TABLE er_notify_config
@@ -229,13 +230,13 @@
CREATE TABLE er_retry_task_log_message
(
id NUMBER GENERATED ALWAYS AS IDENTITY,
- namespace_id VARCHAR2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+ namespace_id VARCHAR2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
group_name VARCHAR2(64) NOT NULL,
unique_id VARCHAR2(64) NOT NULL,
- create_dt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- message CLOB DEFAULT '',
- log_num INT DEFAULT 1,
- real_time NUMERIC(13) DEFAULT 0
+ create_dt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ message CLOB DEFAULT '',
+ log_num INT DEFAULT 1,
+ real_time NUMERIC(13) DEFAULT 0
);
CREATE INDEX idx_retry_task_log_message_1 ON er_retry_task_log_message (namespace_id, group_name, unique_id);
@@ -368,8 +369,8 @@
COMMENT ON COLUMN er_system_user.create_dt IS '鍒涘缓鏃堕棿';
COMMENT ON COLUMN er_system_user.update_dt IS '淇敼鏃堕棿';
--- er_pwd: admin
-INSERT INTO er_system_user VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, sysdate, sysdate);
+-- pwd: admin
+INSERT INTO er_system_user(username, password, role, create_dt, update_dt) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, SYSDATE, SYSDATE);
-- er_system_user_permission
CREATE TABLE er_system_user_permission
diff --git a/script/sql/sqlserver/easy_retry_sqlserver.sql b/script/sql/sqlserver/easy_retry_sqlserver.sql
index 3cf7045..da22b5f 100644
--- a/script/sql/sqlserver/easy_retry_sqlserver.sql
+++ b/script/sql/sqlserver/easy_retry_sqlserver.sql
@@ -188,7 +188,7 @@
'TABLE', N'er_group_config'
GO
-INSERT INTO er_group_config VALUES (N'1', N'dev', N'ruoyi_group', N'', N'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate());
+INSERT INTO er_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'ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', N'4', getdate(), getdate());
GO
-- er_job
@@ -1154,8 +1154,8 @@
'TABLE', N'er_namespace'
GO
-INSERT INTO er_namespace VALUES (N'1', N'Development', N'dev', N'', getdate(), getdate(), N'0');
-INSERT INTO er_namespace VALUES (N'2', N'Production', N'prod', N'', getdate(), getdate(), N'0');
+INSERT INTO er_namespace(name, unique_id, description, create_dt, update_dt, deleted) VALUES (N'Development', N'dev', N'', getdate(), getdate(), N'0');
+INSERT INTO er_namespace(name, unique_id, description, create_dt, update_dt, deleted) VALUES (N'Production', N'prod', N'', getdate(), getdate(), N'0');
GO
-- er_notify_config
@@ -1423,7 +1423,7 @@
GO
CREATE UNIQUE NONCLUSTERED INDEX uk_scene_name_trigger_at ON er_retry_summary (namespace_id ASC, group_name ASC,
- scene_name ASC, trigger_at ASC)
+ scene_name ASC, trigger_at ASC)
GO
EXEC sp_addextendedproperty
@@ -2187,8 +2187,8 @@
'TABLE', N'er_server_node'
GO
--- er_system_user_
-CREATE TABLE er_system_user_
+-- er_system_user
+CREATE TABLE er_system_user
(
id bigint PRIMARY KEY IDENTITY,
username nvarchar(64) NOT NULL,
@@ -2199,59 +2199,59 @@
)
GO
-CREATE UNIQUE NONCLUSTERED INDEX uk_username ON er_system_user_ (username ASC)
+CREATE UNIQUE NONCLUSTERED INDEX uk_username ON er_system_user (username ASC)
GO
EXEC sp_addextendedproperty
'MS_Description', N'涓婚敭',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'id'
GO
EXEC sp_addextendedproperty
'MS_Description', N'璐﹀彿',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'username'
GO
EXEC sp_addextendedproperty
'MS_Description', N'瀵嗙爜',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'password'
GO
EXEC sp_addextendedproperty
'MS_Description', N'瑙掕壊锛�1-鏅�氱敤鎴枫��2-绠＄悊鍛�',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'role'
GO
EXEC sp_addextendedproperty
'MS_Description', N'鍒涘缓鏃堕棿',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'create_dt'
GO
EXEC sp_addextendedproperty
'MS_Description', N'淇敼鏃堕棿',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_',
+ 'TABLE', N'er_system_user',
'COLUMN', N'update_dt'
GO
EXEC sp_addextendedproperty
'MS_Description', N'绯荤粺鐢ㄦ埛琛�',
'SCHEMA', N'dbo',
- 'TABLE', N'er_system_user_'
+ 'TABLE', N'er_system_user'
GO
-- pwd: admin
-INSERT INTO er_system_user_ VALUES (N'1', N'admin', N'465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', N'2', getdate(), getdate());
+INSERT INTO er_system_user(username, password, role, create_dt, update_dt) VALUES (N'admin', N'465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', N'2', getdate(), getdate());
GO
-- er_system_user_permission
--
Gitblit v1.9.3