From 3b0060c300cd87db675dd41e715ad5448642e187 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 21 Mar 2019 17:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=84=9A=E6=9C=AC=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 674 +++++++++--------- modules/core/db/db2/core.sql | 2 +- modules/core/db/mssql/core.sql | 2 +- modules/core/db/mysql/core.sql | 2 +- modules/core/db/oracle/core.sql | 2 +- modules/core/db/postgresql/core.sql | 2 +- .../java/com/jeesite/test/DaoMapperTest.java | 2 + web/db/db2/core.sql | 2 +- web/db/mssql/core.sql | 2 +- web/db/mysql/core.sql | 2 +- web/db/oracle/core.sql | 2 +- web/db/postgresql/core.sql | 2 +- 12 files changed, 349 insertions(+), 347 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 306608eb..5326c77e 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -6044,343 +6044,6 @@ - - a66af690ade469b3b4b472b1680bdc1923d5c972 - 191 - 437 - Segoe UI - 9 - 3438 - 2076 - - 128 - 128 - 192 - - - - dedcc43c72ee436685481fa079d465594380905e - 519d64ec10e7c0df51e0b14489d6666c04b93e34 - a66af690ade469b3b4b472b1680bdc1923d5c972 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_msg_inner_record - 内部消息发送记录表 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 62cf3956f858a0d944fb3fe27dae7d861c74d3c1 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - f385f23b1163beb8b239a67f5a262c83fb46cae6 - 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 - dedcc43c72ee436685481fa079d465594380905e - 所属消息 - - 所属消息 - msg_inner_id - varchar(n) - - - false - true - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 63ba93a883b0de38c98f6bd84772c7666b453576 - f291132581e824fea013624aa68208b946df9fe4 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1e639355834e23e3a39ac190e4768ef48463ae83 - aaee2af8d27adc26dd44a3ed15d97e1d5a199041 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 33137e3fab07284df34eba0d850170935559f88b - 94c86f843b46a1e649f0e2333952b46978988a51 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - ee6a8b248591b7d9507799c3f8f8a8fb3421ba7e - 251c37ff5cda9c6aba51dc242966cddbf655942c - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - beb0b2bbc25fd0de1f47e6d31d88cbb3e2af3631 - a29b12cbd56c53b9e480f155f17c69e4bf4d8c7f - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - - - false - true - idx_sys_msg_inner_r_mi - - - - - f385f23b1163beb8b239a67f5a262c83fb46cae6 - false - - - - - false - true - idx_sys_msg_inner_r_ruc - - - - - f291132581e824fea013624aa68208b946df9fe4 - false - - - - - false - true - idx_sys_msg_inner_r_status - - - - - 94c86f843b46a1e649f0e2333952b46978988a51 - false - - - - - false - true - idx_sys_msg_inner_r_star - - - - - a29b12cbd56c53b9e480f155f17c69e4bf4d8c7f - false - - - - - - - - - -
a6c608c6e251fcd0abdda6ac92248c3955fccc20254 @@ -16332,6 +15995,343 @@
+ + a66af690ade469b3b4b472b1680bdc1923d5c972 + 191 + 437 + Segoe UI + 9 + 3438 + 2076 + + 128 + 128 + 192 + + + + dedcc43c72ee436685481fa079d465594380905e + 519d64ec10e7c0df51e0b14489d6666c04b93e34 + a66af690ade469b3b4b472b1680bdc1923d5c972 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_msg_inner_record + 内部消息发送记录表 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 62cf3956f858a0d944fb3fe27dae7d861c74d3c1 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + f385f23b1163beb8b239a67f5a262c83fb46cae6 + 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 + dedcc43c72ee436685481fa079d465594380905e + 所属消息 + + 所属消息 + msg_inner_id + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 63ba93a883b0de38c98f6bd84772c7666b453576 + f291132581e824fea013624aa68208b946df9fe4 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1e639355834e23e3a39ac190e4768ef48463ae83 + aaee2af8d27adc26dd44a3ed15d97e1d5a199041 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 33137e3fab07284df34eba0d850170935559f88b + 94c86f843b46a1e649f0e2333952b46978988a51 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ee6a8b248591b7d9507799c3f8f8a8fb3421ba7e + 251c37ff5cda9c6aba51dc242966cddbf655942c + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + beb0b2bbc25fd0de1f47e6d31d88cbb3e2af3631 + a29b12cbd56c53b9e480f155f17c69e4bf4d8c7f + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + false + true + idx_sys_msg_inner_r_mi + + + + + f385f23b1163beb8b239a67f5a262c83fb46cae6 + false + + + + + false + true + idx_sys_msg_inner_r_ruc + + + + + f291132581e824fea013624aa68208b946df9fe4 + false + + + + + false + true + idx_sys_msg_inner_r_status + + + + + 94c86f843b46a1e649f0e2333952b46978988a51 + false + + + + + false + true + idx_sys_msg_inner_r_star + + + + + a29b12cbd56c53b9e480f155f17c69e4bf4d8c7f + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 0a9c0737..366940f4 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL, msg_inner_id varchar(64) NOT NULL, - receive_user_code varchar(64), + receive_user_code varchar(64) NOT NULL, receive_user_name varchar(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp, diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 593862fd..2fb32dd6 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -503,7 +503,7 @@ CREATE TABLE [js_sys_msg_inner_record] ( [id] varchar(64) NOT NULL, [msg_inner_id] varchar(64) NOT NULL, - [receive_user_code] varchar(64), + [receive_user_code] varchar(64) NOT NULL, [receive_user_name] varchar(100) NOT NULL, [read_status] char(1) NOT NULL, [read_date] datetime, diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index cf0b337a..eb36c6b5 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -504,7 +504,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL COMMENT '编号', msg_inner_id varchar(64) NOT NULL COMMENT '所属消息', - receive_user_code varchar(64) COMMENT '接受者用户编码', + receive_user_code varchar(64) NOT NULL COMMENT '接受者用户编码', receive_user_name varchar(100) NOT NULL COMMENT '接受者用户姓名', read_status char(1) NOT NULL COMMENT '读取状态（0未送达 1已读 2未读）', read_date datetime COMMENT '阅读时间', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 9943b4e1..39112ebe 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar2(64) NOT NULL, msg_inner_id varchar2(64) NOT NULL, - receive_user_code varchar2(64), + receive_user_code varchar2(64) NOT NULL, receive_user_name varchar2(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp, diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 0a0403c5..193d3468 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL, msg_inner_id varchar(64) NOT NULL, - receive_user_code varchar(64), + receive_user_code varchar(64) NOT NULL, receive_user_name varchar(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp, diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java index 730f962c..753177e3 100644 --- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java +++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java @@ -59,8 +59,10 @@ public class DaoMapperTest extends BaseSpringContextTests { config.setIsSys("1"); Config config2 = (Config)config.clone(); config2.setId("2"); + config.setConfigKey("test2"); Config config3 = (Config)config.clone(); config3.setId("3"); + config.setConfigKey("test3"); System.out.println(configDao.insert(config)); System.out.println(configDao.insertBatch(ListUtils.newArrayList(config2, config3))); diff --git a/web/db/db2/core.sql b/web/db/db2/core.sql index 0a9c0737..366940f4 100644 --- a/web/db/db2/core.sql +++ b/web/db/db2/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL, msg_inner_id varchar(64) NOT NULL, - receive_user_code varchar(64), + receive_user_code varchar(64) NOT NULL, receive_user_name varchar(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp, diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 593862fd..2fb32dd6 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -503,7 +503,7 @@ CREATE TABLE [js_sys_msg_inner_record] ( [id] varchar(64) NOT NULL, [msg_inner_id] varchar(64) NOT NULL, - [receive_user_code] varchar(64), + [receive_user_code] varchar(64) NOT NULL, [receive_user_name] varchar(100) NOT NULL, [read_status] char(1) NOT NULL, [read_date] datetime, diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index cf0b337a..eb36c6b5 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -504,7 +504,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL COMMENT '编号', msg_inner_id varchar(64) NOT NULL COMMENT '所属消息', - receive_user_code varchar(64) COMMENT '接受者用户编码', + receive_user_code varchar(64) NOT NULL COMMENT '接受者用户编码', receive_user_name varchar(100) NOT NULL COMMENT '接受者用户姓名', read_status char(1) NOT NULL COMMENT '读取状态（0未送达 1已读 2未读）', read_date datetime COMMENT '阅读时间', diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 9943b4e1..39112ebe 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar2(64) NOT NULL, msg_inner_id varchar2(64) NOT NULL, - receive_user_code varchar2(64), + receive_user_code varchar2(64) NOT NULL, receive_user_name varchar2(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp, diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 0a0403c5..193d3468 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -503,7 +503,7 @@ CREATE TABLE js_sys_msg_inner_record ( id varchar(64) NOT NULL, msg_inner_id varchar(64) NOT NULL, - receive_user_code varchar(64), + receive_user_code varchar(64) NOT NULL, receive_user_name varchar(100) NOT NULL, read_status char(1) NOT NULL, read_date timestamp,