diff --git a/script/sql/mysql/mysql_ry_v0.6.0.sql b/script/sql/mysql/mysql_ry_v0.7.X.sql similarity index 97% rename from script/sql/mysql/mysql_ry_v0.6.0.sql rename to script/sql/mysql/mysql_ry_v0.7.X.sql index e7dfcc06..b7a3ed3b 100644 --- a/script/sql/mysql/mysql_ry_v0.6.0.sql +++ b/script/sql/mysql/mysql_ry_v0.7.X.sql @@ -141,7 +141,7 @@ create table sys_menu ( is_frame int(1) default 1 comment '是否为外链（0是 1否）', is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '菜单状态（0显示 1隐藏）', + visible char(1) default 0 comment '显示状态（0显示 1隐藏）', status char(1) default 0 comment '菜单状态（0正常 1停用）', perms varchar(100) default null comment '权限标识', icon varchar(100) default '#' comment '菜单图标', @@ -175,10 +175,10 @@ insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 's 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菜单 @@ -256,6 +256,7 @@ insert into sys_menu values('1082', '日志导出', '500', '4', '#', '', '', 1, insert into sys_menu values('1090', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1091', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1092', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate(), '', null, ''); -- 在线用户按钮 insert into sys_menu values('1100', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu values('1101', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); @@ -360,10 +361,10 @@ insert into sys_role_menu values ('2', '107'); insert into sys_role_menu values ('2', '108'); insert into sys_role_menu values ('2', '109'); insert into sys_role_menu values ('2', '111'); +insert into sys_role_menu values ('2', '112'); insert into sys_role_menu values ('2', '113'); insert into sys_role_menu values ('2', '114'); insert into sys_role_menu values ('2', '115'); -insert into sys_role_menu values ('2', '116'); insert into sys_role_menu values ('2', '117'); insert into sys_role_menu values ('2', '118'); insert into sys_role_menu values ('2', '120'); @@ -424,6 +425,7 @@ insert into sys_role_menu values ('2', '1082'); insert into sys_role_menu values ('2', '1090'); insert into sys_role_menu values ('2', '1091'); insert into sys_role_menu values ('2', '1092'); +insert into sys_role_menu values ('2', '1093'); insert into sys_role_menu values ('2', '1100'); insert into sys_role_menu values ('2', '1101'); insert into sys_role_menu values ('2', '1102'); @@ -595,6 +597,7 @@ insert into sys_dict_data values(14, 1, '通知', '1', 'sys_notice_ty 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, '删除操作'); @@ -627,11 +630,11 @@ create table sys_config ( ) engine=innodb comment = '参数配置表'; 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，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，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(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，浅色主题theme-light' ); +insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，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:关闭'); -- ---------------------------- @@ -750,7 +753,7 @@ create table sys_oss ( create_by varchar(64) default '' comment '上传人', update_time datetime default null comment '更新时间', update_by varchar(64) default '' comment '更新人', - service varchar(10) not null default 'minio' comment '服务商', + service varchar(20) not null default 'minio' comment '服务商', primary key (oss_id) ) engine=innodb comment ='OSS对象存储表'; @@ -760,7 +763,7 @@ create table sys_oss ( drop table if exists sys_oss_config; create table sys_oss_config ( oss_config_id bigint(20) not null comment '主建', - config_key varchar(255) not null default '' comment '配置key', + config_key varchar(20) not null default '' comment '配置key', access_key varchar(255) default '' comment 'accessKey', secret_key varchar(255) default '' comment '秘钥', bucket_name varchar(255) default '' comment '桶名称', diff --git a/script/sql/mysql/update/update_v0.6.X~v0.7.X.sql b/script/sql/mysql/update/update_v0.6.X~v0.7.X.sql new file mode 100644 index 00000000..dcadf070 --- /dev/null +++ b/script/sql/mysql/update/update_v0.6.X~v0.7.X.sql @@ -0,0 +1,11 @@ +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, '缓存列表菜单'); + +delete from sys_menu WHERE menu_id = 116; + +update sys_config set config_key = 'sys.account.captchaEnabled' where config_id = 4; + +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_role_menu values ('2', '1093'); + +insert into sys_dict_data values(29, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '其他操作'); diff --git a/script/sql/oracle/oracle_ry_v0.6.0.sql b/script/sql/oracle/oracle_ry_v0.7.X.sql similarity index 98% rename from script/sql/oracle/oracle_ry_v0.6.0.sql rename to script/sql/oracle/oracle_ry_v0.7.X.sql index a95ed51a..20f32b9d 100644 --- a/script/sql/oracle/oracle_ry_v0.6.0.sql +++ b/script/sql/oracle/oracle_ry_v0.7.X.sql @@ -228,7 +228,7 @@ 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 '菜单类型（M目录 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 '菜单图标'; @@ -260,10 +260,10 @@ insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 's 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菜单 @@ -341,6 +341,7 @@ insert into sys_menu values('1082', '日志导出', '500', '4', '#', '', '', 1, insert into sys_menu values('1090', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', sysdate, '', null, ''); insert into sys_menu values('1091', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', sysdate, '', null, ''); insert into sys_menu values('1092', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', sysdate, '', null, ''); +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate, '', null, ''); -- 在线用户按钮 insert into sys_menu values('1100', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate, '', null, ''); insert into sys_menu values('1101', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate, '', null, ''); @@ -453,10 +454,10 @@ insert into sys_role_menu values ('2', '107'); insert into sys_role_menu values ('2', '108'); insert into sys_role_menu values ('2', '109'); insert into sys_role_menu values ('2', '111'); +insert into sys_role_menu values ('2', '112'); insert into sys_role_menu values ('2', '113'); insert into sys_role_menu values ('2', '114'); insert into sys_role_menu values ('2', '115'); -insert into sys_role_menu values ('2', '116'); insert into sys_role_menu values ('2', '117'); insert into sys_role_menu values ('2', '118'); insert into sys_role_menu values ('2', '120'); @@ -517,6 +518,7 @@ insert into sys_role_menu values ('2', '1082'); insert into sys_role_menu values ('2', '1090'); insert into sys_role_menu values ('2', '1091'); insert into sys_role_menu values ('2', '1092'); +insert into sys_role_menu values ('2', '1093'); insert into sys_role_menu values ('2', '1100'); insert into sys_role_menu values ('2', '1101'); insert into sys_role_menu values ('2', '1102'); @@ -738,6 +740,7 @@ insert into sys_dict_data values(14, 1, '通知', '1', 'sys_notice_ty 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, '删除操作'); @@ -780,12 +783,12 @@ comment on column sys_config.update_by is '更新者'; 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，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate, '', null, '是否开启验证码功能（true开启，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, '是否开启验证码功能（true开启，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:关闭'); -- ---------------------------- @@ -969,7 +972,7 @@ create table sys_oss ( 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 '', @@ -996,7 +999,7 @@ comment on column sys_oss.update_by is '更新者'; -- ---------------------------- 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 '', diff --git a/script/sql/oracle/update/update_v0.6.X~v0.7.X.sql b/script/sql/oracle/update/update_v0.6.X~v0.7.X.sql new file mode 100644 index 00000000..4c9f7d53 --- /dev/null +++ b/script/sql/oracle/update/update_v0.6.X~v0.7.X.sql @@ -0,0 +1,11 @@ +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, '缓存列表菜单'); + +delete from sys_menu WHERE menu_id = 116; + +update sys_config set config_key = 'sys.account.captchaEnabled' where config_id = 4; + +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', sysdate, '', null, ''); + +insert into sys_role_menu values ('2', '1093'); + +insert into sys_dict_data values(29, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate, '', null, '其他操作'); diff --git a/script/sql/postgres/postgres_ry_v0.6.0.sql b/script/sql/postgres/postgres_ry_v0.7.X.sql similarity index 98% rename from script/sql/postgres/postgres_ry_v0.6.0.sql rename to script/sql/postgres/postgres_ry_v0.7.X.sql index 8ea1f70c..ee32b743 100644 --- a/script/sql/postgres/postgres_ry_v0.6.0.sql +++ b/script/sql/postgres/postgres_ry_v0.7.X.sql @@ -231,7 +231,7 @@ 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 '菜单类型（M目录 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 '菜单图标'; @@ -263,10 +263,10 @@ insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 's insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', now(), '', null, '日志管理菜单'); insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', now(), '', null, '在线用户菜单'); insert into sys_menu values('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', '', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', now(), '', null, '数据监控菜单'); +insert into sys_menu values('112', '缓存列表', '2', '6', 'cacheList', 'monitor/cache/list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', now(), '', null, '缓存列表菜单'); insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', now(), '', null, '缓存监控菜单'); insert into sys_menu values('114', '表单构建', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', now(), '', null, '表单构建菜单'); insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', now(), '', null, '代码生成菜单'); -insert into sys_menu values('116', '系统接口', '3', '3', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', now(), '', 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', now(), '', null, 'Admin监控菜单'); -- oss菜单 @@ -344,6 +344,7 @@ insert into sys_menu values('1082', '日志导出', '500', '4', '#', '', '', 1, insert into sys_menu values('1090', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', now(), '', null, ''); insert into sys_menu values('1091', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', now(), '', null, ''); insert into sys_menu values('1092', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', now(), '', null, ''); +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', now(), '', null, ''); -- 在线用户按钮 insert into sys_menu values('1100', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', now(), '', null, ''); insert into sys_menu values('1101', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', now(), '', null, ''); @@ -458,6 +459,7 @@ insert into sys_role_menu values ('2', '107'); insert into sys_role_menu values ('2', '108'); insert into sys_role_menu values ('2', '109'); insert into sys_role_menu values ('2', '111'); +insert into sys_role_menu values ('2', '112'); insert into sys_role_menu values ('2', '113'); insert into sys_role_menu values ('2', '114'); insert into sys_role_menu values ('2', '115'); @@ -522,6 +524,7 @@ insert into sys_role_menu values ('2', '1082'); insert into sys_role_menu values ('2', '1090'); insert into sys_role_menu values ('2', '1091'); insert into sys_role_menu values ('2', '1092'); +insert into sys_role_menu values ('2', '1093'); insert into sys_role_menu values ('2', '1100'); insert into sys_role_menu values ('2', '1101'); insert into sys_role_menu values ('2', '1102'); @@ -745,6 +748,7 @@ insert into sys_dict_data values(14, 1, '通知', '1', 'sys_notice_ty insert into sys_dict_data values(15, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', now(), '', null, '公告'); insert into sys_dict_data values(16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', now(), '', null, '正常状态'); insert into sys_dict_data values(17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', now(), '', null, '关闭状态'); +insert into sys_dict_data values(29, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', now(), '', null, '其他操作'); insert into sys_dict_data values(18, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', now(), '', null, '新增操作'); insert into sys_dict_data values(19, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', now(), '', null, '修改操作'); insert into sys_dict_data values(20, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', now(), '', null, '删除操作'); @@ -792,7 +796,7 @@ comment on column sys_config.remark is '备注'; insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', now(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', now(), '', null, '初始化密码 123456' ); insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', now(), '', null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', now(), '', null, '是否开启验证码功能（true开启，false关闭）'); +insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', now(), '', null, '是否开启验证码功能（true开启，false关闭）'); insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', now(), '', null, '是否开启注册用户功能（true开启，false关闭）'); insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', now(), '', null, 'true:开启, false:关闭'); @@ -985,7 +989,7 @@ create table if not exists sys_oss create_time timestamp, update_by varchar(64) default ''::varchar, update_time timestamp, - service varchar(10) default 'minio'::varchar, + service varchar(20) default 'minio'::varchar, constraint sys_oss_pk primary key (oss_id) ); @@ -1008,12 +1012,13 @@ drop table if exists sys_oss_config; create table if not exists sys_oss_config ( oss_config_id int8, - config_key varchar(255) default ''::varchar not null, + config_key varchar(20) default ''::varchar not null, access_key varchar(255) default ''::varchar, secret_key varchar(255) default ''::varchar, bucket_name varchar(255) default ''::varchar, prefix varchar(255) default ''::varchar, endpoint varchar(255) default ''::varchar, + domain varchar(255) default ''::varchar, is_https char default 'N'::bpchar, region varchar(255) default ''::varchar, status char default '1'::bpchar, @@ -1173,3 +1178,10 @@ comment on column wf_copy.create_time is '创建时间'; comment on column wf_copy.update_by is '更新者'; comment on column wf_copy.update_time is '更新时间'; comment on column wf_copy.del_flag is '删除标志（0代表存在 2代表删除）'; + +-- 字符串自动转时间 避免框架时间查询报错问题 +create or replace function cast_varchar_to_timestamp(varchar) returns timestamptz as $$ +select to_timestamp($1, 'yyyy-mm-dd hh24:mi:ss'); +$$ language sql strict ; + +create cast (varchar as timestamptz) with function cast_varchar_to_timestamp as IMPLICIT; diff --git a/script/sql/postgres/update/update_v0.6.X~v0.7.X.sql b/script/sql/postgres/update/update_v0.6.X~v0.7.X.sql new file mode 100644 index 00000000..810953cc --- /dev/null +++ b/script/sql/postgres/update/update_v0.6.X~v0.7.X.sql @@ -0,0 +1,19 @@ +insert into sys_menu values('112', '缓存列表', '2', '6', 'cacheList', 'monitor/cache/list', '', '1', '0', 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', now(), '', null, '缓存列表菜单'); + +delete from sys_menu WHERE menu_id = 116; + +update sys_config set config_key = 'sys.account.captchaEnabled' where config_id = 4; + +insert into sys_menu values('1093', '账户解锁', '501', '4', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:unlock', '#', 'admin', now(), '', null, ''); + +insert into sys_role_menu values ('2', '1093'); + +-- 字符串自动转时间 避免框架时间查询报错问题 +create or replace function cast_varchar_to_timestamp(varchar) returns timestamptz as $$ +select to_timestamp($1, 'yyyy-mm-dd hh24:mi:ss'); +$$ language sql strict ; + +create cast (varchar as timestamptz) with function cast_varchar_to_timestamp as IMPLICIT; + +insert into sys_dict_data values(29, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', now(), '', null, '其他操作'); + diff --git a/script/sql/sqlserver/sqlserver_ry_v0.6.0.sql b/script/sql/sqlserver/sqlserver_ry_v0.7.X.sql similarity index 99% rename from script/sql/sqlserver/sqlserver_ry_v0.6.0.sql rename to script/sql/sqlserver/sqlserver_ry_v0.7.X.sql index 2f679d9e..049f3987 100644 --- a/script/sql/sqlserver/sqlserver_ry_v0.6.0.sql +++ b/script/sql/sqlserver/sqlserver_ry_v0.7.X.sql @@ -1,3 +1,4 @@ + CREATE TABLE [gen_table] ( [table_id] bigint NOT NULL, @@ -410,7 +411,7 @@ INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [ GO INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (3, N'主框架页-侧边栏主题', N'sys.index.sideTheme', N'theme-dark', N'Y', N'admin', getdate(), N'', NULL, N'深色主题theme-dark，浅色主题theme-light') GO -INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (4, N'账号自助-验证码开关', N'sys.account.captchaOnOff', N'true', N'Y', N'admin', getdate(), N'', NULL, N'是否开启验证码功能（true开启，false关闭）') +INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (4, N'账号自助-验证码开关', N'sys.account.captchaEnabled', N'true', N'Y', N'admin', getdate(), N'', NULL, N'是否开启验证码功能（true开启，false关闭）') GO INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (5, N'账号自助-是否开启用户注册功能', N'sys.account.registerUser', N'false', N'Y', N'admin', getdate(), N'', NULL, N'是否开启注册用户功能（true开启，false关闭）') GO @@ -696,6 +697,8 @@ INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [d GO INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [dict_type], [css_class], [list_class], [is_default], [status], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (17, 2, N'关闭', N'1', N'sys_notice_status', N'', N'danger', N'N', N'0', N'admin', getdate(), N'', NULL, N'关闭状态') GO +INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [dict_type], [css_class], [list_class], [is_default], [status], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (29, 99, N'其他', N'0', N'sys_oper_type', N'', N'info', N'N', N'0', N'admin', getdate(), N'', NULL, N'其他操作'); +GO INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [dict_type], [css_class], [list_class], [is_default], [status], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (18, 1, N'新增', N'1', N'sys_oper_type', N'', N'info', N'N', N'0', N'admin', getdate(), N'', NULL, N'新增操作') GO INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [dict_type], [css_class], [list_class], [is_default], [status], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (19, 2, N'修改', N'2', N'sys_oper_type', N'', N'info', N'N', N'0', N'admin', getdate(), N'', NULL, N'修改操作') @@ -982,7 +985,7 @@ EXEC sys.sp_addextendedproperty 'COLUMN', N'menu_type' GO EXEC sys.sp_addextendedproperty - 'MS_Description', N'菜单状态（0显示 1隐藏）' , + 'MS_Description', N'显示状态（0显示 1隐藏）' , 'SCHEMA', N'dbo', 'TABLE', N'sys_menu', 'COLUMN', N'visible' @@ -1076,14 +1079,14 @@ INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [co GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (111, N'数据监控', 2, 3, N'druid', N'monitor/druid/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:druid:list', N'druid', N'admin', getdate(), N'', NULL, N'数据监控菜单') GO +INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (112, N'缓存列表', 2, 6, N'cacheList', N'monitor/cache/list', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis-list', N'admin', getdate(), N'', NULL, N'缓存列表菜单') +GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (113, N'缓存监控', 2, 5, N'cache', N'monitor/cache/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis', N'admin', getdate(), N'', NULL, N'缓存监控菜单') GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (114, N'表单构建', 3, 1, N'build', N'tool/build/index', N'', 1, 0, N'C', N'0', N'0', N'tool:build:list', N'build', N'admin', getdate(), N'', NULL, N'表单构建菜单') GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (115, N'代码生成', 3, 2, N'gen', N'tool/gen/index', N'', 1, 0, N'C', N'0', N'0', N'tool:gen:list', N'code', N'admin', getdate(), N'', NULL, N'代码生成菜单') GO -INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (116, N'系统接口', 3, 3, N'swagger', N'tool/swagger/index', N'', 1, 0, N'C', N'0', N'0', N'tool:swagger:list', N'swagger', N'admin', getdate(), N'', NULL, N'系统接口菜单') -GO -- springboot-admin监控 INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (117, N'Admin监控', 2, 5, N'Admin', N'monitor/admin/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:admin:list', N'dashboard', N'admin', getdate(), N'', NULL, N'Admin监控菜单') GO @@ -1211,6 +1214,8 @@ INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [co GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (1092, N'日志导出', 501, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:export', N'#', N'admin', getdate(), N'', NULL, N'') GO +INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (1093, N'账户解锁', 501, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:unlock', N'#', N'admin', getdate(), N'', null, N'') +GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (1100, N'在线查询', 109, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:query', N'#', N'admin', getdate(), N'', NULL, N'') GO INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (1101, N'批量强退', 109, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:batchLogout', N'#', N'admin', getdate(), N'', NULL, N'') @@ -1841,8 +1846,6 @@ INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 114) GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 115) GO -INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 116) -GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 117) GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 118) @@ -1961,6 +1964,8 @@ INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1091) GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1092) GO +INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1093) +GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1100) GO INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1101) @@ -2279,7 +2284,7 @@ CREATE TABLE [sys_oss] [create_by] nvarchar(64) DEFAULT '' NULL, [update_time] datetime2(7) NULL, [update_by] nvarchar(64) DEFAULT '' NULL, - [service] nvarchar(10) DEFAULT ('minio') NOT NULL, + [service] nvarchar(20) DEFAULT ('minio') NOT NULL, CONSTRAINT [PK__sys_oss] PRIMARY KEY CLUSTERED ([oss_id]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] @@ -2355,7 +2360,7 @@ GO CREATE TABLE [sys_oss_config] ( [oss_config_id] bigint NOT NULL, - [config_key] nvarchar(255) DEFAULT '' NOT NULL, + [config_key] nvarchar(20) DEFAULT '' NOT NULL, [access_key] nvarchar(255) DEFAULT '' NULL, [secret_key] nvarchar(255) DEFAULT '' NULL, [bucket_name] nvarchar(255) DEFAULT '' NULL, diff --git a/script/sql/sqlserver/update/update_v0.6.X~v0.7.X.sql b/script/sql/sqlserver/update/update_v0.6.X~v0.7.X.sql new file mode 100644 index 00000000..1093c453 --- /dev/null +++ b/script/sql/sqlserver/update/update_v0.6.X~v0.7.X.sql @@ -0,0 +1,17 @@ +INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (112, N'缓存列表', 2, 6, N'cacheList', N'monitor/cache/list', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis-list', N'admin', getdate(), N'', NULL, N'缓存列表菜单'); +GO + +delete from sys_menu WHERE menu_id = 116; +GO + +update sys_config set config_key = 'sys.account.captchaEnabled' where config_id = 4; +GO + +INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (1093, N'账户解锁', 501, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:unlock', N'#', N'admin', getdate(), N'', null, N''); +GO + +INSERT [sys_role_menu] ([role_id], [menu_id]) VALUES (2, 1093) +GO + +INSERT [sys_dict_data] ([dict_code], [dict_sort], [dict_label], [dict_value], [dict_type], [css_class], [list_class], [is_default], [status], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (29, 99, N'其他', N'0', N'sys_oper_type', N'', N'info', N'N', N'0', N'admin', getdate(), N'', NULL, N'其他操作'); +GO