admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: easy-retry 3.2.0升级修复

Browse Source 
1. SQLServer,Oracle的IDENTITY字段不能插入值
2. SQLServer er_system_user_=> er_system_user
3. ruoyi-admin增加token配置
This commit is contained in:
dhb52 2024-04-08 13:57:14 +08:00
parent 0b43cf4b1c
commit 6438f80526
5 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -29,10 +29,11 @@ easy-retry:
enabled: true enabled: true
# 需要在EasyRetry后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 # 需要在EasyRetry后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group-name: "ruoyi_group" group-name: "ruoyi_group"
token: "ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server: server:
host: 127.0.0.1 host: 127.0.0.1
port: 1788 port: 1788
# 详见 script/sql/easy_retry.sql `namespace` 表 # 详见 script/sql/easy_retry.sql `er_namespace` 表
namespace: ${spring.profiles.active} namespace: ${spring.profiles.active}

3
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -32,10 +32,11 @@ easy-retry:
enabled: false enabled: false
# 需要在EasyRetry后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 # 需要在EasyRetry后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group-name: "ruoyi_group" group-name: "ruoyi_group"
token: "ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server: server:
host: 127.0.0.1 host: 127.0.0.1
port: 1788 port: 1788
# 详见 script/sql/easy_retry.sql `namespace` 表 # 详见 script/sql/easy_retry.sql `er_namespace` 表
namespace: ${spring.profiles.active} namespace: ${spring.profiles.active}
--- # 数据源配置 --- # 数据源配置

4
script/sql/easy_retry.sql
View File

@ -25,7 +25,7 @@ CREATE TABLE `er_group_config`
`namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
`group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称', `group_name` varchar(64) NOT NULL DEFAULT '' COMMENT '组名称',
`description` varchar(256) 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、启用', `group_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '组状态 0、未启用 1、启用',
`version` int(11) NOT NULL COMMENT '版本号', `version` int(11) NOT NULL COMMENT '版本号',
`group_partition` int(11) NOT NULL COMMENT '分区', `group_partition` int(11) NOT NULL COMMENT '分区',
@ -158,7 +158,7 @@ CREATE TABLE `er_retry_task_log_message`
`group_name` varchar(64) NOT NULL COMMENT '组名称', `group_name` varchar(64) NOT NULL COMMENT '组名称',
`unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一',
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `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 '日志数量', `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量',
`real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),

21
script/sql/oracle/easy_retry_oracle.sql
View File

@ -23,8 +23,9 @@ COMMENT ON COLUMN er_namespace.create_dt IS '创建时间';
COMMENT ON COLUMN er_namespace.update_dt IS '修改时间'; COMMENT ON COLUMN er_namespace.update_dt IS '修改时间';
COMMENT ON COLUMN er_namespace.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN er_namespace.deleted IS '逻辑删除 1、删除';
INSERT INTO er_namespace VALUES (1, 'Development', 'dev', '', sysdate, sysdate, 0); -- id 为 IDENTITY 类型, 不能插入
INSERT INTO er_namespace VALUES (2, 'Production', 'prod', '', sysdate, sysdate, 0); 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 -- er_group_config
CREATE TABLE er_group_config CREATE TABLE er_group_config
@ -61,7 +62,7 @@ COMMENT ON COLUMN er_group_config.bucket_index IS 'bucket';
COMMENT ON COLUMN er_group_config.create_dt IS '创建时间'; COMMENT ON COLUMN er_group_config.create_dt IS '创建时间';
COMMENT ON COLUMN er_group_config.update_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 -- er_notify_config
CREATE TABLE er_notify_config CREATE TABLE er_notify_config
@ -229,13 +230,13 @@ COMMENT ON COLUMN er_retry_task_log.update_dt IS '修改时间';
CREATE TABLE er_retry_task_log_message CREATE TABLE er_retry_task_log_message
( (
id NUMBER GENERATED ALWAYS AS IDENTITY, id NUMBER GENERATED ALWAYS AS IDENTITY,
namespace_id VARCHAR2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', namespace_id VARCHAR2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
group_name VARCHAR2(64) NOT NULL, group_name VARCHAR2(64) NOT NULL,
unique_id VARCHAR2(64) NOT NULL, unique_id VARCHAR2(64) NOT NULL,
create_dt TIMESTAMP DEFAULT CURRENT_TIMESTAMP, create_dt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
message CLOB DEFAULT '', message CLOB DEFAULT '',
log_num INT DEFAULT 1, log_num INT DEFAULT 1,
real_time NUMERIC(13) DEFAULT 0 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); 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.role IS '角色：1-普通用户、2-管理员'
COMMENT ON COLUMN er_system_user.create_dt IS '创建时间'; COMMENT ON COLUMN er_system_user.create_dt IS '创建时间';
COMMENT ON COLUMN er_system_user.update_dt IS '修改时间'; COMMENT ON COLUMN er_system_user.update_dt IS '修改时间';
-- er_pwd: admin -- pwd: admin
INSERT INTO er_system_user VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, sysdate, sysdate); INSERT INTO er_system_user(username, password, role, create_dt, update_dt) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, SYSDATE, SYSDATE);
-- er_system_user_permission -- er_system_user_permission
CREATE TABLE er_system_user_permission CREATE TABLE er_system_user_permission

