manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update config and erm

Browse Source
This commit is contained in:
thinkgem
2018-02-24 20:05:11 +08:00
parent 756e2af7ae
commit 2350eea786
9 changed files with 198 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
modules/core/db/core.erm
View File

@@ -10,9 +10,9 @@
<right_margin>30</right_margin>
</page_setting>
<category_index>0</category_index>
<zoom>1.0</zoom>
<x>109</x>
<y>1903</y>
<zoom>0.5</zoom>
<x>1293</x>
<y>485</y>
<default_color>
<r>128</r>
<g>128</g>
@@ -8282,13 +8282,13 @@
</table_properties>
</table>
<table>
<id>12fb747d5b3255fe6af29552bf66e95908ac6f45</id>
<id>5a55f28ca4981311f4dace00ee7a95458ae7e556</id>
<height>191</height>
<width>437</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>3804</x>
<y>1956</y>
<x>3780</x>
<y>1383</y>
<color>
<r>128</r>
<g>128</g>
@@ -8296,9 +8296,9 @@
</color>
<connections>
<relation>
<id>17196f8765286294a5c236803a5459c9edd88493</id>
<source>d020e8d2a030c61cef2f4a5dccd3edee3275ed7f</source>
<target>12fb747d5b3255fe6af29552bf66e95908ac6f45</target>
<id>e09e1c696eeab068658a8e23d0521c7bad167640</id>
<source>06bec351d8370028d7d476207a365f62c2774461</source>
<target>5a55f28ca4981311f4dace00ee7a95458ae7e556</target>
<source_xp>-1</source_xp>
<source_yp>-1</source_yp>
<target_xp>-1</target_xp>
@@ -8359,13 +8359,13 @@
</sequence>
</normal_column>
<normal_column>
<id>ffb4560727a7b938a074bc05a831bec12d7a7000</id>
<id>f385f23b1163beb8b239a67f5a262c83fb46cae6</id>
<referenced_column>5eecd1e4e1dc132da52de1bd1f59b13dd13a3587</referenced_column>
<relation>17196f8765286294a5c236803a5459c9edd88493</relation>
<relation>e09e1c696eeab068658a8e23d0521c7bad167640</relation>
<description>所属消息</description>
<unique_key_name></unique_key_name>
<logical_name>所属消息</logical_name>
<physical_name>message_id</physical_name>
<physical_name>msg_inner_id</physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
@@ -8562,12 +8562,12 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_record_mi</name>
<name>idx_sys_msg_inner_r_mi</name>
<type></type>
<description></description>
<columns>
<column>
<id>ffb4560727a7b938a074bc05a831bec12d7a7000</id>
<id>f385f23b1163beb8b239a67f5a262c83fb46cae6</id>
<desc>false</desc>
</column>
</columns>
@@ -8575,7 +8575,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_record_rc</name>
<name>idx_sys_msg_inner_r_rc</name>
<type></type>
<description></description>
<columns>
@@ -8588,7 +8588,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_record_ruc</name>
<name>idx_sys_msg_inner_r_ruc</name>
<type></type>
<description></description>
<columns>
@@ -8601,7 +8601,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_record_status</name>
<name>idx_sys_msg_inner_r_status</name>
<type></type>
<description></description>
<columns>
@@ -8614,7 +8614,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_record_star</name>
<name>idx_sys_msg_inner_r_star</name>
<type></type>
<description></description>
<columns>
@@ -10671,13 +10671,13 @@
</table_properties>
</table>
<table>
<id>dfa9e9f85b8f4c4a65c33fa5ac51c2edbab8305d</id>
<id>a7747e8ed06cfd1d77c15b7ce77082d651c45bfe</id>
<height>296</height>
<width>320</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>2969</x>
<y>1224</y>
<x>2750</x>
<y>1938</y>
<color>
<r>128</r>
<g>128</g>
@@ -10940,13 +10940,13 @@
</table_properties>
</table>
<table>
<id>d020e8d2a030c61cef2f4a5dccd3edee3275ed7f</id>
<id>06bec351d8370028d7d476207a365f62c2774461</id>
<height>443</height>
<width>484</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>3000</x>
<y>1836</y>
<x>3024</x>
<y>1257</y>
<color>
<r>128</r>
<g>128</g>
@@ -11429,7 +11429,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_cb</name>
<name>idx_sys_msg_inner_cb</name>
<type></type>
<description></description>
<columns>
@@ -11442,7 +11442,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_status</name>
<name>idx_sys_msg_inner_status</name>
<type></type>
<description></description>
<columns>
@@ -11455,7 +11455,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_cl</name>
<name>idx_sys_msg_inner_cl</name>
<type></type>
<description></description>
<columns>
@@ -11468,7 +11468,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_sc</name>
<name>idx_sys_msg_inner_sc</name>
<type></type>
<description></description>
<columns>
@@ -11481,7 +11481,7 @@
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_message_sd</name>
<name>idx_sys_msg_inner_sd</name>
<type></type>
<description></description>
<columns>
@@ -11499,13 +11499,13 @@
</table_properties>
</table>
<table>
<id>ec3befafc5dcca3e7d5fdcd6bbf927043f710321</id>
<height>373</height>
<id>3e332349cc4dee90c48f4a86de799362111ac497</id>
<height>506</height>
<width>419</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>3888</x>
<y>1164</y>
<x>3840</x>
<y>1825</y>
<color>
<r>128</r>
<g>128</g>
@@ -12386,13 +12386,13 @@
</table_properties>
</table>
<table>
<id>0644a53664ad02b879345ad7c216edfce2515716</id>
<height>373</height>
<id>332ac990d4a8e4dd77ca650d230c9f1deedee83b</id>
<height>506</height>
<width>419</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>3396</x>
<y>1164</y>
<x>3228</x>
<y>1825</y>
<color>
<r>128</r>
<g>128</g>

42
modules/core/db/mysql/core.sql
View File

@@ -63,16 +63,16 @@ DROP INDEX idx_sys_menu_sc ON js_sys_menu;
DROP INDEX idx_sys_menu_is ON js_sys_menu;
DROP INDEX idx_sys_menu_mcs ON js_sys_menu;
DROP INDEX idx_sys_module_status ON js_sys_module;
DROP INDEX idx_sys_message_cb ON js_sys_msg_inner;
DROP INDEX idx_sys_message_status ON js_sys_msg_inner;
DROP INDEX idx_sys_message_cl ON js_sys_msg_inner;
DROP INDEX idx_sys_message_sc ON js_sys_msg_inner;
DROP INDEX idx_sys_message_sd ON js_sys_msg_inner;
DROP INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_status ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_star ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_status ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_push_type ON js_sys_msg_push;
DROP INDEX idx_sys_msg_push_rc ON js_sys_msg_push;
DROP INDEX idx_sys_msg_push_uc ON js_sys_msg_push;
@@ -573,7 +573,7 @@ CREATE TABLE js_sys_msg_inner
CREATE TABLE js_sys_msg_inner_record
(
id varchar(64) NOT NULL COMMENT '编号',
message_id varchar(64) NOT NULL COMMENT '所属消息',
msg_inner_id varchar(64) NOT NULL COMMENT '所属消息',
receive_user_code varchar(64) COMMENT '接受者用户编码',
receive_user_name varchar(100) NOT NULL COMMENT '接受者用户姓名',
read_status char(1) NOT NULL COMMENT '读取状态（0未送达 1未读 2已读）',
@@ -923,16 +923,16 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code ASC);
CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show ASC);
CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes ASC);
CREATE INDEX idx_sys_module_status ON js_sys_module (status ASC);
CREATE INDEX idx_sys_message_cb ON js_sys_msg_inner (create_by ASC);
CREATE INDEX idx_sys_message_status ON js_sys_msg_inner (status ASC);
CREATE INDEX idx_sys_message_cl ON js_sys_msg_inner (content_level ASC);
CREATE INDEX idx_sys_message_sc ON js_sys_msg_inner (send_user_code ASC);
CREATE INDEX idx_sys_message_sd ON js_sys_msg_inner (send_date ASC);
CREATE INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record (message_id ASC);
CREATE INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_message_record_status ON js_sys_msg_inner_record (read_status ASC);
CREATE INDEX idx_sys_message_record_star ON js_sys_msg_inner_record (is_star ASC);
CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by ASC);
CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status ASC);
CREATE INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner (content_level ASC);
CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code ASC);
CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date ASC);
CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id ASC);
CREATE INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status ASC);
CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star ASC);
CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type ASC);
CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code ASC);
CREATE INDEX idx_sys_msg_push_uc ON js_sys_msg_push (receive_user_code ASC);

44
modules/core/db/oracle/core.sql
View File

