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

job添加instanceName集群的实例名字段，与yml配置文件一致，在微服务模块中使用非常重要；优化job目标字符串中包含单引号的时候XSS问题；若你重写了jobForm.html你需要同步下次此文件；若你在yml中修改了instanceName名字，你需要更新下sys_job的instanceName字段为你修改的名字。

Browse Source
This commit is contained in:
thinkgem
2019-03-05 22:10:09 +08:00
parent 2e4ca4b2ad
commit ee9f3fd580
12 changed files with 502 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,8 @@
</page_setting>
<category_index>0</category_index>
<zoom>1.0</zoom>
<x>1129</x>
<y>1486</y>
<x>0</x>
<y>2239</y>
<default_color>
<r>128</r>
<g>128</g>
@@ -1671,6 +1671,22 @@
<physical_name>id</physical_name>
<type>varchar(n)</type>
</word>
<word>
<id>f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
<array_dimension>null</array_dimension>
<unsigned>false</unsigned>
<zerofill>false</zerofill>
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>集群的实例名字</logical_name>
<physical_name>instance_name</physical_name>
<type>varchar(n)</type>
</word>
<word>
<id>e2663716e6af40682333d3e8495a04bceff16647</id>
<length>1000</length>
@@ -8270,7 +8286,7 @@
</color>
<connections>
<relation>
<id>7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4</id>
<id>78c6c210e1b15ba33ee65931a26f8a40512ba11c</id>
<source>cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c</source>
<target>f32de7f0ee93167beb39e00a9bacf941b9e09eb5</target>
<source_xp>-1</source_xp>
@@ -8335,7 +8351,7 @@
<normal_column>
<id>6d5f3e5ef4d28e57966c33c4b4ef424f1dc42b7b</id>
<referenced_column>55c7d0a9ab8650c264a75bb1bf958cac2fe68152</referenced_column>
<relation>7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4</relation>
<relation>78c6c210e1b15ba33ee65931a26f8a40512ba11c</relation>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
@@ -8369,7 +8385,7 @@
<normal_column>
<id>91110163a8a31ee61a4153360707026b5498dd65</id>
<referenced_column>443772d4627c23aef484c324c8e431121b921a44</referenced_column>
<relation>7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4</relation>
<relation>78c6c210e1b15ba33ee65931a26f8a40512ba11c</relation>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
@@ -15539,315 +15555,6 @@
<schema></schema>
</table_properties>
</table>
<table>
<id>cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c</id>
<height>386</height>
<width>426</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>968</x>
<y>2244</y>
<color>
<r>128</r>
<g>128</g>
<b>192</b>
</color>
<connections>
</connections>
<physical_name>js_sys_job</physical_name>
<logical_name>作业调度表</logical_name>
<description></description>
<constraint></constraint>
<primary_key_name></primary_key_name>
<option></option>
<columns>
<normal_column>
<word_id>70abca97f16eab0d562a2104ec1a0ede326b1c46</word_id>
<id>55c7d0a9ab8650c264a75bb1bf958cac2fe68152</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>2fe17467ad48944f125de4abf28e973234a9bcb4</word_id>
<id>443772d4627c23aef484c324c8e431121b921a44</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0</word_id>
<id>225e6d868b8d45320dc7f79db6296db64985b308</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>e2663716e6af40682333d3e8495a04bceff16647</word_id>
<id>c5abf897611d8a927582d1dcb3deceef5c164614</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>03debcf1d4bf27cdad9acd24fda84a6ee9cdd908</word_id>
<id>d8ece7f15423d813de0dc100fa1c67e047ca4a08</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>44ce4edd5ad45896934d6f90f14af5884b98ba5b</word_id>
<id>7041a843a37e89ce935ad9309fa1a3b2548920e5</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>decimal(p)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>261aca14bc2dd0bef97fa78a1256a95b5cb94171</word_id>
<id>91c2e73c20940e4a715ffb02148e2f3a1bb72334</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>character(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>481c1a6225e0f2a86dbf4f752e9455afac57f897</word_id>
<id>644c88074f6f9cbe4b29b12b9633f4e238a2761b</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>character(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>85024a2953cf3e3c9c1cce49b2351853ab0d125b</column_group>
</columns>
<indexes>
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_job_status</name>
<type></type>
<description></description>
<columns>
<column>
<id>644c88074f6f9cbe4b29b12b9633f4e238a2761b</id>
<desc>false</desc>
</column>
</columns>
</inidex>
</indexes>
<complex_unique_key_list>
</complex_unique_key_list>
<table_properties>
<schema></schema>
</table_properties>
</table>
<table>
<id>bccc82daf981c93b1f698f012a4fbbe4aa9f728a</id>
<height>360</height>
@@ -16234,6 +15941,348 @@
<schema></schema>
</table_properties>
</table>
<table>
<id>cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c</id>
<height>386</height>
<width>426</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>968</x>
<y>2244</y>
<color>
<r>128</r>
<g>128</g>
<b>192</b>
</color>
<connections>
</connections>
<physical_name>js_sys_job</physical_name>
<logical_name>作业调度表</logical_name>
<description></description>
<constraint></constraint>
<primary_key_name></primary_key_name>
<option></option>
<columns>
<normal_column>
<word_id>70abca97f16eab0d562a2104ec1a0ede326b1c46</word_id>
<id>55c7d0a9ab8650c264a75bb1bf958cac2fe68152</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>2fe17467ad48944f125de4abf28e973234a9bcb4</word_id>
<id>443772d4627c23aef484c324c8e431121b921a44</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>true</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0</word_id>
<id>225e6d868b8d45320dc7f79db6296db64985b308</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>e2663716e6af40682333d3e8495a04bceff16647</word_id>
<id>c5abf897611d8a927582d1dcb3deceef5c164614</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>nvarchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>03debcf1d4bf27cdad9acd24fda84a6ee9cdd908</word_id>
<id>d8ece7f15423d813de0dc100fa1c67e047ca4a08</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>44ce4edd5ad45896934d6f90f14af5884b98ba5b</word_id>
<id>7041a843a37e89ce935ad9309fa1a3b2548920e5</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>decimal(p)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>261aca14bc2dd0bef97fa78a1256a95b5cb94171</word_id>
<id>91c2e73c20940e4a715ffb02148e2f3a1bb72334</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>character(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f</word_id>
<id>599b9798d287db98af97bda02a378aa97b0c62c4</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>varchar(n)</type>
<constraint></constraint>
<default_value>JeeSiteScheduler</default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<normal_column>
<word_id>481c1a6225e0f2a86dbf4f752e9455afac57f897</word_id>
<id>644c88074f6f9cbe4b29b12b9633f4e238a2761b</id>
<description></description>
<unique_key_name></unique_key_name>
<logical_name></logical_name>
<physical_name></physical_name>
<type>character(n)</type>
<constraint></constraint>
<default_value></default_value>
<auto_increment>false</auto_increment>
<foreign_key>false</foreign_key>
<not_null>true</not_null>
<primary_key>false</primary_key>
<unique_key>false</unique_key>
<character_set></character_set>
<collation></collation>
<sequence>
<name></name>
<schema></schema>
<increment></increment>
<min_value></min_value>
<max_value></max_value>
<start></start>
<cache></cache>
<nocache>false</nocache>
<cycle>false</cycle>
<order>false</order>
<description></description>
<data_type></data_type>
<decimal_size>0</decimal_size>
</sequence>
</normal_column>
<column_group>85024a2953cf3e3c9c1cce49b2351853ab0d125b</column_group>
</columns>
<indexes>
<inidex>
<full_text>false</full_text>
<non_unique>true</non_unique>
<name>idx_sys_job_status</name>
<type></type>
<description></description>
<columns>
<column>
<id>644c88074f6f9cbe4b29b12b9633f4e238a2761b</id>
<desc>false</desc>
</column>
</columns>
</inidex>
</indexes>
<complex_unique_key_list>
</complex_unique_key_list>
<table_properties>
<schema></schema>
</table_properties>
</table>
</contents>
<column_groups>
<column_group>

1
modules/core/db/db2/core.sql
View File

@@ -327,6 +327,7 @@ CREATE TABLE js_sys_job
cron_expression varchar(255) NOT NULL,
misfire_instruction decimal(1) NOT NULL,
concurrent char(1) NOT NULL,
instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
status char(1) NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,

1
modules/core/db/mssql/core.sql
View File

@@ -327,6 +327,7 @@ CREATE TABLE [js_sys_job]
[cron_expression] varchar(255) NOT NULL,
[misfire_instruction] decimal(1) NOT NULL,
[concurrent] char(1) NOT NULL,
[instance_name] varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
[status] char(1) NOT NULL,
[create_by] varchar(64) NOT NULL,
[create_date] datetime NOT NULL,

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

@@ -328,6 +328,7 @@ CREATE TABLE js_sys_job
cron_expression varchar(255) NOT NULL COMMENT 'Cron执行表达式',
misfire_instruction decimal(1) NOT NULL COMMENT '计划执行错误策略',
concurrent char(1) NOT NULL COMMENT '是否并发执行',
instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL COMMENT '集群的实例名字',
status char(1) NOT NULL COMMENT '状态（0正常 1删除 2暂停）',
create_by varchar(64) NOT NULL COMMENT '创建者',
create_date datetime NOT NULL COMMENT '创建时间',

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

@@ -327,6 +327,7 @@ CREATE TABLE js_sys_job
cron_expression varchar2(255) NOT NULL,
misfire_instruction number(1) NOT NULL,
concurrent char(1) NOT NULL,
instance_name varchar2(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
status char(1) NOT NULL,
create_by varchar2(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1133,6 +1134,7 @@ COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串';
COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式';
COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略';
COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行';
COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字';
COMMENT ON COLUMN js_sys_job.status IS '状态（0正常 1删除 2暂停）';
COMMENT ON COLUMN js_sys_job.create_by IS '创建者';
COMMENT ON COLUMN js_sys_job.create_date IS '创建时间';

2
modules/core/db/postgresql/core.sql
View File

@@ -327,6 +327,7 @@ CREATE TABLE js_sys_job
cron_expression varchar(255) NOT NULL,
misfire_instruction decimal(1) NOT NULL,
concurrent char(1) NOT NULL,
instance_name varchar(64) DEFAULT 'JeeSiteScheduler' NOT NULL,
status char(1) NOT NULL,
create_by varchar(64) NOT NULL,
create_date timestamp NOT NULL,
@@ -1133,6 +1134,7 @@ COMMENT ON COLUMN js_sys_job.invoke_target IS '调用目标字符串';
COMMENT ON COLUMN js_sys_job.cron_expression IS 'Cron执行表达式';
COMMENT ON COLUMN js_sys_job.misfire_instruction IS '计划执行错误策略';
COMMENT ON COLUMN js_sys_job.concurrent IS '是否并发执行';
COMMENT ON COLUMN js_sys_job.instance_name IS '集群的实例名字';
COMMENT ON COLUMN js_sys_job.status IS '状态（0正常 1删除 2暂停）';
COMMENT ON COLUMN js_sys_job.create_by IS '创建者';
COMMENT ON COLUMN js_sys_job.create_date IS '创建时间';

4
modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql
View File

@@ -1,3 +1,5 @@
-- 删除sys_file_entity表的file_md5唯一索引
-- ALTER TABLE [js_sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F]
-- ALTER TABLE [${_prefix}sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F];
ALTER TABLE [${_prefix}sys_job] ADD [instance_name] varchar(64) DEFAULT JeeSiteScheduler NOT NULL;

8
modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql
View File

@@ -1,5 +1,9 @@
-- 删除sys_file_entity表的file_md5唯一索引
ALTER TABLE `js_sys_file_entity`
ALTER TABLE `${_prefix}sys_file_entity`
DROP INDEX `file_md5`,
ADD INDEX `file_md5`(`file_md5`);
ADD INDEX `file_md5`(`file_md5`);
-- 集群的实例名字
ALTER TABLE `${_prefix}sys_job`
ADD COLUMN `instance_name` varchar(64) NOT NULL DEFAULT JeeSiteScheduler COMMENT '集群的实例名字' AFTER `concurrent`;

6
modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql
View File

@@ -1,3 +1,7 @@
-- 删除sys_file_entity表的file_md5唯一索引
-- ALTER TABLE "JS_SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398"
-- ALTER TABLE "${_prefix}SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398"
ALTER TABLE "${_prefix}SYS_JOB"
ADD ("instance_name" VARCHAR2(64) DEFAULT JeeSiteScheduler NOT NULL );
COMMENT ON COLUMN "${_prefix}SYS_JOB"."instance_name" IS '集群的实例名字'

9
modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql
View File

@@ -1,4 +1,9 @@
-- 删除sys_file_entity表的file_md5唯一索引
ALTER TABLE "js_sys_file_entity"
DROP CONSTRAINT "js_sys_file_entity_file_md5_key";
ALTER TABLE "${_prefix}sys_file_entity"
DROP CONSTRAINT "${_prefix}sys_file_entity_file_md5_key";
-- 集群的实例名字
ALTER TABLE "${_prefix}sys_job"
ADD COLUMN "instance_name" varchar(255) NOT NULL DEFAULT JeeSiteScheduler;
COMMENT ON COLUMN "${_prefix}sys_job"."instance_name" IS '集群的实例名字';

3
modules/core/src/main/resources/mybatis/mybatis-config.xml
View File

@@ -37,6 +37,9 @@
<!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER，插入空值时不需要指定类型 -->
<setting name="jdbcTypeForNull" value="NULL"/>
<!-- 返回值为Map时，类型数据空值字段时，仍然需要返回
<setting name="callSettersOnNulls" value="true"/>-->
</settings>
<!-- 类型别名 -->