diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index f604959c..0f287d85 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -49,12 +49,6 @@ spring-boot-starter-actuator - - - org.springframework.cloud - spring-cloud-loadbalancer - - cn.hutool hutool-http diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java index 8a1cc4f2..85a523ce 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java @@ -42,6 +42,11 @@ public class SysOss extends TenantEntity { */ private String url; + /** + * 扩展字段 + */ + private String ext1; + /** * 服务商 */ diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java index 0f399db7..798b2ebe 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java @@ -41,6 +41,11 @@ public class SysOssBo extends BaseEntity { */ private String url; + /** + * 扩展字段 + */ + private String ext1; + /** * 服务商 */ diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java index aa2957bb..877802fe 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java @@ -47,6 +47,11 @@ public class SysOssVo implements Serializable { */ private String url; + /** + * 扩展字段 + */ + private String ext1; + /** * 创建时间 */ diff --git a/sql/oracle/oracle_ry_cloud.sql b/sql/oracle/oracle_ry_cloud.sql index 7accd3fb..b7ced55e 100644 --- a/sql/oracle/oracle_ry_cloud.sql +++ b/sql/oracle/oracle_ry_cloud.sql @@ -1183,6 +1183,7 @@ create table sys_oss ( file_suffix varchar(10) not null, url varchar(500) not null, service varchar(20) default 'minio' not null, + ext1 varchar2(255) default '', create_dept number(20) default null, create_by number(20) default null, create_time date, @@ -1200,6 +1201,7 @@ comment on column sys_oss.original_name is '原名'; comment on column sys_oss.file_suffix is '文件后缀名'; comment on column sys_oss.url is 'URL地址'; comment on column sys_oss.service is '服务商'; +comment on column sys_oss.ext1 is '扩展字段'; comment on column sys_oss.create_dept is '创建部门'; comment on column sys_oss.create_time is '创建时间'; comment on column sys_oss.create_by is '上传者'; diff --git a/sql/postgres/postgres_ry_cloud.sql b/sql/postgres/postgres_ry_cloud.sql index 137c040c..f1ec1a18 100644 --- a/sql/postgres/postgres_ry_cloud.sql +++ b/sql/postgres/postgres_ry_cloud.sql @@ -1180,6 +1180,7 @@ create table if not exists sys_oss original_name varchar(255) default ''::varchar not null, file_suffix varchar(10) default ''::varchar not null, url varchar(500) default ''::varchar not null, + ext1 varchar(500) default ''::varchar, create_dept int8, create_by int8, create_time timestamp, @@ -1196,6 +1197,7 @@ comment on column sys_oss.file_name is '文件名'; comment on column sys_oss.original_name is '原名'; comment on column sys_oss.file_suffix is '文件后缀名'; comment on column sys_oss.url is 'URL地址'; +comment on column sys_oss.ext1 is '扩展字段'; comment on column sys_oss.create_by is '上传人'; comment on column sys_oss.create_dept is '创建部门'; comment on column sys_oss.create_time is '创建时间'; diff --git a/sql/ry-cloud.sql b/sql/ry-cloud.sql index 420d51fd..7fb165d9 100644 --- a/sql/ry-cloud.sql +++ b/sql/ry-cloud.sql @@ -849,6 +849,7 @@ create table sys_oss ( original_name varchar(255) not null default '' comment '原名', file_suffix varchar(10) not null default '' comment '文件后缀名', url varchar(500) not null comment 'URL地址', + ext1 text default '' comment '扩展字段', create_dept bigint(20) default null comment '创建部门', create_time datetime default null comment '创建时间', create_by bigint(20) default null comment '上传人', diff --git a/sql/update/oracle/update_2.2.0-2.3.0.sql b/sql/update/oracle/update_2.2.0-2.3.0.sql new file mode 100644 index 00000000..2c4835b8 --- /dev/null +++ b/sql/update/oracle/update_2.2.0-2.3.0.sql @@ -0,0 +1,2 @@ +ALTER TABLE sys_oss ADD (ext1 VARCHAR2(500)); +COMMENT ON COLUMN sys_oss.ext1 IS '扩展属性'; diff --git a/sql/update/postgres/update_2.2.0-2.3.0.sql b/sql/update/postgres/update_2.2.0-2.3.0.sql new file mode 100644 index 00000000..e73b55ff --- /dev/null +++ b/sql/update/postgres/update_2.2.0-2.3.0.sql @@ -0,0 +1,2 @@ +ALTER TABLE sys_oss ADD COLUMN ext1 varchar(500)); +COMMENT ON COLUMN sys_oss.ext1 IS '扩展属性'; diff --git a/sql/update/update_2.2.0-2.3.0.sql b/sql/update/update_2.2.0-2.3.0.sql new file mode 100644 index 00000000..a00ca67b --- /dev/null +++ b/sql/update/update_2.2.0-2.3.0.sql @@ -0,0 +1,2 @@ +ALTER TABLE `sys_oss` + ADD COLUMN `ext1` text NULL COMMENT '扩展属性' AFTER `url`;