@@ -62,16 +62,16 @@ DROP INDEX idx_sys_menu_sc;
DROP INDEX idx_sys_menu_is;
DROP INDEX idx_sys_menu_mcs;
DROP INDEX idx_sys_module_status;
DROP INDEX idx_sys_message_cb;
DROP INDEX idx_sys_message_status;
DROP INDEX idx_sys_message_cl;
DROP INDEX idx_sys_message_sc;
DROP INDEX idx_sys_message_sd;
DROP INDEX idx_sys_message_record_mi;
DROP INDEX idx_sys_message_record_rc;
DROP INDEX idx_sys_message_record_ruc;
DROP INDEX idx_sys_message_record_status;
DROP INDEX idx_sys_message_record_star;
DROP INDEX idx_sys_msg_inner_cb;
DROP INDEX idx_sys_msg_inner_status;
DROP INDEX idx_sys_msg_inner_cl;
DROP INDEX idx_sys_msg_inner_sc;
DROP INDEX idx_sys_msg_inner_sd;
DROP INDEX idx_sys_msg_inner_r_mi;
DROP INDEX idx_sys_msg_inner_r_rc;
DROP INDEX idx_sys_msg_inner_r_ruc;
DROP INDEX idx_sys_msg_inner_r_status;
DROP INDEX idx_sys_msg_inner_r_star;
DROP INDEX idx_sys_msg_push_type;
DROP INDEX idx_sys_msg_push_rc;
DROP INDEX idx_sys_msg_push_uc;
@@ -570,7 +570,7 @@ CREATE TABLE js_sys_msg_inner
CREATE TABLE js_sys_msg_inner_record
(
id varchar2(64) NOT NULL,
message_id varchar2(64) NOT NULL,
msg_inner_id varchar2(64) NOT NULL,
receive_user_code varchar2(64),
receive_user_name varchar2(100) NOT NULL,
read_status char(1) NOT NULL,
@@ -920,16 +920,16 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
CREATE INDEX idx_sys_module_status ON js_sys_module (status);
CREATE INDEX idx_sys_message_cb ON js_sys_msg_inner (create_by);
CREATE INDEX idx_sys_message_status ON js_sys_msg_inner (status);
CREATE INDEX idx_sys_message_cl ON js_sys_msg_inner (content_level);
CREATE INDEX idx_sys_message_sc ON js_sys_msg_inner (send_user_code);
CREATE INDEX idx_sys_message_sd ON js_sys_msg_inner (send_date);
CREATE INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record (message_id);
CREATE INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_message_record_status ON js_sys_msg_inner_record (read_status);
CREATE INDEX idx_sys_message_record_star ON js_sys_msg_inner_record (is_star);
CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);
CREATE INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner (content_level);
CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
CREATE INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
CREATE INDEX idx_sys_msg_push_uc ON js_sys_msg_push (receive_user_code);
@@ -1289,7 +1289,7 @@ COMMENT ON COLUMN js_sys_msg_inner.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_msg_inner.remarks IS '备注信息';
COMMENT ON TABLE js_sys_msg_inner_record IS '内部消息发送记录表';
COMMENT ON COLUMN js_sys_msg_inner_record.id IS '编号';
COMMENT ON COLUMN js_sys_msg_inner_record.message_id IS '所属消息';
COMMENT ON COLUMN js_sys_msg_inner_record.msg_inner_id IS '所属消息';
COMMENT ON COLUMN js_sys_msg_inner_record.receive_user_code IS '接受者用户编码';
COMMENT ON COLUMN js_sys_msg_inner_record.receive_user_name IS '接受者用户姓名';
COMMENT ON COLUMN js_sys_msg_inner_record.read_status IS '读取状态（0未送达 1未读 2已读）';

3
web/bin/init-data.bat
View File

@@ -24,7 +24,6 @@ echo.
cd %~dp0
cd ../
call mvn test -Dtest=com.jeesite.test.InitCoreData
call mvn test -Dtest=com.jeesite.test.InitGenData
call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData
pause

42
web/db/mysql/core.sql
View File

@@ -63,16 +63,16 @@ DROP INDEX idx_sys_menu_sc ON js_sys_menu;
DROP INDEX idx_sys_menu_is ON js_sys_menu;
DROP INDEX idx_sys_menu_mcs ON js_sys_menu;
DROP INDEX idx_sys_module_status ON js_sys_module;
DROP INDEX idx_sys_message_cb ON js_sys_msg_inner;
DROP INDEX idx_sys_message_status ON js_sys_msg_inner;
DROP INDEX idx_sys_message_cl ON js_sys_msg_inner;
DROP INDEX idx_sys_message_sc ON js_sys_msg_inner;
DROP INDEX idx_sys_message_sd ON js_sys_msg_inner;
DROP INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_status ON js_sys_msg_inner_record;
DROP INDEX idx_sys_message_record_star ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_status ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner;
DROP INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record;
DROP INDEX idx_sys_msg_push_type ON js_sys_msg_push;
DROP INDEX idx_sys_msg_push_rc ON js_sys_msg_push;
DROP INDEX idx_sys_msg_push_uc ON js_sys_msg_push;
@@ -573,7 +573,7 @@ CREATE TABLE js_sys_msg_inner
CREATE TABLE js_sys_msg_inner_record
(
id varchar(64) NOT NULL COMMENT '编号',
message_id varchar(64) NOT NULL COMMENT '所属消息',
msg_inner_id varchar(64) NOT NULL COMMENT '所属消息',
receive_user_code varchar(64) COMMENT '接受者用户编码',
receive_user_name varchar(100) NOT NULL COMMENT '接受者用户姓名',
read_status char(1) NOT NULL COMMENT '读取状态（0未送达 1未读 2已读）',
@@ -923,16 +923,16 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code ASC);
CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show ASC);
CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes ASC);
CREATE INDEX idx_sys_module_status ON js_sys_module (status ASC);
CREATE INDEX idx_sys_message_cb ON js_sys_msg_inner (create_by ASC);
CREATE INDEX idx_sys_message_status ON js_sys_msg_inner (status ASC);
CREATE INDEX idx_sys_message_cl ON js_sys_msg_inner (content_level ASC);
CREATE INDEX idx_sys_message_sc ON js_sys_msg_inner (send_user_code ASC);
CREATE INDEX idx_sys_message_sd ON js_sys_msg_inner (send_date ASC);
CREATE INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record (message_id ASC);
CREATE INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_message_record_status ON js_sys_msg_inner_record (read_status ASC);
CREATE INDEX idx_sys_message_record_star ON js_sys_msg_inner_record (is_star ASC);
CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by ASC);
CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status ASC);
CREATE INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner (content_level ASC);
CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code ASC);
CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date ASC);
CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id ASC);
CREATE INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code ASC);
CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status ASC);
CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star ASC);
CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type ASC);
CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code ASC);
CREATE INDEX idx_sys_msg_push_uc ON js_sys_msg_push (receive_user_code ASC);

95
web/db/oracle/core.sql
View File

@@ -39,6 +39,11 @@ DROP INDEX idx_sys_file_biz_ud;
DROP INDEX idx_sys_file_biz_bt;
DROP INDEX idx_sys_file_biz_bk;
DROP INDEX idx_sys_job_status;
DROP INDEX idx_sys_job_log_jn;
DROP INDEX idx_sys_job_log_jg;
DROP INDEX idx_sys_job_log_t;
DROP INDEX idx_sys_job_log_e;
DROP INDEX idx_sys_job_log_ie;
DROP INDEX idx_sys_lang_code;
DROP INDEX idx_sys_lang_type;
DROP INDEX idx_sys_log_cd;
@@ -46,6 +51,7 @@ DROP INDEX idx_sys_log_cc;
DROP INDEX idx_sys_log_lt;
DROP INDEX idx_sys_log_bk;
DROP INDEX idx_sys_log_bt;
DROP INDEX idx_sys_log_ie;
DROP INDEX idx_sys_menu_pc;
DROP INDEX idx_sys_menu_ts;
DROP INDEX idx_sys_menu_status;
@@ -56,16 +62,16 @@ DROP INDEX idx_sys_menu_sc;
DROP INDEX idx_sys_menu_is;
DROP INDEX idx_sys_menu_mcs;
DROP INDEX idx_sys_module_status;
DROP INDEX idx_sys_message_cb;
DROP INDEX idx_sys_message_status;
DROP INDEX idx_sys_message_cl;
DROP INDEX idx_sys_message_sc;
DROP INDEX idx_sys_message_sd;
DROP INDEX idx_sys_message_record_mi;
DROP INDEX idx_sys_message_record_rc;
DROP INDEX idx_sys_message_record_ruc;
DROP INDEX idx_sys_message_record_status;
DROP INDEX idx_sys_message_record_star;
DROP INDEX idx_sys_msg_inner_cb;
DROP INDEX idx_sys_msg_inner_status;
DROP INDEX idx_sys_msg_inner_cl;
DROP INDEX idx_sys_msg_inner_sc;
DROP INDEX idx_sys_msg_inner_sd;
DROP INDEX idx_sys_msg_inner_r_mi;
DROP INDEX idx_sys_msg_inner_r_rc;
DROP INDEX idx_sys_msg_inner_r_ruc;
DROP INDEX idx_sys_msg_inner_r_status;
DROP INDEX idx_sys_msg_inner_r_star;
DROP INDEX idx_sys_msg_push_type;
DROP INDEX idx_sys_msg_push_rc;
DROP INDEX idx_sys_msg_push_uc;
@@ -75,6 +81,7 @@ DROP INDEX idx_sys_msg_push_ps;
DROP INDEX idx_sys_msg_push_rs;
DROP INDEX idx_sys_msg_push_bk;
DROP INDEX idx_sys_msg_push_bt;
DROP INDEX idx_sys_msg_push_imp;
DROP INDEX idx_sys_msg_pushw_type;
DROP INDEX idx_sys_msg_pushw_rc;
DROP INDEX idx_sys_msg_pushw_uc;
@@ -84,6 +91,7 @@ DROP INDEX idx_sys_msg_pushw_ps;
DROP INDEX idx_sys_msg_pushw_rs;
DROP INDEX idx_sys_msg_pushw_bk;
DROP INDEX idx_sys_msg_pushw_bt;
DROP INDEX idx_sys_msg_pushw_imp;
DROP INDEX idx_sys_msg_tpl_key;
DROP INDEX idx_sys_msg_tpl_type;
DROP INDEX idx_sys_msg_tpl_status;
@@ -132,6 +140,7 @@ DROP TABLE js_sys_dict_data CASCADE CONSTRAINTS;
DROP TABLE js_sys_dict_type CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_upload CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_entity CASCADE CONSTRAINTS;
DROP TABLE js_sys_job_log CASCADE CONSTRAINTS;
DROP TABLE js_sys_job CASCADE CONSTRAINTS;
DROP TABLE js_sys_lang CASCADE CONSTRAINTS;
DROP TABLE js_sys_log CASCADE CONSTRAINTS;
@@ -399,6 +408,22 @@ CREATE TABLE js_sys_job
);
-- 作业调度日志表
CREATE TABLE js_sys_job_log
(
id varchar2(64) NOT NULL,
job_name varchar2(64) NOT NULL,
job_group varchar2(64) NOT NULL,
job_type varchar2(50),
job_event varchar2(200),
job_message varchar2(500),
is_exception char(1),
exception_info clob,
create_date timestamp,
PRIMARY KEY (id)
);
-- 国际化语言
CREATE TABLE js_sys_lang
(
@@ -420,18 +445,20 @@ CREATE TABLE js_sys_lang
CREATE TABLE js_sys_log
(
id varchar2(64) NOT NULL,
log_type char(1) NOT NULL,
log_type varchar2(50) NOT NULL,
log_title nvarchar2(500) NOT NULL,
create_by varchar2(64) NOT NULL,
create_by_name nvarchar2(100) NOT NULL,
create_date timestamp NOT NULL,
request_uri nvarchar2(255),
request_uri nvarchar2(500),
request_method varchar2(10),
request_params clob,
diff_modify_data clob,
biz_key varchar2(64),
biz_type varchar2(64),
remote_addr varchar2(255) NOT NULL,
server_addr varchar2(255) NOT NULL,
is_exception char(1),
exception_info clob,
user_agent nvarchar2(500),
device_name varchar2(100),
@@ -543,7 +570,7 @@ CREATE TABLE js_sys_msg_inner
CREATE TABLE js_sys_msg_inner_record
(
id varchar2(64) NOT NULL,
message_id varchar2(64) NOT NULL,
msg_inner_id varchar2(64) NOT NULL,
receive_user_code varchar2(64),
receive_user_name varchar2(100) NOT NULL,
read_status char(1) NOT NULL,
@@ -870,6 +897,11 @@ CREATE INDEX idx_sys_file_biz_ud ON js_sys_file_upload (update_date);
CREATE INDEX idx_sys_file_biz_bt ON js_sys_file_upload (biz_type);
CREATE INDEX idx_sys_file_biz_bk ON js_sys_file_upload (biz_key);
CREATE INDEX idx_sys_job_status ON js_sys_job (status);
CREATE INDEX idx_sys_job_log_jn ON js_sys_job_log (job_name);
CREATE INDEX idx_sys_job_log_jg ON js_sys_job_log (job_group);
CREATE INDEX idx_sys_job_log_t ON js_sys_job_log (job_type);
CREATE INDEX idx_sys_job_log_e ON js_sys_job_log (job_event);
CREATE INDEX idx_sys_job_log_ie ON js_sys_job_log (is_exception);
CREATE INDEX idx_sys_lang_code ON js_sys_lang (lang_code);
CREATE INDEX idx_sys_lang_type ON js_sys_lang (lang_type);
CREATE INDEX idx_sys_log_cd ON js_sys_log (create_by);
@@ -877,6 +909,7 @@ CREATE INDEX idx_sys_log_cc ON js_sys_log (corp_code);
CREATE INDEX idx_sys_log_lt ON js_sys_log (log_type);
CREATE INDEX idx_sys_log_bk ON js_sys_log (biz_key);
CREATE INDEX idx_sys_log_bt ON js_sys_log (biz_type);
CREATE INDEX idx_sys_log_ie ON js_sys_log (is_exception);
CREATE INDEX idx_sys_menu_pc ON js_sys_menu (parent_code);
CREATE INDEX idx_sys_menu_ts ON js_sys_menu (tree_sort);
CREATE INDEX idx_sys_menu_status ON js_sys_menu (status);
@@ -887,16 +920,16 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
CREATE INDEX idx_sys_module_status ON js_sys_module (status);
CREATE INDEX idx_sys_message_cb ON js_sys_msg_inner (create_by);
CREATE INDEX idx_sys_message_status ON js_sys_msg_inner (status);
CREATE INDEX idx_sys_message_cl ON js_sys_msg_inner (content_level);
CREATE INDEX idx_sys_message_sc ON js_sys_msg_inner (send_user_code);
CREATE INDEX idx_sys_message_sd ON js_sys_msg_inner (send_date);
CREATE INDEX idx_sys_message_record_mi ON js_sys_msg_inner_record (message_id);
CREATE INDEX idx_sys_message_record_rc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_message_record_ruc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_message_record_status ON js_sys_msg_inner_record (read_status);
CREATE INDEX idx_sys_message_record_star ON js_sys_msg_inner_record (is_star);
CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);
CREATE INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner (content_level);
CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code);
CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date);
CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id);
CREATE INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code);
CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status);
CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star);
CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type);
CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code);
CREATE INDEX idx_sys_msg_push_uc ON js_sys_msg_push (receive_user_code);
@@ -906,6 +939,7 @@ CREATE INDEX idx_sys_msg_push_ps ON js_sys_msg_push (push_status);
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);
@@ -915,6 +949,7 @@ 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_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);
@@ -1130,6 +1165,16 @@ COMMENT ON COLUMN js_sys_job.create_date IS '创建时间';
COMMENT ON COLUMN js_sys_job.update_by IS '更新者';
COMMENT ON COLUMN js_sys_job.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_job.remarks IS '备注信息';
COMMENT ON TABLE js_sys_job_log IS '作业调度日志表';
COMMENT ON COLUMN js_sys_job_log.id IS '编号';
COMMENT ON COLUMN js_sys_job_log.job_name IS '任务名称';
COMMENT ON COLUMN js_sys_job_log.job_group IS '任务组名';
COMMENT ON COLUMN js_sys_job_log.job_type IS '日志类型';
COMMENT ON COLUMN js_sys_job_log.job_event IS '日志事件';
COMMENT ON COLUMN js_sys_job_log.job_message IS '日志信息';
COMMENT ON COLUMN js_sys_job_log.is_exception IS '是否异常';
COMMENT ON COLUMN js_sys_job_log.exception_info IS '异常信息';
COMMENT ON COLUMN js_sys_job_log.create_date IS '创建时间';
COMMENT ON TABLE js_sys_lang IS '国际化语言';
COMMENT ON COLUMN js_sys_lang.id IS '编号';
COMMENT ON COLUMN js_sys_lang.module_code IS '归属模块';
@@ -1151,10 +1196,12 @@ COMMENT ON COLUMN js_sys_log.create_date IS '创建时间';
COMMENT ON COLUMN js_sys_log.request_uri IS '请求URI';
COMMENT ON COLUMN js_sys_log.request_method IS '操作方式';
COMMENT ON COLUMN js_sys_log.request_params IS '操作提交的数据';
COMMENT ON COLUMN js_sys_log.diff_modify_data IS '新旧数据比较结果';
COMMENT ON COLUMN js_sys_log.biz_key IS '业务主键';
COMMENT ON COLUMN js_sys_log.biz_type IS '业务类型';
COMMENT ON COLUMN js_sys_log.remote_addr IS '操作IP地址';
COMMENT ON COLUMN js_sys_log.server_addr IS '请求服务器地址';
COMMENT ON COLUMN js_sys_log.is_exception IS '是否异常';
COMMENT ON COLUMN js_sys_log.exception_info IS '异常信息';
COMMENT ON COLUMN js_sys_log.user_agent IS '用户代理';
COMMENT ON COLUMN js_sys_log.device_name IS '设备名称/操作系统';
@@ -1242,7 +1289,7 @@ COMMENT ON COLUMN js_sys_msg_inner.update_date IS '更新时间';
COMMENT ON COLUMN js_sys_msg_inner.remarks IS '备注信息';
COMMENT ON TABLE js_sys_msg_inner_record IS '内部消息发送记录表';
COMMENT ON COLUMN js_sys_msg_inner_record.id IS '编号';
COMMENT ON COLUMN js_sys_msg_inner_record.message_id IS '所属消息';
COMMENT ON COLUMN js_sys_msg_inner_record.msg_inner_id IS '所属消息';
COMMENT ON COLUMN js_sys_msg_inner_record.receive_user_code IS '接受者用户编码';
COMMENT ON COLUMN js_sys_msg_inner_record.receive_user_name IS '接受者用户姓名';
COMMENT ON COLUMN js_sys_msg_inner_record.read_status IS '读取状态（0未送达 1未读 2已读）';

