diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java index b73bf65a..cb01ddaf 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java @@ -1,6 +1,6 @@ package com.github.kfcfans.powerjob.server; -import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; 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/redirect/DesignateServerAspect.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/redirect/DesignateServerAspect.java index 9d8684b3..a50edc7e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/redirect/DesignateServerAspect.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/redirect/DesignateServerAspect.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; 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.akka.OhMyServer; -import com.github.kfcfans.powerjob.server.akka.requests.RemoteProcessReq; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.requests.RemoteProcessReq; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java index 55e5fcd5..b628ae31 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java @@ -10,7 +10,7 @@ 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.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; import com.github.kfcfans.powerjob.server.common.constans.ContainerSourceType; import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java index 43b0fe5c..d4a52f3c 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java @@ -3,7 +3,7 @@ package com.github.kfcfans.powerjob.server.service; import akka.actor.ActorSelection; import com.github.kfcfans.powerjob.common.*; import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; -import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; 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; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java index 37ae701e..f12e7be2 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java @@ -4,8 +4,8 @@ import akka.actor.ActorSelection; import akka.pattern.Patterns; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.AskResponse; -import com.github.kfcfans.powerjob.server.akka.OhMyServer; -import com.github.kfcfans.powerjob.server.akka.requests.Ping; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.requests.Ping; 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.extension.LockService; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java index adf666b4..a8eb8e68 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java @@ -8,7 +8,7 @@ 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.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; import com.github.kfcfans.powerjob.server.common.constans.InstanceType; import com.github.kfcfans.powerjob.server.common.redirect.DesignateServer; import com.github.kfcfans.powerjob.server.common.utils.QueryConvertUtils; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java index 4940006a..ad4cd735 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java @@ -5,7 +5,7 @@ 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.constans.SwitchableStatus; -import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; import com.github.kfcfans.powerjob.server.persistence.core.model.*; import com.github.kfcfans.powerjob.server.persistence.core.repository.*; import com.github.kfcfans.powerjob.server.service.DispatchService; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java index c8a4e383..63bff026 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java @@ -2,7 +2,7 @@ package com.github.kfcfans.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.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; import com.github.kfcfans.powerjob.server.common.utils.CronExpression; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/OhMyServer.java similarity index 94% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/OhMyServer.java index 78de213d..2af7afea 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/OhMyServer.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka; +package com.github.kfcfans.powerjob.server.transport.akka; import akka.actor.*; import akka.pattern.Patterns; @@ -7,9 +7,9 @@ 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.akka.actors.FriendActor; -import com.github.kfcfans.powerjob.server.akka.actors.ServerActor; -import com.github.kfcfans.powerjob.server.akka.actors.ServerTroubleshootingActor; +import com.github.kfcfans.powerjob.server.transport.akka.actors.FriendActor; +import com.github.kfcfans.powerjob.server.transport.akka.actors.ServerActor; +import com.github.kfcfans.powerjob.server.transport.akka.actors.ServerTroubleshootingActor; import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; import com.google.common.base.Stopwatch; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/FriendActor.java similarity index 90% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/FriendActor.java index d9d41a84..91f36647 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/FriendActor.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.powerjob.server.akka.actors; +package com.github.kfcfans.powerjob.server.transport.akka.actors; import akka.actor.AbstractActor; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.model.SystemMetrics; import com.github.kfcfans.powerjob.common.response.AskResponse; -import com.github.kfcfans.powerjob.server.akka.requests.FriendQueryWorkerClusterStatusReq; -import com.github.kfcfans.powerjob.server.akka.requests.Ping; -import com.github.kfcfans.powerjob.server.akka.requests.RemoteProcessReq; +import com.github.kfcfans.powerjob.server.transport.akka.requests.FriendQueryWorkerClusterStatusReq; +import com.github.kfcfans.powerjob.server.transport.akka.requests.Ping; +import com.github.kfcfans.powerjob.server.transport.akka.requests.RemoteProcessReq; import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerActor.java similarity index 98% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerActor.java index 685a2056..8999a174 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerActor.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka.actors; +package com.github.kfcfans.powerjob.server.transport.akka.actors; import akka.actor.AbstractActor; import com.github.kfcfans.powerjob.common.InstanceStatus; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerTroubleshootingActor.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerTroubleshootingActor.java similarity index 89% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerTroubleshootingActor.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerTroubleshootingActor.java index 31ec3ef8..79adc257 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerTroubleshootingActor.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/actors/ServerTroubleshootingActor.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka.actors; +package com.github.kfcfans.powerjob.server.transport.akka.actors; import akka.actor.AbstractActor; import akka.actor.DeadLetter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/FriendQueryWorkerClusterStatusReq.java similarity index 84% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/FriendQueryWorkerClusterStatusReq.java index ebc3f639..c489d69f 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/FriendQueryWorkerClusterStatusReq.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka.requests; +package com.github.kfcfans.powerjob.server.transport.akka.requests; import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/Ping.java similarity index 78% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/Ping.java index 18a2ace2..9ea2e122 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/Ping.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka.requests; +package com.github.kfcfans.powerjob.server.transport.akka.requests; import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/RemoteProcessReq.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/RemoteProcessReq.java similarity index 86% rename from powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/RemoteProcessReq.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/RemoteProcessReq.java index 5a2724c1..f9bc8218 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/RemoteProcessReq.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/transport/akka/requests/RemoteProcessReq.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.powerjob.server.akka.requests; +package com.github.kfcfans.powerjob.server.transport.akka.requests; import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Getter; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java index bd0453a4..18f7e444 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java @@ -2,7 +2,7 @@ package com.github.kfcfans.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.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; import com.github.kfcfans.powerjob.server.common.constans.ContainerSourceType; import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; import com.github.kfcfans.powerjob.server.common.utils.ContainerTemplateGenerator; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java index 8cb2e457..4ffe4b60 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java @@ -5,7 +5,7 @@ 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.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; 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.ha.ServerSelectService; diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java index 86a5be65..25248af1 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java @@ -9,8 +9,8 @@ import com.github.kfcfans.powerjob.common.model.SystemMetrics; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.utils.JsonUtils; -import com.github.kfcfans.powerjob.server.akka.OhMyServer; -import com.github.kfcfans.powerjob.server.akka.requests.FriendQueryWorkerClusterStatusReq; +import com.github.kfcfans.powerjob.server.transport.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.transport.akka.requests.FriendQueryWorkerClusterStatusReq; import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository;