diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index c6ada2b3..64e3b7a5 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 0 - 2239 + 1232 + 988 128 128 @@ -1447,6 +1447,22 @@ file_md5 varchar(n) + + e2e0369af3191a268fc1d03ea0eef107d0392be0 + 255 + null + false + null + false + false + false + + false + + 文件信息(JSON格式) + file_meta + varchar(n) + 7295c82faa1ac317a2e7b0e11fbc9b7f8a1bc1e4 500 @@ -4831,6 +4847,39 @@ 0 + + e2e0369af3191a268fc1d03ea0eef107d0392be0 + c1a441e7ef57c97818f59db365d7162fda7cc0df + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -4881,7 +4930,7 @@ - 2e69f023ad8cecebbe06f5330a9d65c6524a5b39 + 21533fba2463605c6cca43bbbb642eeaa8530a5b 6ce90f0c465f8e4480cf489e2f1cfcb423be63d9 bee7bb4881e285bf50f380b8829edff3c2a1ddbf -1 @@ -4946,7 +4995,7 @@ fc44d466dd6009e48b5222d1d71e38d025194ff0 54b86f255d95078898534902087fb704b4265b60 - 2e69f023ad8cecebbe06f5330a9d65c6524a5b39 + 21533fba2463605c6cca43bbbb642eeaa8530a5b diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 0d87713b..935a20ed 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -43,7 +43,7 @@ CREATE TABLE js_gen_table ( table_name varchar(64) NOT NULL, class_name varchar(100) NOT NULL, - comments varchar(500) NOT NULL, + comments vargraphic(500) NOT NULL, parent_table_name varchar(64), parent_table_fk_name varchar(64), data_source_name varchar(64), @@ -51,16 +51,16 @@ CREATE TABLE js_gen_table package_name varchar(500), module_name varchar(30), sub_module_name varchar(30), - function_name varchar(200), - function_name_simple varchar(50), - function_author varchar(50), - gen_base_dir varchar(1000), - options varchar(1000), + function_name vargraphic(200), + function_name_simple vargraphic(50), + function_author vargraphic(50), + gen_base_dir vargraphic(1000), + options vargraphic(1000), create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (table_name) ); @@ -73,8 +73,8 @@ CREATE TABLE js_gen_table_column column_name varchar(64) NOT NULL, column_sort decimal(10), column_type varchar(100) NOT NULL, - column_label varchar(50), - comments varchar(500) NOT NULL, + column_label vargraphic(50), + comments vargraphic(500) NOT NULL, attr_name varchar(200) NOT NULL, attr_type varchar(200) NOT NULL, is_pk char(1), @@ -86,7 +86,7 @@ CREATE TABLE js_gen_table_column query_type varchar(200), is_edit char(1), show_type varchar(200), - options varchar(1000), + options vargraphic(1000), PRIMARY KEY (id) ); @@ -102,14 +102,14 @@ CREATE TABLE js_sys_area tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, tree_names varchar(1000) NOT NULL, - area_name varchar(100) NOT NULL, + area_name vargraphic(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (area_code) ); @@ -126,25 +126,25 @@ CREATE TABLE js_sys_company tree_level decimal(4) NOT NULL, tree_names varchar(1000) NOT NULL, view_code varchar(100) NOT NULL, - company_name varchar(200) NOT NULL, - full_name varchar(200) NOT NULL, + company_name vargraphic(200) NOT NULL, + full_name vargraphic(200) NOT NULL, area_code varchar(100), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - extend_s1 varchar(500), - extend_s2 varchar(500), - extend_s3 varchar(500), - extend_s4 varchar(500), - extend_s5 varchar(500), - extend_s6 varchar(500), - extend_s7 varchar(500), - extend_s8 varchar(500), + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), extend_i1 decimal(19), extend_i2 decimal(19), extend_i3 decimal(19), @@ -174,15 +174,15 @@ CREATE TABLE js_sys_company_office CREATE TABLE js_sys_config ( id varchar(64) NOT NULL, - config_name varchar(100) NOT NULL, + config_name vargraphic(100) NOT NULL, config_key varchar(100) NOT NULL, - config_value varchar(1000), + config_value vargraphic(1000), is_sys char(1) NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -198,29 +198,29 @@ CREATE TABLE js_sys_dict_data tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, tree_names varchar(1000) NOT NULL, - dict_label varchar(100) NOT NULL, + dict_label vargraphic(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_type varchar(100) NOT NULL, is_sys char(1) NOT NULL, - description varchar(500), - css_style varchar(500), - css_class varchar(500), + description vargraphic(500), + css_style vargraphic(500), + css_class vargraphic(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - extend_s1 varchar(500), - extend_s2 varchar(500), - extend_s3 varchar(500), - extend_s4 varchar(500), - extend_s5 varchar(500), - extend_s6 varchar(500), - extend_s7 varchar(500), - extend_s8 varchar(500), + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), extend_i1 decimal(19), extend_i2 decimal(19), extend_i3 decimal(19), @@ -241,7 +241,7 @@ CREATE TABLE js_sys_dict_data CREATE TABLE js_sys_dict_type ( id varchar(64) NOT NULL, - dict_name varchar(100) NOT NULL, + dict_name vargraphic(100) NOT NULL, dict_type varchar(100) NOT NULL, is_sys char(1) NOT NULL, status char(1) DEFAULT '0' NOT NULL, @@ -249,7 +249,7 @@ CREATE TABLE js_sys_dict_type create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -258,20 +258,20 @@ CREATE TABLE js_sys_dict_type CREATE TABLE js_sys_employee ( emp_code varchar(64) NOT NULL, - emp_name varchar(100) NOT NULL, + emp_name vargraphic(100) NOT NULL, emp_name_en varchar(100), office_code varchar(64) NOT NULL, - office_name varchar(100) NOT NULL, + office_name vargraphic(100) NOT NULL, company_code varchar(64), - company_name varchar(200), + company_name vargraphic(200), status char(1) NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, PRIMARY KEY (emp_code) ); @@ -290,10 +290,11 @@ CREATE TABLE js_sys_file_entity ( file_id varchar(64) NOT NULL, file_md5 varchar(64) NOT NULL, - file_path varchar(1000) NOT NULL, + file_path vargraphic(1000) NOT NULL, file_content_type varchar(200) NOT NULL, file_extension varchar(100) NOT NULL, file_size decimal(31) NOT NULL, + file_meta varchar(255), PRIMARY KEY (file_id) ); @@ -303,7 +304,7 @@ CREATE TABLE js_sys_file_upload ( id varchar(64) NOT NULL, file_id varchar(64) NOT NULL, - file_name varchar(500) NOT NULL, + file_name vargraphic(500) NOT NULL, file_type varchar(20) NOT NULL, biz_key varchar(64), biz_type varchar(64), @@ -312,7 +313,7 @@ CREATE TABLE js_sys_file_upload create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -322,8 +323,8 @@ CREATE TABLE js_sys_job ( job_name varchar(64) NOT NULL, job_group varchar(64) NOT NULL, - description varchar(100) NOT NULL, - invoke_target varchar(1000) NOT NULL, + description vargraphic(100) NOT NULL, + invoke_target vargraphic(1000) NOT NULL, cron_expression varchar(255) NOT NULL, misfire_instruction decimal(1) NOT NULL, concurrent char(1) NOT NULL, @@ -333,7 +334,7 @@ CREATE TABLE js_sys_job create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (job_name, job_group) ); @@ -359,14 +360,14 @@ CREATE TABLE js_sys_lang ( id varchar(64) NOT NULL, module_code varchar(64) NOT NULL, - lang_code varchar(500) NOT NULL, - lang_text varchar(500) NOT NULL, + lang_code vargraphic(500) NOT NULL, + lang_text vargraphic(500) NOT NULL, lang_type varchar(50) NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -376,11 +377,11 @@ CREATE TABLE js_sys_log ( id varchar(64) NOT NULL, log_type varchar(50) NOT NULL, - log_title varchar(500) NOT NULL, + log_title vargraphic(500) NOT NULL, create_by varchar(64) NOT NULL, - create_by_name varchar(100) NOT NULL, + create_by_name vargraphic(100) NOT NULL, create_date timestamp NOT NULL, - request_uri varchar(500), + request_uri vargraphic(500), request_method varchar(10), request_params clob, diff_modify_data clob, @@ -390,12 +391,12 @@ CREATE TABLE js_sys_log server_addr varchar(255) NOT NULL, is_exception char(1), exception_info clob, - user_agent varchar(500), + user_agent vargraphic(500), device_name varchar(100), browser_name varchar(100), execute_time decimal(19), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, PRIMARY KEY (id) ); @@ -427,15 +428,15 @@ CREATE TABLE js_sys_menu create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), - extend_s1 varchar(500), - extend_s2 varchar(500), - extend_s3 varchar(500), - extend_s4 varchar(500), - extend_s5 varchar(500), - extend_s6 varchar(500), - extend_s7 varchar(500), - extend_s8 varchar(500), + remarks vargraphic(500), + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), extend_i1 decimal(19), extend_i2 decimal(19), extend_i3 decimal(19), @@ -457,7 +458,7 @@ CREATE TABLE js_sys_module ( module_code varchar(64) NOT NULL, module_name varchar(100) NOT NULL, - description varchar(500), + description vargraphic(500), main_class_name varchar(500), current_version varchar(50), upgrade_info varchar(300), @@ -466,7 +467,7 @@ CREATE TABLE js_sys_module create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (module_code) ); @@ -492,7 +493,7 @@ CREATE TABLE js_sys_msg_inner create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -575,7 +576,7 @@ CREATE TABLE js_sys_msg_template id varchar(64) NOT NULL, module_code varchar(64), tpl_key varchar(100) NOT NULL, - tpl_name varchar(100) NOT NULL, + tpl_name vargraphic(100) NOT NULL, tpl_type varchar(16) NOT NULL, tpl_content clob NOT NULL, status char(1) DEFAULT '0' NOT NULL, @@ -583,7 +584,7 @@ CREATE TABLE js_sys_msg_template create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), PRIMARY KEY (id) ); @@ -600,7 +601,7 @@ CREATE TABLE js_sys_office tree_level decimal(4) NOT NULL, tree_names varchar(1000) NOT NULL, view_code varchar(100) NOT NULL, - office_name varchar(100) NOT NULL, + office_name vargraphic(100) NOT NULL, full_name varchar(200) NOT NULL, office_type char(1) NOT NULL, leader varchar(100), @@ -613,17 +614,17 @@ CREATE TABLE js_sys_office create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - extend_s1 varchar(500), - extend_s2 varchar(500), - extend_s3 varchar(500), - extend_s4 varchar(500), - extend_s5 varchar(500), - extend_s6 varchar(500), - extend_s7 varchar(500), - extend_s8 varchar(500), + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), extend_i1 decimal(19), extend_i2 decimal(19), extend_i3 decimal(19), @@ -652,9 +653,9 @@ CREATE TABLE js_sys_post create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, PRIMARY KEY (post_code) ); @@ -674,9 +675,9 @@ CREATE TABLE js_sys_role create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, PRIMARY KEY (role_code) ); @@ -713,7 +714,7 @@ CREATE TABLE js_sys_user phone varchar(100), sex char(1), avatar varchar(1000), - sign varchar(200), + sign vargraphic(200), wx_openid varchar(100), mobile_imei varchar(100), user_type varchar(16) NOT NULL, @@ -740,17 +741,17 @@ CREATE TABLE js_sys_user create_date timestamp NOT NULL, update_by varchar(64) NOT NULL, update_date timestamp NOT NULL, - remarks varchar(500), + remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - extend_s1 varchar(500), - extend_s2 varchar(500), - extend_s3 varchar(500), - extend_s4 varchar(500), - extend_s5 varchar(500), - extend_s6 varchar(500), - extend_s7 varchar(500), - extend_s8 varchar(500), + corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), extend_i1 decimal(19), extend_i2 decimal(19), extend_i3 decimal(19), diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index a7be803d..0cf1045d 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -294,6 +294,7 @@ CREATE TABLE [js_sys_file_entity] [file_content_type] varchar(200) NOT NULL, [file_extension] varchar(100) NOT NULL, [file_size] decimal(31) NOT NULL, + [file_meta] varchar(255), PRIMARY KEY ([file_id]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index ada699d9..8725c462 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -295,6 +295,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar(200) NOT NULL COMMENT '文件内容类型', file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名', file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)', + file_meta varchar(255) COMMENT '文件信息(JSON格式)', PRIMARY KEY (file_id) ) COMMENT = '文件实体表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 84b64596..b29424e7 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -294,6 +294,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar2(200) NOT NULL, file_extension varchar2(100) NOT NULL, file_size number(31) NOT NULL, + file_meta varchar2(255), PRIMARY KEY (file_id) ); @@ -1113,6 +1114,7 @@ COMMENT ON COLUMN js_sys_file_entity.file_path IS '文件相对路径'; COMMENT ON COLUMN js_sys_file_entity.file_content_type IS '文件内容类型'; COMMENT ON COLUMN js_sys_file_entity.file_extension IS '文件后缀扩展名'; COMMENT ON COLUMN js_sys_file_entity.file_size IS '文件大小(单位B)'; +COMMENT ON COLUMN js_sys_file_entity.file_meta IS '文件信息(JSON格式)'; COMMENT ON TABLE js_sys_file_upload IS '文件上传表'; COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index b8008810..f7a01cf4 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -294,6 +294,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar(200) NOT NULL, file_extension varchar(100) NOT NULL, file_size decimal(31) NOT NULL, + file_meta varchar(255), PRIMARY KEY (file_id) ) WITHOUT OIDS; @@ -1113,6 +1114,7 @@ COMMENT ON COLUMN js_sys_file_entity.file_path IS '文件相对路径'; COMMENT ON COLUMN js_sys_file_entity.file_content_type IS '文件内容类型'; COMMENT ON COLUMN js_sys_file_entity.file_extension IS '文件后缀扩展名'; COMMENT ON COLUMN js_sys_file_entity.file_size IS '文件大小(单位B)'; +COMMENT ON COLUMN js_sys_file_entity.file_meta IS '文件信息(JSON格式)'; COMMENT ON TABLE js_sys_file_upload IS '文件上传表'; COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql index ce716764..80f8f640 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql @@ -2,4 +2,8 @@ -- 删除sys_file_entity表的file_md5唯一索引 -- ALTER TABLE [${_prefix}sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F]; +-- 增加文件信息字段(可存储图片大小) +ALTER TABLE [${_prefix}js_sys_file_entity] ADD [file_meta] varchar(64) NULL; + +-- 集群的实例名字 ALTER TABLE [${_prefix}sys_job] ADD [instance_name] varchar(64) DEFAULT JeeSiteScheduler NOT NULL; diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql index 45de21ce..2efffd57 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql @@ -1,9 +1,13 @@ -- 删除sys_file_entity表的file_md5唯一索引 ALTER TABLE `${_prefix}sys_file_entity` - DROP INDEX `file_md5`, - ADD INDEX `file_md5`(`file_md5`); - +DROP INDEX `file_md5`, +ADD INDEX `file_md5`(`file_md5`); + +-- 增加文件信息字段(可存储图片大小) +ALTER TABLE `${_prefix}js_sys_file_entity` +ADD COLUMN `file_meta` varchar(255) NULL COMMENT '文件信息(JSON格式)' AFTER `file_size`; + -- 集群的实例名字 ALTER TABLE `${_prefix}sys_job` - ADD COLUMN `instance_name` varchar(64) NOT NULL DEFAULT JeeSiteScheduler COMMENT '集群的实例名字' AFTER `concurrent`; \ No newline at end of file +ADD COLUMN `instance_name` varchar(64) NOT NULL DEFAULT JeeSiteScheduler COMMENT '集群的实例名字' AFTER `concurrent`; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql index 3fc612ca..a275f4b4 100644 --- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql @@ -1,7 +1,13 @@ -- 删除sys_file_entity表的file_md5唯一索引 --- ALTER TABLE "${_prefix}SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398" +-- ALTER TABLE ${_prefix}SYS_FILE_ENTITY DROP CONSTRAINT SYS_C0019398 -ALTER TABLE "${_prefix}SYS_JOB" -ADD ("instance_name" VARCHAR2(64) DEFAULT JeeSiteScheduler NOT NULL ); -COMMENT ON COLUMN "${_prefix}SYS_JOB"."instance_name" IS '集群的实例名字' \ No newline at end of file +-- 增加文件信息字段(可存储图片大小) +ALTER TABLE ${_prefix}SYS_FILE_ENTITY +ADD (file_meta VARCHAR2(64) NULL ); +COMMENT ON COLUMN ${_prefix}SYS_FILE_ENTITY.file_meta IS '文件信息(JSON格式)' + +-- 集群的实例名字 +ALTER TABLE ${_prefix}SYS_JOB +ADD (instance_name VARCHAR2(64) DEFAULT JeeSiteScheduler NOT NULL ); +COMMENT ON COLUMN ${_prefix}SYS_JOB.instance_name IS '集群的实例名字' \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql index 475a09cb..95fecce7 100644 --- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql @@ -1,9 +1,14 @@ -- 删除sys_file_entity表的file_md5唯一索引 -ALTER TABLE "${_prefix}sys_file_entity" - DROP CONSTRAINT "${_prefix}sys_file_entity_file_md5_key"; +ALTER TABLE ${_prefix}sys_file_entity +DROP CONSTRAINT ${_prefix}sys_file_entity_file_md5_key; + +-- 增加文件信息字段(可存储图片大小) +ALTER TABLE ${_prefix}sys_file_entity +ADD COLUMN file_meta varchar(255) NULL; +COMMENT ON COLUMN ${_prefix}sys_file_entity.file_meta IS '文件信息(JSON格式)'; -- 集群的实例名字 -ALTER TABLE "${_prefix}sys_job" - ADD COLUMN "instance_name" varchar(255) NOT NULL DEFAULT JeeSiteScheduler; -COMMENT ON COLUMN "${_prefix}sys_job"."instance_name" IS '集群的实例名字'; \ No newline at end of file +ALTER TABLE ${_prefix}sys_job +ADD COLUMN instance_name varchar(255) NOT NULL DEFAULT JeeSiteScheduler; +COMMENT ON COLUMN ${_prefix}sys_job.instance_name IS '集群的实例名字'; \ No newline at end of file diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 93c2f692..0cf1045d 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -294,6 +294,7 @@ CREATE TABLE [js_sys_file_entity] [file_content_type] varchar(200) NOT NULL, [file_extension] varchar(100) NOT NULL, [file_size] decimal(31) NOT NULL, + [file_meta] varchar(255), PRIMARY KEY ([file_id]) ); @@ -327,6 +328,7 @@ CREATE TABLE [js_sys_job] [cron_expression] varchar(255) NOT NULL, [misfire_instruction] decimal(1) NOT NULL, [concurrent] char(1) NOT NULL, + [instance_name] varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, [status] char(1) NOT NULL, [create_by] varchar(64) NOT NULL, [create_date] datetime NOT NULL, diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 5ca75ed7..8725c462 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -295,6 +295,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar(200) NOT NULL COMMENT '文件内容类型', file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名', file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)', + file_meta varchar(255) COMMENT '文件信息(JSON格式)', PRIMARY KEY (file_id) ) COMMENT = '文件实体表'; @@ -328,6 +329,7 @@ CREATE TABLE js_sys_job cron_expression varchar(255) NOT NULL COMMENT 'Cron执行表达式', misfire_instruction decimal(1) NOT NULL COMMENT '计划执行错误策略', concurrent char(1) NOT NULL COMMENT '是否并发执行', + instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL COMMENT '集群的实例名字', status char(1) NOT NULL COMMENT '状态(0正常 1删除 2暂停)', create_by varchar(64) NOT NULL COMMENT '创建者', create_date datetime NOT NULL COMMENT '创建时间', diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 7fd96dc6..b29424e7 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -294,6 +294,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar2(200) NOT NULL, file_extension varchar2(100) NOT NULL, file_size number(31) NOT NULL, + file_meta varchar2(255), PRIMARY KEY (file_id) ); @@ -327,6 +328,7 @@ CREATE TABLE js_sys_job cron_expression varchar2(255) NOT NULL, misfire_instruction number(1) NOT NULL, concurrent char(1) NOT NULL, + instance_name varchar2(64) DEFAULT 'JeeSiteScheduler' NOT NULL, status char(1) NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -1112,6 +1114,7 @@ COMMENT ON COLUMN js_sys_file_entity.file_path IS '文件相对路径'; COMMENT ON COLUMN js_sys_file_entity.file_content_type IS '文件内容类型'; COMMENT ON COLUMN js_sys_file_entity.file_extension IS '文件后缀扩展名'; COMMENT ON COLUMN js_sys_file_entity.file_size IS '文件大小(单位B)'; +COMMENT ON COLUMN js_sys_file_entity.file_meta IS '文件信息(JSON格式)'; COMMENT ON TABLE js_sys_file_upload IS '文件上传表'; COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; @@ -1133,6 +1136,7 @@ COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串'; COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式'; COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略'; COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行'; +COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字'; COMMENT ON COLUMN js_sys_job.status IS '状态(0正常 1删除 2暂停)'; COMMENT ON COLUMN js_sys_job.create_by IS '创建者'; COMMENT ON COLUMN js_sys_job.create_date IS '创建时间'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 95abd1ae..f7a01cf4 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -294,6 +294,7 @@ CREATE TABLE js_sys_file_entity file_content_type varchar(200) NOT NULL, file_extension varchar(100) NOT NULL, file_size decimal(31) NOT NULL, + file_meta varchar(255), PRIMARY KEY (file_id) ) WITHOUT OIDS; @@ -327,6 +328,7 @@ CREATE TABLE js_sys_job cron_expression varchar(255) NOT NULL, misfire_instruction decimal(1) NOT NULL, concurrent char(1) NOT NULL, + instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL, status char(1) NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -1112,6 +1114,7 @@ COMMENT ON COLUMN js_sys_file_entity.file_path IS '文件相对路径'; COMMENT ON COLUMN js_sys_file_entity.file_content_type IS '文件内容类型'; COMMENT ON COLUMN js_sys_file_entity.file_extension IS '文件后缀扩展名'; COMMENT ON COLUMN js_sys_file_entity.file_size IS '文件大小(单位B)'; +COMMENT ON COLUMN js_sys_file_entity.file_meta IS '文件信息(JSON格式)'; COMMENT ON TABLE js_sys_file_upload IS '文件上传表'; COMMENT ON COLUMN js_sys_file_upload.id IS '编号'; COMMENT ON COLUMN js_sys_file_upload.file_id IS '文件编号'; @@ -1133,6 +1136,7 @@ COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串'; COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式'; COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略'; COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行'; +COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字'; COMMENT ON COLUMN js_sys_job.status IS '状态(0正常 1删除 2暂停)'; COMMENT ON COLUMN js_sys_job.create_by IS '创建者'; COMMENT ON COLUMN js_sys_job.create_date IS '创建时间';