diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index c95c9966..532ab004 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL, file_name vargraphic(500) NOT NULL, file_type varchar(20) NOT NULL, + file_sort decimal(10), biz_key varchar(64), biz_type varchar(64), status char(1) DEFAULT '0' NOT NULL, diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 2a13a1e7..ad978cba 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -318,6 +318,7 @@ CREATE TABLE [js_sys_file_upload] [file_id] varchar(64) NOT NULL, [file_name] nvarchar(500) NOT NULL, [file_type] varchar(20) NOT NULL, + [file_sort] decimal(10), [biz_key] varchar(64), [biz_type] varchar(64), [status] char(1) DEFAULT '0' NOT NULL, diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 8fe2935e..0189f345 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -320,6 +320,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL COMMENT '文件编号', file_name varchar(500) NOT NULL COMMENT '文件名称', file_type varchar(20) NOT NULL COMMENT '文件分类(image、media、file)', + file_sort decimal(10) COMMENT '文件排序(升序)', biz_key varchar(64) COMMENT '业务主键', biz_type varchar(64) COMMENT '业务类型', status char(1) DEFAULT '0' NOT NULL COMMENT '状态(0正常 1删除 2停用)', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 28a33097..f34f7f1e 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar2(64) NOT NULL, file_name nvarchar2(500) NOT NULL, file_type varchar2(20) NOT NULL, + file_sort number(10), biz_key varchar2(64), biz_type varchar2(64), status char(1) DEFAULT '0' NOT NULL, @@ -1159,6 +1160,7 @@ COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; COMMENT ON COLUMN js_sys_file_upload.file_name IS '文件名称'; COMMENT ON COLUMN js_sys_file_upload.file_type IS '文件分类(image、media、file)'; +COMMENT ON COLUMN js_sys_file_upload.file_sort IS '文件排序(升序)'; COMMENT ON COLUMN js_sys_file_upload.biz_key IS '业务主键'; COMMENT ON COLUMN js_sys_file_upload.biz_type IS '业务类型'; COMMENT ON COLUMN js_sys_file_upload.status IS '状态(0正常 1删除 2停用)'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 442265fe..4a591dfe 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL, file_name varchar(500) NOT NULL, file_type varchar(20) NOT NULL, + file_sort decimal(10), biz_key varchar(64), biz_type varchar(64), status char(1) DEFAULT '0' NOT NULL, @@ -1159,6 +1160,7 @@ COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; COMMENT ON COLUMN js_sys_file_upload.file_name IS '文件名称'; COMMENT ON COLUMN js_sys_file_upload.file_type IS '文件分类(image、media、file)'; +COMMENT ON COLUMN js_sys_file_upload.file_sort IS '文件排序(升序)'; COMMENT ON COLUMN js_sys_file_upload.biz_key IS '业务主键'; COMMENT ON COLUMN js_sys_file_upload.biz_type IS '业务类型'; COMMENT ON COLUMN js_sys_file_upload.status IS '状态(0正常 1删除 2停用)'; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 77d60978..e7d99626 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.7.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.7.sql new file mode 100644 index 00000000..537be325 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.7.sql @@ -0,0 +1,3 @@ + +-- 文件表增加排序字段 +ALTER TABLE ${_prefix}sys_file_upload ADD file_sort decimal(10) NULL; diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql deleted file mode 100644 index 77959116..00000000 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.s1.sql +++ /dev/null @@ -1,8 +0,0 @@ - --- 文件表增加排序字段 -ALTER TABLE `${_prefix}sys_file_upload` -ADD COLUMN `file_sort` decimal(10) NULL COMMENT '文件排序' AFTER `file_type`; - --- 新增 BPM 模块 -INSERT INTO `${_prefix}sys_module`(`module_code`, `module_name`, `description`, `main_class_name`, `current_version`, `upgrade_info`, `status`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`) -VALUES ('bpm', '业务流程', '流程模型设计器、流程定义管理、待办任务、一般任务', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.6', NULL, '0', 'system', '2019-08-11 22:36:24', 'system', '2019-08-11 22:36:24', NULL); diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.sql new file mode 100644 index 00000000..457774e7 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.7.sql @@ -0,0 +1,4 @@ + +-- 文件表增加排序字段 +ALTER TABLE `${_prefix}sys_file_upload` +ADD COLUMN `file_sort` decimal(10) NULL COMMENT '文件排序' AFTER `file_type`; diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.7.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.7.sql new file mode 100644 index 00000000..0f7710e3 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.7.sql @@ -0,0 +1,4 @@ + +-- 文件表增加排序字段 +ALTER TABLE ${_prefix}sys_file_upload ADD file_sort NUMBER(10) NULL; +COMMENT ON COLUMN ${_prefix}sys_file_upload.file_sort IS '文件排序'; diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.7.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.7.sql new file mode 100644 index 00000000..755f3e07 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.7.sql @@ -0,0 +1,4 @@ + +-- 文件表增加排序字段 +ALTER TABLE ${_prefix}sys_file_upload ADD COLUMN file_sort decimal(10); +COMMENT ON COLUMN ${_prefix}sys_file_upload.file_sort IS '文件排序'; diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index 72c3db24..4d79e119 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -13,4 +13,4 @@ 4.1.4 4.1.5 4.1.6 -4.1.7.s1 \ No newline at end of file +4.1.7 \ No newline at end of file diff --git a/web/db/db2/core.sql b/web/db/db2/core.sql index c95c9966..532ab004 100644 --- a/web/db/db2/core.sql +++ b/web/db/db2/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL, file_name vargraphic(500) NOT NULL, file_type varchar(20) NOT NULL, + file_sort decimal(10), biz_key varchar(64), biz_type varchar(64), status char(1) DEFAULT '0' NOT NULL, diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 2a13a1e7..ad978cba 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -318,6 +318,7 @@ CREATE TABLE [js_sys_file_upload] [file_id] varchar(64) NOT NULL, [file_name] nvarchar(500) NOT NULL, [file_type] varchar(20) NOT NULL, + [file_sort] decimal(10), [biz_key] varchar(64), [biz_type] varchar(64), [status] char(1) DEFAULT '0' NOT NULL, diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 8fe2935e..0189f345 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -320,6 +320,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL COMMENT '文件编号', file_name varchar(500) NOT NULL COMMENT '文件名称', file_type varchar(20) NOT NULL COMMENT '文件分类(image、media、file)', + file_sort decimal(10) COMMENT '文件排序(升序)', biz_key varchar(64) COMMENT '业务主键', biz_type varchar(64) COMMENT '业务类型', status char(1) DEFAULT '0' NOT NULL COMMENT '状态(0正常 1删除 2停用)', diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 28a33097..f34f7f1e 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar2(64) NOT NULL, file_name nvarchar2(500) NOT NULL, file_type varchar2(20) NOT NULL, + file_sort number(10), biz_key varchar2(64), biz_type varchar2(64), status char(1) DEFAULT '0' NOT NULL, @@ -1159,6 +1160,7 @@ COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; COMMENT ON COLUMN js_sys_file_upload.file_name IS '文件名称'; COMMENT ON COLUMN js_sys_file_upload.file_type IS '文件分类(image、media、file)'; +COMMENT ON COLUMN js_sys_file_upload.file_sort IS '文件排序(升序)'; COMMENT ON COLUMN js_sys_file_upload.biz_key IS '业务主键'; COMMENT ON COLUMN js_sys_file_upload.biz_type IS '业务类型'; COMMENT ON COLUMN js_sys_file_upload.status IS '状态(0正常 1删除 2停用)'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 442265fe..4a591dfe 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -318,6 +318,7 @@ CREATE TABLE js_sys_file_upload file_id varchar(64) NOT NULL, file_name varchar(500) NOT NULL, file_type varchar(20) NOT NULL, + file_sort decimal(10), biz_key varchar(64), biz_type varchar(64), status char(1) DEFAULT '0' NOT NULL, @@ -1159,6 +1160,7 @@ COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; COMMENT ON COLUMN js_sys_file_upload.file_name IS '文件名称'; COMMENT ON COLUMN js_sys_file_upload.file_type IS '文件分类(image、media、file)'; +COMMENT ON COLUMN js_sys_file_upload.file_sort IS '文件排序(升序)'; COMMENT ON COLUMN js_sys_file_upload.biz_key IS '业务主键'; COMMENT ON COLUMN js_sys_file_upload.biz_type IS '业务类型'; COMMENT ON COLUMN js_sys_file_upload.status IS '状态(0正常 1删除 2停用)';