From bbc1cce62751c4b4f5736b78d747f9697f4c15fc Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 7 Mar 2021 16:24:09 +0800 Subject: [PATCH] style: optimize server's package --- powerjob-server/pom.xml | 30 ++++++++++++------- .../powerjob/server/core/DispatchService.java | 6 ++-- .../core/container}/ContainerService.java | 23 +++++--------- .../core/handler/WorkerRequestHandler.java | 8 ++--- .../core/instance/InstanceLogService.java | 3 +- .../server/core/instance/InstanceManager.java | 8 ++--- .../instance/InstanceMetadataService.java | 8 ++--- .../server/core/instance/InstanceService.java | 8 ++--- .../server/core/scheduler}/CleanService.java | 6 ++-- .../InstanceStatusCheckService.java | 6 ++-- .../core/scheduler/PowerScheduleService.java} | 20 ++++++------- .../server/core}/service/AppInfoService.java | 6 ++-- .../server/core}/service/CacheService.java | 14 ++++----- .../server/core}/service/JobService.java | 10 +++---- .../server/core/service/UserService.java | 4 +-- .../server/core}/service/ValidateService.java | 2 +- .../workflow/WorkflowInstanceManager.java | 10 +++---- .../workflow/WorkflowInstanceService.java | 8 ++--- .../server/core/workflow/WorkflowService.java | 12 ++++---- .../powerjob/server/extension/Alarmable.java | 2 +- .../server/extension/WorkerFilter.java | 2 +- .../defaultimpl/DatabaseLockService.java | 4 +-- .../defaultimpl/alram/AlarmCenter.java | 2 +- .../alram/impl/DingTalkAlarmService.java | 2 +- .../alram/impl/MailAlarmService.java | 2 +- .../alram/impl/WebHookAlarmService.java | 2 +- .../workerfilter/DesignatedWorkerFilter.java | 2 +- .../DisconnectedWorkerFilter.java | 2 +- .../SystemMetricsWorkerFilter.java | 2 +- .../server/migrate/V3ToV4MigrateService.java | 12 ++++---- .../config/MultiDatasourceConfig.java | 2 +- ...oreJpaConfig.java => RemoteJpaConfig.java} | 28 ++++++++--------- .../{core => remote}/model/AppInfoDO.java | 2 +- .../model/ContainerInfoDO.java | 2 +- .../model/InstanceInfoDO.java | 2 +- .../{core => remote}/model/JobInfoDO.java | 2 +- .../{core => remote}/model/OmsLockDO.java | 2 +- .../{core => remote}/model/ServerInfoDO.java | 2 +- .../{core => remote}/model/UserInfoDO.java | 2 +- .../model/WorkflowInfoDO.java | 2 +- .../model/WorkflowInstanceInfoDO.java | 2 +- .../model/WorkflowNodeInfoDO.java | 2 +- .../{core => remote}/package-info.java | 2 +- .../repository/AppInfoRepository.java | 4 +-- .../repository/ContainerInfoRepository.java | 4 +-- .../repository/InstanceInfoRepository.java | 4 +-- .../repository/JobInfoRepository.java | 4 +-- .../repository/OmsLockRepository.java | 4 +-- .../repository/ServerInfoRepository.java | 4 +-- .../repository/UserInfoRepository.java | 4 +-- .../repository/WorkflowInfoRepository.java | 4 +-- .../WorkflowInstanceInfoRepository.java | 4 +-- .../WorkflowNodeInfoRepository.java | 4 +-- .../remote/server/ServerInfoService.java | 4 +-- .../election/ServerElectionService.java | 4 +-- .../redirector/DesignateServerAspect.java | 4 +-- .../worker/WorkerClusterQueryService.java | 2 +- .../config/OmsEndpointConfigure.java | 2 +- .../{common => }/config/SwaggerConfig.java | 2 +- .../{common => }/config/ThreadPoolConfig.java | 2 +- .../server/{common => }/config/WebConfig.java | 2 +- .../web/controller/AppInfoController.java | 6 ++-- .../web/controller/ContainerController.java | 19 ++++++++---- .../web/controller/InstanceController.java | 8 ++--- .../server/web/controller/JobController.java | 6 ++-- .../web/controller/OpenAPIController.java | 10 +++---- .../web/controller/ServerController.java | 4 +-- .../web/controller/SystemInfoController.java | 4 +-- .../web/controller/UserInfoController.java | 4 +-- .../web/controller/ValidateController.java | 2 +- .../web/controller/WorkflowController.java | 6 ++-- .../WorkflowInstanceController.java | 6 ++-- .../server/web/response/InstanceInfoVO.java | 2 +- .../server/web/response/JobInfoVO.java | 2 +- .../server/web/response/WorkflowInfoVO.java | 2 +- .../web/response/WorkflowInstanceInfoVO.java | 2 +- .../ContainerDeployServerEndpoint.java | 4 +-- .../tech/powerjob/server/test/OmsLogTest.java | 2 +- .../server/test/QueryConvertUtilsTest.java | 2 +- .../powerjob/server/test/RepositoryTest.java | 14 ++++----- .../server/test/ServerInfoServiceTest.java | 4 +-- .../powerjob/server/test/ServiceTest.java | 2 +- 82 files changed, 229 insertions(+), 222 deletions(-) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server/service => powerjob-server-core/src/main/java/tech/powerjob/server/core/container}/ContainerService.java (96%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing => powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler}/CleanService.java (96%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing => powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler}/InstanceStatusCheckService.java (98%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java => powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/PowerScheduleService.java} (95%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server => powerjob-server-core/src/main/java/tech/powerjob/server/core}/service/AppInfoService.java (82%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server => powerjob-server-core/src/main/java/tech/powerjob/server/core}/service/CacheService.java (89%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server => powerjob-server-core/src/main/java/tech/powerjob/server/core}/service/JobService.java (96%) rename powerjob-server/{powerjob-server-starter/src/main/java/tech/powerjob/server => powerjob-server-core/src/main/java/tech/powerjob/server/core}/service/ValidateService.java (98%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/{CoreJpaConfig.java => RemoteJpaConfig.java} (75%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/AppInfoDO.java (95%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/ContainerInfoDO.java (95%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/InstanceInfoDO.java (97%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/JobInfoDO.java (98%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/OmsLockDO.java (94%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/ServerInfoDO.java (93%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/UserInfoDO.java (93%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/WorkflowInfoDO.java (96%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/WorkflowInstanceInfoDO.java (96%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/model/WorkflowNodeInfoDO.java (96%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/package-info.java (80%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/AppInfoRepository.java (84%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/ContainerInfoRepository.java (72%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/InstanceInfoRepository.java (97%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/JobInfoRepository.java (92%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/OmsLockRepository.java (83%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/ServerInfoRepository.java (90%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/UserInfoRepository.java (74%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/WorkflowInfoRepository.java (89%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/WorkflowInstanceInfoRepository.java (89%) rename powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/{core => remote}/repository/WorkflowNodeInfoRepository.java (84%) rename powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/{common => }/config/OmsEndpointConfigure.java (95%) rename powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/{common => }/config/SwaggerConfig.java (98%) rename powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/{common => }/config/ThreadPoolConfig.java (98%) rename powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/{common => }/config/WebConfig.java (95%) diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index bfaad5cf..1ac1856c 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -43,8 +43,16 @@ 1.0.1 4.0.2 - + true + + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 @@ -52,32 +60,32 @@ tech.powerjob powerjob-server-common - 1.0.0 + ${powerjob-server-common.version} tech.powerjob powerjob-server-extension - 1.0.0 + ${powerjob-server-extension.version} tech.powerjob powerjob-server-remote - 1.0.0 + ${powerjob-server-remote.version} tech.powerjob powerjob-server-persistence - 1.0.0 - - - tech.powerjob - powerjob-server-migrate - 1.0.0 + ${powerjob-server-persistence.version} tech.powerjob powerjob-server-core - 1.0.0 + ${powerjob-server-core.version} + + + tech.powerjob + powerjob-server-migrate + ${powerjob-server-migrate.version} diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java index 63a820ef..5de28d6b 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java @@ -6,9 +6,9 @@ import com.github.kfcfans.powerjob.common.DispatchStrategy; import tech.powerjob.server.core.instance.InstanceManager; import tech.powerjob.server.core.instance.InstanceMetadataService; import tech.powerjob.server.core.lock.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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.common.module.WorkerInfo; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java similarity index 96% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java index 248dcfda..a3db1d97 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.service; +package tech.powerjob.server.core.container; import akka.actor.ActorSelection; import com.github.kfcfans.powerjob.common.OmsConstant; @@ -14,13 +14,12 @@ 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.remote.model.ContainerInfoDO; +import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository; import tech.powerjob.server.persistence.mongodb.GridFsManager; import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.common.module.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; @@ -41,7 +40,6 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; -import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -88,28 +86,23 @@ public class ContainerService { /** * 保存容器 - * @param request 容器保存请求 + * @param container 容器保存请求 */ - public void save(SaveContainerInfoRequest request) { + public void save(ContainerInfoDO container) { - request.valid(); - ContainerInfoDO container; - Long originId = request.getId(); + Long originId = container.getId(); if (originId != null) { container = containerInfoRepository.findById(originId).orElseThrow(() -> new IllegalArgumentException("can't find container by id: " + originId)); }else { container = new ContainerInfoDO(); container.setGmtCreate(new Date()); } - BeanUtils.copyProperties(request, container); container.setGmtModified(new Date()); - container.setSourceType(request.getSourceType().getV()); - container.setStatus(request.getStatus().getV()); // 文件上传形式的 sourceInfo 为该文件的 md5 值，Git形式的 md5 在部署阶段生成 - if (request.getSourceType() == ContainerSourceType.FatJar) { - container.setVersion(request.getSourceInfo()); + if (container.getSourceType() == ContainerSourceType.FatJar.getV()) { + container.setVersion(container.getSourceInfo()); }else { container.setVersion("init"); } diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java index 0502e16d..5b188a57 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java @@ -19,10 +19,10 @@ import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; 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.persistence.remote.model.ContainerInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; import tech.powerjob.server.remote.worker.WorkerClusterManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceLogService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceLogService.java index 063cf6d2..7efded31 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceLogService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceLogService.java @@ -10,11 +10,10 @@ import com.github.kfcfans.powerjob.common.utils.SegmentLock; 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.remote.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.core.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/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceManager.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceManager.java index 025b15b7..6c2ec9ea 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceManager.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceManager.java @@ -5,10 +5,10 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; import tech.powerjob.server.common.utils.SpringUtils; import tech.powerjob.server.core.workflow.WorkflowInstanceManager; -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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter; import tech.powerjob.server.extension.defaultimpl.alram.module.JobInstanceAlarm; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceMetadataService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceMetadataService.java index 482648da..4304a74b 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceMetadataService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceMetadataService.java @@ -1,9 +1,9 @@ package tech.powerjob.server.core.instance; -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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.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/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java index 9eecb054..7f0c9d7c 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java @@ -10,10 +10,10 @@ import tech.powerjob.server.common.constants.InstanceType; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; import tech.powerjob.server.persistence.QueryConvertUtils; import tech.powerjob.server.common.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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.transport.TransportService; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/CleanService.java similarity index 96% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/CleanService.java index 67229f59..7e59878d 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/CleanService.java @@ -1,10 +1,10 @@ -package tech.powerjob.server.service.timing; +package tech.powerjob.server.core.scheduler; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; 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.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.mongodb.GridFsManager; import tech.powerjob.server.remote.worker.WorkerClusterManagerService; import tech.powerjob.server.extension.LockService; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/InstanceStatusCheckService.java similarity index 98% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/InstanceStatusCheckService.java index d603e2b0..302569e1 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/InstanceStatusCheckService.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.service.timing; +package tech.powerjob.server.core.scheduler; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.SystemInstanceResult; @@ -6,8 +6,8 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; 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.persistence.remote.model.*; +import tech.powerjob.server.persistence.remote.repository.*; import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.instance.InstanceManager; import tech.powerjob.server.core.workflow.WorkflowInstanceManager; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/PowerScheduleService.java similarity index 95% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/PowerScheduleService.java index 991a1308..3c7a09ad 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/PowerScheduleService.java @@ -1,19 +1,19 @@ -package tech.powerjob.server.service.timing.schedule; +package tech.powerjob.server.core.scheduler; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.TimeExpressionType; 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.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; import tech.powerjob.server.core.DispatchService; -import tech.powerjob.server.service.JobService; +import tech.powerjob.server.core.service.JobService; import tech.powerjob.server.remote.worker.WorkerClusterManagerService; import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; @@ -44,7 +44,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class OmsScheduleService { +public class PowerScheduleService { /** * 每次并发调度的应用数量 diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/AppInfoService.java similarity index 82% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/AppInfoService.java index 367064c6..cc09b2ab 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/AppInfoService.java @@ -1,8 +1,8 @@ -package tech.powerjob.server.service; +package tech.powerjob.server.core.service; import com.github.kfcfans.powerjob.common.PowerJobException; -import tech.powerjob.server.persistence.core.model.AppInfoDO; -import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/CacheService.java similarity index 89% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/CacheService.java index 3edeb06b..619e5356 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/CacheService.java @@ -1,11 +1,11 @@ -package tech.powerjob.server.service; +package tech.powerjob.server.core.service; -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 tech.powerjob.server.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/JobService.java similarity index 96% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/JobService.java index 37ad2e01..9cc47f0b 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/JobService.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.service; +package tech.powerjob.server.core.service; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.PowerJobException; @@ -10,10 +10,10 @@ import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.utils.CronExpression; import tech.powerjob.server.persistence.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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.core.instance.InstanceService; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java index 1f22e22d..6af93504 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java @@ -1,7 +1,7 @@ package tech.powerjob.server.core.service; -import tech.powerjob.server.persistence.core.model.UserInfoDO; -import tech.powerjob.server.persistence.core.repository.UserInfoRepository; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.repository.UserInfoRepository; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.springframework.stereotype.Service; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/ValidateService.java similarity index 98% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java rename to powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/ValidateService.java index 83eb1656..0127951b 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/ValidateService.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.service; +package tech.powerjob.server.core.service; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.TimeExpressionType; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java index e1ad2687..07bf5521 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java @@ -8,11 +8,11 @@ import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.SegmentLock; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.core.workflow.algorithm.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.persistence.remote.model.*; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowNodeInfoRepository; import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceService.java index 80f4e2d5..921e937e 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceService.java @@ -9,10 +9,10 @@ import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.core.workflow.algorithm.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.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.core.instance.InstanceService; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowService.java index 977ca73c..bbc29c40 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowService.java @@ -9,12 +9,12 @@ import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.utils.CronExpression; import tech.powerjob.server.core.workflow.algorithm.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.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowNodeInfoRepository; import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; import com.github.kfcfans.powerjob.common.request.http.AddWorkflowNodeRequest; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/Alarmable.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/Alarmable.java index 80e4260c..9dcfe039 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/Alarmable.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/Alarmable.java @@ -1,6 +1,6 @@ package tech.powerjob.server.extension; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import java.util.List; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/WorkerFilter.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/WorkerFilter.java index 54859813..5df4214d 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/WorkerFilter.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/WorkerFilter.java @@ -1,6 +1,6 @@ package tech.powerjob.server.extension; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.common.module.WorkerInfo; /** diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/DatabaseLockService.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/DatabaseLockService.java index efedfc1c..f6317f6b 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/DatabaseLockService.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/DatabaseLockService.java @@ -3,8 +3,8 @@ package tech.powerjob.server.extension.defaultimpl; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; import tech.powerjob.server.extension.LockService; -import tech.powerjob.server.persistence.core.model.OmsLockDO; -import tech.powerjob.server.persistence.core.repository.OmsLockRepository; +import tech.powerjob.server.persistence.remote.model.OmsLockDO; +import tech.powerjob.server.persistence.remote.repository.OmsLockRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/AlarmCenter.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/AlarmCenter.java index 035f9ffb..1adea461 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/AlarmCenter.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/AlarmCenter.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import tech.powerjob.server.extension.Alarmable; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/DingTalkAlarmService.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/DingTalkAlarmService.java index 351754fc..4567613a 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/DingTalkAlarmService.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/DingTalkAlarmService.java @@ -5,7 +5,7 @@ import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.utils.NetUtils; import tech.powerjob.server.common.PowerJobServerConfigKey; import tech.powerjob.server.common.SJ; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import tech.powerjob.server.extension.Alarmable; import com.google.common.cache.Cache; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/MailAlarmService.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/MailAlarmService.java index 923371c7..e273acc5 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/MailAlarmService.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/MailAlarmService.java @@ -1,6 +1,6 @@ package tech.powerjob.server.extension.defaultimpl.alram.impl; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import tech.powerjob.server.extension.Alarmable; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/WebHookAlarmService.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/WebHookAlarmService.java index 59742b22..33555759 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/WebHookAlarmService.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/WebHookAlarmService.java @@ -3,7 +3,7 @@ package tech.powerjob.server.extension.defaultimpl.alram.impl; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.utils.HttpUtils; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import tech.powerjob.server.extension.Alarmable; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DesignatedWorkerFilter.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DesignatedWorkerFilter.java index 20993baf..0bb35136 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DesignatedWorkerFilter.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DesignatedWorkerFilter.java @@ -2,7 +2,7 @@ package tech.powerjob.server.extension.defaultimpl.workerfilter; import tech.powerjob.server.common.SJ; import tech.powerjob.server.extension.WorkerFilter; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.common.module.WorkerInfo; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DisconnectedWorkerFilter.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DisconnectedWorkerFilter.java index 158ae560..de87a910 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DisconnectedWorkerFilter.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DisconnectedWorkerFilter.java @@ -1,7 +1,7 @@ package tech.powerjob.server.extension.defaultimpl.workerfilter; import tech.powerjob.server.extension.WorkerFilter; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.common.module.WorkerInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/SystemMetricsWorkerFilter.java b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/SystemMetricsWorkerFilter.java index aa907ac7..53180bdd 100644 --- a/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/SystemMetricsWorkerFilter.java +++ b/powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/SystemMetricsWorkerFilter.java @@ -2,7 +2,7 @@ package tech.powerjob.server.extension.defaultimpl.workerfilter; import com.github.kfcfans.powerjob.common.model.SystemMetrics; import tech.powerjob.server.extension.WorkerFilter; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.common.module.WorkerInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/powerjob-server/powerjob-server-migrate/src/main/java/tech/powerjob/server/migrate/V3ToV4MigrateService.java b/powerjob-server/powerjob-server-migrate/src/main/java/tech/powerjob/server/migrate/V3ToV4MigrateService.java index 5d61a529..e7dbab62 100644 --- a/powerjob-server/powerjob-server-migrate/src/main/java/tech/powerjob/server/migrate/V3ToV4MigrateService.java +++ b/powerjob-server/powerjob-server-migrate/src/main/java/tech/powerjob/server/migrate/V3ToV4MigrateService.java @@ -6,12 +6,12 @@ import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.ProcessorType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; 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 tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java index 7db80c70..68c6b321 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java @@ -28,7 +28,7 @@ public class MultiDatasourceConfig { private static final int H2_MAX_ACTIVE_SIZE = 10; @Primary - @Bean("omsCoreDatasource") + @Bean("omsRemoteDatasource") @ConfigurationProperties(prefix = "spring.datasource.core") public DataSource initOmsCoreDatasource() { return DataSourceBuilder.create().build(); diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/RemoteJpaConfig.java similarity index 75% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/RemoteJpaConfig.java index cf6936b5..bb1290fa 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/RemoteJpaConfig.java @@ -28,18 +28,18 @@ import java.util.Objects; @EnableTransactionManagement @EnableJpaRepositories( // repository包名 - basePackages = CoreJpaConfig.CORE_PACKAGES, + basePackages = RemoteJpaConfig.CORE_PACKAGES, // 实体管理bean名称 - entityManagerFactoryRef = "coreEntityManagerFactory", + entityManagerFactoryRef = "remoteEntityManagerFactory", // 事务管理bean名称 - transactionManagerRef = "coreTransactionManager" + transactionManagerRef = "remoteTransactionManager" ) -public class CoreJpaConfig { +public class RemoteJpaConfig { - @Resource(name = "omsCoreDatasource") - private DataSource omsCoreDatasource; + @Resource(name = "omsRemoteDatasource") + private DataSource omsRemoteDatasource; - public static final String CORE_PACKAGES = "tech.powerjob.server.persistence.core"; + public static final String CORE_PACKAGES = "tech.powerjob.server.persistence.remote"; /** * 生成配置文件，包括 JPA配置文件和Hibernate配置文件，相当于一下三个配置 @@ -65,21 +65,21 @@ public class CoreJpaConfig { } @Primary - @Bean(name = "coreEntityManagerFactory") - public LocalContainerEntityManagerFactoryBean initCoreEntityManagerFactory(EntityManagerFactoryBuilder builder) { + @Bean(name = "remoteEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean initRemoteEntityManagerFactory(EntityManagerFactoryBuilder builder) { return builder - .dataSource(omsCoreDatasource) + .dataSource(omsRemoteDatasource) .properties(genDatasourceProperties()) .packages(CORE_PACKAGES) - .persistenceUnit("corePersistenceUnit") + .persistenceUnit("remotePersistenceUnit") .build(); } @Primary - @Bean(name = "coreTransactionManager") - public PlatformTransactionManager initCoreTransactionManager(EntityManagerFactoryBuilder builder) { - return new JpaTransactionManager(Objects.requireNonNull(initCoreEntityManagerFactory(builder).getObject())); + @Bean(name = "remoteTransactionManager") + public PlatformTransactionManager initRemoteTransactionManager(EntityManagerFactoryBuilder builder) { + return new JpaTransactionManager(Objects.requireNonNull(initRemoteEntityManagerFactory(builder).getObject())); } } diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java similarity index 95% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java index 640a69d0..ec5c1fe1 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ContainerInfoDO.java similarity index 95% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ContainerInfoDO.java index c6da1a8a..8bc09eea 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ContainerInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/InstanceInfoDO.java similarity index 97% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/InstanceInfoDO.java index 66e629ee..cf05ed04 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/InstanceInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import com.github.kfcfans.powerjob.common.InstanceStatus; import lombok.AllArgsConstructor; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java similarity index 98% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java index fd6e86e8..93b534f1 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.AllArgsConstructor; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/OmsLockDO.java similarity index 94% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/OmsLockDO.java index 66b4b11d..3f045c63 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/OmsLockDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ServerInfoDO.java similarity index 93% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ServerInfoDO.java index 45a41868..53c8a396 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ServerInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/UserInfoDO.java similarity index 93% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/UserInfoDO.java index ac18309f..307f4d2a 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/UserInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.Data; import org.hibernate.annotations.GenericGenerator; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInfoDO.java similarity index 96% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInfoDO.java index 80c3b88f..8d7fcd32 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInstanceInfoDO.java similarity index 96% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInstanceInfoDO.java index fac9f742..54714221 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInstanceInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowNodeInfoDO.java similarity index 96% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowNodeInfoDO.java index eab040b3..23d20b97 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowNodeInfoDO.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.persistence.core.model; +package tech.powerjob.server.persistence.remote.model; import lombok.AllArgsConstructor; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/package-info.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/package-info.java similarity index 80% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/package-info.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/package-info.java index e31896c6..b09e5563 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/package-info.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/package-info.java @@ -5,4 +5,4 @@ * @author tjq * @since 2020/6/3 */ -package tech.powerjob.server.persistence.core; \ No newline at end of file +package tech.powerjob.server.persistence.remote; \ No newline at end of file diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/AppInfoRepository.java similarity index 84% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/AppInfoRepository.java index 01ff2e16..874915e1 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/AppInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ContainerInfoRepository.java similarity index 72% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ContainerInfoRepository.java index 582223e4..5373fb0b 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ContainerInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.ContainerInfoDO; +import tech.powerjob.server.persistence.remote.model.ContainerInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/InstanceInfoRepository.java similarity index 97% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/InstanceInfoRepository.java index bad07e16..d63a21fe 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/InstanceInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/JobInfoRepository.java similarity index 92% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/JobInfoRepository.java index 965a0e95..ddd77e9a 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/JobInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/OmsLockRepository.java similarity index 83% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/OmsLockRepository.java index 5abf9cf5..64dedf28 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/OmsLockRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.OmsLockDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ServerInfoRepository.java similarity index 90% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ServerInfoRepository.java index 64cd9ebc..96d75fd8 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ServerInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.ServerInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/UserInfoRepository.java similarity index 74% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/UserInfoRepository.java index 8333cb12..2a11d207 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInfoRepository.java similarity index 89% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInfoRepository.java index 70fdc220..7a673fc4 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInstanceInfoRepository.java similarity index 89% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInstanceInfoRepository.java index c957af4c..3782d864 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInstanceInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowNodeInfoRepository.java similarity index 84% rename from powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java rename to powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowNodeInfoRepository.java index c8bf3ea4..51a44cde 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowNodeInfoRepository.java @@ -1,6 +1,6 @@ -package tech.powerjob.server.persistence.core.repository; +package tech.powerjob.server.persistence.remote.repository; -import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java index 06b53b7e..d2b9ee11 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java @@ -4,8 +4,8 @@ import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils; import tech.powerjob.server.extension.LockService; -import tech.powerjob.server.persistence.core.model.ServerInfoDO; -import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; +import tech.powerjob.server.persistence.remote.model.ServerInfoDO; +import tech.powerjob.server.persistence.remote.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/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java index c5c175e2..23a9e0e3 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java @@ -8,8 +8,8 @@ import com.github.kfcfans.powerjob.common.Protocol; import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.utils.JsonUtils; import tech.powerjob.server.extension.LockService; -import tech.powerjob.server.persistence.core.model.AppInfoDO; -import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.transport.starter.AkkaStarter; import com.google.common.collect.Sets; diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java index 5e7833bd..994ceebb 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java @@ -7,8 +7,8 @@ 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 tech.powerjob.server.persistence.core.model.AppInfoDO; -import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; import tech.powerjob.server.remote.transport.starter.AkkaStarter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java index 33f82a49..59d0b95b 100644 --- a/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java +++ b/powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java @@ -3,7 +3,7 @@ package tech.powerjob.server.remote.worker; import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.extension.WorkerFilter; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.remote.server.redirector.DesignateServer; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/OmsEndpointConfigure.java similarity index 95% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/OmsEndpointConfigure.java index 0fb7ef85..d69e7fc4 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/OmsEndpointConfigure.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.common.config; +package tech.powerjob.server.config; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/SwaggerConfig.java similarity index 98% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/SwaggerConfig.java index db42ed3f..890718fc 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.common.config; +package tech.powerjob.server.config; import tech.powerjob.server.common.PowerJobServerConfigKey; import org.apache.commons.lang3.StringUtils; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/ThreadPoolConfig.java similarity index 98% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/ThreadPoolConfig.java index d6137e28..b9f42e86 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.common.config; +package tech.powerjob.server.config; import tech.powerjob.server.common.RejectedExecutionHandlerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/WebConfig.java similarity index 95% rename from powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java rename to powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/WebConfig.java index 010a1ac6..c1e819ad 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/WebConfig.java @@ -1,4 +1,4 @@ -package tech.powerjob.server.common.config; +package tech.powerjob.server.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java index 95e1eb53..743ae587 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java @@ -2,9 +2,9 @@ package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.response.ResultDTO; -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.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; +import tech.powerjob.server.core.service.AppInfoService; import tech.powerjob.server.web.request.AppAssertRequest; import tech.powerjob.server.web.request.ModifyAppInfoRequest; import com.google.common.collect.Lists; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java index 60d25b58..a88aedab 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java @@ -7,11 +7,11 @@ import tech.powerjob.server.common.constants.ContainerSourceType; import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.core.container.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.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.model.ContainerInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository; +import tech.powerjob.server.core.container.ContainerService; import tech.powerjob.server.web.request.GenerateContainerTemplateRequest; import tech.powerjob.server.web.request.SaveContainerInfoRequest; import tech.powerjob.server.web.response.ContainerInfoVO; @@ -75,7 +75,14 @@ public class ContainerController { @PostMapping("/save") public ResultDTO saveContainer(@RequestBody SaveContainerInfoRequest request) { - containerService.save(request); + request.valid(); + + ContainerInfoDO container = new ContainerInfoDO(); + BeanUtils.copyProperties(request, container); + container.setSourceType(request.getSourceType().getV()); + container.setStatus(request.getStatus().getV()); + + containerService.save(container); return ResultDTO.success(null); } diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java index 2d2992ad..d6063d30 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java @@ -5,10 +5,10 @@ import com.github.kfcfans.powerjob.common.response.ResultDTO; 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.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.core.service.CacheService; import tech.powerjob.server.core.instance.InstanceLogService; import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.web.request.QueryInstanceRequest; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java index 8e3ce756..0a48a6f0 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java @@ -4,9 +4,9 @@ import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; import com.github.kfcfans.powerjob.common.response.ResultDTO; 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.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.core.service.JobService; import tech.powerjob.server.web.request.QueryJobInfoRequest; import tech.powerjob.server.web.response.JobInfoVO; import com.google.common.collect.Lists; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java index 185be4d2..6b258609 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java @@ -9,11 +9,11 @@ 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 tech.powerjob.server.persistence.core.model.WorkflowInfoDO; -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.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO; +import tech.powerjob.server.core.service.AppInfoService; +import tech.powerjob.server.core.service.CacheService; +import tech.powerjob.server.core.service.JobService; import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.workflow.WorkflowInstanceService; import tech.powerjob.server.core.workflow.WorkflowService; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java index 0725ab00..d224e1e0 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java @@ -5,8 +5,8 @@ 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 tech.powerjob.server.persistence.core.model.AppInfoDO; -import tech.powerjob.server.persistence.core.repository.AppInfoRepository; +import tech.powerjob.server.persistence.remote.model.AppInfoDO; +import tech.powerjob.server.persistence.remote.repository.AppInfoRepository; import tech.powerjob.server.remote.server.election.ServerElectionService; import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java index 9da467cc..331dcbcf 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java @@ -4,8 +4,8 @@ import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.response.ResultDTO; 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.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.web.response.SystemOverviewVO; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java index f12652c8..6708bd01 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java @@ -2,8 +2,8 @@ package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.response.ResultDTO; import org.springframework.beans.BeanUtils; -import tech.powerjob.server.persistence.core.model.UserInfoDO; -import tech.powerjob.server.persistence.core.repository.UserInfoRepository; +import tech.powerjob.server.persistence.remote.model.UserInfoDO; +import tech.powerjob.server.persistence.remote.repository.UserInfoRepository; import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.web.request.ModifyUserInfoRequest; import com.google.common.collect.Lists; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java index 4483c7d5..90845a36 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java @@ -2,7 +2,7 @@ package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.response.ResultDTO; -import tech.powerjob.server.service.ValidateService; +import tech.powerjob.server.core.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/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java index 111e2b32..6071bbae 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java @@ -7,9 +7,9 @@ import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; import com.github.kfcfans.powerjob.common.response.ResultDTO; 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.persistence.remote.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO; +import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository; import tech.powerjob.server.core.workflow.WorkflowService; import tech.powerjob.server.web.request.QueryWorkflowInfoRequest; import tech.powerjob.server.web.response.WorkflowInfoVO; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java index 58e2d867..7a222292 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java @@ -3,9 +3,9 @@ package tech.powerjob.server.web.controller; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.response.ResultDTO; 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.persistence.remote.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository; +import tech.powerjob.server.core.service.CacheService; import tech.powerjob.server.core.workflow.WorkflowInstanceService; import tech.powerjob.server.web.request.QueryWorkflowInstanceRequest; import tech.powerjob.server.web.response.WorkflowInstanceInfoVO; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java index 596e754e..6d1eaa31 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/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 tech.powerjob.server.web.response; import com.github.kfcfans.powerjob.common.OmsConstant; -import tech.powerjob.server.persistence.core.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.InstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java index 42b788ce..89af4dd0 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java @@ -7,7 +7,7 @@ import com.github.kfcfans.powerjob.common.utils.CommonUtils; import tech.powerjob.server.common.SJ; import com.github.kfcfans.powerjob.common.DispatchStrategy; import tech.powerjob.server.common.constants.SwitchableStatus; -import tech.powerjob.server.persistence.core.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; import com.google.common.collect.Lists; import lombok.Data; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java index 190fb5d8..61a3e6ee 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java @@ -5,7 +5,7 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.constants.SwitchableStatus; -import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.util.StringUtils; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java index cd4cd7e2..1b7737aa 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java @@ -3,7 +3,7 @@ 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 tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.WorkflowInstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java index 45b9b0b0..b019ed01 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/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 tech.powerjob.server.web.websocket; -import tech.powerjob.server.common.config.OmsEndpointConfigure; -import tech.powerjob.server.service.ContainerService; +import tech.powerjob.server.config.OmsEndpointConfigure; +import tech.powerjob.server.core.container.ContainerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Component; diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java index 3157331b..f0f9e1ab 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java @@ -2,7 +2,7 @@ package tech.powerjob.server.test; import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.persistence.mongodb.GridFsManager; -import tech.powerjob.server.service.timing.CleanService; +import tech.powerjob.server.core.scheduler.CleanService; import com.mongodb.client.gridfs.model.GridFSFile; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java index 99cd69b5..ef292a4d 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java @@ -3,7 +3,7 @@ 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 tech.powerjob.server.service.JobService; +import tech.powerjob.server.core.service.JobService; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.time.DateUtils; diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java index c4f02bed..4dacdbec 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java @@ -5,13 +5,13 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.utils.NetUtils; 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 tech.powerjob.server.persistence.remote.model.InstanceInfoDO; +import tech.powerjob.server.persistence.remote.model.JobInfoDO; +import tech.powerjob.server.persistence.remote.model.OmsLockDO; +import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository; +import tech.powerjob.server.persistence.remote.repository.JobInfoRepository; +import tech.powerjob.server.persistence.remote.repository.OmsLockRepository; +import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository; import org.assertj.core.util.Lists; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java index 78ff9567..4a9b3bfc 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java @@ -1,7 +1,7 @@ package tech.powerjob.server.test; -import tech.powerjob.server.persistence.core.model.ServerInfoDO; -import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; +import tech.powerjob.server.persistence.remote.model.ServerInfoDO; +import tech.powerjob.server.persistence.remote.repository.ServerInfoRepository; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.DateUtils; import org.junit.jupiter.api.Test; diff --git a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java index 2d5ed4d3..96d195ee 100644 --- a/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java +++ b/powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java @@ -2,7 +2,7 @@ package tech.powerjob.server.test; import tech.powerjob.server.core.uid.IdGenerateService; import tech.powerjob.server.extension.LockService; -import tech.powerjob.server.service.timing.CleanService; +import tech.powerjob.server.core.scheduler.CleanService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest;