diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index c6e5f006..5208c378 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 242 - 0 + 3295 + 1262 128 128 @@ -568,7 +568,7 @@ character(n) - b6d7af0ea5dad1a0925ff63d5bd2d33946640369 + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef 64 null false @@ -584,7 +584,7 @@ varchar(n) - 810c114a1c22e1766589ec6b6da020db683137f8 + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d 100 null false @@ -2728,7 +2728,7 @@ varchar(n) - 23e677fb626631780d092ad56ce7fddc1b470a85 + 1ac0c56274ea3dd84f0a1c22002a44373d216d5f null null false @@ -2741,7 +2741,7 @@ 推送时间 push_date - date + datetime 7f00758215841d707b4eb3b7bdb1f7cbb4752a95 @@ -3000,7 +3000,7 @@ varchar(n) - 6aebba19b24d1792a8b1e8a03ad43af4eb0b6ad3 + 3751f5815571927a4e0256d96332940be3298b32 null null false @@ -3013,7 +3013,7 @@ 读取时间 read_date - date + datetime ee6a8b248591b7d9507799c3f8f8a8fb3421ba7e @@ -8532,13 +8532,13 @@ - 23e677fb626631780d092ad56ce7fddc1b470a85 + 1ac0c56274ea3dd84f0a1c22002a44373d216d5f d91930762399578e65dc3d3b028052460dd28bdd - date + datetime false @@ -8598,13 +8598,13 @@ - 6aebba19b24d1792a8b1e8a03ad43af4eb0b6ad3 + 3751f5815571927a4e0256d96332940be3298b32 6a9f1a249aa33b4171ccaa3b9110e0ae015016cf - date + datetime false @@ -8769,893 +8769,6 @@ - - 9ab9e19921654f64fedac3e4a117a6109afc4e41 - 506 - 419 - Segoe UI - 9 - 3180 - 1279 - - 128 - 128 - 192 - - - - js_sys_msg_push - 消息推送表 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 36cf10f3b283e8d16b710fd8d3d21f21e4dbd02d - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - e0b1aac165f125b035482c239571e732457eb8a9 - cb11ee89c6123c0dc9ee5770735af56cc81c9b07 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a304841afc9968e7c8768979fe2ba3f2f315db78 - 116fd0c3c8c888027ad6419fe4eecb2a437e2bf1 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 98eb079aebd2f56c461cb92d97ab4d56f603b840 - a1af64703fec74d055736f7076d81ec79d6eb5e8 - - - - - clob - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 667704664e4b88b145cebda0d6a1fbafb53525f0 - 3f61ba87308a18681e25ed3c0f8f89acd60e063b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 - 7d9a7eae0e2ffc810fa615128b5dab3a613669af - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6b9d91752acccc30552bfaf5c7a8793defd825fb - 46d552357357e9392306339993963045756b751c - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 63ba93a883b0de38c98f6bd84772c7666b453576 - b6c0b7eeb563ed932c43700dfde767999087aaab - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1e639355834e23e3a39ac190e4768ef48463ae83 - 9ff498915b2e1106aa607a729127416ee63b29b2 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - c5364fcf3327275d038d229e22f80ce97c28d402 - 16e3cd493352220f14b79e39d620496e775ebc30 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 949f48cec7229094875af06d5c3ee4e7efbba1e0 - 9e783a5563fe8d587f3147ac34ea0ae33fa2b6f4 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5e197b7f106763a6952e72203fcc902cea793853 - d5747a323719560026f890ebebfa03b1d2127e22 - - - - - datetime - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5224ef38946585af8ba22f294756ffaecb434ddc - 385ac7698fd3d6123c18f7cd819a83e80313f614 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 28d67ce7603d635f412c5c3fe397b61580b962e5 - 5aad5e7593bf81a4a0ffd20ccdc387cd37189614 - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7f00758215841d707b4eb3b7bdb1f7cbb4752a95 - 05cbcd8fafc5638da0efbe52a620ffbf0d6d17af - - - - - integer - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 4dcc8f1c91f65017557f2c3840e9245b21b22937 - 5b814ffceb1e3c32a4f7d049bbdb00714fd8ea66 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 858797dd1d77830004f9030e960fedcc8fa3f4d5 - e7fe7d1c74a9703ea7a1e29120721f1176cb41f1 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a327f23161a6e1fad764457889fc84600651185b - 8cee701ce9202132b8ec5662c63b5c375e7cc1dc - - - - - clob - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - d58d7e14692bb3a537852c764bd0b13909be2167 - a2da872da6106c1f9cb8eba2ad45d84139744ee8 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 23e677fb626631780d092ad56ce7fddc1b470a85 - c3cd2effaf1523a2b4762fab9addcb786dfaf1de - - - - - date - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - fd2e1d009edc93641f31c8ce386a46089b346023 - bead1bd59c886dbba243654a0435de41897a6e4e - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6aebba19b24d1792a8b1e8a03ad43af4eb0b6ad3 - f63df89c936a59f159170698a25902a7557e204d - - - - - date - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - - - false - true - idx_sys_msg_push_type - - - - - cb11ee89c6123c0dc9ee5770735af56cc81c9b07 - false - - - - - false - true - idx_sys_msg_push_rc - - - - - 46d552357357e9392306339993963045756b751c - false - - - - - false - true - idx_sys_msg_push_uc - - - - - b6c0b7eeb563ed932c43700dfde767999087aaab - false - - - - - false - true - idx_sys_msg_push_suc - - - - - 16e3cd493352220f14b79e39d620496e775ebc30 - false - - - - - false - true - idx_sys_msg_push_pd - - - - - 5aad5e7593bf81a4a0ffd20ccdc387cd37189614 - false - - - - - false - true - idx_sys_msg_push_ps - - - - - a2da872da6106c1f9cb8eba2ad45d84139744ee8 - false - - - - - false - true - idx_sys_msg_push_rs - - - - - bead1bd59c886dbba243654a0435de41897a6e4e - false - - - - - false - true - idx_sys_msg_push_bk - - - - - 3f61ba87308a18681e25ed3c0f8f89acd60e063b - false - - - - - false - true - idx_sys_msg_push_bt - - - - - 7d9a7eae0e2ffc810fa615128b5dab3a613669af - false - - - - - false - true - idx_sys_msg_push_imp - - - - - 385ac7698fd3d6123c18f7cd819a83e80313f614 - false - - - - - - - - - -
ab8aa0c74f805f347640da80d9266971cc53ca68233 @@ -16177,6 +15290,893 @@
+ + 9ab9e19921654f64fedac3e4a117a6109afc4e41 + 506 + 419 + Segoe UI + 9 + 3180 + 1279 + + 128 + 128 + 192 + + + + js_sys_msg_push + 消息推送表 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 36cf10f3b283e8d16b710fd8d3d21f21e4dbd02d + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + e0b1aac165f125b035482c239571e732457eb8a9 + cb11ee89c6123c0dc9ee5770735af56cc81c9b07 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a304841afc9968e7c8768979fe2ba3f2f315db78 + 116fd0c3c8c888027ad6419fe4eecb2a437e2bf1 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 98eb079aebd2f56c461cb92d97ab4d56f603b840 + a1af64703fec74d055736f7076d81ec79d6eb5e8 + + + + + clob + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 667704664e4b88b145cebda0d6a1fbafb53525f0 + 3f61ba87308a18681e25ed3c0f8f89acd60e063b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 + 7d9a7eae0e2ffc810fa615128b5dab3a613669af + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6b9d91752acccc30552bfaf5c7a8793defd825fb + 46d552357357e9392306339993963045756b751c + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 63ba93a883b0de38c98f6bd84772c7666b453576 + b6c0b7eeb563ed932c43700dfde767999087aaab + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1e639355834e23e3a39ac190e4768ef48463ae83 + 9ff498915b2e1106aa607a729127416ee63b29b2 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c5364fcf3327275d038d229e22f80ce97c28d402 + 16e3cd493352220f14b79e39d620496e775ebc30 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 949f48cec7229094875af06d5c3ee4e7efbba1e0 + 9e783a5563fe8d587f3147ac34ea0ae33fa2b6f4 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5e197b7f106763a6952e72203fcc902cea793853 + d5747a323719560026f890ebebfa03b1d2127e22 + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5224ef38946585af8ba22f294756ffaecb434ddc + 385ac7698fd3d6123c18f7cd819a83e80313f614 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 28d67ce7603d635f412c5c3fe397b61580b962e5 + 5aad5e7593bf81a4a0ffd20ccdc387cd37189614 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7f00758215841d707b4eb3b7bdb1f7cbb4752a95 + 05cbcd8fafc5638da0efbe52a620ffbf0d6d17af + + + + + integer + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4dcc8f1c91f65017557f2c3840e9245b21b22937 + 5b814ffceb1e3c32a4f7d049bbdb00714fd8ea66 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 858797dd1d77830004f9030e960fedcc8fa3f4d5 + e7fe7d1c74a9703ea7a1e29120721f1176cb41f1 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a327f23161a6e1fad764457889fc84600651185b + 8cee701ce9202132b8ec5662c63b5c375e7cc1dc + + + + + clob + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + d58d7e14692bb3a537852c764bd0b13909be2167 + a2da872da6106c1f9cb8eba2ad45d84139744ee8 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1ac0c56274ea3dd84f0a1c22002a44373d216d5f + c3cd2effaf1523a2b4762fab9addcb786dfaf1de + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + fd2e1d009edc93641f31c8ce386a46089b346023 + bead1bd59c886dbba243654a0435de41897a6e4e + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3751f5815571927a4e0256d96332940be3298b32 + f63df89c936a59f159170698a25902a7557e204d + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + false + true + idx_sys_msg_push_type + + + + + cb11ee89c6123c0dc9ee5770735af56cc81c9b07 + false + + + + + false + true + idx_sys_msg_push_rc + + + + + 46d552357357e9392306339993963045756b751c + false + + + + + false + true + idx_sys_msg_push_uc + + + + + b6c0b7eeb563ed932c43700dfde767999087aaab + false + + + + + false + true + idx_sys_msg_push_suc + + + + + 16e3cd493352220f14b79e39d620496e775ebc30 + false + + + + + false + true + idx_sys_msg_push_pd + + + + + 5aad5e7593bf81a4a0ffd20ccdc387cd37189614 + false + + + + + false + true + idx_sys_msg_push_ps + + + + + a2da872da6106c1f9cb8eba2ad45d84139744ee8 + false + + + + + false + true + idx_sys_msg_push_rs + + + + + bead1bd59c886dbba243654a0435de41897a6e4e + false + + + + + false + true + idx_sys_msg_push_bk + + + + + 3f61ba87308a18681e25ed3c0f8f89acd60e063b + false + + + + + false + true + idx_sys_msg_push_bt + + + + + 7d9a7eae0e2ffc810fa615128b5dab3a613669af + false + + + + + false + true + idx_sys_msg_push_imp + + + + + 385ac7698fd3d6123c18f7cd819a83e80313f614 + false + + + + + + + + + +
@@ -16256,7 +16256,7 @@ BaseEntityCorp - b6d7af0ea5dad1a0925ff63d5bd2d33946640369 + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef b8ea4b73d6d32a222e5abfd453287575ae518480 @@ -16289,7 +16289,7 @@ - 810c114a1c22e1766589ec6b6da020db683137f8 + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d b94f5fe344185c40739cf93d1090686001bb11e0 diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index efe76989..35322c0a 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -531,9 +531,9 @@ CREATE TABLE [js_sys_msg_push] [push_return_msg_id] varchar(200), [push_return_content] text, [push_status] char(1), - [push_date] date, + [push_date] datetime, [read_status] char(1), - [read_date] date, + [read_date] datetime, PRIMARY KEY ([id]) ); @@ -560,9 +560,9 @@ CREATE TABLE [js_sys_msg_pushed] [push_return_code] varchar(200), [push_return_msg_id] varchar(200), [push_status] char(1), - [push_date] date, + [push_date] datetime, [read_status] char(1), - [read_date] date, + [read_date] datetime, PRIMARY KEY ([id]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 6dc53253..25a5a695 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -534,9 +534,9 @@ CREATE TABLE js_sys_msg_push push_return_msg_id varchar(200) COMMENT '推送返回消息编号', push_return_content text COMMENT '推送返回的内容信息', push_status char(1) COMMENT '推送状态（0未推送 1成功 2失败）', - push_date date COMMENT '推送时间', + push_date datetime COMMENT '推送时间', read_status char(1) COMMENT '读取状态（0未送达 1未读 2已读）', - read_date date COMMENT '读取时间', + read_date datetime COMMENT '读取时间', PRIMARY KEY (id) ) COMMENT = '消息推送表'; @@ -563,9 +563,9 @@ CREATE TABLE js_sys_msg_pushed push_return_code varchar(200) COMMENT '推送返回结果码', push_return_msg_id varchar(200) COMMENT '推送返回消息编号', push_status char(1) COMMENT '推送状态（0未推送 1成功 2失败）', - push_date date COMMENT '推送时间', + push_date datetime COMMENT '推送时间', read_status char(1) COMMENT '读取状态（0未送达 1未读 2已读）', - read_date date COMMENT '读取时间', + read_date datetime COMMENT '读取时间', PRIMARY KEY (id) ) COMMENT = '消息已推送表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 0b72caba..8bbc4b2c 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -531,9 +531,9 @@ CREATE TABLE js_sys_msg_push push_return_msg_id varchar2(200), push_return_content clob, push_status char(1), - push_date date, + push_date timestamp, read_status char(1), - read_date date, + read_date timestamp, PRIMARY KEY (id) ); @@ -560,9 +560,9 @@ CREATE TABLE js_sys_msg_pushed push_return_code varchar2(200), push_return_msg_id varchar2(200), push_status char(1), - push_date date, + push_date timestamp, read_status char(1), - read_date date, + read_date timestamp, PRIMARY KEY (id) ); diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 80996a44..6282ede7 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -531,9 +531,9 @@ CREATE TABLE js_sys_msg_push push_return_msg_id varchar(200), push_return_content text, push_status char(1), - push_date date, + push_date timestamp, read_status char(1), - read_date date, + read_date timestamp, PRIMARY KEY (id) ) WITHOUT OIDS; @@ -560,9 +560,9 @@ CREATE TABLE js_sys_msg_pushed push_return_code varchar(200), push_return_msg_id varchar(200), push_status char(1), - push_date date, + push_date timestamp, read_status char(1), - read_date date, + read_date timestamp, PRIMARY KEY (id) ) WITHOUT OIDS; diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index c34a9474..0b03f339 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -383,7 +383,8 @@ web: ${adminPath}/sys/online/count, ${adminPath}/**/treeData, ${adminPath}/file/**, - ${adminPath}/tags/* + ${adminPath}/tags/*, + ${adminPath}/msg/** # 前台自动切换到手机视图拦截器 mobile: diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.3.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.3.sql new file mode 100644 index 00000000..7d8cfac7 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.0.3.sql @@ -0,0 +1,9 @@ + +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516261885186048', '0', '0,', '9030', '0000009030,', '0', '0', '消息推送', '消息推送', '1', '', '', 'icon-envelope-letter', '', '', '60', '0', 'default', 'core', '0', 'system', getdate(), 'system', getdate(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516673799393280', '989516261885186048', '0,989516261885186048,', '30', '0000009030,0000000030,', '1', '1', '消息推送/未完成消息', '未完成消息', '1', '/msg/msgPush/list', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', getdate(), 'system', getdate(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516723044716544', '989516261885186048', '0,989516261885186048,', '60', '0000009030,0000000060,', '1', '1', '消息推送/已完成消息', '已完成消息', '1', '/msg/msgPush/list?pushed=true', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', getdate(), 'system', getdate(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516785057501184', '989516261885186048', '0,989516261885186048,', '90', '0000009030,0000000090,', '1', '1', '消息推送/消息模板管理', '消息模板管理', '1', '/msg/msgTemplate/list', '', '', '', 'msg:msgTemplate', '60', '1', 'default', 'core', '0', 'system', getdate(), 'system', getdate(), ''); diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.0.3.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.0.3.sql new file mode 100644 index 00000000..a55d6880 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.0.3.sql @@ -0,0 +1,17 @@ + +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516261885186048', '0', '0,', '9030', '0000009030,', '0', '0', '消息推送', '消息推送', '1', '', '', 'icon-envelope-letter', '', '', '60', '0', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516673799393280', '989516261885186048', '0,989516261885186048,', '30', '0000009030,0000000030,', '1', '1', '消息推送/未完成消息', '未完成消息', '1', '/msg/msgPush/list', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516723044716544', '989516261885186048', '0,989516261885186048,', '60', '0000009030,0000000060,', '1', '1', '消息推送/已完成消息', '已完成消息', '1', '/msg/msgPush/list?pushed=true', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516785057501184', '989516261885186048', '0,989516261885186048,', '90', '0000009030,0000000090,', '1', '1', '消息推送/消息模板管理', '消息模板管理', '1', '/msg/msgTemplate/list', '', '', '', 'msg:msgTemplate', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); + +ALTER TABLE `js_sys_msg_push` + CHANGE `push_date` `push_date` DATETIME NULL COMMENT '推送时间', + CHANGE `read_date` `read_date` DATETIME NULL COMMENT '读取时间'; +ALTER TABLE `js_sys_msg_pushed` + CHANGE `push_date` `push_date` DATETIME NULL COMMENT '推送时间', + CHANGE `read_date` `read_date` DATETIME NULL COMMENT '读取时间'; + diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.3.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.3.sql new file mode 100644 index 00000000..c2fdffcd --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.0.3.sql @@ -0,0 +1,9 @@ + +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516261885186048', '0', '0,', '9030', '0000009030,', '0', '0', '消息推送', '消息推送', '1', '', '', 'icon-envelope-letter', '', '', '60', '0', 'default', 'core', '0', 'system', sysdate, 'system', sysdate, ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516673799393280', '989516261885186048', '0,989516261885186048,', '30', '0000009030,0000000030,', '1', '1', '消息推送/未完成消息', '未完成消息', '1', '/msg/msgPush/list', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', sysdate, 'system', sysdate, ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516723044716544', '989516261885186048', '0,989516261885186048,', '60', '0000009030,0000000060,', '1', '1', '消息推送/已完成消息', '已完成消息', '1', '/msg/msgPush/list?pushed=true', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', sysdate, 'system', sysdate, ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516785057501184', '989516261885186048', '0,989516261885186048,', '90', '0000009030,0000000090,', '1', '1', '消息推送/消息模板管理', '消息模板管理', '1', '/msg/msgTemplate/list', '', '', '', 'msg:msgTemplate', '60', '1', 'default', 'core', '0', 'system', sysdate, 'system', sysdate, ''); diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.3.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.3.sql new file mode 100644 index 00000000..5fa02bc3 --- /dev/null +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.0.3.sql @@ -0,0 +1,9 @@ + +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516261885186048', '0', '0,', '9030', '0000009030,', '0', '0', '消息推送', '消息推送', '1', '', '', 'icon-envelope-letter', '', '', '60', '0', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516673799393280', '989516261885186048', '0,989516261885186048,', '30', '0000009030,0000000030,', '1', '1', '消息推送/未完成消息', '未完成消息', '1', '/msg/msgPush/list', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516723044716544', '989516261885186048', '0,989516261885186048,', '60', '0000009030,0000000060,', '1', '1', '消息推送/已完成消息', '已完成消息', '1', '/msg/msgPush/list?pushed=true', '', '', '', 'msg:msgPush', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); +INSERT INTO js_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, permission, weight, is_show, sys_code, module_codes, status, create_by, create_date, update_by, update_date, remarks) +VALUES ('989516785057501184', '989516261885186048', '0,989516261885186048,', '90', '0000009030,0000000090,', '1', '1', '消息推送/消息模板管理', '消息模板管理', '1', '/msg/msgTemplate/list', '', '', '', 'msg:msgTemplate', '60', '1', 'default', 'core', '0', 'system', now(), 'system', now(), ''); diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties index 749c28dc..77150cc7 100644 --- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties @@ -13,6 +13,7 @@ 新增=New 增行=New line 刷新=Refresh +查看=View 展开=Expand 展开一级=Expand level 1 折叠=Collapse diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index 57f236d8..1bd153f8 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -75,6 +75,16 @@ 在线=Online 注销=Logout +# =========== 消息提醒 =========== + +消息=Message +你有=You have +条消息=messages +查看全部消息=See All Messages +查看消息=See message +系统消息=System message +您有\ {0}\ 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。=You have {0} new message, because there are too many messages, for you merge, click View see details. + # =========== 个人中心 =========== 修改密保=Security question diff --git a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html index 729b56ef..07e9e721 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html +++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html @@ -17,7 +17,7 @@
    • <% include('/modules/sys/sysIndex/topMenuLang.html'){} %> <% include('/modules/sys/sysIndex/topMenuOnline.html'){} %> - <% //include('/modules/sys/sysIndex/topMenuMsg.html'){} %> + <% include('/modules/sys/sysIndex/topMenuMsg.html'){} %> <% //include('/modules/sys/sysIndex/topMenuNotify.html'){} %> <% //include('/modules/sys/sysIndex/topMenuTask.html'){} %> <% include('/modules/sys/sysIndex/topMenuUser.html'){} %> diff --git a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuMsg.html b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuMsg.html index cdceff6b..51278902 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuMsg.html +++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuMsg.html @@ -1,76 +1,44 @@
  • - 4 + 0 + + + + +
    • \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuOnline.html b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuOnline.html index ae05622d..8b2f44b7 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuOnline.html +++ b/modules/core/src/main/resources/views/modules/sys/sysIndex/topMenuOnline.html @@ -5,7 +5,7 @@