From e130cae470f946b2802c02c053fbde5bfd9e4f66 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 4 Mar 2020 10:10:01 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=B0=83=E5=BA=A6=E4=BD=9C=E4=B8=9A=E5=8C=85=E5=90=8D?= =?UTF-8?q?gray->job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{gray => job}/ElasticJobAutoConfiguration.java | 10 +++++----- .../common/{gray => job}/XxlJobAutoConfiguration.java | 6 +++--- .../{gray => job}/annotation/EnablePigxElasticJob.java | 4 ++-- .../{gray => job}/annotation/EnablePigxXxlJob.java | 4 ++-- .../jobinit/AbstractJobInitialization.java | 6 +++--- .../jobinit/DataflowJobInitialization.java | 4 ++-- .../{gray => job}/jobinit/ScriptJobInitialization.java | 4 ++-- .../{gray => job}/jobinit/SimpleJobInitialization.java | 4 ++-- .../{gray => job}/properties/ElasticJobProperties.java | 4 ++-- .../{gray => job}/properties/XxlAdminProperties.java | 2 +- .../properties/XxlExecutorProperties.java | 2 +- .../{gray => job}/properties/XxlJobProperties.java | 2 +- .../elastic/PigxDaemonElasticJobApplication.java | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/ElasticJobAutoConfiguration.java (91%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/XxlJobAutoConfiguration.java (92%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/annotation/EnablePigxElasticJob.java (90%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/annotation/EnablePigxXxlJob.java (90%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/jobinit/AbstractJobInitialization.java (98%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/jobinit/DataflowJobInitialization.java (94%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/jobinit/ScriptJobInitialization.java (94%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/jobinit/SimpleJobInitialization.java (94%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/properties/ElasticJobProperties.java (98%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/properties/XxlAdminProperties.java (96%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/properties/XxlExecutorProperties.java (97%) rename pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/{gray => job}/properties/XxlJobProperties.java (95%) diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/ElasticJobAutoConfiguration.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/ElasticJobAutoConfiguration.java similarity index 91% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/ElasticJobAutoConfiguration.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/ElasticJobAutoConfiguration.java index 903ceca42..97afd9bb7 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/ElasticJobAutoConfiguration.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/ElasticJobAutoConfiguration.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray; +package com.pig4cloud.pigx.common.job; import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperConfiguration; import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperRegistryCenter; -import com.pig4cloud.pigx.common.gray.jobinit.DataflowJobInitialization; -import com.pig4cloud.pigx.common.gray.jobinit.ScriptJobInitialization; -import com.pig4cloud.pigx.common.gray.jobinit.SimpleJobInitialization; -import com.pig4cloud.pigx.common.gray.properties.ElasticJobProperties; +import com.pig4cloud.pigx.common.job.jobinit.DataflowJobInitialization; +import com.pig4cloud.pigx.common.job.jobinit.ScriptJobInitialization; +import com.pig4cloud.pigx.common.job.jobinit.SimpleJobInitialization; +import com.pig4cloud.pigx.common.job.properties.ElasticJobProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/XxlJobAutoConfiguration.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java similarity index 92% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/XxlJobAutoConfiguration.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java index b24fb5d79..7e81e44bd 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/XxlJobAutoConfiguration.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray; +package com.pig4cloud.pigx.common.job; -import com.pig4cloud.pigx.common.gray.properties.XxlJobProperties; +import com.pig4cloud.pigx.common.job.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @EnableAutoConfiguration -@ComponentScan("com.pig4cloud.pigx.common.gray.properties") +@ComponentScan("com.pig4cloud.pigx.common.job.properties") public class XxlJobAutoConfiguration { @Bean(initMethod = "start", destroyMethod = "destroy") diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxElasticJob.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxElasticJob.java similarity index 90% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxElasticJob.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxElasticJob.java index da37b80fd..bd1d92460 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxElasticJob.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxElasticJob.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.annotation; +package com.pig4cloud.pigx.common.job.annotation; -import com.pig4cloud.pigx.common.gray.ElasticJobAutoConfiguration; +import com.pig4cloud.pigx.common.job.ElasticJobAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxXxlJob.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxXxlJob.java similarity index 90% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxXxlJob.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxXxlJob.java index b57b7c5a9..aa40052aa 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/annotation/EnablePigxXxlJob.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/annotation/EnablePigxXxlJob.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.annotation; +package com.pig4cloud.pigx.common.job.annotation; -import com.pig4cloud.pigx.common.gray.XxlJobAutoConfiguration; +import com.pig4cloud.pigx.common.job.XxlJobAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/AbstractJobInitialization.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/AbstractJobInitialization.java similarity index 98% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/AbstractJobInitialization.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/AbstractJobInitialization.java index 9f0e2b014..b9b81b5d8 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/AbstractJobInitialization.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/AbstractJobInitialization.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.jobinit; +package com.pig4cloud.pigx.common.job.jobinit; import com.dangdang.ddframe.job.api.ElasticJob; import com.dangdang.ddframe.job.api.JobType; @@ -30,7 +30,7 @@ import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener; import com.dangdang.ddframe.job.lite.config.LiteJobConfiguration; import com.dangdang.ddframe.job.lite.spring.api.SpringJobScheduler; import com.dangdang.ddframe.job.reg.zookeeper.ZookeeperRegistryCenter; -import com.pig4cloud.pigx.common.gray.properties.ElasticJobProperties; +import com.pig4cloud.pigx.common.job.properties.ElasticJobProperties; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.BeanDefinition; @@ -46,7 +46,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static com.pig4cloud.pigx.common.gray.ElasticJobAutoConfiguration.DEFAULT_REGISTRY_CENTER_NAME; +import static com.pig4cloud.pigx.common.job.ElasticJobAutoConfiguration.DEFAULT_REGISTRY_CENTER_NAME; /** diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/DataflowJobInitialization.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/DataflowJobInitialization.java similarity index 94% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/DataflowJobInitialization.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/DataflowJobInitialization.java index 989710152..66af592bb 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/DataflowJobInitialization.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/DataflowJobInitialization.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.jobinit; +package com.pig4cloud.pigx.common.job.jobinit; import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.JobTypeConfiguration; import com.dangdang.ddframe.job.config.dataflow.DataflowJobConfiguration; -import com.pig4cloud.pigx.common.gray.properties.ElasticJobProperties; +import com.pig4cloud.pigx.common.job.properties.ElasticJobProperties; import java.util.Map; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/ScriptJobInitialization.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/ScriptJobInitialization.java similarity index 94% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/ScriptJobInitialization.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/ScriptJobInitialization.java index bded1fb30..c7cbd5890 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/ScriptJobInitialization.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/ScriptJobInitialization.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.jobinit; +package com.pig4cloud.pigx.common.job.jobinit; import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.JobTypeConfiguration; import com.dangdang.ddframe.job.config.script.ScriptJobConfiguration; -import com.pig4cloud.pigx.common.gray.properties.ElasticJobProperties; +import com.pig4cloud.pigx.common.job.properties.ElasticJobProperties; import java.util.Map; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/SimpleJobInitialization.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/SimpleJobInitialization.java similarity index 94% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/SimpleJobInitialization.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/SimpleJobInitialization.java index 551e6ba85..fbbead7cb 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/jobinit/SimpleJobInitialization.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/jobinit/SimpleJobInitialization.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.jobinit; +package com.pig4cloud.pigx.common.job.jobinit; import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.JobTypeConfiguration; import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration; -import com.pig4cloud.pigx.common.gray.properties.ElasticJobProperties; +import com.pig4cloud.pigx.common.job.properties.ElasticJobProperties; import java.util.Map; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/ElasticJobProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/ElasticJobProperties.java similarity index 98% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/ElasticJobProperties.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/ElasticJobProperties.java index 12d63de13..7dbbab4d7 100755 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/ElasticJobProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/ElasticJobProperties.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.properties; +package com.pig4cloud.pigx.common.job.properties; import com.dangdang.ddframe.job.api.JobType; import lombok.Getter; @@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.LinkedHashMap; import java.util.Map; -import static com.pig4cloud.pigx.common.gray.ElasticJobAutoConfiguration.DEFAULT_REGISTRY_CENTER_NAME; +import static com.pig4cloud.pigx.common.job.ElasticJobAutoConfiguration.DEFAULT_REGISTRY_CENTER_NAME; /** diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlAdminProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlAdminProperties.java similarity index 96% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlAdminProperties.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlAdminProperties.java index 29d2ad359..eda15b774 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlAdminProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlAdminProperties.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.properties; +package com.pig4cloud.pigx.common.job.properties; import lombok.Data; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlExecutorProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java similarity index 97% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlExecutorProperties.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java index 24d14d906..09f56cec7 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlExecutorProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.properties; +package com.pig4cloud.pigx.common.job.properties; import lombok.Data; diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlJobProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java similarity index 95% rename from pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlJobProperties.java rename to pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java index 15e8050a9..a45e0a475 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/gray/properties/XxlJobProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.common.gray.properties; +package com.pig4cloud.pigx.common.job.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java index f01188317..926f25833 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.daemon.elastic; import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; -import com.pig4cloud.pigx.common.gray.annotation.EnablePigxXxlJob; +import com.pig4cloud.pigx.common.job.annotation.EnablePigxXxlJob; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication;