diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 9aac61ce..0d48b708 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -11,7 +11,13 @@ 4.0.0 powerjob-server 3.4.6 - jar + + powerjob-server-common + powerjob-server-remote + powerjob-server-persistence + powerjob-server-starter + + pom 2.9.2 @@ -220,7 +226,7 @@ spring-boot-maven-plugin ${springboot.version} - com.github.kfcfans.powerjob.server.OhMyApplication + tech.powerjob.server.OhMyApplication diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml new file mode 100644 index 00000000..7c0237b5 --- /dev/null +++ b/powerjob-server/powerjob-server-common/pom.xml @@ -0,0 +1,21 @@ + + + + powerjob-server + com.github.kfcfans + 3.4.6 + + 4.0.0 + + tech.powerjob + powerjob-server-common + 1.0.0 + + + 8 + 8 + + + \ No newline at end of file diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml new file mode 100644 index 00000000..184fae85 --- /dev/null +++ b/powerjob-server/powerjob-server-persistence/pom.xml @@ -0,0 +1,21 @@ + + + + powerjob-server + com.github.kfcfans + 3.4.6 + + 4.0.0 + + tech.powerjob + powerjob-server-persistence + 1.0.0 + + + 8 + 8 + + + \ No newline at end of file diff --git a/powerjob-server/powerjob-server-remote/pom.xml b/powerjob-server/powerjob-server-remote/pom.xml new file mode 100644 index 00000000..1449baa5 --- /dev/null +++ b/powerjob-server/powerjob-server-remote/pom.xml @@ -0,0 +1,21 @@ + + + + powerjob-server + com.github.kfcfans + 3.4.6 + + 4.0.0 + + tech.powerjob + powerjob-server-remote + 1.0.0 + + + 8 + 8 + + + \ No newline at end of file diff --git a/powerjob-server/powerjob-server-starter/pom.xml b/powerjob-server/powerjob-server-starter/pom.xml new file mode 100644 index 00000000..6cdf63c2 --- /dev/null +++ b/powerjob-server/powerjob-server-starter/pom.xml @@ -0,0 +1,21 @@ + + + + powerjob-server + com.github.kfcfans + 3.4.6 + + 4.0.0 + + tech.powerjob + powerjob-server-starter + 1.0.0 + + + 8 + 8 + + + \ No newline at end of file diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/OhMyApplication.java similarity index 82% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/OhMyApplication.java index e1063978..5a86e68b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/OhMyApplication.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server; +package tech.powerjob.server; -import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; -import com.github.kfcfans.powerjob.server.remote.transport.starter.VertXStarter; +import tech.powerjob.server.common.utils.PropertyUtils; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.remote.transport.starter.VertXStarter; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/PowerJobServerConfigKey.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/PowerJobServerConfigKey.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/PowerJobServerConfigKey.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/PowerJobServerConfigKey.java index adec56e4..75ca2635 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/PowerJobServerConfigKey.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/PowerJobServerConfigKey.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common; +package tech.powerjob.server.common; /** * 配置文件 key diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/RejectedExecutionHandlerFactory.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/RejectedExecutionHandlerFactory.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/RejectedExecutionHandlerFactory.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/RejectedExecutionHandlerFactory.java index 17eeecb2..e7ea7cc0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/RejectedExecutionHandlerFactory.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/RejectedExecutionHandlerFactory.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common; +package tech.powerjob.server.common; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/SJ.java similarity index 85% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/SJ.java index aa290eed..443300b2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/SJ.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common; +package tech.powerjob.server.common; import com.google.common.base.Joiner; import com.google.common.base.Splitter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java index 9fb35811..0fb7ef85 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.config; +package tech.powerjob.server.common.config; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java index e32bea84..db42ed3f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.common.config; +package tech.powerjob.server.common.config; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.PowerJobServerConfigKey; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java index 4289f66f..d6137e28 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.common.config; +package tech.powerjob.server.common.config; -import com.github.kfcfans.powerjob.server.common.RejectedExecutionHandlerFactory; +import tech.powerjob.server.common.RejectedExecutionHandlerFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java index 9841e750..010a1ac6 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.config; +package tech.powerjob.server.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/ContainerSourceType.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/ContainerSourceType.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/ContainerSourceType.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/ContainerSourceType.java index 2ad1a81a..88991bb6 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/ContainerSourceType.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/ContainerSourceType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.constants; +package tech.powerjob.server.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/InstanceType.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/InstanceType.java similarity index 80% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/InstanceType.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/InstanceType.java index 099bb735..0b960b7d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/InstanceType.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/InstanceType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.constants; +package tech.powerjob.server.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/SwitchableStatus.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/SwitchableStatus.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/SwitchableStatus.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/SwitchableStatus.java index ec881c5d..e143553c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constants/SwitchableStatus.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/constants/SwitchableStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.constants; +package tech.powerjob.server.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/AOPUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/AOPUtils.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/AOPUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/AOPUtils.java index 2f0b5067..c1edeb09 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/AOPUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/AOPUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/ContainerTemplateGenerator.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/ContainerTemplateGenerator.java index 8a42c5a1..ad9c0ccf 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/ContainerTemplateGenerator.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.github.kfcfans.powerjob.common.ContainerConstant; import net.lingala.zip4j.ZipFile; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/CronExpression.java similarity index 99% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/CronExpression.java index a9c16fe3..43260549 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/CronExpression.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; /* Copyright [2020] [PowerJob] diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/DingTalkUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/DingTalkUtils.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/DingTalkUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/DingTalkUtils.java index 6196d1cb..8253bf8e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/DingTalkUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/DingTalkUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java index ea35028d..944eb933 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/PropertyUtils.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/PropertyUtils.java index e9c4c158..f124c053 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/PropertyUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/QueryConvertUtils.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/QueryConvertUtils.java index 2f8b4ebd..d95b7212 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/QueryConvertUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.alibaba.fastjson.JSONArray; import com.github.kfcfans.powerjob.common.PowerJobException; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/SpringUtils.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/SpringUtils.java index 53eb7bfd..13fda3b3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java index eba64bda..fd420e3a 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.github.kfcfans.powerjob.common.RemoteConstant; import com.google.common.collect.Lists; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/WorkflowDAGUtils.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/WorkflowDAGUtils.java index 3057d6ef..88d9ed1d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/WorkflowDAGUtils.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.common.utils; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.SystemInstanceResult; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.utils.JsonUtils; -import com.github.kfcfans.powerjob.server.model.WorkflowDAG; +import tech.powerjob.server.model.WorkflowDAG; import com.google.common.collect.*; import java.util.*; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/HashedWheelTimer.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/HashedWheelTimer.java index 241bbe5d..5767199c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/HashedWheelTimer.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.common.utils.timewheel; +package tech.powerjob.server.common.utils.timewheel; import com.github.kfcfans.powerjob.common.utils.CommonUtils; -import com.github.kfcfans.powerjob.server.common.RejectedExecutionHandlerFactory; +import tech.powerjob.server.common.RejectedExecutionHandlerFactory; import com.google.common.collect.Queues; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/Timer.java similarity index 83% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/Timer.java index d87630f2..0015962d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/Timer.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils.timewheel; +package tech.powerjob.server.common.utils.timewheel; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerFuture.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerFuture.java index 68f50609..9303e8c9 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerFuture.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils.timewheel; +package tech.powerjob.server.common.utils.timewheel; /** * TimerFuture diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerTask.java similarity index 67% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerTask.java index e85dd0c6..3c14fa91 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/utils/timewheel/TimerTask.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.common.utils.timewheel; +package tech.powerjob.server.common.utils.timewheel; /** * 时间任务接口 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/Alarmable.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/Alarmable.java similarity index 59% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/Alarmable.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/Alarmable.java index abab5b00..cf52e850 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/Alarmable.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/Alarmable.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.extension; +package tech.powerjob.server.extension; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.service.alarm.Alarm; -import com.github.kfcfans.powerjob.server.service.alarm.AlarmCenter; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.service.alarm.Alarm; +import tech.powerjob.server.service.alarm.AlarmCenter; import org.springframework.beans.factory.InitializingBean; import java.util.List; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/LockService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/LockService.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/LockService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/LockService.java index d6b89d70..d68a25ec 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/LockService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/LockService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.extension; +package tech.powerjob.server.extension; /** * 锁服务，所有方法都不允许抛出任何异常！ diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/ServerElectionService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/ServerElectionService.java similarity index 83% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/ServerElectionService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/ServerElectionService.java index 4129811f..f9059312 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/ServerElectionService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/ServerElectionService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.extension; +package tech.powerjob.server.extension; /** * 调度服务器选举服务，默认实现为先到先得，可自行接入 Zookeeper 等实现"负载均衡"策略 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/WorkerFilter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/WorkerFilter.java similarity index 66% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/WorkerFilter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/WorkerFilter.java index adbecb45..374ddf0b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/extension/WorkerFilter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/extension/WorkerFilter.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.extension; +package tech.powerjob.server.extension; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; /** * filter worker by system metrics or other info diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/model/WorkflowDAG.java similarity index 96% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/model/WorkflowDAG.java index 3671d3b4..8c6573a3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/model/WorkflowDAG.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.model; +package tech.powerjob.server.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/PageResult.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/PageResult.java index d3c4260a..18fc8c77 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/PageResult.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence; +package tech.powerjob.server.persistence; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/StringPage.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/StringPage.java index 0cedbacd..6af56305 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/StringPage.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence; +package tech.powerjob.server.persistence; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java index 22398920..cf6936b5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.config; +package tech.powerjob.server.persistence.config; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; @@ -39,7 +39,7 @@ public class CoreJpaConfig { @Resource(name = "omsCoreDatasource") private DataSource omsCoreDatasource; - public static final String CORE_PACKAGES = "com.github.kfcfans.powerjob.server.persistence.core"; + public static final String CORE_PACKAGES = "tech.powerjob.server.persistence.core"; /** * 生成配置文件，包括 JPA配置文件和Hibernate配置文件，相当于一下三个配置 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/LocalJpaConfig.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/LocalJpaConfig.java index 0a3b8f12..c33f0b9e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/LocalJpaConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.config; +package tech.powerjob.server.persistence.config; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; @@ -41,7 +41,7 @@ public class LocalJpaConfig { @Resource(name = "omsLocalDatasource") private DataSource omsLocalDatasource; - public static final String LOCAL_PACKAGES = "com.github.kfcfans.powerjob.server.persistence.local"; + public static final String LOCAL_PACKAGES = "tech.powerjob.server.persistence.local"; private static Map genDatasourceProperties() { diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java index 06531499..7db80c70 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.config; +package tech.powerjob.server.persistence.config; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.common.utils.OmsFileUtils; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import org.apache.commons.io.FileUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java index 395487a0..2bd7ca04 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/config/PowerJobPhysicalNamingStrategy.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.persistence.config; +package tech.powerjob.server.persistence.config; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; -import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; +import tech.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.utils.PropertyUtils; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java index e3016aaf..640a69d0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java index 04a5b42f..c6da1a8a 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java similarity index 96% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java index a23e0a01..66e629ee 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import com.github.kfcfans.powerjob.common.InstanceStatus; import lombok.AllArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java index 96833408..fd6e86e8 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java index ee96d342..66b4b11d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java index 5e200f2a..45a41868 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java index 1a74e9ed..ac18309f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java index 97da366f..80c3b88f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java index 23fe0af8..fac9f742 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java index d278eebc..eab040b3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/package-info.java similarity index 76% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/package-info.java index 683787d9..e31896c6 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/package-info.java @@ -5,4 +5,4 @@ * @author tjq * @since 2020/6/3 */ -package com.github.kfcfans.powerjob.server.persistence.core; \ No newline at end of file +package tech.powerjob.server.persistence.core; \ No newline at end of file diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java similarity index 82% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java index 66f11fa1..01ff2e16 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.model.AppInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java similarity index 68% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java index f1a4c916..582223e4 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; +import tech.powerjob.server.persistence.core.model.ContainerInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java index 9def5894..bad07e16 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java index 60cb83ba..965a0e95 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java similarity index 81% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java index 93ed309e..5abf9cf5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO; +import tech.powerjob.server.persistence.core.model.OmsLockDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java index 0588d00f..64cd9ebc 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.ServerInfoDO; +import tech.powerjob.server.persistence.core.model.ServerInfoDO; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java similarity index 70% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java index bd025a11..8333cb12 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.core.model.UserInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java index 849c3784..70fdc220 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java index 6dabc143..c957af4c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java similarity index 81% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java index 989fa2e4..c8bf3ea4 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.core.repository; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogDO.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogDO.java index e9e5028a..370f96bd 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.local; +package tech.powerjob.server.persistence.local; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogRepository.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogRepository.java index d1a00329..cd8057f7 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/local/LocalInstanceLogRepository.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.persistence.local; +package tech.powerjob.server.persistence.local; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/mongodb/GridFsManager.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/mongodb/GridFsManager.java index 71d7d8b8..9a607ad5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/persistence/mongodb/GridFsManager.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.persistence.mongodb; +package tech.powerjob.server.persistence.mongodb; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.PowerJobServerConfigKey; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.mongodb.client.MongoDatabase; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/DispatchService.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/DispatchService.java index 794b989e..9c8f6675 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/DispatchService.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.powerjob.server.remote; +package tech.powerjob.server.remote; import com.github.kfcfans.powerjob.common.*; import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; import com.github.kfcfans.powerjob.common.DispatchStrategy; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.remote.transport.TransportService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; -import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; -import com.github.kfcfans.powerjob.server.service.instance.InstanceMetadataService; -import com.github.kfcfans.powerjob.server.service.lock.local.UseSegmentLock; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.remote.transport.TransportService; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.service.instance.InstanceManager; +import tech.powerjob.server.service.instance.InstanceMetadataService; +import tech.powerjob.server.service.lock.local.UseSegmentLock; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/FriendRequestHandler.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java similarity index 79% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/FriendRequestHandler.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java index bd5529ea..cc4a0863 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/FriendRequestHandler.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/FriendRequestHandler.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.powerjob.server.remote.server; +package tech.powerjob.server.remote.server; import akka.actor.AbstractActor; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.JsonUtils; -import com.github.kfcfans.powerjob.server.remote.server.election.Ping; -import com.github.kfcfans.powerjob.server.remote.server.redirector.RemoteProcessReq; -import com.github.kfcfans.powerjob.server.remote.server.redirector.RemoteRequestProcessor; -import com.github.kfcfans.powerjob.server.remote.transport.TransportService; +import tech.powerjob.server.remote.server.election.Ping; +import tech.powerjob.server.remote.server.redirector.RemoteProcessReq; +import tech.powerjob.server.remote.server.redirector.RemoteRequestProcessor; +import tech.powerjob.server.remote.transport.TransportService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java index f352b782..06b53b7e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.powerjob.server.remote.server; +package tech.powerjob.server.remote.server; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.persistence.core.model.ServerInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.ServerInfoRepository; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.persistence.core.model.ServerInfoDO; +import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/DefaultServerElectionService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/DefaultServerElectionService.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/DefaultServerElectionService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/DefaultServerElectionService.java index 95440b76..5ae92625 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/DefaultServerElectionService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/DefaultServerElectionService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.server.election; +package tech.powerjob.server.remote.server.election; import akka.actor.ActorSelection; import akka.pattern.Patterns; @@ -7,12 +7,12 @@ import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.JsonUtils; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.extension.ServerElectionService; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.remote.transport.TransportService; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.extension.ServerElectionService; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.remote.transport.TransportService; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/Ping.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/Ping.java similarity index 78% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/Ping.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/Ping.java index 758d215c..52707b9b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/election/Ping.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/election/Ping.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.server.election; +package tech.powerjob.server.remote.server.election; import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServer.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServer.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServer.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServer.java index 4f69d8fa..0da74566 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServer.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServer.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.server.redirector; +package tech.powerjob.server.remote.server.redirector; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServerAspect.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServerAspect.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java index ab62d6ae..5e7833bd 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/DesignateServerAspect.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.server.redirector; +package tech.powerjob.server.remote.server.redirector; import akka.pattern.Patterns; import com.fasterxml.jackson.databind.JavaType; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.type.TypeFactory; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.response.AskResponse; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteProcessReq.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteProcessReq.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteProcessReq.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteProcessReq.java index 8fcabae7..2d2addad 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteProcessReq.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteProcessReq.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.server.redirector; +package tech.powerjob.server.remote.server.redirector; import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java index 8010b9fb..8325ac7f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/server/redirector/RemoteRequestProcessor.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.remote.server.redirector; +package tech.powerjob.server.remote.server.redirector; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; +import tech.powerjob.server.common.utils.SpringUtils; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/TransportService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/TransportService.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/TransportService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/TransportService.java index bfd6b947..eef1f18a 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/TransportService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/TransportService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.transport; +package tech.powerjob.server.remote.transport; import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.Protocol; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/Transporter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/Transporter.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/Transporter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/Transporter.java index debb6bc2..04f4f8f2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/Transporter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/Transporter.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.transport; +package tech.powerjob.server.remote.transport; import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.Protocol; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/AkkaTransporter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/AkkaTransporter.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/AkkaTransporter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/AkkaTransporter.java index 977ac379..9198847f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/AkkaTransporter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/AkkaTransporter.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.transport.impl; +package tech.powerjob.server.remote.transport.impl; import akka.actor.ActorSelection; import akka.pattern.Patterns; @@ -6,8 +6,8 @@ import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.response.AskResponse; -import com.github.kfcfans.powerjob.server.remote.transport.Transporter; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.remote.transport.Transporter; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; import org.springframework.stereotype.Service; import java.time.Duration; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/HttpTransporter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/HttpTransporter.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/HttpTransporter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/HttpTransporter.java index 3e57fc46..5dab785d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/impl/HttpTransporter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/impl/HttpTransporter.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.powerjob.server.remote.transport.impl; +package tech.powerjob.server.remote.transport.impl; import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.remote.transport.Transporter; -import com.github.kfcfans.powerjob.server.remote.transport.starter.VertXStarter; +import tech.powerjob.server.remote.transport.Transporter; +import tech.powerjob.server.remote.transport.starter.VertXStarter; import io.vertx.core.Future; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/AkkaStarter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/AkkaStarter.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/AkkaStarter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/AkkaStarter.java index 03a4c695..0d5a85a0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/AkkaStarter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/AkkaStarter.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.transport.starter; +package tech.powerjob.server.remote.transport.starter; import akka.actor.ActorSelection; import akka.actor.ActorSystem; @@ -10,10 +10,10 @@ import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; -import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; -import com.github.kfcfans.powerjob.server.remote.server.FriendRequestHandler; -import com.github.kfcfans.powerjob.server.remote.worker.handler.impl.WorkerRequestAkkaHandler; +import tech.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.utils.PropertyUtils; +import tech.powerjob.server.remote.server.FriendRequestHandler; +import tech.powerjob.server.remote.worker.handler.impl.WorkerRequestAkkaHandler; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.typesafe.config.Config; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/VertXStarter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/VertXStarter.java similarity index 81% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/VertXStarter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/VertXStarter.java index 1d70ebda..f7c6031f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/transport/starter/VertXStarter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/transport/starter/VertXStarter.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.powerjob.server.remote.transport.starter; +package tech.powerjob.server.remote.transport.starter; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; -import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; -import com.github.kfcfans.powerjob.server.remote.worker.handler.impl.WorkerRequestHttpHandler; +import tech.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.utils.PropertyUtils; +import tech.powerjob.server.remote.worker.handler.impl.WorkerRequestHttpHandler; import com.google.common.base.Stopwatch; import io.vertx.core.Vertx; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java index 98d20745..24a6cf08 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/ClusterStatusHolder.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster; +package tech.powerjob.server.remote.worker.cluster; import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java similarity index 96% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java index b10d2097..ba9ffd2d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterManagerService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster; +package tech.powerjob.server.remote.worker.cluster; import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; import com.google.common.collect.Maps; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java index ad5cf105..2c01c875 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerClusterQueryService.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster; +package tech.powerjob.server.remote.worker.cluster; import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; -import com.github.kfcfans.powerjob.server.extension.WorkerFilter; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.extension.WorkerFilter; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.remote.server.redirector.DesignateServer; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerInfo.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerInfo.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerInfo.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerInfo.java index cd74b3a9..a19263f4 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/WorkerInfo.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/WorkerInfo.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster; +package tech.powerjob.server.remote.worker.cluster; import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; import com.github.kfcfans.powerjob.common.model.SystemMetrics; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java similarity index 72% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java index 077306f9..69fa8b62 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DesignatedWorkerFilter.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster.filter; +package tech.powerjob.server.remote.worker.cluster.filter; -import com.github.kfcfans.powerjob.server.common.SJ; -import com.github.kfcfans.powerjob.server.extension.WorkerFilter; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.extension.WorkerFilter; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java similarity index 67% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java index 46a3c167..62b88101 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/DisconnectedWorkerFilter.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster.filter; +package tech.powerjob.server.remote.worker.cluster.filter; -import com.github.kfcfans.powerjob.server.extension.WorkerFilter; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.extension.WorkerFilter; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java similarity index 73% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java index 78b9bae5..271447d3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/cluster/filter/SystemMetricsWorkerFilter.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.remote.worker.cluster.filter; +package tech.powerjob.server.remote.worker.cluster.filter; import com.github.kfcfans.powerjob.common.model.SystemMetrics; -import com.github.kfcfans.powerjob.server.extension.WorkerFilter; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.extension.WorkerFilter; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/WorkerRequestHandler.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/WorkerRequestHandler.java similarity index 84% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/WorkerRequestHandler.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/WorkerRequestHandler.java index 41919bdc..eb232a0c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/WorkerRequestHandler.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/WorkerRequestHandler.java @@ -1,22 +1,22 @@ -package com.github.kfcfans.powerjob.server.remote.worker.handler; +package tech.powerjob.server.remote.worker.handler; import com.github.kfcfans.powerjob.common.InstanceStatus; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; import com.github.kfcfans.powerjob.common.request.*; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.service.InstanceLogService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.SpringUtils; +import tech.powerjob.server.persistence.core.model.ContainerInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.service.InstanceLogService; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; +import tech.powerjob.server.service.instance.InstanceManager; +import tech.powerjob.server.service.workflow.WorkflowInstanceManager; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java index af5fd39f..cef3fa66 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestAkkaHandler.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.worker.handler.impl; +package tech.powerjob.server.remote.worker.handler.impl; import akka.actor.AbstractActor; import com.github.kfcfans.powerjob.common.request.*; @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.Optional; -import static com.github.kfcfans.powerjob.server.remote.worker.handler.WorkerRequestHandler.getWorkerRequestHandler; +import static tech.powerjob.server.remote.worker.handler.WorkerRequestHandler.getWorkerRequestHandler; /** * 处理 Worker 请求 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java index 83f7de23..e0550773 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/remote/worker/handler/impl/WorkerRequestHttpHandler.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.remote.worker.handler.impl; +package tech.powerjob.server.remote.worker.handler.impl; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.ProtocolConstant; @@ -7,8 +7,8 @@ import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; import com.github.kfcfans.powerjob.common.request.WorkerLogReportReq; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; -import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; +import tech.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.utils.PropertyUtils; import io.vertx.core.AbstractVerticle; import io.vertx.core.http.HttpServer; import io.vertx.core.http.HttpServerOptions; @@ -21,7 +21,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.Properties; -import static com.github.kfcfans.powerjob.server.remote.worker.handler.WorkerRequestHandler.getWorkerRequestHandler; +import static tech.powerjob.server.remote.worker.handler.WorkerRequestHandler.getWorkerRequestHandler; /** * WorkerRequestHandler diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/AppInfoService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java similarity index 80% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/AppInfoService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java index 2f8b0bb3..367064c6 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/AppInfoService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; import com.github.kfcfans.powerjob.common.PowerJobException; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java index 0fe02dec..3edeb06b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java index 727aa1d8..fdc3eec2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; import akka.actor.ActorSelection; import com.github.kfcfans.powerjob.common.OmsConstant; @@ -10,17 +10,17 @@ import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.SegmentLock; -import com.github.kfcfans.powerjob.server.common.constants.ContainerSourceType; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; -import com.github.kfcfans.powerjob.server.web.request.SaveContainerInfoRequest; +import tech.powerjob.server.common.constants.ContainerSourceType; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.persistence.core.model.ContainerInfoDO; +import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import tech.powerjob.server.persistence.mongodb.GridFsManager; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.web.request.SaveContainerInfoRequest; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/InstanceLogService.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/InstanceLogService.java index 36f964c7..72158945 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/InstanceLogService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; import com.github.kfcfans.powerjob.common.LogLevel; import com.github.kfcfans.powerjob.common.OmsConstant; @@ -7,14 +7,14 @@ import com.github.kfcfans.powerjob.common.model.InstanceLogContent; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.SegmentLock; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.persistence.StringPage; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.local.LocalInstanceLogDO; -import com.github.kfcfans.powerjob.server.persistence.local.LocalInstanceLogRepository; -import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.powerjob.server.service.instance.InstanceMetadataService; +import tech.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.persistence.StringPage; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.local.LocalInstanceLogDO; +import tech.powerjob.server.persistence.local.LocalInstanceLogRepository; +import tech.powerjob.server.persistence.mongodb.GridFsManager; +import tech.powerjob.server.service.instance.InstanceMetadataService; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java index 0b8fd963..1a3575f3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.PowerJobException; @@ -6,18 +6,18 @@ import com.github.kfcfans.powerjob.common.PowerQuery; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; import com.github.kfcfans.powerjob.common.response.JobInfoDTO; -import com.github.kfcfans.powerjob.server.common.SJ; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; -import com.github.kfcfans.powerjob.server.common.utils.QueryConvertUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceTimeWheelService; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.CronExpression; +import tech.powerjob.server.common.utils.QueryConvertUtils; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.service.instance.InstanceTimeWheelService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.data.jpa.domain.Specification; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/UserService.java similarity index 84% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/UserService.java index f95f7b1a..5bdd9680 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/UserService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.UserInfoRepository; -import com.github.kfcfans.powerjob.server.web.request.ModifyUserInfoRequest; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.core.repository.UserInfoRepository; +import tech.powerjob.server.web.request.ModifyUserInfoRequest; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java index aa8cb7eb..83eb1656 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ValidateService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.service; +package tech.powerjob.server.service; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.TimeExpressionType; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import tech.powerjob.server.common.utils.CronExpression; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/Alarm.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/Alarm.java index be669ad9..6a29ca4d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/Alarm.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.alarm; +package tech.powerjob.server.service.alarm; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.OmsConstant; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/AlarmCenter.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/AlarmCenter.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/AlarmCenter.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/AlarmCenter.java index 356931c6..8e7ce3c0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/AlarmCenter.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/AlarmCenter.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.service.alarm; +package tech.powerjob.server.service.alarm; -import com.github.kfcfans.powerjob.server.extension.Alarmable; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.extension.Alarmable; +import tech.powerjob.server.persistence.core.model.UserInfoDO; import com.google.common.collect.Lists; import com.google.common.collect.Queues; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarm.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/JobInstanceAlarm.java similarity index 95% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarm.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/JobInstanceAlarm.java index fc6524ed..e4cd8f27 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarm.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/JobInstanceAlarm.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.alarm; +package tech.powerjob.server.service.alarm; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarm.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/WorkflowInstanceAlarm.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarm.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/WorkflowInstanceAlarm.java index 0237c5dc..f01b658b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarm.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/WorkflowInstanceAlarm.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.alarm; +package tech.powerjob.server.service.alarm; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/DingTalkAlarmService.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/DingTalkAlarmService.java index 5df9024b..6e9eeac5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/DingTalkAlarmService.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.powerjob.server.service.alarm.impl; +package tech.powerjob.server.service.alarm.impl; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; -import com.github.kfcfans.powerjob.server.common.SJ; -import com.github.kfcfans.powerjob.server.common.utils.DingTalkUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.service.alarm.Alarm; -import com.github.kfcfans.powerjob.server.extension.Alarmable; +import tech.powerjob.server.common.PowerJobServerConfigKey; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.common.utils.DingTalkUtils; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.service.alarm.Alarm; +import tech.powerjob.server.extension.Alarmable; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.Lists; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/MailAlarmService.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/MailAlarmService.java index 60010e1d..afb0d838 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/MailAlarmService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.service.alarm.impl; +package tech.powerjob.server.service.alarm.impl; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.service.alarm.Alarm; -import com.github.kfcfans.powerjob.server.extension.Alarmable; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.service.alarm.Alarm; +import tech.powerjob.server.extension.Alarmable; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/WebHookAlarmService.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/WebHookAlarmService.java index 9de33c67..5da1125d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/WebHookAlarmService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/alarm/impl/WebHookAlarmService.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.powerjob.server.service.alarm.impl; +package tech.powerjob.server.service.alarm.impl; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.utils.HttpUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.service.alarm.Alarm; -import com.github.kfcfans.powerjob.server.extension.Alarmable; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.service.alarm.Alarm; +import tech.powerjob.server.extension.Alarmable; import lombok.extern.slf4j.Slf4j; import okhttp3.MediaType; import okhttp3.RequestBody; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/IdGenerateService.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/IdGenerateService.java index ad6e2f08..9c384a39 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/IdGenerateService.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.service.id; +package tech.powerjob.server.service.id; -import com.github.kfcfans.powerjob.server.remote.server.ServerInfoService; +import tech.powerjob.server.remote.server.ServerInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/SnowFlakeIdGenerator.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/SnowFlakeIdGenerator.java index 2eb5888d..2af66f9d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/id/SnowFlakeIdGenerator.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.id; +package tech.powerjob.server.service.id; /** * Twitter SnowFlake（Scala -> Java） diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceManager.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceManager.java index df12979b..a1353642 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceManager.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.powerjob.server.service.instance; +package tech.powerjob.server.service.instance; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; -import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.service.InstanceLogService; -import com.github.kfcfans.powerjob.server.service.UserService; -import com.github.kfcfans.powerjob.server.service.alarm.AlarmCenter; -import com.github.kfcfans.powerjob.server.service.alarm.JobInstanceAlarm; -import com.github.kfcfans.powerjob.server.service.timing.schedule.HashedWheelTimerHolder; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; +import tech.powerjob.server.common.utils.SpringUtils; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.service.InstanceLogService; +import tech.powerjob.server.service.UserService; +import tech.powerjob.server.service.alarm.AlarmCenter; +import tech.powerjob.server.service.alarm.JobInstanceAlarm; +import tech.powerjob.server.service.timing.schedule.HashedWheelTimerHolder; +import tech.powerjob.server.service.workflow.WorkflowInstanceManager; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceMetadataService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceMetadataService.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceMetadataService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceMetadataService.java index 42d59b48..df37410c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceMetadataService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceMetadataService.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.service.instance; +package tech.powerjob.server.service.instance; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import org.springframework.beans.factory.InitializingBean; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceService.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceService.java index dc4f9cd3..49b3e48d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.instance; +package tech.powerjob.server.service.instance; import com.github.kfcfans.powerjob.common.*; import com.github.kfcfans.powerjob.common.model.InstanceDetail; @@ -6,19 +6,19 @@ import com.github.kfcfans.powerjob.common.request.ServerQueryInstanceStatusReq; import com.github.kfcfans.powerjob.common.request.ServerStopInstanceReq; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.response.InstanceInfoDTO; -import com.github.kfcfans.powerjob.server.common.constants.InstanceType; -import com.github.kfcfans.powerjob.server.common.utils.QueryConvertUtils; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; -import com.github.kfcfans.powerjob.server.remote.transport.TransportService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; -import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; +import tech.powerjob.server.common.constants.InstanceType; +import tech.powerjob.server.common.utils.QueryConvertUtils; +import tech.powerjob.server.common.utils.timewheel.TimerFuture; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.remote.transport.TransportService; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.service.id.IdGenerateService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceTimeWheelService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceTimeWheelService.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceTimeWheelService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceTimeWheelService.java index c4e626c9..afa86f79 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceTimeWheelService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/instance/InstanceTimeWheelService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.service.instance; +package tech.powerjob.server.service.instance; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; +import tech.powerjob.server.common.utils.timewheel.HashedWheelTimer; +import tech.powerjob.server.common.utils.timewheel.TimerFuture; +import tech.powerjob.server.common.utils.timewheel.TimerTask; import com.google.common.collect.Maps; import java.util.Map; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/DatabaseLockService.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/DatabaseLockService.java index f1de733b..9dd7f3b1 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/DatabaseLockService.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.powerjob.server.service.lock; +package tech.powerjob.server.service.lock; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.OmsLockRepository; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.persistence.core.model.OmsLockDO; +import tech.powerjob.server.persistence.core.repository.OmsLockRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLock.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLock.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLock.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLock.java index d550d476..2f73fec2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLock.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLock.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.lock.local; +package tech.powerjob.server.service.lock.local; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLockAspect.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLockAspect.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLockAspect.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLockAspect.java index 2ff67f1b..c0e3ca2b 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/local/UseSegmentLockAspect.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/lock/local/UseSegmentLockAspect.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.service.lock.local; +package tech.powerjob.server.service.lock.local; import com.github.kfcfans.powerjob.common.utils.SegmentLock; -import com.github.kfcfans.powerjob.server.common.utils.AOPUtils; +import tech.powerjob.server.common.utils.AOPUtils; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/migrate/MigrateService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/migrate/MigrateService.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/migrate/MigrateService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/migrate/MigrateService.java index cab49e15..7546399c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/migrate/MigrateService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/migrate/MigrateService.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.powerjob.server.service.migrate; +package tech.powerjob.server.service.migrate; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.ProcessorType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java index ee8b3a00..a934fec7 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.powerjob.server.service.timing; +package tech.powerjob.server.service.timing; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; -import com.github.kfcfans.powerjob.server.extension.LockService; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.persistence.mongodb.GridFsManager; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; +import tech.powerjob.server.extension.LockService; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java index 4bd8fdae..ff5820cb 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.powerjob.server.service.timing; +package tech.powerjob.server.service.timing; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.SystemInstanceResult; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; -import com.github.kfcfans.powerjob.server.persistence.core.model.*; -import com.github.kfcfans.powerjob.server.persistence.core.repository.*; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.persistence.core.model.*; +import tech.powerjob.server.persistence.core.repository.*; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.service.instance.InstanceManager; +import tech.powerjob.server.service.workflow.WorkflowInstanceManager; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java similarity index 65% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java index 113944b8..13c5e0ca 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.service.timing.schedule; +package tech.powerjob.server.service.timing.schedule; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; +import tech.powerjob.server.common.utils.timewheel.HashedWheelTimer; /** * 时间轮单例 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java index 66589b14..819d6901 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java @@ -1,23 +1,23 @@ -package com.github.kfcfans.powerjob.server.service.timing.schedule; +package tech.powerjob.server.service.timing.schedule; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.TimeExpressionType; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.service.JobService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceTimeWheelService; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.CronExpression; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.service.JobService; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; +import tech.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.service.instance.InstanceTimeWheelService; +import tech.powerjob.server.service.workflow.WorkflowInstanceManager; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceManager.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceManager.java index 3aeaa46b..52ac2ee4 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceManager.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.workflow; +package tech.powerjob.server.service.workflow; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; @@ -6,20 +6,20 @@ import com.github.kfcfans.powerjob.common.*; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.SegmentLock; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.*; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; -import com.github.kfcfans.powerjob.server.remote.DispatchService; -import com.github.kfcfans.powerjob.server.service.UserService; -import com.github.kfcfans.powerjob.server.service.alarm.AlarmCenter; -import com.github.kfcfans.powerjob.server.service.alarm.WorkflowInstanceAlarm; -import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; -import com.github.kfcfans.powerjob.server.service.lock.local.UseSegmentLock; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.WorkflowDAGUtils; +import tech.powerjob.server.persistence.core.model.*; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; +import tech.powerjob.server.remote.DispatchService; +import tech.powerjob.server.service.UserService; +import tech.powerjob.server.service.alarm.AlarmCenter; +import tech.powerjob.server.service.alarm.WorkflowInstanceAlarm; +import tech.powerjob.server.service.id.IdGenerateService; +import tech.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.service.lock.local.UseSegmentLock; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; -import static com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils.isNotAllowSkipWhenFailed; +import static tech.powerjob.server.common.utils.WorkflowDAGUtils.isNotAllowSkipWhenFailed; /** * 管理运行中的工作流实例 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceService.java similarity index 91% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceService.java index 2cf8e84a..c3f3c189 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowInstanceService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.service.workflow; +package tech.powerjob.server.service.workflow; import com.alibaba.fastjson.JSON; import com.github.kfcfans.powerjob.common.InstanceStatus; @@ -7,14 +7,14 @@ import com.github.kfcfans.powerjob.common.SystemInstanceResult; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.WorkflowDAGUtils; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.service.instance.InstanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Objects; import java.util.Optional; -import static com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils.isNotAllowSkipWhenFailed; +import static tech.powerjob.server.common.utils.WorkflowDAGUtils.isNotAllowSkipWhenFailed; /** * 工作流实例服务 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowService.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowService.java index 925dae04..0405904e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/workflow/WorkflowService.java @@ -1,26 +1,26 @@ -package com.github.kfcfans.powerjob.server.service.workflow; +package tech.powerjob.server.service.workflow; import com.alibaba.fastjson.JSON; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.powerjob.server.common.SJ; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; -import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; -import com.github.kfcfans.powerjob.server.remote.server.redirector.DesignateServer; -import com.github.kfcfans.powerjob.server.service.instance.InstanceTimeWheelService; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.CronExpression; +import tech.powerjob.server.common.utils.WorkflowDAGUtils; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; +import tech.powerjob.server.remote.server.redirector.DesignateServer; +import tech.powerjob.server.service.instance.InstanceTimeWheelService; import com.github.kfcfans.powerjob.common.request.http.AddWorkflowNodeRequest; import com.github.kfcfans.powerjob.common.request.http.ModifyWorkflowNodeRequest; import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowDAGRequest; -import com.github.kfcfans.powerjob.server.web.response.WorkflowInfoVO; +import tech.powerjob.server.web.response.WorkflowInfoVO; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/ControllerExceptionHandler.java similarity index 97% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/ControllerExceptionHandler.java index 92506dc2..70860fdb 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/ControllerExceptionHandler.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web; +package tech.powerjob.server.web; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.ResultDTO; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/WebLogAspect.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/WebLogAspect.java index 1b83499a..10aa456f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/WebLogAspect.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web; +package tech.powerjob.server.web; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -38,11 +38,11 @@ public class WebLogAspect { * 第三个*：所有的方法 * 最后的两个点：所有类型的参数 */ - @Pointcut("execution(public * com.github.kfcfans.powerjob.server.web.controller..*.*(..))") + @Pointcut("execution(public * tech.powerjob.server.web.controller..*.*(..))") public void include() { } - @Pointcut("execution(public * com.github.kfcfans.powerjob.server.web.controller.ServerController.*(..))") + @Pointcut("execution(public * tech.powerjob.server.web.controller.ServerController.*(..))") public void exclude() { } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java index 95fdaf0c..95e1eb53 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.service.AppInfoService; -import com.github.kfcfans.powerjob.server.web.request.AppAssertRequest; -import com.github.kfcfans.powerjob.server.web.request.ModifyAppInfoRequest; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.service.AppInfoService; +import tech.powerjob.server.web.request.AppAssertRequest; +import tech.powerjob.server.web.request.ModifyAppInfoRequest; import com.google.common.collect.Lists; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java similarity index 81% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java index 83e3b5f3..c6bab604 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.remote.transport.starter.AkkaStarter; -import com.github.kfcfans.powerjob.server.common.constants.ContainerSourceType; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.common.utils.ContainerTemplateGenerator; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.powerjob.server.service.ContainerService; -import com.github.kfcfans.powerjob.server.web.request.GenerateContainerTemplateRequest; -import com.github.kfcfans.powerjob.server.web.request.SaveContainerInfoRequest; -import com.github.kfcfans.powerjob.server.web.response.ContainerInfoVO; +import tech.powerjob.server.remote.transport.starter.AkkaStarter; +import tech.powerjob.server.common.constants.ContainerSourceType; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.utils.ContainerTemplateGenerator; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.model.ContainerInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import tech.powerjob.server.service.ContainerService; +import tech.powerjob.server.web.request.GenerateContainerTemplateRequest; +import tech.powerjob.server.web.request.SaveContainerInfoRequest; +import tech.powerjob.server.web.response.ContainerInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java similarity index 80% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java index bdc4e5c9..646ea625 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java @@ -1,21 +1,19 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.InstanceStatus; -import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.persistence.PageResult; -import com.github.kfcfans.powerjob.server.persistence.StringPage; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.service.CacheService; -import com.github.kfcfans.powerjob.server.service.InstanceLogService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; -import com.github.kfcfans.powerjob.server.web.request.QueryInstanceRequest; -import com.github.kfcfans.powerjob.server.web.response.InstanceDetailVO; -import com.github.kfcfans.powerjob.server.web.response.InstanceInfoVO; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.persistence.PageResult; +import tech.powerjob.server.persistence.StringPage; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.service.CacheService; +import tech.powerjob.server.service.InstanceLogService; +import tech.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.web.request.QueryInstanceRequest; +import tech.powerjob.server.web.response.InstanceDetailVO; +import tech.powerjob.server.web.response.InstanceInfoVO; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; @@ -32,7 +30,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.net.URL; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java similarity index 87% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java index 9d3bc759..8e3ce756 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.PageResult; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.service.JobService; -import com.github.kfcfans.powerjob.server.web.request.QueryJobInfoRequest; -import com.github.kfcfans.powerjob.server.web.response.JobInfoVO; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.PageResult; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.service.JobService; +import tech.powerjob.server.web.request.QueryJobInfoRequest; +import tech.powerjob.server.web.response.JobInfoVO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/MigrateController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/MigrateController.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/MigrateController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/MigrateController.java index fb7552f5..ffbfd514 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/MigrateController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/MigrateController.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.service.migrate.MigrateService; +import tech.powerjob.server.service.migrate.MigrateService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java index ae6fe8b3..7840f67d 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.OpenAPIConstant; @@ -9,14 +9,14 @@ import com.github.kfcfans.powerjob.common.response.InstanceInfoDTO; import com.github.kfcfans.powerjob.common.response.JobInfoDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; -import com.github.kfcfans.powerjob.server.service.AppInfoService; -import com.github.kfcfans.powerjob.server.service.CacheService; -import com.github.kfcfans.powerjob.server.service.JobService; -import com.github.kfcfans.powerjob.server.service.instance.InstanceService; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceService; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowService; -import com.github.kfcfans.powerjob.server.web.response.WorkflowInfoVO; +import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.service.AppInfoService; +import tech.powerjob.server.service.CacheService; +import tech.powerjob.server.service.JobService; +import tech.powerjob.server.service.instance.InstanceService; +import tech.powerjob.server.service.workflow.WorkflowInstanceService; +import tech.powerjob.server.service.workflow.WorkflowService; +import tech.powerjob.server.web.response.WorkflowInfoVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java similarity index 81% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java index fb419164..fc5109d3 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java @@ -1,16 +1,15 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.extension.ServerElectionService; -import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterManagerService; -import com.github.kfcfans.powerjob.server.remote.transport.TransportService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.extension.ServerElectionService; +import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.remote.transport.TransportService; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java similarity index 78% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java index b2265ce0..ff806059 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java @@ -1,15 +1,15 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; -import com.github.kfcfans.powerjob.server.web.response.SystemOverviewVO; -import com.github.kfcfans.powerjob.server.web.response.WorkerStatusVO; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.remote.worker.cluster.WorkerClusterQueryService; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.web.response.SystemOverviewVO; +import tech.powerjob.server.web.response.WorkerStatusVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java similarity index 82% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java index 8c786177..e697e769 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.UserInfoRepository; -import com.github.kfcfans.powerjob.server.service.UserService; -import com.github.kfcfans.powerjob.server.web.request.ModifyUserInfoRequest; +import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.core.repository.UserInfoRepository; +import tech.powerjob.server.service.UserService; +import tech.powerjob.server.web.request.ModifyUserInfoRequest; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ValidateController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ValidateController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java index cb9b122e..4483c7d5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ValidateController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.service.ValidateService; +import tech.powerjob.server.service.ValidateService; import com.google.common.collect.Lists; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java index 1ca8d670..a2a997d9 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java @@ -1,18 +1,18 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.request.http.AddWorkflowNodeRequest; import com.github.kfcfans.powerjob.common.request.http.ModifyWorkflowNodeRequest; import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowDAGRequest; import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.PageResult; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowService; -import com.github.kfcfans.powerjob.server.web.request.QueryWorkflowInfoRequest; -import com.github.kfcfans.powerjob.server.web.response.WorkflowInfoVO; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.PageResult; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import tech.powerjob.server.service.workflow.WorkflowService; +import tech.powerjob.server.web.request.QueryWorkflowInfoRequest; +import tech.powerjob.server.web.response.WorkflowInfoVO; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java similarity index 83% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java index 8144fd6f..1609f5b0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.powerjob.server.web.controller; +package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import com.github.kfcfans.powerjob.server.persistence.PageResult; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.powerjob.server.service.CacheService; -import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceService; -import com.github.kfcfans.powerjob.server.web.request.QueryWorkflowInstanceRequest; -import com.github.kfcfans.powerjob.server.web.response.WorkflowInstanceInfoVO; +import tech.powerjob.server.persistence.PageResult; +import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.service.CacheService; +import tech.powerjob.server.service.workflow.WorkflowInstanceService; +import tech.powerjob.server.web.request.QueryWorkflowInstanceRequest; +import tech.powerjob.server.web.response.WorkflowInstanceInfoVO; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/AppAssertRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/AppAssertRequest.java similarity index 78% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/AppAssertRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/AppAssertRequest.java index 88177320..826d99ad 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/AppAssertRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/AppAssertRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/GenerateContainerTemplateRequest.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/GenerateContainerTemplateRequest.java index e3835c5c..af8e5085 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/GenerateContainerTemplateRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyAppInfoRequest.java similarity index 92% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyAppInfoRequest.java index dc4e229e..bb1920bb 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyAppInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.utils.CommonUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyUserInfoRequest.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyUserInfoRequest.java index 4f47cb3b..486c5617 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/ModifyUserInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryInstanceRequest.java similarity index 78% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryInstanceRequest.java index d803e349..cf80f1db 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryInstanceRequest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; -import com.github.kfcfans.powerjob.server.common.constants.InstanceType; +import tech.powerjob.server.common.constants.InstanceType; import lombok.Data; /** diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryJobInfoRequest.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryJobInfoRequest.java index 70c1fccd..10fd568c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryJobInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInfoRequest.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInfoRequest.java index c35fb7d5..4c6b96b1 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInstanceRequest.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInstanceRequest.java index 62128579..9eb5c1a5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/QueryWorkflowInstanceRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/SaveContainerInfoRequest.java similarity index 82% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/SaveContainerInfoRequest.java index 06b35002..c983394e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/request/SaveContainerInfoRequest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.web.request; +package tech.powerjob.server.web.request; import com.github.kfcfans.powerjob.common.utils.CommonUtils; -import com.github.kfcfans.powerjob.server.common.constants.ContainerSourceType; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.common.constants.ContainerSourceType; +import tech.powerjob.server.common.constants.SwitchableStatus; import lombok.Data; /** diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/ContainerInfoVO.java similarity index 93% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/ContainerInfoVO.java index e669bbdc..dfc7d4ec 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/ContainerInfoVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceDetailVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceDetailVO.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceDetailVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceDetailVO.java index 18ec3d4c..10de79d5 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceDetailVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceDetailVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.model.InstanceDetail; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java index 1cca6e38..596e754e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.github.kfcfans.powerjob.common.OmsConstant; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java index bbb09b80..42b788ce 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.github.kfcfans.powerjob.common.ExecuteType; import com.github.kfcfans.powerjob.common.ProcessorType; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.utils.CommonUtils; -import com.github.kfcfans.powerjob.server.common.SJ; +import tech.powerjob.server.common.SJ; import com.github.kfcfans.powerjob.common.DispatchStrategy; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.core.model.JobInfoDO; import com.google.common.collect.Lists; import lombok.Data; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/SystemOverviewVO.java similarity index 85% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/SystemOverviewVO.java index 3e25dfbd..e1df3238 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/SystemOverviewVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkerStatusVO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkerStatusVO.java index 61670325..42b0bd42 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkerStatusVO.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.github.kfcfans.powerjob.common.model.SystemMetrics; -import com.github.kfcfans.powerjob.server.remote.worker.cluster.WorkerInfo; +import tech.powerjob.server.remote.worker.cluster.WorkerInfo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java similarity index 88% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java index e2dc1baa..190fb5d8 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.alibaba.fastjson.JSON; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; -import com.github.kfcfans.powerjob.server.common.SJ; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.common.SJ; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.util.StringUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java index 95b209c3..cd4cd7e2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.web.response; +package tech.powerjob.server.web.response; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; -import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java index e0aa1b26..45b9b0b0 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.web.websocket; +package tech.powerjob.server.web.websocket; -import com.github.kfcfans.powerjob.server.common.config.OmsEndpointConfigure; -import com.github.kfcfans.powerjob.server.service.ContainerService; +import tech.powerjob.server.common.config.OmsEndpointConfigure; +import tech.powerjob.server.service.ContainerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Component; diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties similarity index 100% rename from powerjob-server/src/main/resources/application-daily.properties rename to powerjob-server/powerjob-server-starter/src/main/resources/application-daily.properties diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties similarity index 100% rename from powerjob-server/src/main/resources/application-pre.properties rename to powerjob-server/powerjob-server-starter/src/main/resources/application-pre.properties diff --git a/powerjob-server/src/main/resources/application-product.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties similarity index 100% rename from powerjob-server/src/main/resources/application-product.properties rename to powerjob-server/powerjob-server-starter/src/main/resources/application-product.properties diff --git a/powerjob-server/src/main/resources/application.properties b/powerjob-server/powerjob-server-starter/src/main/resources/application.properties similarity index 100% rename from powerjob-server/src/main/resources/application.properties rename to powerjob-server/powerjob-server-starter/src/main/resources/application.properties diff --git a/powerjob-server/src/main/resources/banner.txt b/powerjob-server/powerjob-server-starter/src/main/resources/banner.txt similarity index 100% rename from powerjob-server/src/main/resources/banner.txt rename to powerjob-server/powerjob-server-starter/src/main/resources/banner.txt diff --git a/powerjob-server/src/main/resources/logback-dev.xml b/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml similarity index 93% rename from powerjob-server/src/main/resources/logback-dev.xml rename to powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml index 3fdd2c66..3b1d6467 100644 --- a/powerjob-server/src/main/resources/logback-dev.xml +++ b/powerjob-server/powerjob-server-starter/src/main/resources/logback-dev.xml @@ -21,7 +21,7 @@ - + diff --git a/powerjob-server/src/main/resources/logback-product.xml b/powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml similarity index 100% rename from powerjob-server/src/main/resources/logback-product.xml rename to powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml diff --git a/powerjob-server/src/main/resources/oms-server.akka.conf b/powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf similarity index 100% rename from powerjob-server/src/main/resources/oms-server.akka.conf rename to powerjob-server/powerjob-server-starter/src/main/resources/oms-server.akka.conf diff --git a/powerjob-server/src/main/resources/oms-template-origin.zip b/powerjob-server/powerjob-server-starter/src/main/resources/oms-template-origin.zip similarity index 100% rename from powerjob-server/src/main/resources/oms-template-origin.zip rename to powerjob-server/powerjob-server-starter/src/main/resources/oms-template-origin.zip diff --git a/powerjob-server/src/main/resources/static/favicon.ico b/powerjob-server/powerjob-server-starter/src/main/resources/static/favicon.ico similarity index 100% rename from powerjob-server/src/main/resources/static/favicon.ico rename to powerjob-server/powerjob-server-starter/src/main/resources/static/favicon.ico diff --git a/powerjob-server/src/main/resources/static/fonts/element-icons.535877f5.woff b/powerjob-server/powerjob-server-starter/src/main/resources/static/fonts/element-icons.535877f5.woff similarity index 100% rename from powerjob-server/src/main/resources/static/fonts/element-icons.535877f5.woff rename to powerjob-server/powerjob-server-starter/src/main/resources/static/fonts/element-icons.535877f5.woff diff --git a/powerjob-server/src/main/resources/static/fonts/element-icons.732389de.ttf b/powerjob-server/powerjob-server-starter/src/main/resources/static/fonts/element-icons.732389de.ttf similarity index 100% rename from powerjob-server/src/main/resources/static/fonts/element-icons.732389de.ttf rename to powerjob-server/powerjob-server-starter/src/main/resources/static/fonts/element-icons.732389de.ttf diff --git a/powerjob-server/src/main/resources/static/img/banner.f4c75b86.jpg b/powerjob-server/powerjob-server-starter/src/main/resources/static/img/banner.f4c75b86.jpg similarity index 100% rename from powerjob-server/src/main/resources/static/img/banner.f4c75b86.jpg rename to powerjob-server/powerjob-server-starter/src/main/resources/static/img/banner.f4c75b86.jpg diff --git a/powerjob-server/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png b/powerjob-server/powerjob-server-starter/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png similarity index 100% rename from powerjob-server/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png rename to powerjob-server/powerjob-server-starter/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png diff --git a/powerjob-server/src/main/resources/static/index.html b/powerjob-server/powerjob-server-starter/src/main/resources/static/index.html similarity index 100% rename from powerjob-server/src/main/resources/static/index.html rename to powerjob-server/powerjob-server-starter/src/main/resources/static/index.html diff --git a/powerjob-server/src/main/resources/static/js/0.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/0.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/0.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/0.js diff --git a/powerjob-server/src/main/resources/static/js/1.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/1.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/1.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/1.js diff --git a/powerjob-server/src/main/resources/static/js/10.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/10.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/10.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/10.js diff --git a/powerjob-server/src/main/resources/static/js/11.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/11.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/11.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/11.js diff --git a/powerjob-server/src/main/resources/static/js/2.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/2.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/2.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/2.js diff --git a/powerjob-server/src/main/resources/static/js/3.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/3.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/3.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/3.js diff --git a/powerjob-server/src/main/resources/static/js/4.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/4.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/4.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/4.js diff --git a/powerjob-server/src/main/resources/static/js/5.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/5.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/5.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/5.js diff --git a/powerjob-server/src/main/resources/static/js/6.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/6.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/6.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/6.js diff --git a/powerjob-server/src/main/resources/static/js/7.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/7.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/7.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/7.js diff --git a/powerjob-server/src/main/resources/static/js/8.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/8.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/8.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/8.js diff --git a/powerjob-server/src/main/resources/static/js/9.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/9.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/9.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/9.js diff --git a/powerjob-server/src/main/resources/static/js/app.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/app.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/app.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/app.js diff --git a/powerjob-server/src/main/resources/static/js/chunk-vendors.js b/powerjob-server/powerjob-server-starter/src/main/resources/static/js/chunk-vendors.js similarity index 100% rename from powerjob-server/src/main/resources/static/js/chunk-vendors.js rename to powerjob-server/powerjob-server-starter/src/main/resources/static/js/chunk-vendors.js diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/CronTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/CronTest.java similarity index 80% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/CronTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/CronTest.java index 98316099..f972eeab 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/CronTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/CronTest.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import tech.powerjob.server.common.utils.CronExpression; import org.junit.Test; import java.util.Date; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java similarity index 98% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java index 262bf609..e2ee7ff8 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DAGTest.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.utils.JsonUtils; -import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.powerjob.server.model.WorkflowDAG; +import tech.powerjob.server.common.utils.WorkflowDAGUtils; +import tech.powerjob.server.model.WorkflowDAG; import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DingTalkTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DingTalkTest.java similarity index 90% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DingTalkTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DingTalkTest.java index 4821b89f..c237893a 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DingTalkTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/DingTalkTest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.common.utils.DingTalkUtils; +import tech.powerjob.server.common.utils.DingTalkUtils; import com.google.common.collect.Lists; import org.junit.jupiter.api.Test; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/GridFsTest.java similarity index 91% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/GridFsTest.java index c69c2eb7..37835a8a 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/GridFsTest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; +import tech.powerjob.server.persistence.mongodb.GridFsManager; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/HashedWheelTimerTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/HashedWheelTimerTest.java similarity index 91% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/HashedWheelTimerTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/HashedWheelTimerTest.java index 86dd13ca..52214645 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/HashedWheelTimerTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/HashedWheelTimerTest.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; -import com.github.kfcfans.powerjob.server.service.instance.InstanceTimeWheelService; +import tech.powerjob.server.common.utils.timewheel.HashedWheelTimer; +import tech.powerjob.server.common.utils.timewheel.TimerFuture; +import tech.powerjob.server.common.utils.timewheel.TimerTask; +import tech.powerjob.server.service.instance.InstanceTimeWheelService; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java similarity index 85% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java index 50d6998c..3157331b 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; -import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.powerjob.server.service.timing.CleanService; +import tech.powerjob.server.common.utils.OmsFileUtils; +import tech.powerjob.server.persistence.mongodb.GridFsManager; +import tech.powerjob.server.service.timing.CleanService; import com.mongodb.client.gridfs.model.GridFSFile; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtilsTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java similarity index 82% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtilsTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java index d34595fb..99cd69b5 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/common/utils/QueryConvertUtilsTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java @@ -1,11 +1,9 @@ -package com.github.kfcfans.powerjob.server.common.utils; +package tech.powerjob.server.test; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.PowerQuery; import com.github.kfcfans.powerjob.common.response.JobInfoDTO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.service.JobService; -import lombok.Data; +import tech.powerjob.server.service.JobService; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.time.DateUtils; @@ -13,7 +11,6 @@ import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.jpa.domain.Specification; import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; @@ -21,8 +18,6 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; - /** * test QueryConvertUtils * diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java similarity index 83% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java index 121f6b95..c4f02bed 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.utils.NetUtils; -import com.github.kfcfans.powerjob.server.common.constants.SwitchableStatus; -import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.OmsLockRepository; -import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.common.constants.SwitchableStatus; +import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.core.model.OmsLockDO; +import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.core.repository.JobInfoRepository; +import tech.powerjob.server.persistence.core.repository.OmsLockRepository; +import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import org.assertj.core.util.Lists; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoServiceTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java similarity index 82% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoServiceTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java index 88a1f7d1..78ff9567 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/remote/server/ServerInfoServiceTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.powerjob.server.remote.server; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.persistence.core.model.ServerInfoDO; -import com.github.kfcfans.powerjob.server.persistence.core.repository.ServerInfoRepository; +import tech.powerjob.server.persistence.core.model.ServerInfoDO; +import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.DateUtils; import org.junit.jupiter.api.Test; @@ -15,8 +15,6 @@ import java.util.Date; import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import static org.junit.jupiter.api.Assertions.*; - /** * test server info * diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java similarity index 80% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java index 66e1a243..e3dcf58b 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; -import com.github.kfcfans.powerjob.server.extension.LockService; -import com.github.kfcfans.powerjob.server.service.timing.CleanService; +import tech.powerjob.server.service.id.IdGenerateService; +import tech.powerjob.server.extension.LockService; +import tech.powerjob.server.service.timing.CleanService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/TimezoneTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/TimezoneTest.java similarity index 94% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/TimezoneTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/TimezoneTest.java index 33a3c1bf..cd52fa24 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/TimezoneTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/TimezoneTest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; import com.github.kfcfans.powerjob.common.OmsConstant; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/UtilsTest.java similarity index 76% rename from powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java rename to powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/UtilsTest.java index b3592a4a..81e12aad 100644 --- a/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/UtilsTest.java @@ -1,9 +1,6 @@ -package com.github.kfcfans.powerjob.server.test; +package tech.powerjob.server.test; -import com.github.kfcfans.powerjob.server.common.utils.CronExpression; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; -import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; +import tech.powerjob.server.common.utils.CronExpression; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.junit.Test; @@ -12,8 +9,6 @@ import java.util.Date; import java.util.List; import java.util.Objects; import java.util.TimeZone; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** diff --git a/powerjob-server/src/test/resources/application.properties b/powerjob-server/powerjob-server-starter/src/test/resources/application.properties similarity index 100% rename from powerjob-server/src/test/resources/application.properties rename to powerjob-server/powerjob-server-starter/src/test/resources/application.properties diff --git a/powerjob-server/src/test/resources/logback-test.xml b/powerjob-server/powerjob-server-starter/src/test/resources/logback-test.xml similarity index 100% rename from powerjob-server/src/test/resources/logback-test.xml rename to powerjob-server/powerjob-server-starter/src/test/resources/logback-test.xml