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/ry_vue_5.X.sql | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql
index 3e3562d..48e5f35 100644
--- a/script/sql/ry_vue_5.X.sql
+++ b/script/sql/ry_vue_5.X.sql
@@ -5,7 +5,7 @@
(
id bigint not null comment '涓婚敭',
user_id bigint not null comment '鐢ㄦ埛ID',
- tenant_id varchar(20) default null comment '绉熸埛id',
+ tenant_id varchar(20) default '000000' comment '绉熸埛id',
auth_id varchar(255) not null comment '骞冲彴+骞冲彴鍞竴id',
source varchar(255) not null comment '鐢ㄦ埛鏉ユ簮',
open_id varchar(255) default null comment '骞冲彴缂栧彿鍞竴id',
@@ -31,7 +31,7 @@
create_time datetime comment '鍒涘缓鏃堕棿',
update_by bigint(20) comment '鏇存柊鑰�',
update_time datetime comment '鏇存柊鏃堕棿',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
PRIMARY KEY (id)
) engine=innodb comment = '绀句細鍖栧叧绯昏〃';
@@ -55,7 +55,7 @@
expire_time datetime comment '杩囨湡鏃堕棿',
account_count int default -1 comment '鐢ㄦ埛鏁伴噺锛�-1涓嶉檺鍒讹級',
status char(1) default '0' comment '绉熸埛鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
create_dept bigint(20) comment '鍒涘缓閮ㄩ棬',
create_by bigint(20) comment '鍒涘缓鑰�',
create_time datetime comment '鍒涘缓鏃堕棿',
@@ -82,7 +82,7 @@
remark varchar(200) comment '澶囨敞',
menu_check_strictly tinyint(1) default 1 comment '鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�',
status char(1) default '0' comment '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
create_dept bigint(20) comment '鍒涘缓閮ㄩ棬',
create_by bigint(20) comment '鍒涘缓鑰�',
create_time datetime comment '鍒涘缓鏃堕棿',
@@ -107,7 +107,7 @@
phone varchar(11) default null comment '鑱旂郴鐢佃瘽',
email varchar(50) default null comment '閭',
status char(1) default '0' comment '閮ㄩ棬鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
create_dept bigint(20) default null comment '鍒涘缓閮ㄩ棬',
create_by bigint(20) default null comment '鍒涘缓鑰�',
create_time datetime comment '鍒涘缓鏃堕棿',
@@ -149,7 +149,7 @@
avatar bigint(20) comment '澶村儚鍦板潃',
password varchar(100) default '' comment '瀵嗙爜',
status char(1) default '0' comment '甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
login_ip varchar(128) default '' comment '鏈�鍚庣櫥褰旾P',
login_date datetime comment '鏈�鍚庣櫥褰曟椂闂�',
create_dept bigint(20) default null comment '鍒涘缓閮ㄩ棬',
@@ -212,7 +212,7 @@
menu_check_strictly tinyint(1) default 1 comment '鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�',
dept_check_strictly tinyint(1) default 1 comment '閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�',
status char(1) not null comment '瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
create_dept bigint(20) default null comment '鍒涘缓閮ㄩ棬',
create_by bigint(20) default null comment '鍒涘缓鑰�',
create_time datetime comment '鍒涘缓鏃堕棿',
@@ -441,6 +441,8 @@
insert into sys_role_menu values ('3', '106');
insert into sys_role_menu values ('3', '107');
insert into sys_role_menu values ('3', '108');
+insert into sys_role_menu values ('3', '118');
+insert into sys_role_menu values ('3', '123');
insert into sys_role_menu values ('3', '500');
insert into sys_role_menu values ('3', '501');
insert into sys_role_menu values ('3', '1001');
@@ -488,6 +490,12 @@
insert into sys_role_menu values ('3', '1043');
insert into sys_role_menu values ('3', '1044');
insert into sys_role_menu values ('3', '1045');
+insert into sys_role_menu values ('3', '1050');
+insert into sys_role_menu values ('3', '1061');
+insert into sys_role_menu values ('3', '1062');
+insert into sys_role_menu values ('3', '1063');
+insert into sys_role_menu values ('3', '1064');
+insert into sys_role_menu values ('3', '1065');
insert into sys_role_menu values ('3', '1500');
insert into sys_role_menu values ('3', '1501');
insert into sys_role_menu values ('3', '1502');
@@ -500,6 +508,25 @@
insert into sys_role_menu values ('3', '1509');
insert into sys_role_menu values ('3', '1510');
insert into sys_role_menu values ('3', '1511');
+insert into sys_role_menu values ('3', '1600');
+insert into sys_role_menu values ('3', '1601');
+insert into sys_role_menu values ('3', '1602');
+insert into sys_role_menu values ('3', '1603');
+insert into sys_role_menu values ('3', '1620');
+insert into sys_role_menu values ('3', '1621');
+insert into sys_role_menu values ('3', '1622');
+insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11618');
+insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11629');
+insert into sys_role_menu values ('3', '11632');
+insert into sys_role_menu values ('3', '11633');
+insert into sys_role_menu values ('3', '11638');
+insert into sys_role_menu values ('3', '11639');
+insert into sys_role_menu values ('3', '11640');
+insert into sys_role_menu values ('3', '11641');
+insert into sys_role_menu values ('3', '11642');
+insert into sys_role_menu values ('3', '11643');
insert into sys_role_menu values ('4', '5');
insert into sys_role_menu values ('4', '1500');
insert into sys_role_menu values ('4', '1501');
@@ -554,10 +581,10 @@
oper_url varchar(255) default '' comment '璇锋眰URL',
oper_ip varchar(128) default '' comment '涓绘満鍦板潃',
oper_location varchar(255) default '' comment '鎿嶄綔鍦扮偣',
- oper_param varchar(2000) default '' comment '璇锋眰鍙傛暟',
- json_result varchar(2000) default '' comment '杩斿洖鍙傛暟',
+ oper_param varchar(4000) default '' comment '璇锋眰鍙傛暟',
+ json_result varchar(4000) default '' comment '杩斿洖鍙傛暟',
status int(1) default 0 comment '鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�',
- error_msg varchar(2000) default '' comment '閿欒娑堟伅',
+ error_msg varchar(4000) default '' comment '閿欒娑堟伅',
oper_time datetime comment '鎿嶄綔鏃堕棿',
cost_time bigint(20) default 0 comment '娑堣�楁椂闂�',
primary key (oper_id),
@@ -840,7 +867,7 @@
insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null);
insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
-insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
+insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1240000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
-- ----------------------------
@@ -856,7 +883,7 @@
active_timeout int(11) default 1800 comment 'token娲昏穬瓒呮椂鏃堕棿',
timeout int(11) default 604800 comment 'token鍥哄畾瓒呮椂',
status char(1) default '0' comment '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
- del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�',
+ del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�',
create_dept bigint(20) default null comment '鍒涘缓閮ㄩ棬',
create_by bigint(20) default null comment '鍒涘缓鑰�',
create_time datetime default null comment '鍒涘缓鏃堕棿',
--
Gitblit v1.9.3