From ee9f3fd5805fe919b974e2b6ed4dfd44f08b5f3a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 5 Mar 2019 22:10:09 +0800 Subject: [PATCH] =?UTF-8?q?job=E6=B7=BB=E5=8A=A0instanceName=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E7=9A=84=E5=AE=9E=E4=BE=8B=E5=90=8D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E4=B8=8Eyml=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E5=9C=A8=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E4=BD=BF=E7=94=A8=E9=9D=9E=E5=B8=B8?= =?UTF-8?q?=E9=87=8D=E8=A6=81=EF=BC=9B=E4=BC=98=E5=8C=96job=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=B8=AD=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=8D=95=E5=BC=95=E5=8F=B7=E7=9A=84=E6=97=B6=E5=80=99XSS?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E8=8B=A5=E4=BD=A0=E9=87=8D=E5=86=99?= =?UTF-8?q?=E4=BA=86jobForm.html=E4=BD=A0=E9=9C=80=E8=A6=81=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=8B=E6=AC=A1=E6=AD=A4=E6=96=87=E4=BB=B6=EF=BC=9B?= =?UTF-8?q?=E8=8B=A5=E4=BD=A0=E5=9C=A8yml=E4=B8=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86instanceName=E5=90=8D=E5=AD=97=EF=BC=8C=E4=BD=A0?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0=E4=B8=8Bsys=5Fjob=E7=9A=84?= =?UTF-8?q?instanceName=E5=AD=97=E6=AE=B5=E4=B8=BA=E4=BD=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E5=90=8D=E5=AD=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/common/base64.js | 108 +++ modules/core/db/core.erm | 677 ++++++++++-------- modules/core/db/db2/core.sql | 1 + modules/core/db/mssql/core.sql | 1 + modules/core/db/mysql/core.sql | 1 + modules/core/db/oracle/core.sql | 2 + modules/core/db/postgresql/core.sql | 2 + .../db/upgrade/core/mssql/mssql_4.1.4.sql | 4 +- .../db/upgrade/core/mysql/mysql_4.1.4.sql | 8 +- .../db/upgrade/core/oracle/oracle_4.1.4.sql | 6 +- .../core/postgresql/postgresql_4.1.4.sql | 9 +- .../main/resources/mybatis/mybatis-config.xml | 3 + 12 files changed, 502 insertions(+), 320 deletions(-) create mode 100644 common/src/main/resources/static/common/base64.js diff --git a/common/src/main/resources/static/common/base64.js b/common/src/main/resources/static/common/base64.js new file mode 100644 index 00000000..af766b54 --- /dev/null +++ b/common/src/main/resources/static/common/base64.js @@ -0,0 +1,108 @@ +(function() { + + this.Base64 = new Base64(); + + function Base64() { + + // private property + _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + + // public method for encoding + this.encode = function (input) { + var output = ""; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; + input = _utf8_encode(input); + while (i < input.length) { + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + output = output + + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + + _keyStr.charAt(enc3) + _keyStr.charAt(enc4); + } + return output; + } + + // public method for decoding + this.decode = function (input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + while (i < input.length) { + enc1 = _keyStr.indexOf(input.charAt(i++)); + enc2 = _keyStr.indexOf(input.charAt(i++)); + enc3 = _keyStr.indexOf(input.charAt(i++)); + enc4 = _keyStr.indexOf(input.charAt(i++)); + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; + output = output + String.fromCharCode(chr1); + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } + } + output = _utf8_decode(output); + return output; + } + + // private method for UTF-8 encoding + _utf8_encode = function (string) { + string = string.replace(/\r\n/g,"\n"); + var utftext = ""; + for (var n = 0; n < string.length; n++) { + var c = string.charCodeAt(n); + if (c < 128) { + utftext += String.fromCharCode(c); + } else if((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } + + } + return utftext; + } + + // private method for UTF-8 decoding + _utf8_decode = function (utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; + while ( i < utftext.length ) { + c = utftext.charCodeAt(i); + if (c < 128) { + string += String.fromCharCode(c); + i++; + } else if((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i+1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } else { + c2 = utftext.charCodeAt(i+1); + c3 = utftext.charCodeAt(i+2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } + } + return string; + } + } +})(); \ No newline at end of file diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index ddce01a7..c6ada2b3 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 1129 - 1486 + 0 + 2239 128 128 @@ -1671,6 +1671,22 @@ id varchar(n) + + f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f + 64 + null + false + null + false + false + false + + false + + 集群的实例名字 + instance_name + varchar(n) + e2663716e6af40682333d3e8495a04bceff16647 1000 @@ -8270,7 +8286,7 @@ - 7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4 + 78c6c210e1b15ba33ee65931a26f8a40512ba11c cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c f32de7f0ee93167beb39e00a9bacf941b9e09eb5 -1 @@ -8335,7 +8351,7 @@ 6d5f3e5ef4d28e57966c33c4b4ef424f1dc42b7b 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - 7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4 + 78c6c210e1b15ba33ee65931a26f8a40512ba11c @@ -8369,7 +8385,7 @@ 91110163a8a31ee61a4153360707026b5498dd65 443772d4627c23aef484c324c8e431121b921a44 - 7d511abc9d985f7c911dcafd7fe2eec93ccbd8a4 + 78c6c210e1b15ba33ee65931a26f8a40512ba11c @@ -15539,315 +15555,6 @@ - - cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c - 386 - 426 - Segoe UI - 9 - 968 - 2244 - - 128 - 128 - 192 - - - - js_sys_job - 作业调度表 - - - - - - - 70abca97f16eab0d562a2104ec1a0ede326b1c46 - 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2fe17467ad48944f125de4abf28e973234a9bcb4 - 443772d4627c23aef484c324c8e431121b921a44 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 - 225e6d868b8d45320dc7f79db6296db64985b308 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2663716e6af40682333d3e8495a04bceff16647 - c5abf897611d8a927582d1dcb3deceef5c164614 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 - d8ece7f15423d813de0dc100fa1c67e047ca4a08 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 44ce4edd5ad45896934d6f90f14af5884b98ba5b - 7041a843a37e89ce935ad9309fa1a3b2548920e5 - - - - - decimal(p) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261aca14bc2dd0bef97fa78a1256a95b5cb94171 - 91c2e73c20940e4a715ffb02148e2f3a1bb72334 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 481c1a6225e0f2a86dbf4f752e9455afac57f897 - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_job_status - - - - - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - false - - - - - - - - - -
bccc82daf981c93b1f698f012a4fbbe4aa9f728a360 @@ -16234,6 +15941,348 @@
+ + cf06de3277f0d1dbf7ef6dc8750ad12ff49c8c9c + 386 + 426 + Segoe UI + 9 + 968 + 2244 + + 128 + 128 + 192 + + + + js_sys_job + 作业调度表 + + + + + + + 70abca97f16eab0d562a2104ec1a0ede326b1c46 + 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fe17467ad48944f125de4abf28e973234a9bcb4 + 443772d4627c23aef484c324c8e431121b921a44 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 + 225e6d868b8d45320dc7f79db6296db64985b308 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2663716e6af40682333d3e8495a04bceff16647 + c5abf897611d8a927582d1dcb3deceef5c164614 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 + d8ece7f15423d813de0dc100fa1c67e047ca4a08 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 44ce4edd5ad45896934d6f90f14af5884b98ba5b + 7041a843a37e89ce935ad9309fa1a3b2548920e5 + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261aca14bc2dd0bef97fa78a1256a95b5cb94171 + 91c2e73c20940e4a715ffb02148e2f3a1bb72334 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f + 599b9798d287db98af97bda02a378aa97b0c62c4 + + + + + varchar(n) + + JeeSiteScheduler + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 481c1a6225e0f2a86dbf4f752e9455afac57f897 + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_job_status + + + + + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 7a7d77b6..0d87713b 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -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, diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 93c2f692..a7be803d 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -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, diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 5ca75ed7..ada699d9 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -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 '创建时间', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 7fd96dc6..84b64596 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -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 '创建时间'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 95abd1ae..b8008810 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -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 '创建时间'; diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql index 0be2026d..ce716764 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.4.sql @@ -1,3 +1,5 @@ -- 删除sys_file_entity表的file_md5唯一索引 --- ALTER TABLE [js_sys_file_entity] DROP CONSTRAINT [UQ__js_sys_f__3BD63C9E32E0915F] \ No newline at end of file +-- 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; diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql index c74ad94b..45de21ce 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.4.sql @@ -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`); \ No newline at end of file + ADD INDEX `file_md5`(`file_md5`); + +-- 集群的实例名字 +ALTER TABLE `${_prefix}sys_job` + ADD COLUMN `instance_name` varchar(64) NOT NULL DEFAULT JeeSiteScheduler COMMENT '集群的实例名字' AFTER `concurrent`; \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql index 4719276d..3fc612ca 100644 --- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.4.sql @@ -1,3 +1,7 @@ -- 删除sys_file_entity表的file_md5唯一索引 --- ALTER TABLE "JS_SYS_FILE_ENTITY" DROP CONSTRAINT "SYS_C0019398" \ No newline at end of file +-- 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 '集群的实例名字' \ No newline at end of file diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql index 86ef63e3..475a09cb 100644 --- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.4.sql @@ -1,4 +1,9 @@ -- 删除sys_file_entity表的file_md5唯一索引 -ALTER TABLE "js_sys_file_entity" - DROP CONSTRAINT "js_sys_file_entity_file_md5_key"; \ No newline at end of file +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 '集群的实例名字'; \ No newline at end of file diff --git a/modules/core/src/main/resources/mybatis/mybatis-config.xml b/modules/core/src/main/resources/mybatis/mybatis-config.xml index b66bc042..5b67d5b7 100644 --- a/modules/core/src/main/resources/mybatis/mybatis-config.xml +++ b/modules/core/src/main/resources/mybatis/mybatis-config.xml @@ -37,6 +37,9 @@ + +