Skip to content

Commit

Permalink
chore: release 1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
yixiaco committed Jul 11, 2023
1 parent cbb0dfc commit 65e1470
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .run/ruoyi-monitor-admin.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:1.0.3" />
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:1.0.4" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion .run/ruoyi-xxl-job-admin.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:1.0.3" />
<option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:1.0.4" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile" />
</settings>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
<br>
[![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)]()
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>ruoyi-tdesign多租户管理系统</description>

<properties>
<revision>1.0.3</revision>
<revision>1.0.4</revision>
<spring-boot.version>3.1.0</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-common/ruoyi-common-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</description>

<properties>
<revision>1.0.3</revision>
<revision>1.0.4</revision>
</properties>

<dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions script/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
# 时区上海
Expand All @@ -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:
# 时区上海
Expand All @@ -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:
# 时区上海
Expand All @@ -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:
# 时区上海
Expand Down
11 changes: 0 additions & 11 deletions script/sql/update/oracle/update_1.0.2-1.0.3.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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, '');
10 changes: 10 additions & 0 deletions script/sql/update/oracle/update_1.0.3-1.0.4.sql
Original file line number Diff line number Diff line change
@@ -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, '');
11 changes: 0 additions & 11 deletions script/sql/update/postgres/update_1.0.2-1.0.3.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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, '');
10 changes: 10 additions & 0 deletions script/sql/update/postgres/update_1.0.3-1.0.4.sql
Original file line number Diff line number Diff line change
@@ -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, '');
9 changes: 0 additions & 9 deletions script/sql/update/update_1.0.2-1.0.3.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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, '');
8 changes: 8 additions & 0 deletions script/sql/update/update_1.0.3-1.0.4.sql
Original file line number Diff line number Diff line change
@@ -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, '');

0 comments on commit 65e1470

Please sign in to comment.