Prechádzať zdrojové kódy

:art: Improving structure / format of the code.rename project: pigx-daemon-elastic --> pigx-daemon-elastic-job

萌萌哒Sakura酱 6 rokov pred
rodič
commit
1c1764a95b
25 zmenil súbory, kde vykonal 12 pridanie a 22 odobranie
  1. 4 4
      docker-compose.yml
  2. 0 0
      pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml
  3. 4 4
      pigx-visual/pigx-daemon-elastic/Dockerfile
  4. 1 1
      pigx-visual/pigx-daemon-elastic/pom.xml
  5. 2 2
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.java
  6. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java
  7. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java
  8. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java
  9. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java
  10. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java
  11. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java
  12. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java
  13. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java
  14. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java
  15. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java
  16. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java
  17. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java
  18. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java
  19. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java
  20. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java
  21. 0 0
      pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
  22. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/ExecutionLogMapper.xml
  23. 0 0
      pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/StatusTraceLogMapper.xml
  24. 0 10
      pigx-visual/pigx-daemon-quartz/pom.xml
  25. 1 1
      pigx-visual/pom.xml

+ 4 - 4
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:

pigx-config/src/main/resources/config/pigx-daemon-elastic-dev.yml → pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml


+ 4 - 4
pigx-visual/pigx-daemon-elastic/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

+ 1 - 1
pigx-visual/pigx-daemon-elastic/pom.xml

@@ -26,7 +26,7 @@
 		<version>2.6.0</version>
 	</parent>
 
-	<artifactId>pigx-daemon-elastic</artifactId>
+	<artifactId>pigx-daemon-elastic-job</artifactId>
 	<packaging>jar</packaging>
 
 	<description>基于elastic-job后台跑批定时任务模块</description>

+ 2 - 2
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticApplication.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);
 	}
 
 }

+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java


pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java → pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java


pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java → pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java


pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java → pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java


pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java → pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java


pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java → pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java


pigx-visual/pigx-daemon-elastic/src/main/resources/bootstrap.yml → pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/ExecutionLogMapper.xml


+ 0 - 0
pigx-visual/pigx-daemon-elastic/src/main/resources/mapper/StatusTraceLogMapper.xml


+ 0 - 10
pigx-visual/pigx-daemon-quartz/pom.xml

@@ -71,16 +71,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<mainClass>com.company.platform.frwcloud.job.FrwcloudJobApplication</mainClass>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>

+ 1 - 1
pigx-visual/pom.xml

@@ -34,7 +34,7 @@
 	<modules>
 		<module>pigx-activiti</module>
 		<module>pigx-codegen</module>
-		<module>pigx-daemon-elastic</module>
+		<module>pigx-daemon-elastic-job</module>
 		<module>pigx-daemon-quartz</module>
 		<module>pigx-monitor</module>
 		<module>pigx-sso-client-demo</module>