From 9e075f5c853a2f91f1328177c08eaee93cc2d05f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 09:31:44 +0800
Subject: [PATCH] fix 修复 oss配置删除内部数据id匹配类型问题
---
script/sql/oracle/oracle_ry_vue_4.X.sql | 59 +++++++++++++++++++++++++----------------------------------
1 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/script/sql/oracle/oracle_ry_vue_4.X.sql b/script/sql/oracle/oracle_ry_vue_4.X.sql
index 6295231..ad3a442 100644
--- a/script/sql/oracle/oracle_ry_vue_4.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_4.X.sql
@@ -4,7 +4,7 @@
create table sys_dept (
dept_id number(20) not null,
parent_id number(20) default 0,
- ancestors varchar2(50) default '',
+ ancestors varchar2(500) default '',
dept_name varchar2(30) default '',
order_num number(4) default 0,
leader varchar2(20) default null,
@@ -200,7 +200,7 @@
order_num number(4) default 0,
path varchar(200) default '',
component varchar(255) default null,
- query varchar(255) default null,
+ query_param varchar(255) default null,
is_frame number(1) default 1,
is_cache number(1) default 0,
menu_type char(1) default '',
@@ -224,11 +224,11 @@
comment on column sys_menu.order_num is '鏄剧ず椤哄簭';
comment on column sys_menu.path is '璇锋眰鍦板潃';
comment on column sys_menu.component is '璺敱鍦板潃';
-comment on column sys_menu.query is '璺敱鍙傛暟';
+comment on column sys_menu.query_param is '璺敱鍙傛暟';
comment on column sys_menu.is_frame is '鏄惁涓哄閾撅紙0鏄� 1鍚︼級';
comment on column sys_menu.is_cache is '鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級';
comment on column sys_menu.menu_type is '鑿滃崟绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�';
-comment on column sys_menu.visible is '鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�';
+comment on column sys_menu.visible is '鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�';
comment on column sys_menu.status is '鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
comment on column sys_menu.perms is '鏉冮檺鏍囪瘑';
comment on column sys_menu.icon is '鑿滃崟鍥炬爣';
@@ -258,10 +258,10 @@
insert into sys_menu values('108', '鏃ュ織绠＄悊', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate, '', null, '鏃ュ織绠＄悊鑿滃崟');
insert into sys_menu values('109', '鍦ㄧ嚎鐢ㄦ埛', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate, '', null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟');
insert into sys_menu values('111', '鏁版嵁鐩戞帶', '2', '3', 'druid', 'monitor/druid/index', '', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', sysdate, '', null, '鏁版嵁鐩戞帶鑿滃崟');
+insert into sys_menu values('112', '缂撳瓨鍒楄〃', '2', '6', 'cacheList', 'monitor/cache/list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', sysdate, '', null, '缂撳瓨鍒楄〃鑿滃崟');
insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', sysdate, '', null, '缂撳瓨鐩戞帶鑿滃崟');
insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate, '', null, '琛ㄥ崟鏋勫缓鑿滃崟');
insert into sys_menu values('115', '浠ｇ爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate, '', null, '浠ｇ爜鐢熸垚鑿滃崟');
-insert into sys_menu values('116', '绯荤粺鎺ュ彛', '3', '3', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate, '', null, '绯荤粺鎺ュ彛鑿滃崟');
-- springboot-admin鐩戞帶
insert into sys_menu values('117', 'Admin鐩戞帶', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 'admin', sysdate, '', null, 'Admin鐩戞帶鑿滃崟');
-- oss鑿滃崟
@@ -327,6 +327,7 @@
insert into sys_menu values('1043', '鐧诲綍鏌ヨ', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', sysdate, '', null, '');
insert into sys_menu values('1044', '鐧诲綍鍒犻櫎', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', sysdate, '', null, '');
insert into sys_menu values('1045', '鏃ュ織瀵煎嚭', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', sysdate, '', null, '');
+insert into sys_menu values('1050', '璐︽埛瑙ｉ攣', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate, '', null, '');
-- 鍦ㄧ嚎鐢ㄦ埛鎸夐挳
insert into sys_menu values('1046', '鍦ㄧ嚎鏌ヨ', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate, '', null, '');
insert into sys_menu values('1047', '鎵归噺寮洪��', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate, '', null, '');
@@ -454,6 +455,7 @@
insert into sys_role_menu values ('2', '1043');
insert into sys_role_menu values ('2', '1044');
insert into sys_role_menu values ('2', '1045');
+insert into sys_role_menu values ('2', '1050');
insert into sys_role_menu values ('2', '1046');
insert into sys_role_menu values ('2', '1047');
insert into sys_role_menu values ('2', '1048');
@@ -522,10 +524,10 @@
oper_url varchar2(255) default '',
oper_ip varchar2(128) default '',
oper_location varchar2(255) default '',
- oper_param varchar2(2000) default '',
- json_result varchar2(2000) default '',
+ oper_param varchar2(2100) default '',
+ json_result varchar2(2100) default '',
status number(1) default 0,
- error_msg varchar2(2000) default '' ,
+ error_msg varchar2(2100) default '' ,
oper_time date
);
@@ -640,6 +642,7 @@
insert into sys_dict_data values(15, 2, '鍏憡', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', sysdate, '', null, '鍏憡');
insert into sys_dict_data values(16, 1, '姝ｅ父', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', sysdate, '', null, '姝ｅ父鐘舵��');
insert into sys_dict_data values(17, 2, '鍏抽棴', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', sysdate, '', null, '鍏抽棴鐘舵��');
+insert into sys_dict_data values(29, 99, '鍏朵粬', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate, '', null, '鍏朵粬鎿嶄綔');
insert into sys_dict_data values(18, 1, '鏂板', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate, '', null, '鏂板鎿嶄綔');
insert into sys_dict_data values(19, 2, '淇敼', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate, '', null, '淇敼鎿嶄綔');
insert into sys_dict_data values(20, 3, '鍒犻櫎', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate, '', null, '鍒犻櫎鎿嶄綔');
@@ -682,12 +685,12 @@
comment on column sys_config.update_time is '鏇存柊鏃堕棿';
comment on column sys_config.remark is '澶囨敞';
-insert into sys_config values(1, '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate, '', null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
+insert into sys_config values(1, '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate, '', null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
insert into sys_config values(2, '鐢ㄦ埛绠＄悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate, '', null, '鍒濆鍖栧瘑鐮� 123456' );
insert into sys_config values(3, '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate, '', null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
-insert into sys_config values(4, '璐﹀彿鑷姪-楠岃瘉鐮佸紑鍏�', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate, '', null, '鏄惁寮�鍚獙璇佺爜鍔熻兘锛坱rue寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(5, '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate, '', null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(11, 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate, '', null, 'true:寮�鍚�, false:鍏抽棴');
+insert into sys_config values(4, '璐﹀彿鑷姪-楠岃瘉鐮佸紑鍏�', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', sysdate, '', null, '鏄惁寮�鍚獙璇佺爜鍔熻兘锛坱rue寮�鍚紝false鍏抽棴锛�');
+insert into sys_config values(5, '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate, '', null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
+insert into sys_config values(11, 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate, '', null, 'true:寮�鍚�, false:鍏抽棴');
-- ----------------------------
@@ -812,7 +815,7 @@
-- ----------------------------
create table gen_table_column (
column_id number(20) not null,
- table_id varchar2(64),
+ table_id number(20),
column_name varchar2(200),
column_comment varchar2(500),
column_type varchar2(100),
@@ -871,7 +874,7 @@
original_name varchar(255) not null,
file_suffix varchar(10) not null,
url varchar(500) not null,
- service varchar(10) default 'minio' not null,
+ service varchar(20) default 'minio' not null,
create_by varchar(64) default '',
create_time date,
update_by varchar(64) default '',
@@ -898,12 +901,13 @@
-- ----------------------------
create table sys_oss_config (
oss_config_id number(20) not null,
- config_key varchar(255) not null,
+ config_key varchar(20) not null,
access_key varchar(255) default '',
secret_key varchar(255) default '',
bucket_name varchar(255) default '',
prefix varchar(255) default '',
endpoint varchar(255) default '',
+ domain varchar(255) default '',
is_https char(1) default 'N',
region varchar(255) default '',
status char(1) default '1',
@@ -925,6 +929,7 @@
comment on column sys_oss_config.bucket_name is '妗跺悕绉�';
comment on column sys_oss_config.prefix is '鍓嶇紑';
comment on column sys_oss_config.endpoint is '璁块棶绔欑偣';
+comment on column sys_oss_config.domain is '鑷畾涔夊煙鍚�';
comment on column sys_oss_config.is_https is '鏄惁https锛圷=鏄�,N=鍚︼級';
comment on column sys_oss_config.region is '鍩�';
comment on column sys_oss_config.status is '鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�';
@@ -935,26 +940,12 @@
comment on column sys_oss_config.update_by is '鏇存柊鑰�';
comment on column sys_oss_config.update_time is '鏇存柊鏃堕棿';
-insert into sys_oss_config values (1, 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', 'http://localhost:9000', 'N', '', '0', '', NULL, 'admin', sysdate, 'admin', sysdate);
-insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
-insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
-insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
+insert into sys_oss_config values (1, 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '0', '', NULL, 'admin', sysdate, 'admin', sysdate);
+insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
+insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
+insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
+insert into sys_oss_config values (5, 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1', '', NULL, 'admin', sysdate, 'admin', sysdate);
-
--- ----------------------------
--- 鍑芥暟 锛屼唬鏇縨ysql鐨刦ind_in_set
--- 渚嬪锛� select * from sys_dept where FIND_IN_SET (101,ancestors) <> 0
--- mysql鍙帴鍙�0鎴栧叾瀹僴umber鍋氫负where 鏉′欢锛宱racle鍙帴鍙楄〃杈惧紡鍋氫负where 鏉′欢
--- ----------------------------
-create or replace function find_in_set(arg1 in varchar2,arg2 in varchar)
-return number is Result number;
-begin
-select instr(','||arg2||',' , ','||arg1||',') into Result from dual;
-return(Result);
-end find_in_set;
-
--- 鍑芥暟鍒嗛殧绗�
-/
-- ----------------------------
-- 閽╁瓙 锛岀敤浜巗ession杩炴帴涔嬪悗 鑷姩璁剧疆榛樿鐨刣ate绫诲瀷鏍煎紡鍖� 绠�鍖栨椂闂存煡璇�
--
Gitblit v1.9.3