diff --git a/common/xxljob/README.md b/common/common-xxl-job/README.md similarity index 100% rename from common/xxljob/README.md rename to common/common-xxl-job/README.md diff --git a/common/xxljob/pom.xml b/common/common-xxl-job/pom.xml similarity index 96% rename from common/xxljob/pom.xml rename to common/common-xxl-job/pom.xml index 9b07a88..b168ff1 100644 --- a/common/xxljob/pom.xml +++ b/common/common-xxl-job/pom.xml @@ -10,7 +10,7 @@ ../../pom.xml - xxljob + common-xxl-job 21 diff --git a/common/xxljob/src/main/java/com/tacit/starter/xxljob/XxlJobAutoConfiguration.java b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/XxlJobAutoConfiguration.java similarity index 97% rename from common/xxljob/src/main/java/com/tacit/starter/xxljob/XxlJobAutoConfiguration.java rename to common/common-xxl-job/src/main/java/com/tacit/common/xxljob/XxlJobAutoConfiguration.java index 89a82c1..630a141 100644 --- a/common/xxljob/src/main/java/com/tacit/starter/xxljob/XxlJobAutoConfiguration.java +++ b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/XxlJobAutoConfiguration.java @@ -1,7 +1,7 @@ -package com.tacit.starter.xxljob; +package com.tacit.common.xxljob; -import com.tacit.starter.xxljob.properties.XxlExecutorProperties; -import com.tacit.starter.xxljob.properties.XxlJobProperties; +import com.tacit.common.xxljob.properties.XxlExecutorProperties; +import com.tacit.common.xxljob.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/xxljob/src/main/java/com/tacit/starter/xxljob/annotation/EnableXxlJob.java b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/annotation/EnableXxlJob.java similarity index 85% rename from common/xxljob/src/main/java/com/tacit/starter/xxljob/annotation/EnableXxlJob.java rename to common/common-xxl-job/src/main/java/com/tacit/common/xxljob/annotation/EnableXxlJob.java index 107b93e..fcf0d07 100644 --- a/common/xxljob/src/main/java/com/tacit/starter/xxljob/annotation/EnableXxlJob.java +++ b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/annotation/EnableXxlJob.java @@ -1,6 +1,6 @@ -package com.tacit.starter.xxljob.annotation; +package com.tacit.common.xxljob.annotation; -import com.tacit.starter.xxljob.XxlJobAutoConfiguration; +import com.tacit.common.xxljob.XxlJobAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.Documented; diff --git a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlAdminProperties.java b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlAdminProperties.java similarity index 92% rename from common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlAdminProperties.java rename to common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlAdminProperties.java index fca0906..29c1bed 100644 --- a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlAdminProperties.java +++ b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlAdminProperties.java @@ -1,4 +1,4 @@ -package com.tacit.starter.xxljob.properties; +package com.tacit.common.xxljob.properties; import lombok.Data; diff --git a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlExecutorProperties.java b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlExecutorProperties.java similarity index 97% rename from common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlExecutorProperties.java rename to common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlExecutorProperties.java index ad74928..942b8b8 100644 --- a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlExecutorProperties.java +++ b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlExecutorProperties.java @@ -1,4 +1,4 @@ -package com.tacit.starter.xxljob.properties; +package com.tacit.common.xxljob.properties; import lombok.Data; diff --git a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlJobProperties.java b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlJobProperties.java similarity index 92% rename from common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlJobProperties.java rename to common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlJobProperties.java index 230c4cc..2e9ced9 100644 --- a/common/xxljob/src/main/java/com/tacit/starter/xxljob/properties/XxlJobProperties.java +++ b/common/common-xxl-job/src/main/java/com/tacit/common/xxljob/properties/XxlJobProperties.java @@ -1,4 +1,4 @@ -package com.tacit.starter.xxljob.properties; +package com.tacit.common.xxljob.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/common/xxljob/src/main/resources/META-INF/spring.factories b/common/common-xxl-job/src/main/resources/META-INF/spring.factories similarity index 56% rename from common/xxljob/src/main/resources/META-INF/spring.factories rename to common/common-xxl-job/src/main/resources/META-INF/spring.factories index 5f40a8e..f2e205b 100644 --- a/common/xxljob/src/main/resources/META-INF/spring.factories +++ b/common/common-xxl-job/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tacit.starter.xxljob.XxlJobAutoConfiguration \ No newline at end of file + com.tacit.common.xxljob.XxlJobAutoConfiguration \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index b2c2f32..731d50f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,7 +25,7 @@ common-feign common-core common-redis - xxljob + common-xxl-job \ No newline at end of file diff --git a/tacit-admin/pom.xml b/tacit-admin/pom.xml index 05d78ea..f9d1561 100644 --- a/tacit-admin/pom.xml +++ b/tacit-admin/pom.xml @@ -84,7 +84,7 @@ com.tacit - xxljob + common-xxl-job ${project.parent.version}