From 21207f5d800d9a0c15b3bbb1ee6524cc616dac45 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 23 Mar 2018 21:33:34 +0800 Subject: [PATCH] js_sys_msg_push_wait to js_sys_msg_pushed --- modules/core/db/core.erm | 94 +++++++++++++-------------- modules/core/db/mssql/core.sql | 26 ++++---- modules/core/db/mysql/core.sql | 28 ++++---- modules/core/db/mysql/create_user.sql | 3 +- modules/core/db/oracle/core.sql | 72 ++++++++++---------- modules/core/db/postgresql/core.sql | 72 ++++++++++---------- modules/core/pom.xml | 7 ++ web/db/mssql/core.sql | 26 ++++---- web/db/mysql/core.sql | 28 ++++---- web/db/mysql/create_user.sql | 3 +- web/db/oracle/core.sql | 72 ++++++++++---------- web/db/postgresql/core.sql | 72 ++++++++++---------- web/pom.xml | 7 -- 13 files changed, 256 insertions(+), 254 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index bb333442..24f672b9 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 0.8 - 0 - 1406 + 2476 + 1455 128 128 @@ -10793,7 +10793,7 @@ - 3e332349cc4dee90c48f4a86de799362111ac497 + 5073939d7dbd96d0da1b7879a566895d90f29624506419Segoe UI @@ -10807,8 +10807,8 @@ - js_sys_msg_push_wait - 消息待推送表 + js_sys_msg_pushed + 消息已推送表 @@ -10816,7 +10816,7 @@ 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 0744094f5aab9760c9590b0407295c556ea51fd4 + 94142372cce0fa637010a4f1ffbcdb09c79280a5 @@ -10849,7 +10849,7 @@ e0b1aac165f125b035482c239571e732457eb8a9 - 802c839a51f7f6bd90cf6037b6758c8ff1330a42 + 48e3284819439b54313716f5d1b7875d96a94346 @@ -10882,7 +10882,7 @@ a304841afc9968e7c8768979fe2ba3f2f315db78 - da2a732bb762f9c899103cd46681c818926f1aeb + 348959ce20a023239a8585e94c0a26b144c706ab @@ -10915,7 +10915,7 @@ 98eb079aebd2f56c461cb92d97ab4d56f603b840 - 4da41fb3f900fd011d77567cf0ac900b2c18db2c + ad07cb36dfe9635464a8e916d1ff0f4cfc39354d @@ -10948,7 +10948,7 @@ 667704664e4b88b145cebda0d6a1fbafb53525f0 - 7c1fcc6ee48ce6985cfd67af04fbda94164a92b2 + 9616345b413d53f24fcfbd55ef76702530c5e135 @@ -10981,7 +10981,7 @@ 4f9a5bc4fccb64cfc3a35f9209c9ce9bd044a6b9 - 06bec07afc77506106e74d52ca0f8d0ab203ebec + 5818a0753aaaf1b6f7b5424c94109feca573eb9f @@ -11014,7 +11014,7 @@ 6b9d91752acccc30552bfaf5c7a8793defd825fb - 3030ea0e133c205cd7de02e9656f49cd45888727 + c1ad8a7f995b7e311e37727f2d83ab2999378bc3 @@ -11047,7 +11047,7 @@ 63ba93a883b0de38c98f6bd84772c7666b453576 - ddeb3fb795b43881fe8277512eb6ddcb6d3c5875 + 1b9ecf5da3526acc0cb3d46775447289dd16781e @@ -11080,7 +11080,7 @@ 1e639355834e23e3a39ac190e4768ef48463ae83 - 00b6cbf48c49b92096150c7ea67356f1374bdf27 + 3020883c0d78e9565931fa4cae562f1c5cbff195 @@ -11113,7 +11113,7 @@ c5364fcf3327275d038d229e22f80ce97c28d402 - 6390942fdd516dfbf1a8547f34c395ba27c45465 + 14c84ddd9d5d81064c0e63c03280b58242e2f1ed @@ -11146,7 +11146,7 @@ 949f48cec7229094875af06d5c3ee4e7efbba1e0 - 0b3011dd73bfd5009a14b8fe3436049f0a66539b + de9e2029fea32d3ec721bed77fc90e870cee92a8 @@ -11179,7 +11179,7 @@ 17feded8380d1dfd61365054eb92bba181ae23f7 - fecddb5e522b73a99975db0c16ae8a487c3745dd + c3f7c93f6a43005dbffb262eb843aa0049a0069a @@ -11212,7 +11212,7 @@ 5224ef38946585af8ba22f294756ffaecb434ddc - 013bfa07b771054f43105d72d01324d96518fc38 + da53917cef89b0ef7e6a4e190f1d74149d1f02a4 @@ -11245,7 +11245,7 @@ 583e6e4dc671433b137fbbe6674bd7b81be2b57d - 0f154198da38cc614865ff87fd74c0665e31b9ec + 855d14e23de62f5e57c41c705f39d7b749735ad2 @@ -11278,7 +11278,7 @@ 7f00758215841d707b4eb3b7bdb1f7cbb4752a95 - 0443fa6277cc51ec8e20f5a9dae5403381257324 + d6eb5f4356f8b46b1b74ca1fa9fe95dd7557bf4e @@ -11311,7 +11311,7 @@ a327f23161a6e1fad764457889fc84600651185b - 2d3783d76578748731ab8cabf57776279843017c + 3c90e218d5110ed4f34dd5d7e8ee07dc468a57af @@ -11344,7 +11344,7 @@ 4dcc8f1c91f65017557f2c3840e9245b21b22937 - 9af4b998ab404996deecd44a48441f633450d10f + 8ecec2692a35e304edd445baa3944803de256ab4 @@ -11377,7 +11377,7 @@ 858797dd1d77830004f9030e960fedcc8fa3f4d5 - 88d026ef5288f46960efa59e3b26bf7eb9415eca + a068a1a088b68f12b1c8141e473d53e57faf9a6b @@ -11410,7 +11410,7 @@ d58d7e14692bb3a537852c764bd0b13909be2167 - e8c2b0e89c35ccc3f5b15c9f98ab407ba95219ba + 8c6b914d0d7fbf484630a356ebad0c5a370aefea @@ -11443,7 +11443,7 @@ 23e677fb626631780d092ad56ce7fddc1b470a85 - a223a180c40a31ab4b1151826b0eb42d08490c4d + d91930762399578e65dc3d3b028052460dd28bdd @@ -11476,7 +11476,7 @@ fd2e1d009edc93641f31c8ce386a46089b346023 - bb55c13a70f444ee4155ca716a3febae5349baf4 + 1f712c0ab5fc4ef2b948047153cbc63e947c4fc5 @@ -11509,7 +11509,7 @@ 6aebba19b24d1792a8b1e8a03ad43af4eb0b6ad3 - 91a015fa98c3ef791994f88f967bc2ad01b2d4ad + 6a9f1a249aa33b4171ccaa3b9110e0ae015016cf @@ -11545,12 +11545,12 @@ false true - idx_sys_msg_pushw_type + idx_sys_msg_pushed_type - 802c839a51f7f6bd90cf6037b6758c8ff1330a42 + 48e3284819439b54313716f5d1b7875d96a94346 false @@ -11558,12 +11558,12 @@ false true - idx_sys_msg_pushw_rc + idx_sys_msg_pushed_rc - 3030ea0e133c205cd7de02e9656f49cd45888727 + c1ad8a7f995b7e311e37727f2d83ab2999378bc3 false @@ -11571,12 +11571,12 @@ false true - idx_sys_msg_pushw_uc + idx_sys_msg_pushed_uc - ddeb3fb795b43881fe8277512eb6ddcb6d3c5875 + 1b9ecf5da3526acc0cb3d46775447289dd16781e false @@ -11584,12 +11584,12 @@ false true - idx_sys_msg_pushw_suc + idx_sys_msg_pushed_suc - 6390942fdd516dfbf1a8547f34c395ba27c45465 + 14c84ddd9d5d81064c0e63c03280b58242e2f1ed false @@ -11597,12 +11597,12 @@ false true - idx_sys_msg_pushw_pd + idx_sys_msg_pushed_pd - 0f154198da38cc614865ff87fd74c0665e31b9ec + 855d14e23de62f5e57c41c705f39d7b749735ad2 false @@ -11610,12 +11610,12 @@ false true - idx_sys_msg_pushw_ps + idx_sys_msg_pushed_ps - e8c2b0e89c35ccc3f5b15c9f98ab407ba95219ba + 8c6b914d0d7fbf484630a356ebad0c5a370aefea false @@ -11623,12 +11623,12 @@ false true - idx_sys_msg_pushw_rs + idx_sys_msg_pushed_rs - bb55c13a70f444ee4155ca716a3febae5349baf4 + 1f712c0ab5fc4ef2b948047153cbc63e947c4fc5 false @@ -11636,12 +11636,12 @@ false true - idx_sys_msg_pushw_bk + idx_sys_msg_pushed_bk - 7c1fcc6ee48ce6985cfd67af04fbda94164a92b2 + 9616345b413d53f24fcfbd55ef76702530c5e135 false @@ -11649,12 +11649,12 @@ false true - idx_sys_msg_pushw_bt + idx_sys_msg_pushed_bt - 06bec07afc77506106e74d52ca0f8d0ab203ebec + 5818a0753aaaf1b6f7b5424c94109feca573eb9f false @@ -11662,12 +11662,12 @@ false true - idx_sys_msg_pushw_imp + idx_sys_msg_pushed_imp - 013bfa07b771054f43105d72d01324d96518fc38 + da53917cef89b0ef7e6a4e190f1d74149d1f02a4 false diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index e2a9d53c..3be1775f 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -24,7 +24,7 @@ IF OBJECT_ID('[js_sys_module]') IS NOT NULL DROP TABLE [js_sys_module]; IF OBJECT_ID('[js_sys_msg_inner_record]') IS NOT NULL DROP TABLE [js_sys_msg_inner_record]; IF OBJECT_ID('[js_sys_msg_inner]') IS NOT NULL DROP TABLE [js_sys_msg_inner]; IF OBJECT_ID('[js_sys_msg_push]') IS NOT NULL DROP TABLE [js_sys_msg_push]; -IF OBJECT_ID('[js_sys_msg_push_wait]') IS NOT NULL DROP TABLE [js_sys_msg_push_wait]; +IF OBJECT_ID('[js_sys_msg_pushed]') IS NOT NULL DROP TABLE [js_sys_msg_pushed]; IF OBJECT_ID('[js_sys_msg_template]') IS NOT NULL DROP TABLE [js_sys_msg_template]; IF OBJECT_ID('[js_sys_office]') IS NOT NULL DROP TABLE [js_sys_office]; IF OBJECT_ID('[js_sys_post]') IS NOT NULL DROP TABLE [js_sys_post]; @@ -484,8 +484,8 @@ CREATE TABLE [js_sys_msg_push] ); --- 消息待推送表 -CREATE TABLE [js_sys_msg_push_wait] +-- 消息已推送表 +CREATE TABLE [js_sys_msg_pushed] ( [id] varchar(64) NOT NULL, [msg_type] varchar(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX [idx_sys_msg_push_rs] ON [js_sys_msg_push] ([read_status]); CREATE INDEX [idx_sys_msg_push_bk] ON [js_sys_msg_push] ([biz_key]); CREATE INDEX [idx_sys_msg_push_bt] ON [js_sys_msg_push] ([biz_type]); CREATE INDEX [idx_sys_msg_push_imp] ON [js_sys_msg_push] ([is_merge_push]); -CREATE INDEX [idx_sys_msg_pushw_type] ON [js_sys_msg_push_wait] ([msg_type]); -CREATE INDEX [idx_sys_msg_pushw_rc] ON [js_sys_msg_push_wait] ([receive_code]); -CREATE INDEX [idx_sys_msg_pushw_uc] ON [js_sys_msg_push_wait] ([receive_user_code]); -CREATE INDEX [idx_sys_msg_pushw_suc] ON [js_sys_msg_push_wait] ([send_user_code]); -CREATE INDEX [idx_sys_msg_pushw_pd] ON [js_sys_msg_push_wait] ([plan_push_date]); -CREATE INDEX [idx_sys_msg_pushw_ps] ON [js_sys_msg_push_wait] ([push_status]); -CREATE INDEX [idx_sys_msg_pushw_rs] ON [js_sys_msg_push_wait] ([read_status]); -CREATE INDEX [idx_sys_msg_pushw_bk] ON [js_sys_msg_push_wait] ([biz_key]); -CREATE INDEX [idx_sys_msg_pushw_bt] ON [js_sys_msg_push_wait] ([biz_type]); -CREATE INDEX [idx_sys_msg_pushw_imp] ON [js_sys_msg_push_wait] ([is_merge_push]); +CREATE INDEX [idx_sys_msg_pushed_type] ON [js_sys_msg_pushed] ([msg_type]); +CREATE INDEX [idx_sys_msg_pushed_rc] ON [js_sys_msg_pushed] ([receive_code]); +CREATE INDEX [idx_sys_msg_pushed_uc] ON [js_sys_msg_pushed] ([receive_user_code]); +CREATE INDEX [idx_sys_msg_pushed_suc] ON [js_sys_msg_pushed] ([send_user_code]); +CREATE INDEX [idx_sys_msg_pushed_pd] ON [js_sys_msg_pushed] ([plan_push_date]); +CREATE INDEX [idx_sys_msg_pushed_ps] ON [js_sys_msg_pushed] ([push_status]); +CREATE INDEX [idx_sys_msg_pushed_rs] ON [js_sys_msg_pushed] ([read_status]); +CREATE INDEX [idx_sys_msg_pushed_bk] ON [js_sys_msg_pushed] ([biz_key]); +CREATE INDEX [idx_sys_msg_pushed_bt] ON [js_sys_msg_pushed] ([biz_type]); +CREATE INDEX [idx_sys_msg_pushed_imp] ON [js_sys_msg_pushed] ([is_merge_push]); CREATE INDEX [idx_sys_msg_tpl_key] ON [js_sys_msg_template] ([tpl_key]); CREATE INDEX [idx_sys_msg_tpl_type] ON [js_sys_msg_template] ([tpl_type]); CREATE INDEX [idx_sys_msg_tpl_status] ON [js_sys_msg_template] ([status]); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index a9bec3c0..193d5d54 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -25,7 +25,7 @@ DROP TABLE IF EXISTS js_sys_module; DROP TABLE IF EXISTS js_sys_msg_inner_record; DROP TABLE IF EXISTS js_sys_msg_inner; DROP TABLE IF EXISTS js_sys_msg_push; -DROP TABLE IF EXISTS js_sys_msg_push_wait; +DROP TABLE IF EXISTS js_sys_msg_pushed; DROP TABLE IF EXISTS js_sys_msg_template; DROP TABLE IF EXISTS js_sys_office; DROP TABLE IF EXISTS js_sys_post; @@ -487,8 +487,8 @@ CREATE TABLE js_sys_msg_push ) COMMENT = '消息推送表'; --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar(64) NOT NULL COMMENT '编号', msg_type varchar(16) NOT NULL COMMENT '消息类型（PC APP 短信 邮件 微信）', @@ -513,7 +513,7 @@ CREATE TABLE js_sys_msg_push_wait read_status char(1) COMMENT '读取状态（0未送达 1未读 2已读）', read_date date COMMENT '读取时间', PRIMARY KEY (id) -) COMMENT = '消息待推送表'; +) COMMENT = '消息已推送表'; -- 消息模板 @@ -819,16 +819,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status ASC); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key ASC); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type ASC); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push ASC); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type ASC); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code ASC); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code ASC); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code ASC); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date ASC); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status ASC); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status ASC); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key ASC); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type ASC); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push ASC); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type ASC); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code ASC); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code ASC); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code ASC); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date ASC); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status ASC); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status ASC); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key ASC); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type ASC); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push ASC); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key ASC); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type ASC); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status ASC); diff --git a/modules/core/db/mysql/create_user.sql b/modules/core/db/mysql/create_user.sql index 0906cf7c..2a279d1f 100644 --- a/modules/core/db/mysql/create_user.sql +++ b/modules/core/db/mysql/create_user.sql @@ -1,5 +1,6 @@ -set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'; +-- 打开 my.ini 给 [mysqld] 增加如下配置： +-- sql_mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION create user 'jeesite'@'%' identified by 'jeesite'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index e32d5a78..fdd138e5 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -24,7 +24,7 @@ DROP TABLE js_sys_module CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_inner_record CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_inner CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_push CASCADE CONSTRAINTS; -DROP TABLE js_sys_msg_push_wait CASCADE CONSTRAINTS; +DROP TABLE js_sys_msg_pushed CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_template CASCADE CONSTRAINTS; DROP TABLE js_sys_office CASCADE CONSTRAINTS; DROP TABLE js_sys_post CASCADE CONSTRAINTS; @@ -484,8 +484,8 @@ CREATE TABLE js_sys_msg_push ); --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar2(64) NOT NULL, msg_type varchar2(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status); @@ -1195,29 +1195,29 @@ COMMENT ON COLUMN js_sys_msg_push.push_status IS '推送状态（0未推送 1成 COMMENT ON COLUMN js_sys_msg_push.push_date IS '推送时间'; COMMENT ON COLUMN js_sys_msg_push.read_status IS '读取状态（0未送达 1未读 2已读）'; COMMENT ON COLUMN js_sys_msg_push.read_date IS '读取时间'; -COMMENT ON TABLE js_sys_msg_push_wait IS '消息待推送表'; -COMMENT ON COLUMN js_sys_msg_push_wait.id IS '编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_title IS '消息标题'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_content IS '消息内容'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_key IS '业务主键'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_type IS '业务类型'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_code IS '接受者账号'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_code IS '接受者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_name IS '接受者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_code IS '发送者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_name IS '发送者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_date IS '发送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.is_merge_push IS '是否合并推送'; -COMMENT ON COLUMN js_sys_msg_push_wait.plan_push_date IS '计划推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_number IS '推送尝试次数'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_content IS '推送返回的内容信息'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_code IS '推送返回结果码'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_msg_id IS '推送返回消息编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_status IS '推送状态（0未推送 1成功 2失败）'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_date IS '推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_status IS '读取状态（0未送达 1未读 2已读）'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_date IS '读取时间'; +COMMENT ON TABLE js_sys_msg_pushed IS '消息已推送表'; +COMMENT ON COLUMN js_sys_msg_pushed.id IS '编号'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_title IS '消息标题'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_content IS '消息内容'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_key IS '业务主键'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_type IS '业务类型'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_code IS '接受者账号'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_code IS '接受者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_name IS '接受者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_code IS '发送者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_name IS '发送者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_date IS '发送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.is_merge_push IS '是否合并推送'; +COMMENT ON COLUMN js_sys_msg_pushed.plan_push_date IS '计划推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.push_number IS '推送尝试次数'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_content IS '推送返回的内容信息'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_code IS '推送返回结果码'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_msg_id IS '推送返回消息编号'; +COMMENT ON COLUMN js_sys_msg_pushed.push_status IS '推送状态（0未推送 1成功 2失败）'; +COMMENT ON COLUMN js_sys_msg_pushed.push_date IS '推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.read_status IS '读取状态（0未送达 1未读 2已读）'; +COMMENT ON COLUMN js_sys_msg_pushed.read_date IS '读取时间'; COMMENT ON TABLE js_sys_msg_template IS '消息模板'; COMMENT ON COLUMN js_sys_msg_template.id IS '编号'; COMMENT ON COLUMN js_sys_msg_template.module_code IS '归属模块'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 99e97fd7..c9c0d5fc 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -24,7 +24,7 @@ DROP TABLE IF EXISTS js_sys_module; DROP TABLE IF EXISTS js_sys_msg_inner_record; DROP TABLE IF EXISTS js_sys_msg_inner; DROP TABLE IF EXISTS js_sys_msg_push; -DROP TABLE IF EXISTS js_sys_msg_push_wait; +DROP TABLE IF EXISTS js_sys_msg_pushed; DROP TABLE IF EXISTS js_sys_msg_template; DROP TABLE IF EXISTS js_sys_office; DROP TABLE IF EXISTS js_sys_post; @@ -484,8 +484,8 @@ CREATE TABLE js_sys_msg_push ) WITHOUT OIDS; --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar(64) NOT NULL, msg_type varchar(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status); @@ -1195,29 +1195,29 @@ COMMENT ON COLUMN js_sys_msg_push.push_status IS '推送状态（0未推送 1成 COMMENT ON COLUMN js_sys_msg_push.push_date IS '推送时间'; COMMENT ON COLUMN js_sys_msg_push.read_status IS '读取状态（0未送达 1未读 2已读）'; COMMENT ON COLUMN js_sys_msg_push.read_date IS '读取时间'; -COMMENT ON TABLE js_sys_msg_push_wait IS '消息待推送表'; -COMMENT ON COLUMN js_sys_msg_push_wait.id IS '编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_title IS '消息标题'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_content IS '消息内容'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_key IS '业务主键'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_type IS '业务类型'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_code IS '接受者账号'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_code IS '接受者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_name IS '接受者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_code IS '发送者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_name IS '发送者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_date IS '发送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.is_merge_push IS '是否合并推送'; -COMMENT ON COLUMN js_sys_msg_push_wait.plan_push_date IS '计划推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_number IS '推送尝试次数'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_content IS '推送返回的内容信息'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_code IS '推送返回结果码'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_msg_id IS '推送返回消息编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_status IS '推送状态（0未推送 1成功 2失败）'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_date IS '推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_status IS '读取状态（0未送达 1未读 2已读）'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_date IS '读取时间'; +COMMENT ON TABLE js_sys_msg_pushed IS '消息已推送表'; +COMMENT ON COLUMN js_sys_msg_pushed.id IS '编号'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_title IS '消息标题'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_content IS '消息内容'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_key IS '业务主键'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_type IS '业务类型'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_code IS '接受者账号'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_code IS '接受者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_name IS '接受者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_code IS '发送者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_name IS '发送者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_date IS '发送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.is_merge_push IS '是否合并推送'; +COMMENT ON COLUMN js_sys_msg_pushed.plan_push_date IS '计划推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.push_number IS '推送尝试次数'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_content IS '推送返回的内容信息'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_code IS '推送返回结果码'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_msg_id IS '推送返回消息编号'; +COMMENT ON COLUMN js_sys_msg_pushed.push_status IS '推送状态（0未推送 1成功 2失败）'; +COMMENT ON COLUMN js_sys_msg_pushed.push_date IS '推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.read_status IS '读取状态（0未送达 1未读 2已读）'; +COMMENT ON COLUMN js_sys_msg_pushed.read_date IS '读取时间'; COMMENT ON TABLE js_sys_msg_template IS '消息模板'; COMMENT ON COLUMN js_sys_msg_template.id IS '编号'; COMMENT ON COLUMN js_sys_msg_template.module_code IS '归属模块'; diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0b1555b6..2d3c4000 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -29,6 +29,13 @@ ${project.parent.version} + + + com.jeesite + jeesite-module-devtools + ${project.parent.version} + + diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index e2a9d53c..3be1775f 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -24,7 +24,7 @@ IF OBJECT_ID('[js_sys_module]') IS NOT NULL DROP TABLE [js_sys_module]; IF OBJECT_ID('[js_sys_msg_inner_record]') IS NOT NULL DROP TABLE [js_sys_msg_inner_record]; IF OBJECT_ID('[js_sys_msg_inner]') IS NOT NULL DROP TABLE [js_sys_msg_inner]; IF OBJECT_ID('[js_sys_msg_push]') IS NOT NULL DROP TABLE [js_sys_msg_push]; -IF OBJECT_ID('[js_sys_msg_push_wait]') IS NOT NULL DROP TABLE [js_sys_msg_push_wait]; +IF OBJECT_ID('[js_sys_msg_pushed]') IS NOT NULL DROP TABLE [js_sys_msg_pushed]; IF OBJECT_ID('[js_sys_msg_template]') IS NOT NULL DROP TABLE [js_sys_msg_template]; IF OBJECT_ID('[js_sys_office]') IS NOT NULL DROP TABLE [js_sys_office]; IF OBJECT_ID('[js_sys_post]') IS NOT NULL DROP TABLE [js_sys_post]; @@ -484,8 +484,8 @@ CREATE TABLE [js_sys_msg_push] ); --- 消息待推送表 -CREATE TABLE [js_sys_msg_push_wait] +-- 消息已推送表 +CREATE TABLE [js_sys_msg_pushed] ( [id] varchar(64) NOT NULL, [msg_type] varchar(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX [idx_sys_msg_push_rs] ON [js_sys_msg_push] ([read_status]); CREATE INDEX [idx_sys_msg_push_bk] ON [js_sys_msg_push] ([biz_key]); CREATE INDEX [idx_sys_msg_push_bt] ON [js_sys_msg_push] ([biz_type]); CREATE INDEX [idx_sys_msg_push_imp] ON [js_sys_msg_push] ([is_merge_push]); -CREATE INDEX [idx_sys_msg_pushw_type] ON [js_sys_msg_push_wait] ([msg_type]); -CREATE INDEX [idx_sys_msg_pushw_rc] ON [js_sys_msg_push_wait] ([receive_code]); -CREATE INDEX [idx_sys_msg_pushw_uc] ON [js_sys_msg_push_wait] ([receive_user_code]); -CREATE INDEX [idx_sys_msg_pushw_suc] ON [js_sys_msg_push_wait] ([send_user_code]); -CREATE INDEX [idx_sys_msg_pushw_pd] ON [js_sys_msg_push_wait] ([plan_push_date]); -CREATE INDEX [idx_sys_msg_pushw_ps] ON [js_sys_msg_push_wait] ([push_status]); -CREATE INDEX [idx_sys_msg_pushw_rs] ON [js_sys_msg_push_wait] ([read_status]); -CREATE INDEX [idx_sys_msg_pushw_bk] ON [js_sys_msg_push_wait] ([biz_key]); -CREATE INDEX [idx_sys_msg_pushw_bt] ON [js_sys_msg_push_wait] ([biz_type]); -CREATE INDEX [idx_sys_msg_pushw_imp] ON [js_sys_msg_push_wait] ([is_merge_push]); +CREATE INDEX [idx_sys_msg_pushed_type] ON [js_sys_msg_pushed] ([msg_type]); +CREATE INDEX [idx_sys_msg_pushed_rc] ON [js_sys_msg_pushed] ([receive_code]); +CREATE INDEX [idx_sys_msg_pushed_uc] ON [js_sys_msg_pushed] ([receive_user_code]); +CREATE INDEX [idx_sys_msg_pushed_suc] ON [js_sys_msg_pushed] ([send_user_code]); +CREATE INDEX [idx_sys_msg_pushed_pd] ON [js_sys_msg_pushed] ([plan_push_date]); +CREATE INDEX [idx_sys_msg_pushed_ps] ON [js_sys_msg_pushed] ([push_status]); +CREATE INDEX [idx_sys_msg_pushed_rs] ON [js_sys_msg_pushed] ([read_status]); +CREATE INDEX [idx_sys_msg_pushed_bk] ON [js_sys_msg_pushed] ([biz_key]); +CREATE INDEX [idx_sys_msg_pushed_bt] ON [js_sys_msg_pushed] ([biz_type]); +CREATE INDEX [idx_sys_msg_pushed_imp] ON [js_sys_msg_pushed] ([is_merge_push]); CREATE INDEX [idx_sys_msg_tpl_key] ON [js_sys_msg_template] ([tpl_key]); CREATE INDEX [idx_sys_msg_tpl_type] ON [js_sys_msg_template] ([tpl_type]); CREATE INDEX [idx_sys_msg_tpl_status] ON [js_sys_msg_template] ([status]); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index a9bec3c0..193d5d54 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -25,7 +25,7 @@ DROP TABLE IF EXISTS js_sys_module; DROP TABLE IF EXISTS js_sys_msg_inner_record; DROP TABLE IF EXISTS js_sys_msg_inner; DROP TABLE IF EXISTS js_sys_msg_push; -DROP TABLE IF EXISTS js_sys_msg_push_wait; +DROP TABLE IF EXISTS js_sys_msg_pushed; DROP TABLE IF EXISTS js_sys_msg_template; DROP TABLE IF EXISTS js_sys_office; DROP TABLE IF EXISTS js_sys_post; @@ -487,8 +487,8 @@ CREATE TABLE js_sys_msg_push ) COMMENT = '消息推送表'; --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar(64) NOT NULL COMMENT '编号', msg_type varchar(16) NOT NULL COMMENT '消息类型（PC APP 短信 邮件 微信）', @@ -513,7 +513,7 @@ CREATE TABLE js_sys_msg_push_wait read_status char(1) COMMENT '读取状态（0未送达 1未读 2已读）', read_date date COMMENT '读取时间', PRIMARY KEY (id) -) COMMENT = '消息待推送表'; +) COMMENT = '消息已推送表'; -- 消息模板 @@ -819,16 +819,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status ASC); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key ASC); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type ASC); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push ASC); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type ASC); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code ASC); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code ASC); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code ASC); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date ASC); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status ASC); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status ASC); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key ASC); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type ASC); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push ASC); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type ASC); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code ASC); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code ASC); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code ASC); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date ASC); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status ASC); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status ASC); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key ASC); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type ASC); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push ASC); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key ASC); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type ASC); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status ASC); diff --git a/web/db/mysql/create_user.sql b/web/db/mysql/create_user.sql index 0906cf7c..2a279d1f 100644 --- a/web/db/mysql/create_user.sql +++ b/web/db/mysql/create_user.sql @@ -1,5 +1,6 @@ -set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'; +-- 打开 my.ini 给 [mysqld] 增加如下配置： +-- sql_mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION create user 'jeesite'@'%' identified by 'jeesite'; diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index e32d5a78..fdd138e5 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -24,7 +24,7 @@ DROP TABLE js_sys_module CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_inner_record CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_inner CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_push CASCADE CONSTRAINTS; -DROP TABLE js_sys_msg_push_wait CASCADE CONSTRAINTS; +DROP TABLE js_sys_msg_pushed CASCADE CONSTRAINTS; DROP TABLE js_sys_msg_template CASCADE CONSTRAINTS; DROP TABLE js_sys_office CASCADE CONSTRAINTS; DROP TABLE js_sys_post CASCADE CONSTRAINTS; @@ -484,8 +484,8 @@ CREATE TABLE js_sys_msg_push ); --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar2(64) NOT NULL, msg_type varchar2(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status); @@ -1195,29 +1195,29 @@ COMMENT ON COLUMN js_sys_msg_push.push_status IS '推送状态（0未推送 1成 COMMENT ON COLUMN js_sys_msg_push.push_date IS '推送时间'; COMMENT ON COLUMN js_sys_msg_push.read_status IS '读取状态（0未送达 1未读 2已读）'; COMMENT ON COLUMN js_sys_msg_push.read_date IS '读取时间'; -COMMENT ON TABLE js_sys_msg_push_wait IS '消息待推送表'; -COMMENT ON COLUMN js_sys_msg_push_wait.id IS '编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_title IS '消息标题'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_content IS '消息内容'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_key IS '业务主键'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_type IS '业务类型'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_code IS '接受者账号'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_code IS '接受者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_name IS '接受者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_code IS '发送者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_name IS '发送者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_date IS '发送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.is_merge_push IS '是否合并推送'; -COMMENT ON COLUMN js_sys_msg_push_wait.plan_push_date IS '计划推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_number IS '推送尝试次数'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_content IS '推送返回的内容信息'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_code IS '推送返回结果码'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_msg_id IS '推送返回消息编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_status IS '推送状态（0未推送 1成功 2失败）'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_date IS '推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_status IS '读取状态（0未送达 1未读 2已读）'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_date IS '读取时间'; +COMMENT ON TABLE js_sys_msg_pushed IS '消息已推送表'; +COMMENT ON COLUMN js_sys_msg_pushed.id IS '编号'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_title IS '消息标题'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_content IS '消息内容'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_key IS '业务主键'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_type IS '业务类型'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_code IS '接受者账号'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_code IS '接受者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_name IS '接受者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_code IS '发送者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_name IS '发送者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_date IS '发送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.is_merge_push IS '是否合并推送'; +COMMENT ON COLUMN js_sys_msg_pushed.plan_push_date IS '计划推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.push_number IS '推送尝试次数'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_content IS '推送返回的内容信息'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_code IS '推送返回结果码'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_msg_id IS '推送返回消息编号'; +COMMENT ON COLUMN js_sys_msg_pushed.push_status IS '推送状态（0未推送 1成功 2失败）'; +COMMENT ON COLUMN js_sys_msg_pushed.push_date IS '推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.read_status IS '读取状态（0未送达 1未读 2已读）'; +COMMENT ON COLUMN js_sys_msg_pushed.read_date IS '读取时间'; COMMENT ON TABLE js_sys_msg_template IS '消息模板'; COMMENT ON COLUMN js_sys_msg_template.id IS '编号'; COMMENT ON COLUMN js_sys_msg_template.module_code IS '归属模块'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 99e97fd7..c9c0d5fc 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -24,7 +24,7 @@ DROP TABLE IF EXISTS js_sys_module; DROP TABLE IF EXISTS js_sys_msg_inner_record; DROP TABLE IF EXISTS js_sys_msg_inner; DROP TABLE IF EXISTS js_sys_msg_push; -DROP TABLE IF EXISTS js_sys_msg_push_wait; +DROP TABLE IF EXISTS js_sys_msg_pushed; DROP TABLE IF EXISTS js_sys_msg_template; DROP TABLE IF EXISTS js_sys_office; DROP TABLE IF EXISTS js_sys_post; @@ -484,8 +484,8 @@ CREATE TABLE js_sys_msg_push ) WITHOUT OIDS; --- 消息待推送表 -CREATE TABLE js_sys_msg_push_wait +-- 消息已推送表 +CREATE TABLE js_sys_msg_pushed ( id varchar(64) NOT NULL, msg_type varchar(16) NOT NULL, @@ -816,16 +816,16 @@ CREATE INDEX idx_sys_msg_push_rs ON js_sys_msg_push (read_status); CREATE INDEX idx_sys_msg_push_bk ON js_sys_msg_push (biz_key); CREATE INDEX idx_sys_msg_push_bt ON js_sys_msg_push (biz_type); CREATE INDEX idx_sys_msg_push_imp ON js_sys_msg_push (is_merge_push); -CREATE INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait (msg_type); -CREATE INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait (receive_code); -CREATE INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait (receive_user_code); -CREATE INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait (send_user_code); -CREATE INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait (plan_push_date); -CREATE INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait (push_status); -CREATE INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait (read_status); -CREATE INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait (biz_key); -CREATE INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait (biz_type); -CREATE INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait (is_merge_push); +CREATE INDEX idx_sys_msg_pushed_type ON js_sys_msg_pushed (msg_type); +CREATE INDEX idx_sys_msg_pushed_rc ON js_sys_msg_pushed (receive_code); +CREATE INDEX idx_sys_msg_pushed_uc ON js_sys_msg_pushed (receive_user_code); +CREATE INDEX idx_sys_msg_pushed_suc ON js_sys_msg_pushed (send_user_code); +CREATE INDEX idx_sys_msg_pushed_pd ON js_sys_msg_pushed (plan_push_date); +CREATE INDEX idx_sys_msg_pushed_ps ON js_sys_msg_pushed (push_status); +CREATE INDEX idx_sys_msg_pushed_rs ON js_sys_msg_pushed (read_status); +CREATE INDEX idx_sys_msg_pushed_bk ON js_sys_msg_pushed (biz_key); +CREATE INDEX idx_sys_msg_pushed_bt ON js_sys_msg_pushed (biz_type); +CREATE INDEX idx_sys_msg_pushed_imp ON js_sys_msg_pushed (is_merge_push); CREATE INDEX idx_sys_msg_tpl_key ON js_sys_msg_template (tpl_key); CREATE INDEX idx_sys_msg_tpl_type ON js_sys_msg_template (tpl_type); CREATE INDEX idx_sys_msg_tpl_status ON js_sys_msg_template (status); @@ -1195,29 +1195,29 @@ COMMENT ON COLUMN js_sys_msg_push.push_status IS '推送状态（0未推送 1成 COMMENT ON COLUMN js_sys_msg_push.push_date IS '推送时间'; COMMENT ON COLUMN js_sys_msg_push.read_status IS '读取状态（0未送达 1未读 2已读）'; COMMENT ON COLUMN js_sys_msg_push.read_date IS '读取时间'; -COMMENT ON TABLE js_sys_msg_push_wait IS '消息待推送表'; -COMMENT ON COLUMN js_sys_msg_push_wait.id IS '编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_title IS '消息标题'; -COMMENT ON COLUMN js_sys_msg_push_wait.msg_content IS '消息内容'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_key IS '业务主键'; -COMMENT ON COLUMN js_sys_msg_push_wait.biz_type IS '业务类型'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_code IS '接受者账号'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_code IS '接受者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.receive_user_name IS '接受者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_code IS '发送者用户编码'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_user_name IS '发送者用户姓名'; -COMMENT ON COLUMN js_sys_msg_push_wait.send_date IS '发送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.is_merge_push IS '是否合并推送'; -COMMENT ON COLUMN js_sys_msg_push_wait.plan_push_date IS '计划推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_number IS '推送尝试次数'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_content IS '推送返回的内容信息'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_code IS '推送返回结果码'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_return_msg_id IS '推送返回消息编号'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_status IS '推送状态（0未推送 1成功 2失败）'; -COMMENT ON COLUMN js_sys_msg_push_wait.push_date IS '推送时间'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_status IS '读取状态（0未送达 1未读 2已读）'; -COMMENT ON COLUMN js_sys_msg_push_wait.read_date IS '读取时间'; +COMMENT ON TABLE js_sys_msg_pushed IS '消息已推送表'; +COMMENT ON COLUMN js_sys_msg_pushed.id IS '编号'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_type IS '消息类型（PC APP 短信 邮件 微信）'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_title IS '消息标题'; +COMMENT ON COLUMN js_sys_msg_pushed.msg_content IS '消息内容'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_key IS '业务主键'; +COMMENT ON COLUMN js_sys_msg_pushed.biz_type IS '业务类型'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_code IS '接受者账号'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_code IS '接受者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.receive_user_name IS '接受者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_code IS '发送者用户编码'; +COMMENT ON COLUMN js_sys_msg_pushed.send_user_name IS '发送者用户姓名'; +COMMENT ON COLUMN js_sys_msg_pushed.send_date IS '发送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.is_merge_push IS '是否合并推送'; +COMMENT ON COLUMN js_sys_msg_pushed.plan_push_date IS '计划推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.push_number IS '推送尝试次数'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_content IS '推送返回的内容信息'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_code IS '推送返回结果码'; +COMMENT ON COLUMN js_sys_msg_pushed.push_return_msg_id IS '推送返回消息编号'; +COMMENT ON COLUMN js_sys_msg_pushed.push_status IS '推送状态（0未推送 1成功 2失败）'; +COMMENT ON COLUMN js_sys_msg_pushed.push_date IS '推送时间'; +COMMENT ON COLUMN js_sys_msg_pushed.read_status IS '读取状态（0未送达 1未读 2已读）'; +COMMENT ON COLUMN js_sys_msg_pushed.read_date IS '读取时间'; COMMENT ON TABLE js_sys_msg_template IS '消息模板'; COMMENT ON COLUMN js_sys_msg_template.id IS '编号'; COMMENT ON COLUMN js_sys_msg_template.module_code IS '归属模块'; diff --git a/web/pom.xml b/web/pom.xml index e4d94a0f..d8f15909 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -43,13 +43,6 @@ ${project.parent.version} - - - com.jeesite - jeesite-module-devtools - ${project.parent.version} - -