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/postgres/postgres_ry_vue_5.X.sql | 53 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql index 995d738..d18cfeb 100644 --- a/script/sql/postgres/postgres_ry_vue_5.X.sql +++ b/script/sql/postgres/postgres_ry_vue_5.X.sql @@ -5,7 +5,7 @@ ( id int8 not null, user_id int8 not null, - tenant_id varchar(20) default null::varchar, + tenant_id varchar(20) default '000000'::varchar, auth_id varchar(255) not null, source varchar(255) not null, open_id varchar(255) default null::varchar, @@ -64,7 +64,7 @@ comment on column sys_social.create_time is '鍒涘缓鏃堕棿'; comment on column sys_social.update_by is '鏇存柊鑰�'; comment on column sys_social.update_time is '鏇存柊鏃堕棿'; -comment on column sys_social.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_social.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; -- ---------------------------- -- 绉熸埛琛� @@ -109,7 +109,7 @@ comment on column sys_tenant.expire_time is '杩囨湡鏃堕棿'; comment on column sys_tenant.account_count is '鐢ㄦ埛鏁伴噺锛�-1涓嶉檺鍒讹級'; comment on column sys_tenant.status is '绉熸埛鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_tenant.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_tenant.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_tenant.create_dept is '鍒涘缓閮ㄩ棬'; comment on column sys_tenant.create_by is '鍒涘缓鑰�'; comment on column sys_tenant.create_time is '鍒涘缓鏃堕棿'; @@ -151,7 +151,7 @@ comment on column sys_tenant_package.menu_ids is '鍏宠仈鑿滃崟id'; comment on column sys_tenant_package.remark is '澶囨敞'; comment on column sys_tenant_package.status is '鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_tenant_package.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_tenant_package.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_tenant_package.create_dept is '鍒涘缓閮ㄩ棬'; comment on column sys_tenant_package.create_by is '鍒涘缓鑰�'; comment on column sys_tenant_package.create_time is '鍒涘缓鏃堕棿'; @@ -196,7 +196,7 @@ comment on column sys_dept.phone is '鑱旂郴鐢佃瘽'; comment on column sys_dept.email is '閭'; comment on column sys_dept.status is '閮ㄩ棬鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_dept.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_dept.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_dept.create_dept is '鍒涘缓閮ㄩ棬'; comment on column sys_dept.create_by is '鍒涘缓鑰�'; comment on column sys_dept.create_time is '鍒涘缓鏃堕棿'; @@ -259,7 +259,7 @@ comment on column sys_user.avatar is '澶村儚鍦板潃'; comment on column sys_user.password is '瀵嗙爜'; comment on column sys_user.status is '甯愬彿鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_user.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_user.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_user.login_ip is '鏈�鍚庣櫥闄咺P'; comment on column sys_user.login_date is '鏈�鍚庣櫥闄嗘椂闂�'; comment on column sys_user.create_dept is '鍒涘缓閮ㄩ棬'; @@ -357,7 +357,7 @@ comment on column sys_role.menu_check_strictly is '鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�'; comment on column sys_role.dept_check_strictly is '閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�'; comment on column sys_role.status is '瑙掕壊鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_role.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_role.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_role.create_dept is '鍒涘缓閮ㄩ棬'; comment on column sys_role.create_by is '鍒涘缓鑰�'; comment on column sys_role.create_time is '鍒涘缓鏃堕棿'; @@ -427,7 +427,7 @@ -- ---------------------------- -- 涓�绾ц彍鍗� insert into sys_menu values('1', '绯荤粺绠$悊', '0', '1', 'system', null, '', '1', '0', 'M', '0', '0', '', 'system', 103, 1, now(), null, null, '绯荤粺绠$悊鐩綍'); -insert into sys_menu values('6', '绯荤粺绠$悊', '0', '2', 'tenant', null, '', '1', '0', 'M', '0', '0', '', 'chart', 103, 1, now(), null, null, '绉熸埛绠$悊鐩綍'); +insert into sys_menu values('6', '绉熸埛绠$悊', '0', '2', 'tenant', null, '', '1', '0', 'M', '0', '0', '', 'chart', 103, 1, now(), null, null, '绉熸埛绠$悊鐩綍'); insert into sys_menu values('2', '绯荤粺鐩戞帶', '0', '3', 'monitor', null, '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), null, null, '绯荤粺鐩戞帶鐩綍'); insert into sys_menu values('3', '绯荤粺宸ュ叿', '0', '4', 'tool', null, '', '1', '0', 'M', '0', '0', '', 'tool', 103, 1, now(), null, null, '绯荤粺宸ュ叿鐩綍'); insert into sys_menu values('4', 'PLUS瀹樼綉', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', '0', '0', 'M', '0', '0', '', 'guide', 103, 1, now(), null, null, 'RuoYi-Vue-Plus瀹樼綉鍦板潃'); @@ -617,6 +617,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'); @@ -664,6 +666,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'); @@ -676,6 +684,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'); @@ -741,10 +768,10 @@ oper_url varchar(255) default ''::varchar, oper_ip varchar(128) default ''::varchar, oper_location varchar(255) default ''::varchar, - oper_param varchar(2000) default ''::varchar, - json_result varchar(2000) default ''::varchar, + oper_param varchar(4000) default ''::varchar, + json_result varchar(4000) default ''::varchar, status int4 default 0, - error_msg varchar(2000) default ''::varchar, + error_msg varchar(4000) default ''::varchar, oper_time timestamp, cost_time int8 default 0, constraint sys_oper_log_pk primary key (oper_id) @@ -1209,7 +1236,7 @@ insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1', '0', '', 103, 1, now(), 1, now(), null); insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), null); insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), 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, now(), 1, now(), 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, now(), 1, now(), null); insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1', '1', '', 103, 1, now(), 1, now(), NULL); -- ---------------------------- @@ -1244,7 +1271,7 @@ comment on column sys_client.active_timeout is 'token娲昏穬瓒呮椂鏃堕棿'; comment on column sys_client.timeout is 'token鍥哄畾瓒呮椂'; comment on column sys_client.status is '鐘舵�侊紙0姝e父 1鍋滅敤锛�'; -comment on column sys_client.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�'; +comment on column sys_client.del_flag is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 1浠h〃鍒犻櫎锛�'; comment on column sys_client.create_dept is '鍒涘缓閮ㄩ棬'; comment on column sys_client.create_by is '鍒涘缓鑰�'; comment on column sys_client.create_time is '鍒涘缓鏃堕棿'; -- Gitblit v1.9.3