From c745e578f399b359b6da3842ecc7bee30fd0d19e Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 27 Apr 2020 23:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AE=9E=E4=BD=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E8=AF=86=E6=98=AF=E5=90=A6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BA=86=E6=B5=8F=E8=A7=88=E5=99=A8=E6=94=AF=E6=8C=81=E7=9A=84?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=A2=84=E8=A7=88=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 633 ++++++++++-------- .../main/resources/config/jeesite-core.yml | 2 + .../db/upgrade/core/mysql/mysql_4.2.0.sql | 4 + 3 files changed, 347 insertions(+), 292 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 38a5c5ab..e833e5c0 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 196 - 0 + 317 + 2406 128 128 @@ -1527,6 +1527,22 @@ file_path nvarchar(n) + + 1b5310d274dec8e27515ab91eb99537ee0d2a855 + 1 + null + false + null + false + false + false + + false + 0 无需处理；1 待生成；2 已生成； + 文件预览标记 + file_preview + character(n) + 4f74582c7985a857816f60e5cb57e552173d6786 31 @@ -4532,294 +4548,6 @@ - - ea4a1c367ad1a436305eb4c93d3d1f87ac140ba1 - 230 - 397 - Segoe UI - 9 - 852 - 2451 - - 128 - 128 - 192 - - - - js_sys_file_entity - 文件实体表 - - - - - - - 06c8c06de2e755ce212c5bc885d60c2258ed1582 - 54b86f255d95078898534902087fb704b4265b60 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - ec29482dfd36942ef1e387a971d5369769998532 - 43456d1adb849472d81f93cd41bce296bea397fb - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 680182522ef3e840e233d3245867576299b4f93a - e3cd211a088bfdbd2191f48258e13467f2ffcf8c - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1bd41a312e06683ca045e5888d200e0b78f34eb9 - 2dcc1d71db1ea31eb1662f7adcadecfc29fc76b9 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7a27c52b873302f4200abb336291da16d67e971c - deab0106de802419404e653b526b7cc4d38339d4 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 4f74582c7985a857816f60e5cb57e552173d6786 - db462e1b37a2d6bd5111a1ae2c1315cf186c5ded - - - - - decimal(p) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2e0369af3191a268fc1d03ea0eef107d0392be0 - c1a441e7ef57c97818f59db365d7162fda7cc0df - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - - - false - true - idx_sys_file_entity_md5 - - - - - 43456d1adb849472d81f93cd41bce296bea397fb - false - - - - - false - true - idx_sys_file_entity_size - - - - - db462e1b37a2d6bd5111a1ae2c1315cf186c5ded - false - - - - - - - - - -
fe9991829b27dafb45a95e13b6e9dd724b3bf424308 @@ -14673,7 +14401,7 @@ - b03ed6e9f99023dd0f52f5e982f309bdec4ce4a6 + 9d81b7570b3ebdcbbaeb87693137d863d319e742 ea4a1c367ad1a436305eb4c93d3d1f87ac140ba1 0e046d64a970231cfcc17e4e5c4bc281c289072f -1 @@ -14738,7 +14466,7 @@ fc44d466dd6009e48b5222d1d71e38d025194ff0 54b86f255d95078898534902087fb704b4265b60 - b03ed6e9f99023dd0f52f5e982f309bdec4ce4a6 + 9d81b7570b3ebdcbbaeb87693137d863d319e742 @@ -16745,6 +16473,327 @@
+ + ea4a1c367ad1a436305eb4c93d3d1f87ac140ba1 + 230 + 397 + Segoe UI + 9 + 852 + 2451 + + 128 + 128 + 192 + + + + js_sys_file_entity + 文件实体表 + + + + + + + 06c8c06de2e755ce212c5bc885d60c2258ed1582 + 54b86f255d95078898534902087fb704b4265b60 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ec29482dfd36942ef1e387a971d5369769998532 + 43456d1adb849472d81f93cd41bce296bea397fb + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 680182522ef3e840e233d3245867576299b4f93a + e3cd211a088bfdbd2191f48258e13467f2ffcf8c + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1bd41a312e06683ca045e5888d200e0b78f34eb9 + 2dcc1d71db1ea31eb1662f7adcadecfc29fc76b9 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7a27c52b873302f4200abb336291da16d67e971c + deab0106de802419404e653b526b7cc4d38339d4 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4f74582c7985a857816f60e5cb57e552173d6786 + db462e1b37a2d6bd5111a1ae2c1315cf186c5ded + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2e0369af3191a268fc1d03ea0eef107d0392be0 + c1a441e7ef57c97818f59db365d7162fda7cc0df + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1b5310d274dec8e27515ab91eb99537ee0d2a855 + 5014e5352b66ce51adc502d6628c87a0294ae63f + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + false + true + idx_sys_file_entity_md5 + + + + + 43456d1adb849472d81f93cd41bce296bea397fb + false + + + + + false + true + idx_sys_file_entity_size + + + + + db462e1b37a2d6bd5111a1ae2c1315cf186c5ded + false + + + + + + + + + +
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index f80f0d8e..45f319e9 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -265,6 +265,8 @@ job: isClustered: true dataSourceName: job clusterCheckinInterval: 1000 +# className: org.quartz.impl.jdbcjobstore.JobStoreTX +# className: org.quartz.impl.jdbcjobstore.JobStoreCMT # 调度日志配置 log: diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql index 223262b4..e2fa424f 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.2.0.sql @@ -2,3 +2,7 @@ -- 新增权限审计菜单 INSERT INTO ${_prefix}sys_menu(menu_code, parent_code, parent_codes, tree_sort, tree_sorts, tree_leaf, tree_level, tree_names, menu_name, menu_type, menu_href, menu_target, menu_icon, menu_color, menu_title, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks, extend_s1, extend_s2, extend_s3, extend_s4, extend_s5, extend_s6, extend_s7, extend_s8, extend_i1, extend_i2, extend_i3, extend_i4, extend_f1, extend_f2, extend_f3, extend_f4, extend_d1, extend_d2, extend_d3, extend_d4) VALUES ('1238121573028433920', '0', '0,', 10, '0000000010,', '1', 0, '安全审计', '安全审计', '1', '/sys/audit/list', '', 'icon-energy', '', '', 'sys:audit', 80, '1', 'default', 'core', '0', 'system', now(), 'system', now(), '', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +-- 文件表增加文件预览标记 +ALTER TABLE `${_prefix}sys_file_entity` +ADD COLUMN `file_preview` char(1) NULL COMMENT '文件预览标记' AFTER `file_meta`;