diff --git a/modules/cms/db/cms.erm b/modules/cms/db/cms.erm index 00311184..600dd135 100644 --- a/modules/cms/db/cms.erm +++ b/modules/cms/db/cms.erm @@ -776,8 +776,8 @@ decimal(p) - f777df0683772224af74eaac56ff9ba3086493a1 - null + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 null false null @@ -789,7 +789,7 @@ 扩展 JSON extend_json - text + varchar(n) ad6f9eff50476669df62b7601cbc3a2e0c905d36 @@ -1272,8 +1272,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -1912,8 +1912,8 @@ decimal(p) - 8f1564e5646071de508d4325f3cc7f62bdeede16 - 1000 + 49ec595ac14253d7d25479f6f8c8a94da5a8ca13 + 767 null false null @@ -1944,8 +1944,8 @@ decimal(p) - 312c35e49a1de2ac558655550904b2d4e275322f - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -8613,13 +8613,13 @@ - f777df0683772224af74eaac56ff9ba3086493a1 + 80cd53da9d5a1b19676537e590e20fa2793e902c 42c5d8f490f69b93e77698efa030ca23988ae696 - text + varchar(n) false @@ -8685,7 +8685,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -8751,7 +8751,7 @@ - 312c35e49a1de2ac558655550904b2d4e275322f + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -8850,7 +8850,7 @@ - 8f1564e5646071de508d4325f3cc7f62bdeede16 + 49ec595ac14253d7d25479f6f8c8a94da5a8ca13 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/modules/cms/db/db2/cms.sql b/modules/cms/db/db2/cms.sql index bda96773..b3a5eac8 100644 --- a/modules/cms/db/db2/cms.sql +++ b/modules/cms/db/db2/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE js_cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (id) ); @@ -89,12 +89,12 @@ CREATE TABLE js_cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names vargraphic(1000) NOT NULL, + tree_names vargraphic(767) NOT NULL, category_name vargraphic(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE js_cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (category_code) ); diff --git a/modules/cms/db/h2/cms.sql b/modules/cms/db/h2/cms.sql index a08332ba..b4a04fe2 100644 --- a/modules/cms/db/h2/cms.sql +++ b/modules/cms/db/h2/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE js_cms_article_data extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (id) ); @@ -89,12 +89,12 @@ CREATE TABLE js_cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, category_name varchar(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE js_cms_category extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (category_code) ); diff --git a/modules/cms/db/msaccess/cms.sql b/modules/cms/db/msaccess/cms.sql deleted file mode 100644 index 10f1cfb2..00000000 --- a/modules/cms/db/msaccess/cms.sql +++ /dev/null @@ -1,320 +0,0 @@ - - -/* Create Tables */ - --- 文章表 -CREATE TABLE js_cms_article -( - id varchar(64) NOT NULL, - category_code varchar(64) NOT NULL, - module_type varchar(50), - title varchar(255) NOT NULL, - href varchar(1000), - color varchar(50), - image varchar(1000), - keywords varchar(500), - description varchar(500), - weight numeric DEFAULT 0, - weight_date datetime, - source char(1), - copyfrom varchar(255), - hits numeric DEFAULT 0, - hits_plus numeric, - hits_minus numeric, - word_count numeric, - custom_content_view varchar(255), - view_config varchar(1000), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime NOT NULL, - remarks varchar(500), - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 文章详情表 -CREATE TABLE js_cms_article_data -( - id varchar(64) NOT NULL, - content memo, - relation varchar(1000), - is_can_comment char(1), - 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), - extend_i1 numeric, - extend_i2 numeric, - extend_i3 numeric, - extend_i4 numeric, - extend_f1 numeric, - extend_f2 numeric, - extend_f3 numeric, - extend_f4 numeric, - extend_d1 datetime, - extend_d2 datetime, - extend_d3 datetime, - extend_d4 datetime, - PRIMARY KEY (id) -); - - --- 文章推荐位 -CREATE TABLE js_cms_article_posid -( - article_id varchar(64) NOT NULL, - postid char(1) NOT NULL -); - - --- 文章与标签关系 -CREATE TABLE js_cms_article_tag -( - article_id varchar(64) NOT NULL, - tag_name varchar(200) NOT NULL -); - - --- 栏目表 -CREATE TABLE js_cms_category -( - category_code varchar(64) NOT NULL, - parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, - tree_sort numeric NOT NULL, - tree_sorts varchar(1000) NOT NULL, - tree_leaf char(1) NOT NULL, - tree_level numeric NOT NULL, - tree_names varchar(1000) NOT NULL, - category_name varchar(100) NOT NULL, - site_code varchar(64) NOT NULL, - module_type varchar(50), - image varchar(255), - href varchar(255), - target varchar(20), - keywords varchar(500), - description varchar(500), - in_menu char(1), - in_list char(1), - show_modes char(1), - is_need_audit char(1), - is_can_comment char(1), - custom_list_view varchar(255), - custom_content_view varchar(255), - view_config varchar(1000), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime 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), - extend_i1 numeric, - extend_i2 numeric, - extend_i3 numeric, - extend_i4 numeric, - extend_f1 numeric, - extend_f2 numeric, - extend_f3 numeric, - extend_f4 numeric, - extend_d1 datetime, - extend_d2 datetime, - extend_d3 datetime, - extend_d4 datetime, - PRIMARY KEY (category_code) -); - - --- 栏目与角色关联表 -CREATE TABLE js_cms_category_role -( - category_code varchar(64) NOT NULL, - role_code varchar(64) NOT NULL, - ctrl_type varchar(32), - PRIMARY KEY (category_code, role_code) -); - - --- 文章评论表 -CREATE TABLE js_cms_comment -( - id varchar(64) NOT NULL, - category_code varchar(64) NOT NULL, - article_id varchar(64) NOT NULL, - parent_id varchar(64), - article_title varchar(255) NOT NULL, - content varchar(255) NOT NULL, - name varchar(50), - ip varchar(100), - create_by varchar(64), - create_date datetime NOT NULL, - audit_user_code varchar(64), - audit_date datetime, - audit_comment varchar(200), - hits_plus numeric, - hits_minus numeric, - status char(1) NOT NULL, - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 留言板表 -CREATE TABLE js_cms_guestbook -( - id varchar(64) NOT NULL, - type char(1) NOT NULL, - content varchar(255) NOT NULL, - name varchar(100) NOT NULL, - email varchar(100) NOT NULL, - phone varchar(100) NOT NULL, - workunit varchar(100) NOT NULL, - ip varchar(100) NOT NULL, - create_by varchar(64), - create_date datetime, - re_user_code varchar(64), - re_date datetime, - re_content varchar(100), - status char(1) NOT NULL, - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 内容举报表 -CREATE TABLE js_cms_report -( - id varchar(64) NOT NULL, - report_source char(1), - report_content varchar(500), - report_url varchar(1000), - report_type char(1), - report_cause varchar(500), - PRIMARY KEY (id) -); - - --- 站点表 -CREATE TABLE js_cms_site -( - site_code varchar(64) NOT NULL, - site_name varchar(100) NOT NULL, - site_sort numeric, - title varchar(100) NOT NULL, - logo varchar(1000), - domain varchar(500), - keywords varchar(500), - description varchar(500), - theme varchar(500), - copyright varchar(1000), - custom_index_view varchar(500), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime NOT NULL, - remarks varchar(500), - PRIMARY KEY (site_code) -); - - --- 内容标签 -CREATE TABLE js_cms_tag -( - tag_name varchar(200) NOT NULL, - clicknum numeric NOT NULL, - PRIMARY KEY (tag_name) -); - - --- 访问日志表 -CREATE TABLE js_cms_visit_log -( - id varchar(64) NOT NULL, - request_url varchar(1000), - request_url_host varchar(128), - source_referer varchar(1000), - source_referer_host varchar(128), - source_type char(1), - search_engine varchar(200), - search_word varchar(200), - remote_addr varchar(50), - user_agent varchar(500), - user_language varchar(32), - user_screen_size varchar(32), - user_device varchar(32), - user_os_name varchar(32), - user_browser varchar(32), - user_browser_version varchar(16), - unique_visit_id varchar(64), - visit_date char(8), - visit_time datetime, - is_new_visit char(1), - first_visit_time numeric, - prev_remain_time numeric, - total_remain_time numeric, - site_code varchar(64), - site_name varchar(100), - category_code varchar(64), - category_name varchar(100), - content_id varchar(64), - content_title varchar(255), - visit_user_code varchar(100), - visit_user_name varchar(100), - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - - -/* Create Indexes */ - -CREATE INDEX idx_cms_article_cb ON js_cms_article (create_by); -CREATE INDEX idx_cms_article_cc ON js_cms_article (category_code); -CREATE INDEX idx_cms_article_corp_code ON js_cms_article (corp_code); -CREATE INDEX idx_cms_article_status ON js_cms_article (status); -CREATE INDEX idx_cms_article_ud ON js_cms_article (update_date); -CREATE INDEX idx_cms_article_weight ON js_cms_article (weight); -CREATE INDEX idx_cms_category_pc ON js_cms_category (parent_code); -CREATE INDEX idx_cms_category_ts ON js_cms_category (tree_sort); -CREATE INDEX idx_cms_category_status ON js_cms_category (status); -CREATE INDEX idx_cms_category_tss ON js_cms_category (tree_sorts); -CREATE INDEX idx_cms_comment_catc ON js_cms_comment (category_code); -CREATE INDEX idx_cms_comment_ai ON js_cms_comment (article_id); -CREATE INDEX idx_cms_comment_cc ON js_cms_comment (corp_code); -CREATE INDEX idx_cms_comment_status ON js_cms_comment (status); -CREATE INDEX idx_cms_guestbook_cc ON js_cms_guestbook (corp_code); -CREATE INDEX idx_cms_guestbook_status ON js_cms_guestbook (status); -CREATE INDEX idx_cms_guestbook_type ON js_cms_guestbook (type); -CREATE INDEX idx_cms_site_status ON js_cms_site (status); -CREATE INDEX cms_visit_log_cc ON js_cms_visit_log (category_code); -CREATE INDEX cms_visit_log_ci ON js_cms_visit_log (content_id); -CREATE INDEX cms_visit_log_fvt ON js_cms_visit_log (first_visit_time); -CREATE INDEX cms_visit_log_inv ON js_cms_visit_log (is_new_visit); -CREATE INDEX cms_visit_log_ra ON js_cms_visit_log (remote_addr); -CREATE INDEX cms_visit_log_sc ON js_cms_visit_log (site_code); -CREATE INDEX cms_visit_log_uvid ON js_cms_visit_log (unique_visit_id); -CREATE INDEX cms_visit_log_vd ON js_cms_visit_log (visit_date); -CREATE INDEX cms_visit_log_vt ON js_cms_visit_log (visit_time); -CREATE INDEX idx_cms_visit_log_corpc ON js_cms_visit_log (corp_code); - - - diff --git a/modules/cms/db/mssql/cms.sql b/modules/cms/db/mssql/cms.sql index ea724c8b..d5d82b53 100644 --- a/modules/cms/db/mssql/cms.sql +++ b/modules/cms/db/mssql/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE [js_cms_article_data] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([id]) ); @@ -89,12 +89,12 @@ CREATE TABLE [js_cms_category] ( [category_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] nvarchar(1000) NOT NULL, + [tree_names] nvarchar(767) NOT NULL, [category_name] nvarchar(100) NOT NULL, [site_code] varchar(64) NOT NULL, [module_type] varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE [js_cms_category] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([category_code]) ); diff --git a/modules/cms/db/mysql/cms.sql b/modules/cms/db/mysql/cms.sql index 0ec37c8a..785d43dc 100644 --- a/modules/cms/db/mysql/cms.sql +++ b/modules/cms/db/mysql/cms.sql @@ -64,7 +64,7 @@ CREATE TABLE js_cms_article_data extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (id) ) COMMENT = '文章详情表'; @@ -90,12 +90,12 @@ CREATE TABLE js_cms_category ( category_code varchar(64) NOT NULL COMMENT '栏目编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', category_name varchar(100) NOT NULL COMMENT '栏目名称', site_code varchar(64) NOT NULL COMMENT '站点编码', module_type varchar(50) COMMENT '模块类型', @@ -138,7 +138,7 @@ CREATE TABLE js_cms_category extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (category_code) ) COMMENT = '栏目表'; diff --git a/modules/cms/db/oracle/cms.sql b/modules/cms/db/oracle/cms.sql index ecc5bd7b..7ef9b312 100644 --- a/modules/cms/db/oracle/cms.sql +++ b/modules/cms/db/oracle/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE js_cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (id) ); @@ -89,12 +89,12 @@ CREATE TABLE js_cms_category ( category_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names nvarchar2(1000) NOT NULL, + tree_names nvarchar2(767) NOT NULL, category_name nvarchar2(100) NOT NULL, site_code varchar2(64) NOT NULL, module_type varchar2(50), @@ -137,7 +137,7 @@ CREATE TABLE js_cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (category_code) ); diff --git a/modules/cms/db/postgresql/cms.sql b/modules/cms/db/postgresql/cms.sql index 07210f3e..4a215246 100644 --- a/modules/cms/db/postgresql/cms.sql +++ b/modules/cms/db/postgresql/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE js_cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (id) ) WITHOUT OIDS; @@ -89,12 +89,12 @@ CREATE TABLE js_cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, category_name varchar(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE js_cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (category_code) ) WITHOUT OIDS; diff --git a/modules/cms/src/main/resources/db/create/db2/cms.sql b/modules/cms/src/main/resources/db/create/db2/cms.sql index bda96773..d6c490fc 100644 --- a/modules/cms/src/main/resources/db/create/db2/cms.sql +++ b/modules/cms/src/main/resources/db/create/db2/cms.sql @@ -3,7 +3,7 @@ /* Create Tables */ -- 文章表 -CREATE TABLE js_cms_article +CREATE TABLE ${_prefix}cms_article ( id varchar(64) NOT NULL, category_code varchar(64) NOT NULL, @@ -37,7 +37,7 @@ CREATE TABLE js_cms_article -- 文章详情表 -CREATE TABLE js_cms_article_data +CREATE TABLE ${_prefix}cms_article_data ( id varchar(64) NOT NULL, content clob, @@ -63,13 +63,13 @@ CREATE TABLE js_cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (id) ); -- 文章推荐位 -CREATE TABLE js_cms_article_posid +CREATE TABLE ${_prefix}cms_article_posid ( article_id varchar(64) NOT NULL, postid char(1) NOT NULL @@ -77,7 +77,7 @@ CREATE TABLE js_cms_article_posid -- 文章与标签关系 -CREATE TABLE js_cms_article_tag +CREATE TABLE ${_prefix}cms_article_tag ( article_id varchar(64) NOT NULL, tag_name vargraphic(200) NOT NULL @@ -85,16 +85,16 @@ CREATE TABLE js_cms_article_tag -- 栏目表 -CREATE TABLE js_cms_category +CREATE TABLE ${_prefix}cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names vargraphic(1000) NOT NULL, + tree_names vargraphic(767) NOT NULL, category_name vargraphic(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,13 +137,13 @@ CREATE TABLE js_cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (category_code) ); -- 栏目与角色关联表 -CREATE TABLE js_cms_category_role +CREATE TABLE ${_prefix}cms_category_role ( category_code varchar(64) NOT NULL, role_code varchar(64) NOT NULL, @@ -153,7 +153,7 @@ CREATE TABLE js_cms_category_role -- 文章评论表 -CREATE TABLE js_cms_comment +CREATE TABLE ${_prefix}cms_comment ( id varchar(64) NOT NULL, category_code varchar(64) NOT NULL, @@ -178,7 +178,7 @@ CREATE TABLE js_cms_comment -- 留言板表 -CREATE TABLE js_cms_guestbook +CREATE TABLE ${_prefix}cms_guestbook ( id varchar(64) NOT NULL, type char(1) NOT NULL, @@ -201,7 +201,7 @@ CREATE TABLE js_cms_guestbook -- 内容举报表 -CREATE TABLE js_cms_report +CREATE TABLE ${_prefix}cms_report ( id varchar(64) NOT NULL, report_source char(1), @@ -214,7 +214,7 @@ CREATE TABLE js_cms_report -- 站点表 -CREATE TABLE js_cms_site +CREATE TABLE ${_prefix}cms_site ( site_code varchar(64) NOT NULL, site_name vargraphic(100) NOT NULL, @@ -238,7 +238,7 @@ CREATE TABLE js_cms_site -- 内容标签 -CREATE TABLE js_cms_tag +CREATE TABLE ${_prefix}cms_tag ( tag_name vargraphic(200) NOT NULL, clicknum numeric(10) NOT NULL, @@ -247,7 +247,7 @@ CREATE TABLE js_cms_tag -- 访问日志表 -CREATE TABLE js_cms_visit_log +CREATE TABLE ${_prefix}cms_visit_log ( id varchar(64) NOT NULL, request_url vargraphic(1000), @@ -289,34 +289,34 @@ CREATE TABLE js_cms_visit_log /* Create Indexes */ -CREATE INDEX idx_cms_article_cb ON js_cms_article (create_by); -CREATE INDEX idx_cms_article_cc ON js_cms_article (category_code); -CREATE INDEX idx_cms_article_corp_code ON js_cms_article (corp_code); -CREATE INDEX idx_cms_article_status ON js_cms_article (status); -CREATE INDEX idx_cms_article_ud ON js_cms_article (update_date); -CREATE INDEX idx_cms_article_weight ON js_cms_article (weight); -CREATE INDEX idx_cms_category_pc ON js_cms_category (parent_code); -CREATE INDEX idx_cms_category_ts ON js_cms_category (tree_sort); -CREATE INDEX idx_cms_category_status ON js_cms_category (status); -CREATE INDEX idx_cms_category_tss ON js_cms_category (tree_sorts); -CREATE INDEX idx_cms_comment_catc ON js_cms_comment (category_code); -CREATE INDEX idx_cms_comment_ai ON js_cms_comment (article_id); -CREATE INDEX idx_cms_comment_cc ON js_cms_comment (corp_code); -CREATE INDEX idx_cms_comment_status ON js_cms_comment (status); -CREATE INDEX idx_cms_guestbook_cc ON js_cms_guestbook (corp_code); -CREATE INDEX idx_cms_guestbook_status ON js_cms_guestbook (status); -CREATE INDEX idx_cms_guestbook_type ON js_cms_guestbook (type); -CREATE INDEX idx_cms_site_status ON js_cms_site (status); -CREATE INDEX cms_visit_log_cc ON js_cms_visit_log (category_code); -CREATE INDEX cms_visit_log_ci ON js_cms_visit_log (content_id); -CREATE INDEX cms_visit_log_fvt ON js_cms_visit_log (first_visit_time); -CREATE INDEX cms_visit_log_inv ON js_cms_visit_log (is_new_visit); -CREATE INDEX cms_visit_log_ra ON js_cms_visit_log (remote_addr); -CREATE INDEX cms_visit_log_sc ON js_cms_visit_log (site_code); -CREATE INDEX cms_visit_log_uvid ON js_cms_visit_log (unique_visit_id); -CREATE INDEX cms_visit_log_vd ON js_cms_visit_log (visit_date); -CREATE INDEX cms_visit_log_vt ON js_cms_visit_log (visit_time); -CREATE INDEX idx_cms_visit_log_corpc ON js_cms_visit_log (corp_code); +CREATE INDEX idx_cms_article_cb ON ${_prefix}cms_article (create_by); +CREATE INDEX idx_cms_article_cc ON ${_prefix}cms_article (category_code); +CREATE INDEX idx_cms_article_corp_code ON ${_prefix}cms_article (corp_code); +CREATE INDEX idx_cms_article_status ON ${_prefix}cms_article (status); +CREATE INDEX idx_cms_article_ud ON ${_prefix}cms_article (update_date); +CREATE INDEX idx_cms_article_weight ON ${_prefix}cms_article (weight); +CREATE INDEX idx_cms_category_pc ON ${_prefix}cms_category (parent_code); +CREATE INDEX idx_cms_category_ts ON ${_prefix}cms_category (tree_sort); +CREATE INDEX idx_cms_category_status ON ${_prefix}cms_category (status); +CREATE INDEX idx_cms_category_tss ON ${_prefix}cms_category (tree_sorts); +CREATE INDEX idx_cms_comment_catc ON ${_prefix}cms_comment (category_code); +CREATE INDEX idx_cms_comment_ai ON ${_prefix}cms_comment (article_id); +CREATE INDEX idx_cms_comment_cc ON ${_prefix}cms_comment (corp_code); +CREATE INDEX idx_cms_comment_status ON ${_prefix}cms_comment (status); +CREATE INDEX idx_cms_guestbook_cc ON ${_prefix}cms_guestbook (corp_code); +CREATE INDEX idx_cms_guestbook_status ON ${_prefix}cms_guestbook (status); +CREATE INDEX idx_cms_guestbook_type ON ${_prefix}cms_guestbook (type); +CREATE INDEX idx_cms_site_status ON ${_prefix}cms_site (status); +CREATE INDEX cms_visit_log_cc ON ${_prefix}cms_visit_log (category_code); +CREATE INDEX cms_visit_log_ci ON ${_prefix}cms_visit_log (content_id); +CREATE INDEX cms_visit_log_fvt ON ${_prefix}cms_visit_log (first_visit_time); +CREATE INDEX cms_visit_log_inv ON ${_prefix}cms_visit_log (is_new_visit); +CREATE INDEX cms_visit_log_ra ON ${_prefix}cms_visit_log (remote_addr); +CREATE INDEX cms_visit_log_sc ON ${_prefix}cms_visit_log (site_code); +CREATE INDEX cms_visit_log_uvid ON ${_prefix}cms_visit_log (unique_visit_id); +CREATE INDEX cms_visit_log_vd ON ${_prefix}cms_visit_log (visit_date); +CREATE INDEX cms_visit_log_vt ON ${_prefix}cms_visit_log (visit_time); +CREATE INDEX idx_cms_visit_log_corpc ON ${_prefix}cms_visit_log (corp_code); diff --git a/modules/cms/src/main/resources/db/create/h2/cms.sql b/modules/cms/src/main/resources/db/create/h2/cms.sql index 664f43bf..399068a6 100644 --- a/modules/cms/src/main/resources/db/create/h2/cms.sql +++ b/modules/cms/src/main/resources/db/create/h2/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE ${_prefix}cms_article_data extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (id) ); @@ -89,12 +89,12 @@ CREATE TABLE ${_prefix}cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, category_name varchar(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE ${_prefix}cms_category extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (category_code) ); diff --git a/modules/cms/src/main/resources/db/create/msaccess/cms.sql b/modules/cms/src/main/resources/db/create/msaccess/cms.sql deleted file mode 100644 index 10f1cfb2..00000000 --- a/modules/cms/src/main/resources/db/create/msaccess/cms.sql +++ /dev/null @@ -1,320 +0,0 @@ - - -/* Create Tables */ - --- 文章表 -CREATE TABLE js_cms_article -( - id varchar(64) NOT NULL, - category_code varchar(64) NOT NULL, - module_type varchar(50), - title varchar(255) NOT NULL, - href varchar(1000), - color varchar(50), - image varchar(1000), - keywords varchar(500), - description varchar(500), - weight numeric DEFAULT 0, - weight_date datetime, - source char(1), - copyfrom varchar(255), - hits numeric DEFAULT 0, - hits_plus numeric, - hits_minus numeric, - word_count numeric, - custom_content_view varchar(255), - view_config varchar(1000), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime NOT NULL, - remarks varchar(500), - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 文章详情表 -CREATE TABLE js_cms_article_data -( - id varchar(64) NOT NULL, - content memo, - relation varchar(1000), - is_can_comment char(1), - 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), - extend_i1 numeric, - extend_i2 numeric, - extend_i3 numeric, - extend_i4 numeric, - extend_f1 numeric, - extend_f2 numeric, - extend_f3 numeric, - extend_f4 numeric, - extend_d1 datetime, - extend_d2 datetime, - extend_d3 datetime, - extend_d4 datetime, - PRIMARY KEY (id) -); - - --- 文章推荐位 -CREATE TABLE js_cms_article_posid -( - article_id varchar(64) NOT NULL, - postid char(1) NOT NULL -); - - --- 文章与标签关系 -CREATE TABLE js_cms_article_tag -( - article_id varchar(64) NOT NULL, - tag_name varchar(200) NOT NULL -); - - --- 栏目表 -CREATE TABLE js_cms_category -( - category_code varchar(64) NOT NULL, - parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, - tree_sort numeric NOT NULL, - tree_sorts varchar(1000) NOT NULL, - tree_leaf char(1) NOT NULL, - tree_level numeric NOT NULL, - tree_names varchar(1000) NOT NULL, - category_name varchar(100) NOT NULL, - site_code varchar(64) NOT NULL, - module_type varchar(50), - image varchar(255), - href varchar(255), - target varchar(20), - keywords varchar(500), - description varchar(500), - in_menu char(1), - in_list char(1), - show_modes char(1), - is_need_audit char(1), - is_can_comment char(1), - custom_list_view varchar(255), - custom_content_view varchar(255), - view_config varchar(1000), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime 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), - extend_i1 numeric, - extend_i2 numeric, - extend_i3 numeric, - extend_i4 numeric, - extend_f1 numeric, - extend_f2 numeric, - extend_f3 numeric, - extend_f4 numeric, - extend_d1 datetime, - extend_d2 datetime, - extend_d3 datetime, - extend_d4 datetime, - PRIMARY KEY (category_code) -); - - --- 栏目与角色关联表 -CREATE TABLE js_cms_category_role -( - category_code varchar(64) NOT NULL, - role_code varchar(64) NOT NULL, - ctrl_type varchar(32), - PRIMARY KEY (category_code, role_code) -); - - --- 文章评论表 -CREATE TABLE js_cms_comment -( - id varchar(64) NOT NULL, - category_code varchar(64) NOT NULL, - article_id varchar(64) NOT NULL, - parent_id varchar(64), - article_title varchar(255) NOT NULL, - content varchar(255) NOT NULL, - name varchar(50), - ip varchar(100), - create_by varchar(64), - create_date datetime NOT NULL, - audit_user_code varchar(64), - audit_date datetime, - audit_comment varchar(200), - hits_plus numeric, - hits_minus numeric, - status char(1) NOT NULL, - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 留言板表 -CREATE TABLE js_cms_guestbook -( - id varchar(64) NOT NULL, - type char(1) NOT NULL, - content varchar(255) NOT NULL, - name varchar(100) NOT NULL, - email varchar(100) NOT NULL, - phone varchar(100) NOT NULL, - workunit varchar(100) NOT NULL, - ip varchar(100) NOT NULL, - create_by varchar(64), - create_date datetime, - re_user_code varchar(64), - re_date datetime, - re_content varchar(100), - status char(1) NOT NULL, - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - --- 内容举报表 -CREATE TABLE js_cms_report -( - id varchar(64) NOT NULL, - report_source char(1), - report_content varchar(500), - report_url varchar(1000), - report_type char(1), - report_cause varchar(500), - PRIMARY KEY (id) -); - - --- 站点表 -CREATE TABLE js_cms_site -( - site_code varchar(64) NOT NULL, - site_name varchar(100) NOT NULL, - site_sort numeric, - title varchar(100) NOT NULL, - logo varchar(1000), - domain varchar(500), - keywords varchar(500), - description varchar(500), - theme varchar(500), - copyright varchar(1000), - custom_index_view varchar(500), - status char(1) DEFAULT '0' NOT NULL, - create_by varchar(64) NOT NULL, - create_date datetime NOT NULL, - update_by varchar(64) NOT NULL, - update_date datetime NOT NULL, - remarks varchar(500), - PRIMARY KEY (site_code) -); - - --- 内容标签 -CREATE TABLE js_cms_tag -( - tag_name varchar(200) NOT NULL, - clicknum numeric NOT NULL, - PRIMARY KEY (tag_name) -); - - --- 访问日志表 -CREATE TABLE js_cms_visit_log -( - id varchar(64) NOT NULL, - request_url varchar(1000), - request_url_host varchar(128), - source_referer varchar(1000), - source_referer_host varchar(128), - source_type char(1), - search_engine varchar(200), - search_word varchar(200), - remote_addr varchar(50), - user_agent varchar(500), - user_language varchar(32), - user_screen_size varchar(32), - user_device varchar(32), - user_os_name varchar(32), - user_browser varchar(32), - user_browser_version varchar(16), - unique_visit_id varchar(64), - visit_date char(8), - visit_time datetime, - is_new_visit char(1), - first_visit_time numeric, - prev_remain_time numeric, - total_remain_time numeric, - site_code varchar(64), - site_name varchar(100), - category_code varchar(64), - category_name varchar(100), - content_id varchar(64), - content_title varchar(255), - visit_user_code varchar(100), - visit_user_name varchar(100), - corp_code varchar(64) DEFAULT '0' NOT NULL, - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, - PRIMARY KEY (id) -); - - - -/* Create Indexes */ - -CREATE INDEX idx_cms_article_cb ON js_cms_article (create_by); -CREATE INDEX idx_cms_article_cc ON js_cms_article (category_code); -CREATE INDEX idx_cms_article_corp_code ON js_cms_article (corp_code); -CREATE INDEX idx_cms_article_status ON js_cms_article (status); -CREATE INDEX idx_cms_article_ud ON js_cms_article (update_date); -CREATE INDEX idx_cms_article_weight ON js_cms_article (weight); -CREATE INDEX idx_cms_category_pc ON js_cms_category (parent_code); -CREATE INDEX idx_cms_category_ts ON js_cms_category (tree_sort); -CREATE INDEX idx_cms_category_status ON js_cms_category (status); -CREATE INDEX idx_cms_category_tss ON js_cms_category (tree_sorts); -CREATE INDEX idx_cms_comment_catc ON js_cms_comment (category_code); -CREATE INDEX idx_cms_comment_ai ON js_cms_comment (article_id); -CREATE INDEX idx_cms_comment_cc ON js_cms_comment (corp_code); -CREATE INDEX idx_cms_comment_status ON js_cms_comment (status); -CREATE INDEX idx_cms_guestbook_cc ON js_cms_guestbook (corp_code); -CREATE INDEX idx_cms_guestbook_status ON js_cms_guestbook (status); -CREATE INDEX idx_cms_guestbook_type ON js_cms_guestbook (type); -CREATE INDEX idx_cms_site_status ON js_cms_site (status); -CREATE INDEX cms_visit_log_cc ON js_cms_visit_log (category_code); -CREATE INDEX cms_visit_log_ci ON js_cms_visit_log (content_id); -CREATE INDEX cms_visit_log_fvt ON js_cms_visit_log (first_visit_time); -CREATE INDEX cms_visit_log_inv ON js_cms_visit_log (is_new_visit); -CREATE INDEX cms_visit_log_ra ON js_cms_visit_log (remote_addr); -CREATE INDEX cms_visit_log_sc ON js_cms_visit_log (site_code); -CREATE INDEX cms_visit_log_uvid ON js_cms_visit_log (unique_visit_id); -CREATE INDEX cms_visit_log_vd ON js_cms_visit_log (visit_date); -CREATE INDEX cms_visit_log_vt ON js_cms_visit_log (visit_time); -CREATE INDEX idx_cms_visit_log_corpc ON js_cms_visit_log (corp_code); - - - diff --git a/modules/cms/src/main/resources/db/create/mssql/cms.sql b/modules/cms/src/main/resources/db/create/mssql/cms.sql index bce36a9b..ba8b53c6 100644 --- a/modules/cms/src/main/resources/db/create/mssql/cms.sql +++ b/modules/cms/src/main/resources/db/create/mssql/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE [${_prefix}cms_article_data] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([id]) ); @@ -89,12 +89,12 @@ CREATE TABLE [${_prefix}cms_category] ( [category_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] nvarchar(1000) NOT NULL, + [tree_names] nvarchar(767) NOT NULL, [category_name] nvarchar(100) NOT NULL, [site_code] varchar(64) NOT NULL, [module_type] varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE [${_prefix}cms_category] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([category_code]) ); diff --git a/modules/cms/src/main/resources/db/create/mysql/cms.sql b/modules/cms/src/main/resources/db/create/mysql/cms.sql index ca3de7b2..a1a74453 100644 --- a/modules/cms/src/main/resources/db/create/mysql/cms.sql +++ b/modules/cms/src/main/resources/db/create/mysql/cms.sql @@ -64,7 +64,7 @@ CREATE TABLE ${_prefix}cms_article_data extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (id) ) COMMENT = '文章详情表'; @@ -90,12 +90,12 @@ CREATE TABLE ${_prefix}cms_category ( category_code varchar(64) NOT NULL COMMENT '栏目编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', category_name varchar(100) NOT NULL COMMENT '栏目名称', site_code varchar(64) NOT NULL COMMENT '站点编码', module_type varchar(50) COMMENT '模块类型', @@ -138,7 +138,7 @@ CREATE TABLE ${_prefix}cms_category extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (category_code) ) COMMENT = '栏目表'; diff --git a/modules/cms/src/main/resources/db/create/oracle/cms.sql b/modules/cms/src/main/resources/db/create/oracle/cms.sql index 1b00e6f4..8f4ed52d 100644 --- a/modules/cms/src/main/resources/db/create/oracle/cms.sql +++ b/modules/cms/src/main/resources/db/create/oracle/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE ${_prefix}cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (id) ); @@ -89,12 +89,12 @@ CREATE TABLE ${_prefix}cms_category ( category_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names nvarchar2(1000) NOT NULL, + tree_names nvarchar2(767) NOT NULL, category_name nvarchar2(100) NOT NULL, site_code varchar2(64) NOT NULL, module_type varchar2(50), @@ -137,7 +137,7 @@ CREATE TABLE ${_prefix}cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (category_code) ); diff --git a/modules/cms/src/main/resources/db/create/postgresql/cms.sql b/modules/cms/src/main/resources/db/create/postgresql/cms.sql index c16501c1..c70459ca 100644 --- a/modules/cms/src/main/resources/db/create/postgresql/cms.sql +++ b/modules/cms/src/main/resources/db/create/postgresql/cms.sql @@ -63,7 +63,7 @@ CREATE TABLE ${_prefix}cms_article_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (id) ) WITHOUT OIDS; @@ -89,12 +89,12 @@ CREATE TABLE ${_prefix}cms_category ( category_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, category_name varchar(100) NOT NULL, site_code varchar(64) NOT NULL, module_type varchar(50), @@ -137,7 +137,7 @@ CREATE TABLE ${_prefix}cms_category extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (category_code) ) WITHOUT OIDS; diff --git a/modules/cms/src/main/resources/db/upgrade/cms/mssql/mssql_5.0.0.sql b/modules/cms/src/main/resources/db/upgrade/cms/mssql/mssql_5.0.0.sql index 197a2fc7..bc4047ed 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/mssql/mssql_5.0.0.sql +++ b/modules/cms/src/main/resources/db/upgrade/cms/mssql/mssql_5.0.0.sql @@ -1,6 +1,6 @@ ALTER TABLE ${_prefix}cms_category -ADD extend_json text; +ADD extend_json varchar(1000); ALTER TABLE ${_prefix}cms_article_data -ADD extend_json text; +ADD extend_json varchar(1000); diff --git a/modules/cms/src/main/resources/db/upgrade/cms/mysql/mysql_5.0.0.sql b/modules/cms/src/main/resources/db/upgrade/cms/mysql/mysql_5.0.0.sql index bb560a19..5fb79f16 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/mysql/mysql_5.0.0.sql +++ b/modules/cms/src/main/resources/db/upgrade/cms/mysql/mysql_5.0.0.sql @@ -1,6 +1,6 @@ ALTER TABLE `${_prefix}cms_category` -ADD COLUMN extend_json text COMMENT '扩展 JSON'; +ADD COLUMN extend_json varchar(1000) COMMENT '扩展 JSON'; ALTER TABLE `${_prefix}cms_article_data` -ADD COLUMN extend_json text COMMENT '扩展 JSON'; \ No newline at end of file +ADD COLUMN extend_json varchar(1000) COMMENT '扩展 JSON'; \ No newline at end of file diff --git a/modules/cms/src/main/resources/db/upgrade/cms/oracle/oracle_5.0.0.sql b/modules/cms/src/main/resources/db/upgrade/cms/oracle/oracle_5.0.0.sql index 9975d7a4..b5aa37b2 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/oracle/oracle_5.0.0.sql +++ b/modules/cms/src/main/resources/db/upgrade/cms/oracle/oracle_5.0.0.sql @@ -1,6 +1,6 @@ -ALTER TABLE ${_prefix}cms_category ADD extend_json clob; +ALTER TABLE ${_prefix}cms_category ADD extend_json varchar2(1000); COMMENT ON COLUMN ${_prefix}cms_category.extend_json IS '扩展 JSON'; -ALTER TABLE ${_prefix}cms_article_data ADD extend_json clob; +ALTER TABLE ${_prefix}cms_article_data ADD extend_json varchar2(1000); COMMENT ON COLUMN ${_prefix}cms_article_data.extend_json IS '扩展 JSON'; diff --git a/modules/cms/src/main/resources/db/upgrade/cms/postgresql/postgresql_5.0.0.sql b/modules/cms/src/main/resources/db/upgrade/cms/postgresql/postgresql_5.0.0.sql index 9ea65e21..5a1ed487 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/postgresql/postgresql_5.0.0.sql +++ b/modules/cms/src/main/resources/db/upgrade/cms/postgresql/postgresql_5.0.0.sql @@ -1,6 +1,6 @@ -ALTER TABLE ${_prefix}cms_category ADD COLUMN extend_json text; +ALTER TABLE ${_prefix}cms_category ADD COLUMN extend_json varchar(1000); COMMENT ON COLUMN ${_prefix}cms_category.extend_json IS '扩展 JSON'; -ALTER TABLE ${_prefix}cms_article_data ADD COLUMN extend_json text; +ALTER TABLE ${_prefix}cms_article_data ADD COLUMN extend_json varchar(1000); COMMENT ON COLUMN ${_prefix}cms_article_data.extend_json IS '扩展 JSON'; diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions index 7ea60236..877f0241 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/versions +++ b/modules/cms/src/main/resources/db/upgrade/cms/versions @@ -8,4 +8,5 @@ 4.2.2 4.2.3 4.3.0 -5.0.0 \ No newline at end of file +5.0.0 +5.0.1 \ No newline at end of file diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 65dceb92..d65a5efe 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 226 - 1459 + 0 + 2448 128 128 @@ -1320,8 +1320,8 @@ decimal(p) - 2ed50dd645df216a959f424801ebca617c30e9b2 - null + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 null false null @@ -1333,7 +1333,7 @@ 扩展 JSON extend_json - clob + varchar(n) ad6f9eff50476669df62b7601cbc3a2e0c905d36 @@ -2776,8 +2776,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -3960,8 +3960,8 @@ decimal(p) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -3992,8 +3992,8 @@ decimal(p) - 312c35e49a1de2ac558655550904b2d4e275322f - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -15402,320 +15402,6 @@ - - e358008a1c9b84f744e89039339ba56765fe34bd - 1088 - 387 - Segoe UI - 9 - 521 - 1135 - - 128 - 128 - 192 - - - - 475346a4e370fda6d6be7b9662156dcd49b37fb1 - 1bfc4bd3083403779e9ec3b1bab83e7eed4732e5 - e358008a1c9b84f744e89039339ba56765fe34bd - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 0..1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_company - 公司表 - - - - - - - 8b9e1b544f371e8c2350ab8926707418a6ea8fdf - 5ac7f3a7a755a58e6119c8d4922df644559e632f - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - 5574844cb0d58e6bdfa1ca122c6cca8c5b27602a - 7c46717b372c8596c8138ff412b0363bea79262f - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f0f47249781a8c1e655ae11236426b788f099fce - bb54ac3b2667504dc519cb88904db1337b64704e - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cc2d46a644ef882366305e786927e310dc7945cb - 0bc7917672103a43ef4220fe999083a392356666 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - bdc9f61f5a7bd4a53e05d939ea82f9885c78eb01 - 84fb98359c82f62d61719d8ce1d1f850d69d972f - 475346a4e370fda6d6be7b9662156dcd49b37fb1 - - - - - varchar(n) - - - false - true - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_company_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_company_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_company_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_company_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_company_vc - - - - - 7c46717b372c8596c8138ff412b0363bea79262f - false - - - - - false - true - idx_sys_company_pcs - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_company_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - - - - - -
bbe68e376638ab208682d127d252c38bb6c953a51244 @@ -16375,475 +16061,6 @@
- - 3d247382b17eebade65fa207bb37d089d3c8042a - 1244 - 387 - Segoe UI - 9 - 48 - 792 - - 128 - 128 - 192 - - - - js_sys_office - 组织机构表 - - - - - - - a5fffb704f5efbf6cba1e9e81fd45336d06f06c0 - 512f24dbe486a211117dfb58e689ef3e0e5009a0 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - 87b8aa1c7178b4ce728dac87ce65c43bec953427 - 362544a460470412b9160888e562c4a582626f0e - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2b8439b512c0d6df70ca5f7c65bfd30a32def655 - 2c78fac5e5d538c5e2fa790b4ce1e0217547d271 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 60bc76a5c1e1f5559a42184bff19549d11c7173a - 32800aecf8993dd18a08cbed7711c76cf62a0c21 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7de44d266aacfd2735733386ead9dffd140cdef4 - 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b458d603ccaa8a68b8e7f4af5bc49b45cab7d11c - 16612d3a02d933279b078bd47f663acefa60e8c5 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 - 7b0e850652cfc5cd4e87982e33f5787f6db36704 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 666f23b96ed873b11a77ceca096cafe42631af5f - 148bc18726ef2a8682f8cc0c8ae4859e090564e0 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 275cece5dc0985966870fa12af1ce5928b902eb0 - d63923c59ef1fcecc6a5d5853f41fb3915b3e010 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 329bbb76f0884117ace79bb686695f4e9cb120b6 - a524d13c791fb53b1465c6c814d96eff6798b2c3 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_office_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_office_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_office_pcs - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_office_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_office_ot - - - - - 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 - false - - - - - false - true - idx_sys_office_vc - - - - - 362544a460470412b9160888e562c4a582626f0e - false - - - - - false - true - idx_sys_office_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_office_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - - - - - -
6615f2ce0ec05caf1a51f92d1c2b458984ac9db6296 @@ -17464,6 +16681,789 @@
+ + e358008a1c9b84f744e89039339ba56765fe34bd + 1088 + 387 + Segoe UI + 9 + 521 + 1135 + + 128 + 128 + 192 + + + + 475346a4e370fda6d6be7b9662156dcd49b37fb1 + 1bfc4bd3083403779e9ec3b1bab83e7eed4732e5 + e358008a1c9b84f744e89039339ba56765fe34bd + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 0..1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_company + 公司表 + + + + + + + 8b9e1b544f371e8c2350ab8926707418a6ea8fdf + 5ac7f3a7a755a58e6119c8d4922df644559e632f + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 5574844cb0d58e6bdfa1ca122c6cca8c5b27602a + 7c46717b372c8596c8138ff412b0363bea79262f + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0f47249781a8c1e655ae11236426b788f099fce + bb54ac3b2667504dc519cb88904db1337b64704e + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cc2d46a644ef882366305e786927e310dc7945cb + 0bc7917672103a43ef4220fe999083a392356666 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + bdc9f61f5a7bd4a53e05d939ea82f9885c78eb01 + 84fb98359c82f62d61719d8ce1d1f850d69d972f + 475346a4e370fda6d6be7b9662156dcd49b37fb1 + + + + + varchar(n) + + + false + true + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_company_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_company_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_company_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_company_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_company_vc + + + + + 7c46717b372c8596c8138ff412b0363bea79262f + false + + + + + false + true + idx_sys_company_pcs + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_company_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + + + + + +
+ + 3d247382b17eebade65fa207bb37d089d3c8042a + 1244 + 387 + Segoe UI + 9 + 48 + 792 + + 128 + 128 + 192 + + + + js_sys_office + 组织机构表 + + + + + + + a5fffb704f5efbf6cba1e9e81fd45336d06f06c0 + 512f24dbe486a211117dfb58e689ef3e0e5009a0 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 87b8aa1c7178b4ce728dac87ce65c43bec953427 + 362544a460470412b9160888e562c4a582626f0e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2b8439b512c0d6df70ca5f7c65bfd30a32def655 + 2c78fac5e5d538c5e2fa790b4ce1e0217547d271 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 60bc76a5c1e1f5559a42184bff19549d11c7173a + 32800aecf8993dd18a08cbed7711c76cf62a0c21 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7de44d266aacfd2735733386ead9dffd140cdef4 + 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b458d603ccaa8a68b8e7f4af5bc49b45cab7d11c + 16612d3a02d933279b078bd47f663acefa60e8c5 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 + 7b0e850652cfc5cd4e87982e33f5787f6db36704 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 666f23b96ed873b11a77ceca096cafe42631af5f + 148bc18726ef2a8682f8cc0c8ae4859e090564e0 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 275cece5dc0985966870fa12af1ce5928b902eb0 + d63923c59ef1fcecc6a5d5853f41fb3915b3e010 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 329bbb76f0884117ace79bb686695f4e9cb120b6 + a524d13c791fb53b1465c6c814d96eff6798b2c3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_office_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_office_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_office_pcs + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_office_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_office_ot + + + + + 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 + false + + + + + false + true + idx_sys_office_vc + + + + + 362544a460470412b9160888e562c4a582626f0e + false + + + + + false + true + idx_sys_office_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_office_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + + + + + +
@@ -18650,13 +18650,13 @@ - 2ed50dd645df216a959f424801ebca617c30e9b2 + 80cd53da9d5a1b19676537e590e20fa2793e902c 42c5d8f490f69b93e77698efa030ca23988ae696 - clob + varchar(n) false @@ -18722,7 +18722,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -18788,7 +18788,7 @@ - 312c35e49a1de2ac558655550904b2d4e275322f + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -18887,7 +18887,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 4f336fdc..3c0316a7 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -61,12 +61,12 @@ CREATE TABLE js_sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name vargraphic(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE js_sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name vargraphic(200) NOT NULL, full_name vargraphic(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE js_sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE js_sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label vargraphic(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE js_sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE js_sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE js_sys_health_check +( + id varchar(64) NOT NULL, + server_name vargraphic(50), + server_url vargraphic(500), + lic_version vargraphic(10), + heart_time timestamp, + timeout decimal(10), + state 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 vargraphic(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE js_sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE js_sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE js_sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name vargraphic(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE js_sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE js_sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE js_sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (user_code) ); diff --git a/modules/core/db/h2/core.sql b/modules/core/db/h2/core.sql index 765a7b19..944f2069 100644 --- a/modules/core/db/h2/core.sql +++ b/modules/core/db/h2/core.sql @@ -61,12 +61,12 @@ CREATE TABLE js_sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name varchar(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE js_sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name varchar(200) NOT NULL, full_name varchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE js_sys_company extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE js_sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label varchar(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE js_sys_dict_data extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE js_sys_file_upload extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE js_sys_health_check +( + id varchar(64) NOT NULL, + server_name varchar(50), + server_url varchar(500), + lic_version varchar(10), + heart_time datetime, + timeout decimal(10), + state char(1), + status char(1) DEFAULT '0' NOT NULL, + create_by varchar(64) NOT NULL, + create_date datetime NOT NULL, + update_by varchar(64) NOT NULL, + update_date datetime NOT NULL, + remarks varchar(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE js_sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE js_sys_menu extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE js_sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name varchar(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE js_sys_office extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE js_sys_role extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE js_sys_user extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (user_code) ); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 754f8186..5b304c0d 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -61,12 +61,12 @@ CREATE TABLE [js_sys_area] ( [area_code] varchar(100) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [area_name] nvarchar(100) NOT NULL, [area_type] char(1), [status] char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE [js_sys_company] ( [company_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [view_code] varchar(100) NOT NULL, [company_name] nvarchar(200) NOT NULL, [full_name] nvarchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE [js_sys_company] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([company_code]) ); @@ -158,12 +158,12 @@ CREATE TABLE [js_sys_dict_data] ( [dict_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [dict_label] nvarchar(100) NOT NULL, [dict_value] varchar(100) NOT NULL, [dict_icon] varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE [js_sys_dict_data] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([dict_code]) ); @@ -316,7 +316,27 @@ CREATE TABLE [js_sys_file_upload] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), + PRIMARY KEY ([id]) +); + + +-- 系统健康检查 +CREATE TABLE [js_sys_health_check] +( + [id] varchar(64) NOT NULL, + [server_name] nvarchar(50), + [server_url] nvarchar(500), + [lic_version] nvarchar(10), + [heart_time] datetime, + [timeout] decimal(10), + [state] char(1), + [status] char(1) DEFAULT '0' NOT NULL, + [create_by] varchar(64) NOT NULL, + [create_date] datetime NOT NULL, + [update_by] varchar(64) NOT NULL, + [update_date] datetime NOT NULL, + [remarks] nvarchar(500), PRIMARY KEY ([id]) ); @@ -409,12 +429,12 @@ CREATE TABLE [js_sys_menu] ( [menu_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [menu_name] varchar(100) NOT NULL, [menu_type] char(1) NOT NULL, [menu_href] varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE [js_sys_menu] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([menu_code]) ); @@ -601,12 +621,12 @@ CREATE TABLE [js_sys_office] ( [office_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [view_code] varchar(100) NOT NULL, [office_name] nvarchar(100) NOT NULL, [full_name] varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE [js_sys_office] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([office_code]) ); @@ -709,7 +729,7 @@ CREATE TABLE [js_sys_role] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([role_code]) ); @@ -796,7 +816,7 @@ CREATE TABLE [js_sys_user] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([user_code]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 2a89c072..52a6cd16 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -62,12 +62,12 @@ CREATE TABLE js_sys_area ( area_code varchar(100) NOT NULL COMMENT '区域编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', area_name varchar(100) NOT NULL COMMENT '区域名称', area_type char(1) COMMENT '区域类型', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', @@ -85,12 +85,12 @@ CREATE TABLE js_sys_company ( company_code varchar(64) NOT NULL COMMENT '公司编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', view_code varchar(100) NOT NULL COMMENT '公司代码', company_name varchar(200) NOT NULL COMMENT '公司名称', full_name varchar(200) NOT NULL COMMENT '公司全称', @@ -123,7 +123,7 @@ CREATE TABLE js_sys_company extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (company_code) ) COMMENT = '公司表'; @@ -159,12 +159,12 @@ CREATE TABLE js_sys_dict_data ( dict_code varchar(64) NOT NULL COMMENT '字典编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', dict_label varchar(100) NOT NULL COMMENT '字典标签', dict_value varchar(100) NOT NULL COMMENT '字典键值', dict_icon varchar(100) COMMENT '字典图标', @@ -201,7 +201,7 @@ CREATE TABLE js_sys_dict_data extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (dict_code) ) COMMENT = '字典数据表'; @@ -317,11 +317,31 @@ CREATE TABLE js_sys_file_upload extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (id) ) COMMENT = '文件上传表'; +-- 系统健康检查 +CREATE TABLE js_sys_health_check +( + id varchar(64) NOT NULL COMMENT '编号', + server_name varchar(50) COMMENT '系统节点名称', + server_url varchar(500) COMMENT '系统节点地址', + lic_version varchar(10) COMMENT '系统许可版本', + heart_time datetime COMMENT '最后心跳时间', + timeout decimal(10) COMMENT '超时时间', + state char(1) COMMENT '服务状态', + status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', + create_by varchar(64) NOT NULL COMMENT '创建者', + create_date datetime NOT NULL COMMENT '创建时间', + update_by varchar(64) NOT NULL COMMENT '更新者', + update_date datetime NOT NULL COMMENT '更新时间', + remarks varchar(500) COMMENT '备注信息', + PRIMARY KEY (id) +) COMMENT = '系统健康检查'; + + -- 作业调度表 CREATE TABLE js_sys_job ( @@ -410,12 +430,12 @@ CREATE TABLE js_sys_menu ( menu_code varchar(64) NOT NULL COMMENT '菜单编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', menu_name varchar(100) NOT NULL COMMENT '菜单名称', menu_type char(1) NOT NULL COMMENT '菜单类型（1菜单 2权限 3开发）', menu_href varchar(1000) COMMENT '链接', @@ -456,7 +476,7 @@ CREATE TABLE js_sys_menu extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (menu_code) ) COMMENT = '菜单表'; @@ -602,12 +622,12 @@ CREATE TABLE js_sys_office ( office_code varchar(64) NOT NULL COMMENT '机构编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', view_code varchar(100) NOT NULL COMMENT '机构代码', office_name varchar(100) NOT NULL COMMENT '机构名称', full_name varchar(200) NOT NULL COMMENT '机构全称', @@ -645,7 +665,7 @@ CREATE TABLE js_sys_office extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (office_code) ) COMMENT = '组织机构表'; @@ -710,7 +730,7 @@ CREATE TABLE js_sys_role extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (role_code) ) COMMENT = '角色表'; @@ -797,7 +817,7 @@ CREATE TABLE js_sys_user extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (user_code) ) COMMENT = '用户表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 18cfc4b1..86f021b1 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -61,12 +61,12 @@ CREATE TABLE js_sys_area ( area_code varchar2(100) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, area_name nvarchar2(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE js_sys_company ( company_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, view_code varchar2(100) NOT NULL, company_name nvarchar2(200) NOT NULL, full_name nvarchar2(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE js_sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE js_sys_dict_data ( dict_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, dict_label nvarchar2(100) NOT NULL, dict_value varchar2(100) NOT NULL, dict_icon varchar2(100), @@ -200,7 +200,7 @@ CREATE TABLE js_sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE js_sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE js_sys_health_check +( + id varchar2(64) NOT NULL, + server_name nvarchar2(50), + server_url nvarchar2(500), + lic_version nvarchar2(10), + heart_time timestamp, + timeout number(10), + state char(1), + status char(1) DEFAULT '0' NOT NULL, + create_by varchar2(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar2(64) NOT NULL, + update_date timestamp NOT NULL, + remarks nvarchar2(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE js_sys_menu ( menu_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, menu_name varchar2(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar2(1000), @@ -455,7 +475,7 @@ CREATE TABLE js_sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE js_sys_office ( office_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, view_code varchar2(100) NOT NULL, office_name nvarchar2(100) NOT NULL, full_name varchar2(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE js_sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE js_sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE js_sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (user_code) ); @@ -1194,6 +1214,20 @@ COMMENT ON COLUMN js_sys_file_upload.extend_d2 IS '扩展 Date 2'; COMMENT ON COLUMN js_sys_file_upload.extend_d3 IS '扩展 Date 3'; COMMENT ON COLUMN js_sys_file_upload.extend_d4 IS '扩展 Date 4'; COMMENT ON COLUMN js_sys_file_upload.extend_json IS '扩展 JSON'; +COMMENT ON TABLE js_sys_health_check IS '系统健康检查'; +COMMENT ON COLUMN js_sys_health_check.id IS '编号'; +COMMENT ON COLUMN js_sys_health_check.server_name IS '系统节点名称'; +COMMENT ON COLUMN js_sys_health_check.server_url IS '系统节点地址'; +COMMENT ON COLUMN js_sys_health_check.lic_version IS '系统许可版本'; +COMMENT ON COLUMN js_sys_health_check.heart_time IS '最后心跳时间'; +COMMENT ON COLUMN js_sys_health_check.timeout IS '超时时间'; +COMMENT ON COLUMN js_sys_health_check.state IS '服务状态'; +COMMENT ON COLUMN js_sys_health_check.status IS '状态（0正常 1删除 2停用）'; +COMMENT ON COLUMN js_sys_health_check.create_by IS '创建者'; +COMMENT ON COLUMN js_sys_health_check.create_date IS '创建时间'; +COMMENT ON COLUMN js_sys_health_check.update_by IS '更新者'; +COMMENT ON COLUMN js_sys_health_check.update_date IS '更新时间'; +COMMENT ON COLUMN js_sys_health_check.remarks IS '备注信息'; COMMENT ON TABLE js_sys_job IS '作业调度表'; COMMENT ON COLUMN js_sys_job.job_name IS '任务名称'; COMMENT ON COLUMN js_sys_job.job_group IS '任务组名'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index e8744d94..5ccd1d1d 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -61,12 +61,12 @@ CREATE TABLE js_sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name varchar(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE js_sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name varchar(200) NOT NULL, full_name varchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE js_sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (company_code) ) WITHOUT OIDS; @@ -158,12 +158,12 @@ CREATE TABLE js_sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label varchar(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE js_sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (dict_code) ) WITHOUT OIDS; @@ -316,7 +316,27 @@ CREATE TABLE js_sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), + PRIMARY KEY (id) +) WITHOUT OIDS; + + +-- 系统健康检查 +CREATE TABLE js_sys_health_check +( + id varchar(64) NOT NULL, + server_name varchar(50), + server_url varchar(500), + lic_version varchar(10), + heart_time timestamp, + timeout decimal(10), + state 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), PRIMARY KEY (id) ) WITHOUT OIDS; @@ -409,12 +429,12 @@ CREATE TABLE js_sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE js_sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (menu_code) ) WITHOUT OIDS; @@ -601,12 +621,12 @@ CREATE TABLE js_sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name varchar(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE js_sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (office_code) ) WITHOUT OIDS; @@ -709,7 +729,7 @@ CREATE TABLE js_sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (role_code) ) WITHOUT OIDS; @@ -796,7 +816,7 @@ CREATE TABLE js_sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (user_code) ) WITHOUT OIDS; @@ -1194,6 +1214,20 @@ COMMENT ON COLUMN js_sys_file_upload.extend_d2 IS '扩展 Date 2'; COMMENT ON COLUMN js_sys_file_upload.extend_d3 IS '扩展 Date 3'; COMMENT ON COLUMN js_sys_file_upload.extend_d4 IS '扩展 Date 4'; COMMENT ON COLUMN js_sys_file_upload.extend_json IS '扩展 JSON'; +COMMENT ON TABLE js_sys_health_check IS '系统健康检查'; +COMMENT ON COLUMN js_sys_health_check.id IS '编号'; +COMMENT ON COLUMN js_sys_health_check.server_name IS '系统节点名称'; +COMMENT ON COLUMN js_sys_health_check.server_url IS '系统节点地址'; +COMMENT ON COLUMN js_sys_health_check.lic_version IS '系统许可版本'; +COMMENT ON COLUMN js_sys_health_check.heart_time IS '最后心跳时间'; +COMMENT ON COLUMN js_sys_health_check.timeout IS '超时时间'; +COMMENT ON COLUMN js_sys_health_check.state IS '服务状态'; +COMMENT ON COLUMN js_sys_health_check.status IS '状态（0正常 1删除 2停用）'; +COMMENT ON COLUMN js_sys_health_check.create_by IS '创建者'; +COMMENT ON COLUMN js_sys_health_check.create_date IS '创建时间'; +COMMENT ON COLUMN js_sys_health_check.update_by IS '更新者'; +COMMENT ON COLUMN js_sys_health_check.update_date IS '更新时间'; +COMMENT ON COLUMN js_sys_health_check.remarks IS '备注信息'; COMMENT ON TABLE js_sys_job IS '作业调度表'; COMMENT ON COLUMN js_sys_job.job_name IS '任务名称'; COMMENT ON COLUMN js_sys_job.job_group IS '任务组名'; diff --git a/modules/core/src/main/resources/db/create/db2/core.sql b/modules/core/src/main/resources/db/create/db2/core.sql index c30eb2d1..1a4ed563 100644 --- a/modules/core/src/main/resources/db/create/db2/core.sql +++ b/modules/core/src/main/resources/db/create/db2/core.sql @@ -61,12 +61,12 @@ CREATE TABLE ${_prefix}sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name vargraphic(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE ${_prefix}sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name vargraphic(200) NOT NULL, full_name vargraphic(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE ${_prefix}sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE ${_prefix}sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label vargraphic(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE ${_prefix}sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE ${_prefix}sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE ${_prefix}sys_health_check +( + id varchar(64) NOT NULL, + server_name vargraphic(50), + server_url vargraphic(500), + lic_version vargraphic(10), + heart_time timestamp, + timeout decimal(10), + state 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 vargraphic(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE ${_prefix}sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE ${_prefix}sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE ${_prefix}sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name vargraphic(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE ${_prefix}sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE ${_prefix}sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE ${_prefix}sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (user_code) ); diff --git a/modules/core/src/main/resources/db/create/h2/core.sql b/modules/core/src/main/resources/db/create/h2/core.sql index c8bc348d..f2fa5339 100644 --- a/modules/core/src/main/resources/db/create/h2/core.sql +++ b/modules/core/src/main/resources/db/create/h2/core.sql @@ -61,12 +61,12 @@ CREATE TABLE ${_prefix}sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name varchar(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE ${_prefix}sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name varchar(200) NOT NULL, full_name varchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE ${_prefix}sys_company extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE ${_prefix}sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label varchar(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE ${_prefix}sys_dict_data extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE ${_prefix}sys_file_upload extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE ${_prefix}sys_health_check +( + id varchar(64) NOT NULL, + server_name varchar(50), + server_url varchar(500), + lic_version varchar(10), + heart_time datetime, + timeout decimal(10), + state char(1), + status char(1) DEFAULT '0' NOT NULL, + create_by varchar(64) NOT NULL, + create_date datetime NOT NULL, + update_by varchar(64) NOT NULL, + update_date datetime NOT NULL, + remarks varchar(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE ${_prefix}sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE ${_prefix}sys_menu extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE ${_prefix}sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name varchar(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE ${_prefix}sys_office extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE ${_prefix}sys_role extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE ${_prefix}sys_user extend_d2 datetime, extend_d3 datetime, extend_d4 datetime, - extend_json clob, + extend_json varchar(1000), PRIMARY KEY (user_code) ); diff --git a/modules/core/src/main/resources/db/create/mssql/core.sql b/modules/core/src/main/resources/db/create/mssql/core.sql index 17aeecea..00b36729 100644 --- a/modules/core/src/main/resources/db/create/mssql/core.sql +++ b/modules/core/src/main/resources/db/create/mssql/core.sql @@ -61,12 +61,12 @@ CREATE TABLE [${_prefix}sys_area] ( [area_code] varchar(100) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [area_name] nvarchar(100) NOT NULL, [area_type] char(1), [status] char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE [${_prefix}sys_company] ( [company_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [view_code] varchar(100) NOT NULL, [company_name] nvarchar(200) NOT NULL, [full_name] nvarchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE [${_prefix}sys_company] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([company_code]) ); @@ -158,12 +158,12 @@ CREATE TABLE [${_prefix}sys_dict_data] ( [dict_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [dict_label] nvarchar(100) NOT NULL, [dict_value] varchar(100) NOT NULL, [dict_icon] varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE [${_prefix}sys_dict_data] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([dict_code]) ); @@ -316,7 +316,27 @@ CREATE TABLE [${_prefix}sys_file_upload] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), + PRIMARY KEY ([id]) +); + + +-- 系统健康检查 +CREATE TABLE [${_prefix}sys_health_check] +( + [id] varchar(64) NOT NULL, + [server_name] nvarchar(50), + [server_url] nvarchar(500), + [lic_version] nvarchar(10), + [heart_time] datetime, + [timeout] decimal(10), + [state] char(1), + [status] char(1) DEFAULT '0' NOT NULL, + [create_by] varchar(64) NOT NULL, + [create_date] datetime NOT NULL, + [update_by] varchar(64) NOT NULL, + [update_date] datetime NOT NULL, + [remarks] nvarchar(500), PRIMARY KEY ([id]) ); @@ -409,12 +429,12 @@ CREATE TABLE [${_prefix}sys_menu] ( [menu_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [menu_name] varchar(100) NOT NULL, [menu_type] char(1) NOT NULL, [menu_href] varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE [${_prefix}sys_menu] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([menu_code]) ); @@ -601,12 +621,12 @@ CREATE TABLE [${_prefix}sys_office] ( [office_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [view_code] varchar(100) NOT NULL, [office_name] nvarchar(100) NOT NULL, [full_name] varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE [${_prefix}sys_office] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([office_code]) ); @@ -709,7 +729,7 @@ CREATE TABLE [${_prefix}sys_role] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([role_code]) ); @@ -796,7 +816,7 @@ CREATE TABLE [${_prefix}sys_user] [extend_d2] datetime, [extend_d3] datetime, [extend_d4] datetime, - [extend_json] text, + [extend_json] varchar(1000), PRIMARY KEY ([user_code]) ); diff --git a/modules/core/src/main/resources/db/create/mysql/core.sql b/modules/core/src/main/resources/db/create/mysql/core.sql index e6b4bb62..8217cea4 100644 --- a/modules/core/src/main/resources/db/create/mysql/core.sql +++ b/modules/core/src/main/resources/db/create/mysql/core.sql @@ -62,12 +62,12 @@ CREATE TABLE ${_prefix}sys_area ( area_code varchar(100) NOT NULL COMMENT '区域编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', area_name varchar(100) NOT NULL COMMENT '区域名称', area_type char(1) COMMENT '区域类型', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', @@ -85,12 +85,12 @@ CREATE TABLE ${_prefix}sys_company ( company_code varchar(64) NOT NULL COMMENT '公司编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', view_code varchar(100) NOT NULL COMMENT '公司代码', company_name varchar(200) NOT NULL COMMENT '公司名称', full_name varchar(200) NOT NULL COMMENT '公司全称', @@ -123,7 +123,7 @@ CREATE TABLE ${_prefix}sys_company extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (company_code) ) COMMENT = '公司表'; @@ -159,12 +159,12 @@ CREATE TABLE ${_prefix}sys_dict_data ( dict_code varchar(64) NOT NULL COMMENT '字典编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', dict_label varchar(100) NOT NULL COMMENT '字典标签', dict_value varchar(100) NOT NULL COMMENT '字典键值', dict_icon varchar(100) COMMENT '字典图标', @@ -201,7 +201,7 @@ CREATE TABLE ${_prefix}sys_dict_data extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (dict_code) ) COMMENT = '字典数据表'; @@ -317,11 +317,31 @@ CREATE TABLE ${_prefix}sys_file_upload extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (id) ) COMMENT = '文件上传表'; +-- 系统健康检查 +CREATE TABLE ${_prefix}sys_health_check +( + id varchar(64) NOT NULL COMMENT '编号', + server_name varchar(50) COMMENT '系统节点名称', + server_url varchar(500) COMMENT '系统节点地址', + lic_version varchar(10) COMMENT '系统许可版本', + heart_time datetime COMMENT '最后心跳时间', + timeout decimal(10) COMMENT '超时时间', + state char(1) COMMENT '服务状态', + status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', + create_by varchar(64) NOT NULL COMMENT '创建者', + create_date datetime NOT NULL COMMENT '创建时间', + update_by varchar(64) NOT NULL COMMENT '更新者', + update_date datetime NOT NULL COMMENT '更新时间', + remarks varchar(500) COMMENT '备注信息', + PRIMARY KEY (id) +) COMMENT = '系统健康检查'; + + -- 作业调度表 CREATE TABLE ${_prefix}sys_job ( @@ -410,12 +430,12 @@ CREATE TABLE ${_prefix}sys_menu ( menu_code varchar(64) NOT NULL COMMENT '菜单编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', menu_name varchar(100) NOT NULL COMMENT '菜单名称', menu_type char(1) NOT NULL COMMENT '菜单类型（1菜单 2权限 3开发）', menu_href varchar(1000) COMMENT '链接', @@ -456,7 +476,7 @@ CREATE TABLE ${_prefix}sys_menu extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (menu_code) ) COMMENT = '菜单表'; @@ -602,12 +622,12 @@ CREATE TABLE ${_prefix}sys_office ( office_code varchar(64) NOT NULL COMMENT '机构编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', view_code varchar(100) NOT NULL COMMENT '机构代码', office_name varchar(100) NOT NULL COMMENT '机构名称', full_name varchar(200) NOT NULL COMMENT '机构全称', @@ -645,7 +665,7 @@ CREATE TABLE ${_prefix}sys_office extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (office_code) ) COMMENT = '组织机构表'; @@ -710,7 +730,7 @@ CREATE TABLE ${_prefix}sys_role extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (role_code) ) COMMENT = '角色表'; @@ -797,7 +817,7 @@ CREATE TABLE ${_prefix}sys_user extend_d2 datetime COMMENT '扩展 Date 2', extend_d3 datetime COMMENT '扩展 Date 3', extend_d4 datetime COMMENT '扩展 Date 4', - extend_json text COMMENT '扩展 JSON', + extend_json varchar(1000) COMMENT '扩展 JSON', PRIMARY KEY (user_code) ) COMMENT = '用户表'; diff --git a/modules/core/src/main/resources/db/create/oracle/core.sql b/modules/core/src/main/resources/db/create/oracle/core.sql index 6b755703..f4b66a75 100644 --- a/modules/core/src/main/resources/db/create/oracle/core.sql +++ b/modules/core/src/main/resources/db/create/oracle/core.sql @@ -61,12 +61,12 @@ CREATE TABLE ${_prefix}sys_area ( area_code varchar2(100) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, area_name nvarchar2(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE ${_prefix}sys_company ( company_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, view_code varchar2(100) NOT NULL, company_name nvarchar2(200) NOT NULL, full_name nvarchar2(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE ${_prefix}sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (company_code) ); @@ -158,12 +158,12 @@ CREATE TABLE ${_prefix}sys_dict_data ( dict_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, dict_label nvarchar2(100) NOT NULL, dict_value varchar2(100) NOT NULL, dict_icon varchar2(100), @@ -200,7 +200,7 @@ CREATE TABLE ${_prefix}sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (dict_code) ); @@ -316,7 +316,27 @@ CREATE TABLE ${_prefix}sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), + PRIMARY KEY (id) +); + + +-- 系统健康检查 +CREATE TABLE ${_prefix}sys_health_check +( + id varchar2(64) NOT NULL, + server_name nvarchar2(50), + server_url nvarchar2(500), + lic_version nvarchar2(10), + heart_time timestamp, + timeout number(10), + state char(1), + status char(1) DEFAULT '0' NOT NULL, + create_by varchar2(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar2(64) NOT NULL, + update_date timestamp NOT NULL, + remarks nvarchar2(500), PRIMARY KEY (id) ); @@ -409,12 +429,12 @@ CREATE TABLE ${_prefix}sys_menu ( menu_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, menu_name varchar2(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar2(1000), @@ -455,7 +475,7 @@ CREATE TABLE ${_prefix}sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (menu_code) ); @@ -601,12 +621,12 @@ CREATE TABLE ${_prefix}sys_office ( office_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, view_code varchar2(100) NOT NULL, office_name nvarchar2(100) NOT NULL, full_name varchar2(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE ${_prefix}sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (office_code) ); @@ -709,7 +729,7 @@ CREATE TABLE ${_prefix}sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (role_code) ); @@ -796,7 +816,7 @@ CREATE TABLE ${_prefix}sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json clob, + extend_json varchar2(1000), PRIMARY KEY (user_code) ); @@ -1194,6 +1214,20 @@ COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d2 IS '扩展 Date 2'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d3 IS '扩展 Date 3'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d4 IS '扩展 Date 4'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_json IS '扩展 JSON'; +COMMENT ON TABLE ${_prefix}sys_health_check IS '系统健康检查'; +COMMENT ON COLUMN ${_prefix}sys_health_check.id IS '编号'; +COMMENT ON COLUMN ${_prefix}sys_health_check.server_name IS '系统节点名称'; +COMMENT ON COLUMN ${_prefix}sys_health_check.server_url IS '系统节点地址'; +COMMENT ON COLUMN ${_prefix}sys_health_check.lic_version IS '系统许可版本'; +COMMENT ON COLUMN ${_prefix}sys_health_check.heart_time IS '最后心跳时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.timeout IS '超时时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.state IS '服务状态'; +COMMENT ON COLUMN ${_prefix}sys_health_check.status IS '状态（0正常 1删除 2停用）'; +COMMENT ON COLUMN ${_prefix}sys_health_check.create_by IS '创建者'; +COMMENT ON COLUMN ${_prefix}sys_health_check.create_date IS '创建时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.update_by IS '更新者'; +COMMENT ON COLUMN ${_prefix}sys_health_check.update_date IS '更新时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.remarks IS '备注信息'; COMMENT ON TABLE ${_prefix}sys_job IS '作业调度表'; COMMENT ON COLUMN ${_prefix}sys_job.job_name IS '任务名称'; COMMENT ON COLUMN ${_prefix}sys_job.job_group IS '任务组名'; diff --git a/modules/core/src/main/resources/db/create/postgresql/core.sql b/modules/core/src/main/resources/db/create/postgresql/core.sql index 11e3218f..cdae61b3 100644 --- a/modules/core/src/main/resources/db/create/postgresql/core.sql +++ b/modules/core/src/main/resources/db/create/postgresql/core.sql @@ -61,12 +61,12 @@ CREATE TABLE ${_prefix}sys_area ( area_code varchar(100) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, area_name varchar(100) NOT NULL, area_type char(1), status char(1) DEFAULT '0' NOT NULL, @@ -84,12 +84,12 @@ CREATE TABLE ${_prefix}sys_company ( company_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, company_name varchar(200) NOT NULL, full_name varchar(200) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE ${_prefix}sys_company extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (company_code) ) WITHOUT OIDS; @@ -158,12 +158,12 @@ CREATE TABLE ${_prefix}sys_dict_data ( dict_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, dict_label varchar(100) NOT NULL, dict_value varchar(100) NOT NULL, dict_icon varchar(100), @@ -200,7 +200,7 @@ CREATE TABLE ${_prefix}sys_dict_data extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (dict_code) ) WITHOUT OIDS; @@ -316,7 +316,27 @@ CREATE TABLE ${_prefix}sys_file_upload extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), + PRIMARY KEY (id) +) WITHOUT OIDS; + + +-- 系统健康检查 +CREATE TABLE ${_prefix}sys_health_check +( + id varchar(64) NOT NULL, + server_name varchar(50), + server_url varchar(500), + lic_version varchar(10), + heart_time timestamp, + timeout decimal(10), + state 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), PRIMARY KEY (id) ) WITHOUT OIDS; @@ -409,12 +429,12 @@ CREATE TABLE ${_prefix}sys_menu ( menu_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, menu_name varchar(100) NOT NULL, menu_type char(1) NOT NULL, menu_href varchar(1000), @@ -455,7 +475,7 @@ CREATE TABLE ${_prefix}sys_menu extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (menu_code) ) WITHOUT OIDS; @@ -601,12 +621,12 @@ CREATE TABLE ${_prefix}sys_office ( office_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, view_code varchar(100) NOT NULL, office_name varchar(100) NOT NULL, full_name varchar(200) NOT NULL, @@ -644,7 +664,7 @@ CREATE TABLE ${_prefix}sys_office extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (office_code) ) WITHOUT OIDS; @@ -709,7 +729,7 @@ CREATE TABLE ${_prefix}sys_role extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (role_code) ) WITHOUT OIDS; @@ -796,7 +816,7 @@ CREATE TABLE ${_prefix}sys_user extend_d2 timestamp, extend_d3 timestamp, extend_d4 timestamp, - extend_json text, + extend_json varchar(1000), PRIMARY KEY (user_code) ) WITHOUT OIDS; @@ -1194,6 +1214,20 @@ COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d2 IS '扩展 Date 2'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d3 IS '扩展 Date 3'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_d4 IS '扩展 Date 4'; COMMENT ON COLUMN ${_prefix}sys_file_upload.extend_json IS '扩展 JSON'; +COMMENT ON TABLE ${_prefix}sys_health_check IS '系统健康检查'; +COMMENT ON COLUMN ${_prefix}sys_health_check.id IS '编号'; +COMMENT ON COLUMN ${_prefix}sys_health_check.server_name IS '系统节点名称'; +COMMENT ON COLUMN ${_prefix}sys_health_check.server_url IS '系统节点地址'; +COMMENT ON COLUMN ${_prefix}sys_health_check.lic_version IS '系统许可版本'; +COMMENT ON COLUMN ${_prefix}sys_health_check.heart_time IS '最后心跳时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.timeout IS '超时时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.state IS '服务状态'; +COMMENT ON COLUMN ${_prefix}sys_health_check.status IS '状态（0正常 1删除 2停用）'; +COMMENT ON COLUMN ${_prefix}sys_health_check.create_by IS '创建者'; +COMMENT ON COLUMN ${_prefix}sys_health_check.create_date IS '创建时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.update_by IS '更新者'; +COMMENT ON COLUMN ${_prefix}sys_health_check.update_date IS '更新时间'; +COMMENT ON COLUMN ${_prefix}sys_health_check.remarks IS '备注信息'; COMMENT ON TABLE ${_prefix}sys_job IS '作业调度表'; COMMENT ON COLUMN ${_prefix}sys_job.job_name IS '任务名称'; COMMENT ON COLUMN ${_prefix}sys_job.job_group IS '任务组名'; diff --git a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml index 7c240af3..5befdc61 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml @@ -430,6 +430,22 @@ extend_i4 decimal(p) + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 扩展 JSON + extend_json + varchar(n) + ad6f9eff50476669df62b7601cbc3a2e0c905d36 500 @@ -591,8 +607,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -943,8 +959,8 @@ nvarchar(n) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -959,7 +975,7 @@ varchar(n) - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 10 null false @@ -975,8 +991,8 @@ decimal(p) - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -3297,6 +3313,39 @@ 0 + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -3337,7 +3386,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -3370,7 +3419,7 @@ - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 23f973124aedd0244533f4e7b3b103c548b966be @@ -3403,7 +3452,7 @@ - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -3502,7 +3551,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml index 16554ecc..e5abcd5a 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml @@ -430,6 +430,22 @@ extend_i4 decimal(p) + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 扩展 JSON + extend_json + varchar(n) + ad6f9eff50476669df62b7601cbc3a2e0c905d36 500 @@ -591,8 +607,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -943,8 +959,8 @@ nvarchar(n) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -959,7 +975,7 @@ varchar(n) - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 10 null false @@ -975,8 +991,8 @@ decimal(p) - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -3297,6 +3313,39 @@ 0 + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -3337,7 +3386,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -3370,7 +3419,7 @@ - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 23f973124aedd0244533f4e7b3b103c548b966be @@ -3403,7 +3452,7 @@ - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -3502,7 +3551,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/modules/template/db/template.erm b/modules/template/db/template.erm index 1c9ab28d..631402b6 100644 --- a/modules/template/db/template.erm +++ b/modules/template/db/template.erm @@ -41,7 +41,7 @@ false - db${module.moduleCode}.sql + db\template.sql UTF-8 CR+LF false @@ -73,7 +73,7 @@ null - db${module.moduleCode}.xls + db\template.xls en @@ -89,7 +89,7 @@ true - db${module.moduleCode}.png + db\template.png true true @@ -423,6 +423,22 @@ extend_i4 decimal(p) + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 扩展 JSON + extend_json + varchar(n) + ad6f9eff50476669df62b7601cbc3a2e0c905d36 500 @@ -584,8 +600,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -936,8 +952,8 @@ nvarchar(n) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -952,7 +968,7 @@ varchar(n) - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 10 null false @@ -968,8 +984,8 @@ decimal(p) - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -3290,6 +3306,39 @@ 0 + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -3330,7 +3379,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -3363,7 +3412,7 @@ - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 23f973124aedd0244533f4e7b3b103c548b966be @@ -3396,7 +3445,7 @@ - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -3495,7 +3544,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b @@ -3538,4 +3587,4 @@ - \ No newline at end of file + diff --git a/modules/template/src/main/resources/db/upgrade/template/versions b/modules/template/src/main/resources/db/upgrade/template/versions index b496f2b3..1d1350e4 100644 --- a/modules/template/src/main/resources/db/upgrade/template/versions +++ b/modules/template/src/main/resources/db/upgrade/template/versions @@ -3,4 +3,5 @@ 4.2.2 4.2.3 4.3.0 -5.0.0 \ No newline at end of file +5.0.0 +5.0.1 \ No newline at end of file diff --git a/web-api/db/h2/test.sql b/web-api/db/h2/test.sql index b44c94f5..d522c6da 100644 --- a/web-api/db/h2/test.sql +++ b/web-api/db/h2/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web-api/db/mssql/test.sql b/web-api/db/mssql/test.sql index 4b48c1f4..4ae8a769 100644 --- a/web-api/db/mssql/test.sql +++ b/web-api/db/mssql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE [test_tree] ( [tree_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [tree_name] nvarchar(200) NOT NULL, [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, diff --git a/web-api/db/mysql/test.sql b/web-api/db/mysql/test.sql index 3165078a..06c78075 100644 --- a/web-api/db/mysql/test.sql +++ b/web-api/db/mysql/test.sql @@ -56,12 +56,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL COMMENT '节点编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', tree_name varchar(200) NOT NULL COMMENT '节点名称', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/web-api/db/oracle/test.sql b/web-api/db/oracle/test.sql index 0ffbb56d..4308d8d3 100644 --- a/web-api/db/oracle/test.sql +++ b/web-api/db/oracle/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, tree_name nvarchar2(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web-api/db/postgresql/test.sql b/web-api/db/postgresql/test.sql index 15f53ad5..54758d68 100644 --- a/web-api/db/postgresql/test.sql +++ b/web-api/db/postgresql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web-api/db/test.erm b/web-api/db/test.erm index e3f14529..04d70d57 100644 --- a/web-api/db/test.erm +++ b/web-api/db/test.erm @@ -423,6 +423,22 @@ extend_i4 decimal(p) + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 扩展 JSON + extend_json + varchar(n) + ad6f9eff50476669df62b7601cbc3a2e0c905d36 500 @@ -584,8 +600,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -936,8 +952,8 @@ nvarchar(n) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -952,7 +968,7 @@ varchar(n) - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 10 null false @@ -968,8 +984,8 @@ decimal(p) - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -3290,6 +3306,39 @@ 0 + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -3330,7 +3379,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -3363,7 +3412,7 @@ - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 23f973124aedd0244533f4e7b3b103c548b966be @@ -3396,7 +3445,7 @@ - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -3495,7 +3544,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/web-api/src/main/resources/db/create/h2/test.sql b/web-api/src/main/resources/db/create/h2/test.sql index b44c94f5..d522c6da 100644 --- a/web-api/src/main/resources/db/create/h2/test.sql +++ b/web-api/src/main/resources/db/create/h2/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web-api/src/main/resources/db/create/mssql/test.sql b/web-api/src/main/resources/db/create/mssql/test.sql index 4b48c1f4..4ae8a769 100644 --- a/web-api/src/main/resources/db/create/mssql/test.sql +++ b/web-api/src/main/resources/db/create/mssql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE [test_tree] ( [tree_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [tree_name] nvarchar(200) NOT NULL, [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, diff --git a/web-api/src/main/resources/db/create/mysql/test.sql b/web-api/src/main/resources/db/create/mysql/test.sql index 3165078a..06c78075 100644 --- a/web-api/src/main/resources/db/create/mysql/test.sql +++ b/web-api/src/main/resources/db/create/mysql/test.sql @@ -56,12 +56,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL COMMENT '节点编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', tree_name varchar(200) NOT NULL COMMENT '节点名称', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/web-api/src/main/resources/db/create/oracle/test.sql b/web-api/src/main/resources/db/create/oracle/test.sql index 0ffbb56d..4308d8d3 100644 --- a/web-api/src/main/resources/db/create/oracle/test.sql +++ b/web-api/src/main/resources/db/create/oracle/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, tree_name nvarchar2(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web-api/src/main/resources/db/create/postgresql/test.sql b/web-api/src/main/resources/db/create/postgresql/test.sql index 15f53ad5..54758d68 100644 --- a/web-api/src/main/resources/db/create/postgresql/test.sql +++ b/web-api/src/main/resources/db/create/postgresql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web/db/h2/test.sql b/web/db/h2/test.sql index b44c94f5..d522c6da 100644 --- a/web/db/h2/test.sql +++ b/web/db/h2/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web/db/mssql/test.sql b/web/db/mssql/test.sql index 4b48c1f4..4ae8a769 100644 --- a/web/db/mssql/test.sql +++ b/web/db/mssql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE [test_tree] ( [tree_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [tree_name] nvarchar(200) NOT NULL, [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, diff --git a/web/db/mysql/test.sql b/web/db/mysql/test.sql index 3165078a..06c78075 100644 --- a/web/db/mysql/test.sql +++ b/web/db/mysql/test.sql @@ -56,12 +56,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL COMMENT '节点编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', tree_name varchar(200) NOT NULL COMMENT '节点名称', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql index 0ffbb56d..4308d8d3 100644 --- a/web/db/oracle/test.sql +++ b/web/db/oracle/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, tree_name nvarchar2(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web/db/postgresql/test.sql b/web/db/postgresql/test.sql index 15f53ad5..54758d68 100644 --- a/web/db/postgresql/test.sql +++ b/web/db/postgresql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web/db/test.erm b/web/db/test.erm index e3f14529..04d70d57 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -423,6 +423,22 @@ extend_i4 decimal(p) + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 1000 + null + false + null + false + false + false + + false + + 扩展 JSON + extend_json + varchar(n) + ad6f9eff50476669df62b7601cbc3a2e0c905d36 500 @@ -584,8 +600,8 @@ varchar(n) - 63772c051414452204e91e8d0dabd1dbfd640326 - 1000 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 + 767 null false null @@ -936,8 +952,8 @@ nvarchar(n) - f48d759281e0da56d3e82430c3489d1276418f61 - 1000 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a + 767 null false null @@ -952,7 +968,7 @@ varchar(n) - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 10 null false @@ -968,8 +984,8 @@ decimal(p) - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b - 1000 + a886757c87fb1e04c5f84b6a802e129baaec2ca6 + 767 null false null @@ -3290,6 +3306,39 @@ 0 + + 80cd53da9d5a1b19676537e590e20fa2793e902c + 42c5d8f490f69b93e77698efa030ca23988ae696 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + @@ -3330,7 +3379,7 @@ - 63772c051414452204e91e8d0dabd1dbfd640326 + 5887f9db78a9ebc7b23b9a163c6f68100257c0e5 e8d877396943acfec73023dba2c1c6e3d7802d62 @@ -3363,7 +3412,7 @@ - be17e27c1f73fe128f00468cc83953077b7e00a9 + 16c9c333062ea3614d2e044803b872676c8a5377 23f973124aedd0244533f4e7b3b103c548b966be @@ -3396,7 +3445,7 @@ - b0bd388c14e5b2bbab9590f5247961a7edd9eb3b + a886757c87fb1e04c5f84b6a802e129baaec2ca6 984d5eac2b3221118a61655e4a5a49c78e0f0151 @@ -3495,7 +3544,7 @@ - f48d759281e0da56d3e82430c3489d1276418f61 + bf5e60dee567b3ed0f12e8f3ffa1f74e43012b3a 618194ebfc8c6c42efcef3a4af0b8054f6af209b diff --git a/web/src/main/resources/db/create/h2/test.sql b/web/src/main/resources/db/create/h2/test.sql index b44c94f5..d522c6da 100644 --- a/web/src/main/resources/db/create/h2/test.sql +++ b/web/src/main/resources/db/create/h2/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, diff --git a/web/src/main/resources/db/create/mssql/test.sql b/web/src/main/resources/db/create/mssql/test.sql index 4b48c1f4..4ae8a769 100644 --- a/web/src/main/resources/db/create/mssql/test.sql +++ b/web/src/main/resources/db/create/mssql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE [test_tree] ( [tree_code] varchar(64) NOT NULL, [parent_code] varchar(64) NOT NULL, - [parent_codes] varchar(1000) NOT NULL, + [parent_codes] varchar(767) NOT NULL, [tree_sort] decimal(10) NOT NULL, - [tree_sorts] varchar(1000) NOT NULL, + [tree_sorts] varchar(767) NOT NULL, [tree_leaf] char(1) NOT NULL, [tree_level] decimal(4) NOT NULL, - [tree_names] varchar(1000) NOT NULL, + [tree_names] varchar(767) NOT NULL, [tree_name] nvarchar(200) NOT NULL, [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, diff --git a/web/src/main/resources/db/create/mysql/test.sql b/web/src/main/resources/db/create/mysql/test.sql index 3165078a..06c78075 100644 --- a/web/src/main/resources/db/create/mysql/test.sql +++ b/web/src/main/resources/db/create/mysql/test.sql @@ -56,12 +56,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL COMMENT '节点编码', parent_code varchar(64) NOT NULL COMMENT '父级编号', - parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号', + parent_codes varchar(767) NOT NULL COMMENT '所有父级编号', tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）', - tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号', + tree_sorts varchar(767) NOT NULL COMMENT '所有排序号', tree_leaf char(1) NOT NULL COMMENT '是否最末级', tree_level decimal(4) NOT NULL COMMENT '层次级别', - tree_names varchar(1000) NOT NULL COMMENT '全节点名', + tree_names varchar(767) NOT NULL COMMENT '全节点名', tree_name varchar(200) NOT NULL COMMENT '节点名称', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/web/src/main/resources/db/create/oracle/test.sql b/web/src/main/resources/db/create/oracle/test.sql index 0ffbb56d..4308d8d3 100644 --- a/web/src/main/resources/db/create/oracle/test.sql +++ b/web/src/main/resources/db/create/oracle/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar2(64) NOT NULL, parent_code varchar2(64) NOT NULL, - parent_codes varchar2(1000) NOT NULL, + parent_codes varchar2(767) NOT NULL, tree_sort number(10) NOT NULL, - tree_sorts varchar2(1000) NOT NULL, + tree_sorts varchar2(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level number(4) NOT NULL, - tree_names varchar2(1000) NOT NULL, + tree_names varchar2(767) NOT NULL, tree_name nvarchar2(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web/src/main/resources/db/create/postgresql/test.sql b/web/src/main/resources/db/create/postgresql/test.sql index 15f53ad5..54758d68 100644 --- a/web/src/main/resources/db/create/postgresql/test.sql +++ b/web/src/main/resources/db/create/postgresql/test.sql @@ -55,12 +55,12 @@ CREATE TABLE test_tree ( tree_code varchar(64) NOT NULL, parent_code varchar(64) NOT NULL, - parent_codes varchar(1000) NOT NULL, + parent_codes varchar(767) NOT NULL, tree_sort decimal(10) NOT NULL, - tree_sorts varchar(1000) NOT NULL, + tree_sorts varchar(767) NOT NULL, tree_leaf char(1) NOT NULL, tree_level decimal(4) NOT NULL, - tree_names varchar(1000) NOT NULL, + tree_names varchar(767) NOT NULL, tree_name varchar(200) NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL,