From 53a9803c7e46551207b836c0db7d6f73f6790eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 10 Apr 2019 14:58:18 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E3=80=82=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/5pigxx_job.sql | 73 ++++++++----------- docker-compose.yml | 1 + .../daemon/elastic/entity/ExecutionLog.java | 2 +- .../daemon/elastic/entity/StatusTraceLog.java | 2 +- 4 files changed, 34 insertions(+), 44 deletions(-) diff --git a/db/5pigxx_job.sql b/db/5pigxx_job.sql index 05c2855ef..db07330ec 100644 --- a/db/5pigxx_job.sql +++ b/db/5pigxx_job.sql @@ -1,17 +1,6 @@ /* - Navicat Premium Data Transfer - - Source Server : localhost - Source Server Type : MySQL - Source Server Version : 50723 - Source Host : localhost - Source Database : pigxx_job - - Target Server Type : MySQL - Target Server Version : 50723 - File Encoding : utf-8 - - Date: 03/30/2019 08:11:49 AM + my.cnf 设置数据库表名小写 + --lower_case_table_names=1 */ USE pigxx_job; @@ -21,8 +10,8 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for `job_execution_log` -- ---------------------------- -DROP TABLE IF EXISTS `JOB_EXECUTION_LOG`; -CREATE TABLE `JOB_EXECUTION_LOG` ( +DROP TABLE IF EXISTS `job_execution_log`; +CREATE TABLE `job_execution_log` ( `id` varchar(40) NOT NULL, `job_name` varchar(100) NOT NULL, `task_id` varchar(255) NOT NULL, @@ -40,8 +29,8 @@ CREATE TABLE `JOB_EXECUTION_LOG` ( -- ---------------------------- -- Table structure for `job_status_trace_log` -- ---------------------------- -DROP TABLE IF EXISTS `JOB_STATUS_TRACE_LOG`; -CREATE TABLE `JOB_STATUS_TRACE_LOG` ( +DROP TABLE IF EXISTS `job_status_trace_log`; +CREATE TABLE `job_status_trace_log` ( `id` varchar(40) NOT NULL, `job_name` varchar(100) NOT NULL, `original_task_id` varchar(255) NOT NULL, @@ -60,8 +49,8 @@ CREATE TABLE `JOB_STATUS_TRACE_LOG` ( -- ---------------------------- -- Table structure for `qrtz_blob_triggers` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_BLOB_TRIGGERS`; -CREATE TABLE `QRTZ_BLOB_TRIGGERS` ( +DROP TABLE IF EXISTS `qrtz_blob_triggers`; +CREATE TABLE `qrtz_blob_triggers` ( `sched_name` varchar(120) NOT NULL, `trigger_name` varchar(200) NOT NULL, `trigger_group` varchar(200) NOT NULL, @@ -73,8 +62,8 @@ CREATE TABLE `QRTZ_BLOB_TRIGGERS` ( -- ---------------------------- -- Table structure for `qrtz_calendars` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_CALENDARS`; -CREATE TABLE `QRTZ_CALENDARS` ( +DROP TABLE IF EXISTS `qrtz_calendars`; +CREATE TABLE `qrtz_calendars` ( `sched_name` varchar(120) NOT NULL, `calendar_name` varchar(200) NOT NULL, `calendar` blob NOT NULL, @@ -84,8 +73,8 @@ CREATE TABLE `QRTZ_CALENDARS` ( -- ---------------------------- -- Table structure for `qrtz_cron_triggers` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_CRON_TRIGGERS`; -CREATE TABLE `QRTZ_CRON_TRIGGERS` ( +DROP TABLE IF EXISTS `qrtz_cron_triggers`; +CREATE TABLE `qrtz_cron_triggers` ( `sched_name` varchar(120) NOT NULL, `trigger_name` varchar(200) NOT NULL, `trigger_group` varchar(200) NOT NULL, @@ -99,14 +88,14 @@ CREATE TABLE `QRTZ_CRON_TRIGGERS` ( -- Records of `qrtz_cron_triggers` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_CRON_TRIGGERS` VALUES ('clusteredScheduler', '测试任务', 'demo', '0 * * * * ? *', 'Asia/Shanghai'); +INSERT INTO `qrtz_cron_triggers` VALUES ('clusteredScheduler', '测试任务', 'demo', '0 * * * * ? *', 'Asia/Shanghai'); COMMIT; -- ---------------------------- -- Table structure for `qrtz_fired_triggers` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_FIRED_TRIGGERS`; -CREATE TABLE `QRTZ_FIRED_TRIGGERS` ( +DROP TABLE IF EXISTS `qrtz_fired_triggers`; +CREATE TABLE `qrtz_fired_triggers` ( `sched_name` varchar(120) NOT NULL, `entry_id` varchar(95) NOT NULL, `trigger_name` varchar(200) NOT NULL, @@ -126,8 +115,8 @@ CREATE TABLE `QRTZ_FIRED_TRIGGERS` ( -- ---------------------------- -- Table structure for `qrtz_job_details` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_JOB_DETAILS`; -CREATE TABLE `QRTZ_JOB_DETAILS` ( +DROP TABLE IF EXISTS `qrtz_job_details`; +CREATE TABLE `qrtz_job_details` ( `sched_name` varchar(120) NOT NULL, `job_name` varchar(200) NOT NULL, `job_group` varchar(200) NOT NULL, @@ -145,14 +134,14 @@ CREATE TABLE `QRTZ_JOB_DETAILS` ( -- Records of `qrtz_job_details` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_JOB_DETAILS` VALUES ('clusteredScheduler', '测试任务', 'demo', null, 'com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzFactory', '0', '1', '0', '0', 0xaced0005737200156f72672e71756172747a2e4a6f62446174614d61709fb083e8bfa9b0cb020000787200266f72672e71756172747a2e7574696c732e537472696e674b65794469727479466c61674d61708208e8c3fbc55d280200015a0013616c6c6f77735472616e7369656e74446174617872001d6f72672e71756172747a2e7574696c732e4469727479466c61674d617013e62ead28760ace0200025a000564697274794c00036d617074000f4c6a6176612f7574696c2f4d61703b787001737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000174000b7363686564756c654a6f627372002e636f6d2e70696734636c6f75642e706967782e6461656d6f6e2e71756172747a2e656e746974792e5379734a6f6200000000000000010200174c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c0008637265617465427971007e00094c000a63726561746554696d657400194c6a6176612f74696d652f4c6f63616c4461746554696d653b4c000e63726f6e45787072657373696f6e71007e00094c000b657865637574655061746871007e00094c00106a6f624578656375746553746174757371007e00094c00086a6f6247726f757071007e00094c00056a6f6249647400134c6a6176612f6c616e672f496e74656765723b4c00076a6f624e616d6571007e00094c00086a6f624f7264657271007e00094c00096a6f6253746174757371007e00094c000d6a6f6254656e616e745479706571007e00094c00076a6f625479706571007e00094c000a6d6574686f644e616d6571007e00094c00116d6574686f64506172616d7356616c756571007e00094c000d6d697366697265506f6c69637971007e00094c00086e65787454696d6571007e000a4c000c70726576696f757354696d6571007e000a4c000672656d61726b71007e00094c0009737461727454696d6571007e000a4c000874656e616e74496471007e000b4c0008757064617465427971007e00094c000a75706461746554696d6571007e000a78720035636f6d2e62616f6d69646f752e6d796261746973706c75732e657874656e73696f6e2e6163746976657265636f72642e4d6f64656c0000000000000001020000787074000464656d6f74000561646d696e7372000d6a6176612e74696d652e536572955d84ba1b2248b20c00007870770a05000007e303190e00f17874000d30202a202a202a202a203f202a7400007400013074000464656d6f737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000000174000ce6b58be8af95e4bbbbe58aa17400013574000133740001317400013274000a64656d6f4d6574686f6474000970696734636c6f7564740001337371007e0010770905000007e3031916e2787371007e0010770a05000007e30319161ccd78740020e6bc94e7a4ba537072696e67204265616ee79a84e5ae9ae697b6e4bbbbe58aa17371007e0010770a05000007e303191600de7871007e001874000561646d696e7371007e0010770a05000007e303190e00f1787800); +INSERT INTO `qrtz_job_details` VALUES ('clusteredScheduler', '测试任务', 'demo', null, 'com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzFactory', '0', '1', '0', '0', 0xaced0005737200156f72672e71756172747a2e4a6f62446174614d61709fb083e8bfa9b0cb020000787200266f72672e71756172747a2e7574696c732e537472696e674b65794469727479466c61674d61708208e8c3fbc55d280200015a0013616c6c6f77735472616e7369656e74446174617872001d6f72672e71756172747a2e7574696c732e4469727479466c61674d617013e62ead28760ace0200025a000564697274794c00036d617074000f4c6a6176612f7574696c2f4d61703b787001737200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000174000b7363686564756c654a6f627372002e636f6d2e70696734636c6f75642e706967782e6461656d6f6e2e71756172747a2e656e746974792e5379734a6f6200000000000000010200174c0009636c6173734e616d657400124c6a6176612f6c616e672f537472696e673b4c0008637265617465427971007e00094c000a63726561746554696d657400194c6a6176612f74696d652f4c6f63616c4461746554696d653b4c000e63726f6e45787072657373696f6e71007e00094c000b657865637574655061746871007e00094c00106a6f624578656375746553746174757371007e00094c00086a6f6247726f757071007e00094c00056a6f6249647400134c6a6176612f6c616e672f496e74656765723b4c00076a6f624e616d6571007e00094c00086a6f624f7264657271007e00094c00096a6f6253746174757371007e00094c000d6a6f6254656e616e745479706571007e00094c00076a6f625479706571007e00094c000a6d6574686f644e616d6571007e00094c00116d6574686f64506172616d7356616c756571007e00094c000d6d697366697265506f6c69637971007e00094c00086e65787454696d6571007e000a4c000c70726576696f757354696d6571007e000a4c000672656d61726b71007e00094c0009737461727454696d6571007e000a4c000874656e616e74496471007e000b4c0008757064617465427971007e00094c000a75706461746554696d6571007e000a78720035636f6d2e62616f6d69646f752e6d796261746973706c75732e657874656e73696f6e2e6163746976657265636f72642e4d6f64656c0000000000000001020000787074000464656d6f74000561646d696e7372000d6a6176612e74696d652e536572955d84ba1b2248b20c00007870770a05000007e303190e00f17874000d30202a202a202a202a203f202a7400007400013074000464656d6f737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000000174000ce6b58be8af95e4bbbbe58aa17400013574000133740001317400013274000a64656d6f4d6574686f6474000970696734636c6f7564740001337371007e0010770905000007e3031916e2787371007e0010770a05000007e30319161ccd78740020e6bc94e7a4ba537072696e67204265616ee79a84e5ae9ae697b6e4bbbbe58aa17371007e0010770a05000007e303191600de7871007e001874000561646d696e7371007e0010770a05000007e303190e00f1787800); COMMIT; -- ---------------------------- -- Table structure for `qrtz_locks` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_LOCKS`; -CREATE TABLE `QRTZ_LOCKS` ( +DROP TABLE IF EXISTS `qrtz_locks`; +CREATE TABLE `qrtz_locks` ( `sched_name` varchar(120) NOT NULL, `lock_name` varchar(40) NOT NULL, PRIMARY KEY (`sched_name`,`lock_name`) USING BTREE @@ -162,14 +151,14 @@ CREATE TABLE `QRTZ_LOCKS` ( -- Records of `qrtz_locks` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_LOCKS` VALUES ('clusteredScheduler', 'STATE_ACCESS'), ('clusteredScheduler', 'TRIGGER_ACCESS'); +INSERT INTO `qrtz_locks` VALUES ('clusteredScheduler', 'STATE_ACCESS'), ('clusteredScheduler', 'TRIGGER_ACCESS'); COMMIT; -- ---------------------------- -- Table structure for `qrtz_paused_trigger_grps` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_PAUSED_TRIGGER_GRPS`; -CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS` ( +DROP TABLE IF EXISTS `qrtz_paused_trigger_grps`; +CREATE TABLE `qrtz_paused_trigger_grps` ( `sched_name` varchar(120) NOT NULL, `trigger_group` varchar(200) NOT NULL, PRIMARY KEY (`sched_name`,`trigger_group`) USING BTREE @@ -178,8 +167,8 @@ CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS` ( -- ---------------------------- -- Table structure for `qrtz_scheduler_state` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_SCHEDULER_STATE`; -CREATE TABLE `QRTZ_SCHEDULER_STATE` ( +DROP TABLE IF EXISTS `qrtz_scheduler_state`; +CREATE TABLE `qrtz_scheduler_state` ( `sched_name` varchar(120) NOT NULL, `instance_name` varchar(200) NOT NULL, `last_checkin_time` bigint(13) NOT NULL, @@ -191,7 +180,7 @@ CREATE TABLE `QRTZ_SCHEDULER_STATE` ( -- Records of `qrtz_scheduler_state` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_SCHEDULER_STATE` VALUES ('clusteredScheduler', 'lengleng1553564320591', '1553568907589', '10000'); +INSERT INTO `qrtz_scheduler_state` VALUES ('clusteredScheduler', 'lengleng1553564320591', '1553568907589', '10000'); COMMIT; -- ---------------------------- @@ -212,8 +201,8 @@ CREATE TABLE `qrtz_simple_triggers` ( -- ---------------------------- -- Table structure for `qrtz_simprop_triggers` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_SIMPROP_TRIGGERS`; -CREATE TABLE `QRTZ_SIMPROP_TRIGGERS` ( +DROP TABLE IF EXISTS `qrtz_simprop_triggers`; +CREATE TABLE `qrtz_simprop_triggers` ( `sched_name` varchar(120) NOT NULL, `trigger_name` varchar(200) NOT NULL, `trigger_group` varchar(200) NOT NULL, @@ -235,8 +224,8 @@ CREATE TABLE `QRTZ_SIMPROP_TRIGGERS` ( -- ---------------------------- -- Table structure for `qrtz_triggers` -- ---------------------------- -DROP TABLE IF EXISTS `QRTZ_TRIGGERS`; -CREATE TABLE `QRTZ_TRIGGERS` ( +DROP TABLE IF EXISTS `qrtz_triggers`; +CREATE TABLE `qrtz_triggers` ( `sched_name` varchar(120) NOT NULL, `trigger_name` varchar(200) NOT NULL, `trigger_group` varchar(200) NOT NULL, @@ -262,7 +251,7 @@ CREATE TABLE `QRTZ_TRIGGERS` ( -- Records of `qrtz_triggers` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_TRIGGERS` VALUES ('clusteredScheduler', '测试任务', 'demo', '测试任务', 'demo', null, '1553568960000', '1553568900000', '5', 'WAITING', 'CRON', '1553564598000', '0', null, '2', ''); +INSERT INTO `qrtz_triggers` VALUES ('clusteredScheduler', '测试任务', 'demo', '测试任务', 'demo', null, '1553568960000', '1553568900000', '5', 'WAITING', 'CRON', '1553564598000', '0', null, '2', ''); COMMIT; -- ---------------------------- diff --git a/docker-compose.yml b/docker-compose.yml index 4eaafb588..b18be3c9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: image: pigx-mysql ports: - 3306:3306 + command: --lower_case_table_names=1 pigx-zookeeper: image: zookeeper:3.4.13 diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java index e1bc379af..df7f52671 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/ExecutionLog.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("JOB_EXECUTION_LOG") +@TableName("job_execution_log") public class ExecutionLog extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java index 2e071cea3..dcf1acc38 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/entity/StatusTraceLog.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("JOB_STATUS_TRACE_LOG") +@TableName("job_status_trace_log") public class StatusTraceLog extends Model { private static final long serialVersionUID = 1L;