28
web/src/main/java/com/jeesite/modules/config/task/MsgLocalSendTask.java
View File

@@ -1,28 +0,0 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*/
package com.jeesite.modules.config.task;
/**
* 消息发送服务，如果需要支持定时任务，则要在作业管理里添加该任务：msgLocalSendTask.execute();
* @author ThinkGem
* @version 2018年1月10日
*/
public class MsgLocalSendTask {
// <bean id="msgLocalSendTask" class="com.jeesite.modules.msg.task.MsgLocalSendTask">
// <property name="messageService" ref="messageService" />
// <property name="smsSendService">
// <bean class="com.jeesite.modules.msg.task.impl.SmsDemoSendService"></bean>
// </property>
// <property name="mailSendService">
// <bean class="com.jeesite.modules.msg.task.impl.EmailSendService"></bean>
// </property>
// <property name="weixinSendService">
// <bean class="com.jeesite.modules.msg.task.impl.WeixinSendService">
// <property name="weixinService" ref="weixinService"></property>
// </bean>
// </property>
// </bean>-->
}

25
web/src/main/java/com/jeesite/modules/config/task/MsgTaskConfig.java Normal file
View File

@@ -0,0 +1,25 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
*/
package com.jeesite.modules.config.task;
import org.springframework.context.annotation.Configuration;
/**
* 消息服务，如果需要支持定时任务，则要在作业管理里添加该任务：msgLocalSendTask.execute();
* @author ThinkGem
* @version 2018年1月10日
*/
@Configuration
public class MsgTaskConfig {
// @Bean
// public MsgLocalSendTask msgLocalSendTask(){
// MsgLocalSendTask bean = new MsgLocalSendTask();
// bean.setSmsDemoSendService(new SmsDemoSendService());
// bean.setEmailSendService(new EmailSendService());
// bean.setWeixinSendService(new WeixinSendService());
// return bean;
// }
}

11
web/src/main/resources/config/jeesite.yml
View File

@@ -21,18 +21,7 @@ jdbc:
# username: jeesite
# password: jeesite
# testSql: SELECT 1 FROM DUAL
# Redis 配置
redis:
# Redis 连接参数
host: 192.168.11.12
port: 6379
password: 1234
# 是否启用Redis系统缓存及会话
cacheAndSession: false
#============================#
#===== System settings ======#
#============================#