From 65e1470a50e2b26879b2073b07546c9c77dd5159 Mon Sep 17 00:00:00 2001 From: yixiaco <627428179@qq.com> Date: Tue, 11 Jul 2023 12:00:22 +0800 Subject: [PATCH] chore: release 1.0.4 --- .run/ruoyi-monitor-admin.run.xml | 2 +- .run/ruoyi-xxl-job-admin.run.xml | 2 +- README.md | 2 +- pom.xml | 2 +- ruoyi-common/ruoyi-common-bom/pom.xml | 2 +- script/docker/docker-compose.yml | 8 ++++---- script/sql/update/oracle/update_1.0.2-1.0.3.sql | 11 ----------- script/sql/update/oracle/update_1.0.3-1.0.4.sql | 10 ++++++++++ script/sql/update/postgres/update_1.0.2-1.0.3.sql | 11 ----------- script/sql/update/postgres/update_1.0.3-1.0.4.sql | 10 ++++++++++ script/sql/update/update_1.0.2-1.0.3.sql | 9 --------- script/sql/update/update_1.0.3-1.0.4.sql | 8 ++++++++ 12 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 script/sql/update/oracle/update_1.0.3-1.0.4.sql create mode 100644 script/sql/update/postgres/update_1.0.3-1.0.4.sql create mode 100644 script/sql/update/update_1.0.3-1.0.4.sql diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml index c3d4a3ba..d56d0e06 100644 --- a/.run/ruoyi-monitor-admin.run.xml +++ b/.run/ruoyi-monitor-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml index f78b3a2a..272d27f3 100644 --- a/.run/ruoyi-xxl-job-admin.run.xml +++ b/.run/ruoyi-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/README.md b/README.md index cd64b8fe..2817f355 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/yixiacoco/ruoyi-tdesign/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=ruoyi-tdesign)
-[![ruoyi-tdesign](https://img.shields.io/badge/ruoyi%20tdesign-1.0.3-success.svg)](https://gitee.com/yixiacoco/ruoyi-tdesign) +[![ruoyi-tdesign](https://img.shields.io/badge/ruoyi%20tdesign-1.0.4-success.svg)](https://gitee.com/yixiacoco/ruoyi-tdesign) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.0-blue.svg)]() [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]() [![JDK-19](https://img.shields.io/badge/JDK-19-green.svg)]() diff --git a/pom.xml b/pom.xml index 542886d8..97ed02f2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ ruoyi-tdesign多租户管理系统 - 1.0.3 + 1.0.4 3.1.0 UTF-8 UTF-8 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 69f22721..f9f68461 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -13,7 +13,7 @@ - 1.0.3 + 1.0.4 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 230791c4..1292648d 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -102,7 +102,7 @@ services: network_mode: "host" ruoyi-admin: - image: ruoyi/ruoyi-server:1.0.3 + image: ruoyi/ruoyi-server:1.0.4 container_name: ruoyi-admin environment: # 时区上海 @@ -117,7 +117,7 @@ services: network_mode: "host" ruoyi-server2: - image: ruoyi/ruoyi-server:1.0.3 + image: ruoyi/ruoyi-server:1.0.4 container_name: ruoyi-server2 environment: # 时区上海 @@ -132,7 +132,7 @@ services: network_mode: "host" ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:1.0.3 + image: ruoyi/ruoyi-monitor-admin:1.0.4 container_name: ruoyi-monitor-admin environment: # 时区上海 @@ -144,7 +144,7 @@ services: network_mode: "host" ruoyi-xxl-job-admin: - image: ruoyi/ruoyi-xxl-job-admin:1.0.3 + image: ruoyi/ruoyi-xxl-job-admin:1.0.4 container_name: ruoyi-xxl-job-admin environment: # 时区上海 diff --git a/script/sql/update/oracle/update_1.0.2-1.0.3.sql b/script/sql/update/oracle/update_1.0.2-1.0.3.sql index 9a32ce9e..3d80a943 100644 --- a/script/sql/update/oracle/update_1.0.2-1.0.3.sql +++ b/script/sql/update/oracle/update_1.0.2-1.0.3.sql @@ -207,14 +207,3 @@ INSERT INTO sys_dict_data VALUES(45, '000000', 0, '邮箱', 'MAIL', 'sys_message INSERT INTO sys_dict_data VALUES(46, '000000', 10, '网易云短信', 'NETEASE', 'sys_message_supplier_type', NULL, 'primary', 'N', '1', 103, 1, sysdate, 1, sysdate, NULL); INSERT INTO sys_dict_data VALUES(47, '000000', 0, '模板ID', 'TEMPLATE_ID', 'sys_message_template_mode', NULL, 'primary', 'N', '1', 103, 1, sysdate, 1, sysdate, NULL); INSERT INTO sys_dict_data VALUES(48, '000000', 1, '模板内容', 'TEMPLATE_CONTENT', 'sys_message_template_mode', NULL, 'primary', 'N', '1', 103, 1, sysdate, 1, sysdate, NULL); - --- OSS配置新增自动创建桶字段 update by 2023-07-05 -ALTER TABLE sys_oss_config ADD (create_bucket number(1) default 0 not null); -COMMENT ON COLUMN sys_oss_config.create_bucket IS '创建桶（1=是,0=否）'; - --- 代码生成新增排序字段 update by 2023-07-07 -ALTER TABLE gen_table_column ADD (is_sort char(1)); -COMMENT ON COLUMN gen_table_column.is_sort IS '是否排序字段（1是）'; --- 新增部门、菜单导出 update by 2023-07-07 -insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, sysdate, null, null, ''); -insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, sysdate, null, null, ''); diff --git a/script/sql/update/oracle/update_1.0.3-1.0.4.sql b/script/sql/update/oracle/update_1.0.3-1.0.4.sql new file mode 100644 index 00000000..91c6ce52 --- /dev/null +++ b/script/sql/update/oracle/update_1.0.3-1.0.4.sql @@ -0,0 +1,10 @@ +-- OSS配置新增自动创建桶字段 update by 2023-07-05 +ALTER TABLE sys_oss_config ADD (create_bucket number(1) default 0 not null); +COMMENT ON COLUMN sys_oss_config.create_bucket IS '创建桶（1=是,0=否）'; + +-- 代码生成新增排序字段 update by 2023-07-07 +ALTER TABLE gen_table_column ADD (is_sort char(1)); +COMMENT ON COLUMN gen_table_column.is_sort IS '是否排序字段（1是）'; +-- 新增部门、菜单导出 update by 2023-07-07 +insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, sysdate, null, null, ''); +insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, sysdate, null, null, ''); diff --git a/script/sql/update/postgres/update_1.0.2-1.0.3.sql b/script/sql/update/postgres/update_1.0.2-1.0.3.sql index 87280a42..77ada165 100644 --- a/script/sql/update/postgres/update_1.0.2-1.0.3.sql +++ b/script/sql/update/postgres/update_1.0.2-1.0.3.sql @@ -206,14 +206,3 @@ insert into sys_dict_data values(45, '000000', 0, '邮箱', 'MAIL', 'sys_message insert into sys_dict_data values(46, '000000', 10, '网易云短信', 'NETEASE', 'sys_message_supplier_type', null, 'primary', 'N', '1', 103, 1, now(), 1, now(), null); insert into sys_dict_data values(47, '000000', 0, '模板ID', 'TEMPLATE_ID', 'sys_message_template_mode', null, 'primary', 'N', '1', 103, 1, now(), 1, now(), null); insert into sys_dict_data values(48, '000000', 1, '模板内容', 'TEMPLATE_CONTENT', 'sys_message_template_mode', null, 'primary', 'N', '1', 103, 1, now(), 1, now(), null); - --- OSS配置新增自动创建桶字段 update by 2023-07-05 -ALTER TABLE sys_oss_config ADD create_bucket int2 default 0 not null; -COMMENT ON COLUMN sys_oss_config.create_bucket IS '创建桶（1=是,0=否）'; - --- 代码生成新增排序字段 update by 2023-07-07 -ALTER TABLE gen_table_column ADD is_sort char default null::bpchar; -COMMENT ON COLUMN gen_table_column.is_sort IS '是否排序字段（1是）'; --- 新增部门、菜单导出 update by 2023-07-07 -insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, now(), null, null, ''); -insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, now(), null, null, ''); diff --git a/script/sql/update/postgres/update_1.0.3-1.0.4.sql b/script/sql/update/postgres/update_1.0.3-1.0.4.sql new file mode 100644 index 00000000..30de3294 --- /dev/null +++ b/script/sql/update/postgres/update_1.0.3-1.0.4.sql @@ -0,0 +1,10 @@ +-- OSS配置新增自动创建桶字段 update by 2023-07-05 +ALTER TABLE sys_oss_config ADD create_bucket int2 default 0 not null; +COMMENT ON COLUMN sys_oss_config.create_bucket IS '创建桶（1=是,0=否）'; + +-- 代码生成新增排序字段 update by 2023-07-07 +ALTER TABLE gen_table_column ADD is_sort char default null::bpchar; +COMMENT ON COLUMN gen_table_column.is_sort IS '是否排序字段（1是）'; +-- 新增部门、菜单导出 update by 2023-07-07 +insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, now(), null, null, ''); +insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, now(), null, null, ''); diff --git a/script/sql/update/update_1.0.2-1.0.3.sql b/script/sql/update/update_1.0.2-1.0.3.sql index a65626ea..9c040517 100644 --- a/script/sql/update/update_1.0.2-1.0.3.sql +++ b/script/sql/update/update_1.0.2-1.0.3.sql @@ -144,12 +144,3 @@ insert into sys_dict_data values(45, '000000', 0, '邮箱', 'MAIL', 'sys_message insert into sys_dict_data values(46, '000000', 10, '网易云短信', 'NETEASE', 'sys_message_supplier_type', NULL, 'primary', 'N', '1', 103, 1, sysdate(), 1, sysdate(), NULL); insert into sys_dict_data values(47, '000000', 0, '模板ID', 'TEMPLATE_ID', 'sys_message_template_mode', NULL, 'primary', 'N', '1', 103, 1, sysdate(), 1, sysdate(), NULL); insert into sys_dict_data values(48, '000000', 1, '模板内容', 'TEMPLATE_CONTENT', 'sys_message_template_mode', NULL, 'primary', 'N', '1', 103, 1, sysdate(), 1, sysdate(), NULL); - --- OSS配置新增自动创建桶字段 update by 2023-07-05 -ALTER TABLE sys_oss_config ADD COLUMN create_bucket tinyint(1) NOT NULL DEFAULT '0' COMMENT '创建桶（1=是,0=否）' AFTER status; - --- 代码生成新增排序字段 update by 2023-07-07 -ALTER TABLE gen_table_column ADD COLUMN is_sort char(1) NULL COMMENT '是否排序字段（1是）' AFTER is_detail; --- 新增部门、菜单导出 update by 2023-07-07 -insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, sysdate(), null, null, ''); diff --git a/script/sql/update/update_1.0.3-1.0.4.sql b/script/sql/update/update_1.0.3-1.0.4.sql new file mode 100644 index 00000000..870d58fd --- /dev/null +++ b/script/sql/update/update_1.0.3-1.0.4.sql @@ -0,0 +1,8 @@ +-- OSS配置新增自动创建桶字段 update by 2023-07-05 +ALTER TABLE sys_oss_config ADD COLUMN create_bucket tinyint(1) NOT NULL DEFAULT '0' COMMENT '创建桶（1=是,0=否）' AFTER status; + +-- 代码生成新增排序字段 update by 2023-07-07 +ALTER TABLE gen_table_column ADD COLUMN is_sort char(1) NULL COMMENT '是否排序字段（1是）' AFTER is_detail; +-- 新增部门、菜单导出 update by 2023-07-07 +insert into sys_menu values('1117', '菜单导出', '102', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:menu:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values('1121', '部门导出', '103', '5', '', '', '', 0, 1, 'F', '1', '1', 'system:dept:export', '#', 103, 1, sysdate(), null, null, '');