30
script/sql/sqlserver/easy_retry_sqlserver.sql
View File

@ -188,7 +188,7 @@ EXEC sp_addextendedproperty
'TABLE', N'er_group_config' 'TABLE', N'er_group_config'
GO 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 GO
-- er_job -- er_job
@ -1154,8 +1154,8 @@ EXEC sp_addextendedproperty
'TABLE', N'er_namespace' 'TABLE', N'er_namespace'
GO GO
INSERT INTO er_namespace VALUES (N'1', N'Development', N'dev', 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 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'Production', N'prod', N'', getdate(), getdate(), N'0');
GO GO
-- er_notify_config -- er_notify_config
@ -1423,7 +1423,7 @@ CREATE TABLE er_retry_summary
GO GO
CREATE UNIQUE NONCLUSTERED INDEX uk_scene_name_trigger_at ON er_retry_summary (namespace_id ASC, group_name ASC, 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 GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
@ -2187,8 +2187,8 @@ EXEC sp_addextendedproperty
'TABLE', N'er_server_node' 'TABLE', N'er_server_node'
GO GO
-- er_system_user_ -- er_system_user
CREATE TABLE er_system_user_ CREATE TABLE er_system_user
( (
id bigint PRIMARY KEY IDENTITY, id bigint PRIMARY KEY IDENTITY,
username nvarchar(64) NOT NULL, username nvarchar(64) NOT NULL,
@ -2199,59 +2199,59 @@ CREATE TABLE er_system_user_
) )
GO 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 GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'主键', 'MS_Description', N'主键',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'id' 'COLUMN', N'id'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'账号', 'MS_Description', N'账号',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'username' 'COLUMN', N'username'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'密码', 'MS_Description', N'密码',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'password' 'COLUMN', N'password'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'角色：1-普通用户、2-管理员', 'MS_Description', N'角色：1-普通用户、2-管理员',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'role' 'COLUMN', N'role'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'创建时间', 'MS_Description', N'创建时间',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'create_dt' 'COLUMN', N'create_dt'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'修改时间', 'MS_Description', N'修改时间',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_', 'TABLE', N'er_system_user',
'COLUMN', N'update_dt' 'COLUMN', N'update_dt'
GO GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'系统用户表', 'MS_Description', N'系统用户表',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',
'TABLE', N'er_system_user_' 'TABLE', N'er_system_user'
GO GO
-- pwd: admin -- 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 GO
-- er_system_user_permission -- er_system_user_permission