From 1c1764a95b98783865eae06933ff501cc2e1cb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Sat, 23 Mar 2019 10:09:52 +0800 Subject: [PATCH] :art: Improving structure / format of the code.rename project: pigx-daemon-elastic --> pigx-daemon-elastic-job --- docker-compose.yml | 8 ++++---- ...elastic-dev.yml => pigx-daemon-elastic-job-dev.yml} | 0 .../Dockerfile | 8 ++++---- .../pom.xml | 2 +- .../pigx/daemon/PigxDaemonElasticJobApplication.java} | 4 ++-- .../pigx/daemon/controller/ExecutionLogController.java | 0 .../daemon/controller/StatusTraceLogController.java | 0 .../com/pig4cloud/pigx/daemon/entity/ExecutionLog.java | 0 .../pig4cloud/pigx/daemon/entity/StatusTraceLog.java | 0 .../com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java | 0 .../com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java | 0 .../com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java | 0 .../listener/PigxDistributeElasticJobListener.java | 0 .../pigx/daemon/listener/PigxElasticJobListener.java | 0 .../pigx/daemon/mapper/ExecutionLogMapper.java | 0 .../pigx/daemon/mapper/StatusTraceLogMapper.java | 0 .../pigx/daemon/service/ExecutionLogService.java | 0 .../pigx/daemon/service/StatusTraceLogService.java | 0 .../daemon/service/impl/ExecutionLogServiceImpl.java | 0 .../daemon/service/impl/StatusTraceLogServiceImpl.java | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/mapper/ExecutionLogMapper.xml | 0 .../src/main/resources/mapper/StatusTraceLogMapper.xml | 0 pigx-visual/pigx-daemon-quartz/pom.xml | 10 ---------- pigx-visual/pom.xml | 2 +- 25 files changed, 12 insertions(+), 22 deletions(-) rename pigx-config/src/main/resources/config/{pigx-daemon-elastic-dev.yml => pigx-daemon-elastic-job-dev.yml} (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/Dockerfile (56%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/pom.xml (98%) rename pigx-visual/{pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.java => pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java} (92%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/resources/bootstrap.yml (100%) rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/resources/mapper/ExecutionLogMapper.xml (100%) mode change 100755 => 100644 rename pigx-visual/{pigx-daemon-elastic => pigx-daemon-elastic-job}/src/main/resources/mapper/StatusTraceLogMapper.xml (100%) mode change 100755 => 100644 diff --git a/docker-compose.yml b/docker-compose.yml index d4440cecd..56e5d4c2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,13 +98,13 @@ services: image: pigx-daemon-quartz container_name: pigx-daemon-quartz - pigx-daemon-elastic: + pigx-daemon-elastic-job: build: context: ./ - dockerfile: ./pigx-visual/pigx-daemon-elastic/Dockerfile + dockerfile: ./pigx-visual/pigx-daemon-elastic-job/Dockerfile restart: always - image: pigx-daemon-elastic - container_name: pigx-daemon-elastic + image: pigx-daemon-elastic-job + container_name: pigx-daemon-elastic-job pigx-codegen: diff --git a/pigx-config/src/main/resources/config/pigx-daemon-elastic-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml similarity index 100% rename from pigx-config/src/main/resources/config/pigx-daemon-elastic-dev.yml rename to pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml diff --git a/pigx-visual/pigx-daemon-elastic/Dockerfile b/pigx-visual/pigx-daemon-elastic-job/Dockerfile similarity index 56% rename from pigx-visual/pigx-daemon-elastic/Dockerfile rename to pigx-visual/pigx-daemon-elastic-job/Dockerfile index bff99db97..f18c35c88 100644 --- a/pigx-visual/pigx-daemon-elastic/Dockerfile +++ b/pigx-visual/pigx-daemon-elastic-job/Dockerfile @@ -4,12 +4,12 @@ MAINTAINER wangiegie@gmail.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN mkdir -p /pigx-daemon-elastic +RUN mkdir -p /pigx-daemon-elastic-job -WORKDIR /pigx-daemon-elastic +WORKDIR /pigx-daemon-elastic-job EXPOSE 5002 -ADD ./pigx-visual/pigx-daemon-elastic/target/pigx-daemon-elastic.jar ./ +ADD ./pigx-visual/pigx-daemon-elastic-job/target/pigx-daemon-elastic-job.jar ./ -CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic.jar +CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar diff --git a/pigx-visual/pigx-daemon-elastic/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml similarity index 98% rename from pigx-visual/pigx-daemon-elastic/pom.xml rename to pigx-visual/pigx-daemon-elastic-job/pom.xml index e5c6b739d..7e646a888 100644 --- a/pigx-visual/pigx-daemon-elastic/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -26,7 +26,7 @@ 2.6.0 - pigx-daemon-elastic + pigx-daemon-elastic-job jar 基于elastic-job后台跑批定时任务模块 diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java similarity index 92% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java index f872ce14f..74ef00a9a 100644 --- a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java @@ -34,10 +34,10 @@ import org.springframework.cloud.client.SpringCloudApplication; @EnablePigxFeignClients @SpringCloudApplication @EnablePigxResourceServer -public class PigxDaemonElasticApplication { +public class PigxDaemonElasticJobApplication { public static void main(String[] args) { - SpringApplication.run(PigxDaemonElasticApplication.class, args); + SpringApplication.run(PigxDaemonElasticJobApplication.class, args); } } diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java rename to pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java diff --git a/pigx-visual/pigx-daemon-elastic/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/resources/bootstrap.yml rename to pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml diff --git a/pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/ExecutionLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/ExecutionLogMapper.xml rename to pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml diff --git a/pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/StatusTraceLogMapper.xml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml old mode 100755 new mode 100644 similarity index 100% rename from pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/StatusTraceLogMapper.xml rename to pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index fa40dd6dd..c862da4d7 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -71,16 +71,6 @@ org.springframework.boot spring-boot-maven-plugin - - com.company.platform.frwcloud.job.FrwcloudJobApplication - - - - - repackage - - - com.spotify diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 8037e1461..9661d6c4d 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -34,7 +34,7 @@ pigx-activiti pigx-codegen - pigx-daemon-elastic + pigx-daemon-elastic-job pigx-daemon-quartz pigx-monitor pigx-sso-client-demo