third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: optimize server's package

Browse Source
This commit is contained in:
tjq 2021-03-07 16:24:09 +08:00
parent 7579d02693
commit bbc1cce627
82 changed files with 229 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
powerjob-server/pom.xml
View File

@ -43,8 +43,16 @@
<dingding.version>1.0.1</dingding.version> <dingding.version>1.0.1</dingding.version>
<vertx-web.version>4.0.2</vertx-web.version> <vertx-web.version>4.0.2</vertx-web.version>
<!-- Skip this module when deploying. --> <!-- skip this module when deploying. -->
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<!-- self-internal dependency, generally no need to change the version -->
<powerjob-server-common.version>1.0.0</powerjob-server-common.version>
<powerjob-server-extension.version>1.0.0</powerjob-server-extension.version>
<powerjob-server-remote.version>1.0.0</powerjob-server-remote.version>
<powerjob-server-persistence.version>1.0.0</powerjob-server-persistence.version>
<powerjob-server-core.version>1.0.0</powerjob-server-core.version>
<powerjob-server-migrate.version>1.0.0</powerjob-server-migrate.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -52,32 +60,32 @@
<dependency> <dependency>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-common</artifactId> <artifactId>powerjob-server-common</artifactId>
<version>1.0.0</version> <version>${powerjob-server-common.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-extension</artifactId> <artifactId>powerjob-server-extension</artifactId>
<version>1.0.0</version> <version>${powerjob-server-extension.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-remote</artifactId> <artifactId>powerjob-server-remote</artifactId>
<version>1.0.0</version> <version>${powerjob-server-remote.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-persistence</artifactId> <artifactId>powerjob-server-persistence</artifactId>
<version>1.0.0</version> <version>${powerjob-server-persistence.version}</version>
</dependency>
<dependency>
<groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-migrate</artifactId>
<version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>tech.powerjob</groupId> <groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-core</artifactId> <artifactId>powerjob-server-core</artifactId>
<version>1.0.0</version> <version>${powerjob-server-core.version}</version>
</dependency>
<dependency>
<groupId>tech.powerjob</groupId>
<artifactId>powerjob-server-migrate</artifactId>
<version>${powerjob-server-migrate.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

6
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java
View File

@ -6,9 +6,9 @@ import com.github.kfcfans.powerjob.common.DispatchStrategy;
import tech.powerjob.server.core.instance.InstanceManager; import tech.powerjob.server.core.instance.InstanceManager;
import tech.powerjob.server.core.instance.InstanceMetadataService; import tech.powerjob.server.core.instance.InstanceMetadataService;
import tech.powerjob.server.core.lock.UseSegmentLock; import tech.powerjob.server.core.lock.UseSegmentLock;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.transport.TransportService;
import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService;
import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.common.module.WorkerInfo;

23
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ContainerService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/container/ContainerService.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.service; package tech.powerjob.server.core.container;
import akka.actor.ActorSelection; import akka.actor.ActorSelection;
import com.github.kfcfans.powerjob.common.OmsConstant; 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.constants.SwitchableStatus;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;
import tech.powerjob.server.persistence.core.model.ContainerInfoDO; import tech.powerjob.server.persistence.remote.model.ContainerInfoDO;
import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository;
import tech.powerjob.server.persistence.mongodb.GridFsManager; import tech.powerjob.server.persistence.mongodb.GridFsManager;
import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.transport.starter.AkkaStarter;
import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService;
import tech.powerjob.server.common.module.WorkerInfo; 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.ArrayListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Multimap; 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.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.springframework.beans.BeanUtils;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; 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 = container.getId();
Long originId = request.getId();
if (originId != null) { if (originId != null) {
container = containerInfoRepository.findById(originId).orElseThrow(() -> new IllegalArgumentException("can't find container by id: " + originId)); container = containerInfoRepository.findById(originId).orElseThrow(() -> new IllegalArgumentException("can't find container by id: " + originId));
}else { }else {
container = new ContainerInfoDO(); container = new ContainerInfoDO();
container.setGmtCreate(new Date()); container.setGmtCreate(new Date());
} }
BeanUtils.copyProperties(request, container);
container.setGmtModified(new Date()); container.setGmtModified(new Date());
container.setSourceType(request.getSourceType().getV());
container.setStatus(request.getStatus().getV());
// 文件上传形式的 sourceInfo 为该文件的 md5 值，Git形式的 md5 在部署阶段生成 // 文件上传形式的 sourceInfo 为该文件的 md5 值，Git形式的 md5 在部署阶段生成
if (request.getSourceType() == ContainerSourceType.FatJar) { if (container.getSourceType() == ContainerSourceType.FatJar.getV()) {
container.setVersion(request.getSourceInfo()); container.setVersion(container.getSourceInfo());
}else { }else {
container.setVersion("init"); container.setVersion("init");
} }

8
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/handler/WorkerRequestHandler.java
View File

@ -19,10 +19,10 @@ import com.github.kfcfans.powerjob.common.utils.JsonUtils;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.common.utils.SpringUtils; import tech.powerjob.server.common.utils.SpringUtils;
import tech.powerjob.server.persistence.core.model.ContainerInfoDO; import tech.powerjob.server.persistence.remote.model.ContainerInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.remote.worker.WorkerClusterManagerService; import tech.powerjob.server.remote.worker.WorkerClusterManagerService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

3
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceLogService.java
View File

@ -10,11 +10,10 @@ import com.github.kfcfans.powerjob.common.utils.SegmentLock;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.persistence.StringPage; 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.LocalInstanceLogDO;
import tech.powerjob.server.persistence.local.LocalInstanceLogRepository; import tech.powerjob.server.persistence.local.LocalInstanceLogRepository;
import tech.powerjob.server.persistence.mongodb.GridFsManager; import tech.powerjob.server.persistence.mongodb.GridFsManager;
import tech.powerjob.server.core.instance.InstanceMetadataService;
import com.google.common.base.Stopwatch; import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

8
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceManager.java
View File

@ -5,10 +5,10 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType;
import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq;
import tech.powerjob.server.common.utils.SpringUtils; import tech.powerjob.server.common.utils.SpringUtils;
import tech.powerjob.server.core.workflow.WorkflowInstanceManager; import tech.powerjob.server.core.workflow.WorkflowInstanceManager;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.UserInfoDO; import tech.powerjob.server.persistence.remote.model.UserInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.core.service.UserService;
import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter; import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter;
import tech.powerjob.server.extension.defaultimpl.alram.module.JobInstanceAlarm; import tech.powerjob.server.extension.defaultimpl.alram.module.JobInstanceAlarm;

8
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceMetadataService.java
View File

@ -1,9 +1,9 @@
package tech.powerjob.server.core.instance; package tech.powerjob.server.core.instance;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;

8
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java
View File

@ -10,10 +10,10 @@ import tech.powerjob.server.common.constants.InstanceType;
import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService;
import tech.powerjob.server.persistence.QueryConvertUtils; import tech.powerjob.server.persistence.QueryConvertUtils;
import tech.powerjob.server.common.timewheel.TimerFuture; import tech.powerjob.server.common.timewheel.TimerFuture;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.DispatchService;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.transport.TransportService;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/CleanService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/CleanService.java
View File

@ -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.InstanceStatus;
import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository;
import tech.powerjob.server.persistence.mongodb.GridFsManager; import tech.powerjob.server.persistence.mongodb.GridFsManager;
import tech.powerjob.server.remote.worker.WorkerClusterManagerService; import tech.powerjob.server.remote.worker.WorkerClusterManagerService;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/InstanceStatusCheckService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/InstanceStatusCheckService.java
View File

@ -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.InstanceStatus;
import com.github.kfcfans.powerjob.common.SystemInstanceResult; 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 com.github.kfcfans.powerjob.common.WorkflowInstanceStatus;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.transport.starter.AkkaStarter;
import tech.powerjob.server.persistence.core.model.*; import tech.powerjob.server.persistence.remote.model.*;
import tech.powerjob.server.persistence.core.repository.*; import tech.powerjob.server.persistence.remote.repository.*;
import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.DispatchService;
import tech.powerjob.server.core.instance.InstanceManager; import tech.powerjob.server.core.instance.InstanceManager;
import tech.powerjob.server.core.workflow.WorkflowInstanceManager; import tech.powerjob.server.core.workflow.WorkflowInstanceManager;

20
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/timing/schedule/OmsScheduleService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/scheduler/PowerScheduleService.java
View File

@ -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.InstanceStatus;
import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.TimeExpressionType;
import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.transport.starter.AkkaStarter;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.common.utils.CronExpression; import tech.powerjob.server.common.utils.CronExpression;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.core.DispatchService; 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.remote.worker.WorkerClusterManagerService;
import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.instance.InstanceService;
import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService;
@ -44,7 +44,7 @@ import java.util.stream.Collectors;
*/ */
@Slf4j @Slf4j
@Service @Service
public class OmsScheduleService { public class PowerScheduleService {
/** /**
* 每次并发调度的应用数量 * 每次并发调度的应用数量

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/AppInfoService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/AppInfoService.java
View File

@ -1,8 +1,8 @@
package tech.powerjob.server.service; package tech.powerjob.server.core.service;
import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.PowerJobException;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;

14
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/CacheService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/CacheService.java
View File

@ -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.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

10
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/JobService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/JobService.java
View File

@ -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.InstanceStatus;
import com.github.kfcfans.powerjob.common.PowerJobException; 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.constants.SwitchableStatus;
import tech.powerjob.server.common.utils.CronExpression; import tech.powerjob.server.common.utils.CronExpression;
import tech.powerjob.server.persistence.QueryConvertUtils; import tech.powerjob.server.persistence.QueryConvertUtils;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.DispatchService;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.instance.InstanceService;

4
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/UserService.java
View File

@ -1,7 +1,7 @@
package tech.powerjob.server.core.service; package tech.powerjob.server.core.service;
import tech.powerjob.server.persistence.core.model.UserInfoDO; import tech.powerjob.server.persistence.remote.model.UserInfoDO;
import tech.powerjob.server.persistence.core.repository.UserInfoRepository; import tech.powerjob.server.persistence.remote.repository.UserInfoRepository;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/service/ValidateService.java → powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/service/ValidateService.java
View File

@ -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.OmsConstant;
import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.TimeExpressionType;

10
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java
View File

@ -8,11 +8,11 @@ import com.github.kfcfans.powerjob.common.utils.JsonUtils;
import com.github.kfcfans.powerjob.common.utils.SegmentLock; import com.github.kfcfans.powerjob.common.utils.SegmentLock;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils; import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils;
import tech.powerjob.server.persistence.core.model.*; import tech.powerjob.server.persistence.remote.model.*;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowNodeInfoRepository;
import tech.powerjob.server.core.DispatchService; import tech.powerjob.server.core.DispatchService;
import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.core.service.UserService;
import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter; import tech.powerjob.server.extension.defaultimpl.alram.AlarmCenter;

8
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceService.java
View File

@ -9,10 +9,10 @@ import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG;
import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils; import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInstanceInfoDO;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.instance.InstanceService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

12
powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowService.java
View File

@ -9,12 +9,12 @@ import tech.powerjob.server.common.SJ;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.common.utils.CronExpression; import tech.powerjob.server.common.utils.CronExpression;
import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils; import tech.powerjob.server.core.workflow.algorithm.WorkflowDAGUtils;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowNodeInfoRepository;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService; import tech.powerjob.server.common.timewheel.holder.InstanceTimeWheelService;
import com.github.kfcfans.powerjob.common.request.http.AddWorkflowNodeRequest; import com.github.kfcfans.powerjob.common.request.http.AddWorkflowNodeRequest;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/Alarmable.java
View File

@ -1,6 +1,6 @@
package tech.powerjob.server.extension; 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 tech.powerjob.server.extension.defaultimpl.alram.module.Alarm;
import java.util.List; import java.util.List;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/WorkerFilter.java
View File

@ -1,6 +1,6 @@
package tech.powerjob.server.extension; 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; import tech.powerjob.server.common.module.WorkerInfo;
/** /**

4
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/DatabaseLockService.java
View File

@ -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.CommonUtils;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;
import tech.powerjob.server.persistence.core.model.OmsLockDO; import tech.powerjob.server.persistence.remote.model.OmsLockDO;
import tech.powerjob.server.persistence.core.repository.OmsLockRepository; import tech.powerjob.server.persistence.remote.repository.OmsLockRepository;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/AlarmCenter.java
View File

@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm; import tech.powerjob.server.extension.defaultimpl.alram.module.Alarm;
import tech.powerjob.server.extension.Alarmable; 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.Lists;
import com.google.common.collect.Queues; import com.google.common.collect.Queues;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/DingTalkAlarmService.java
View File

@ -5,7 +5,7 @@ import com.github.kfcfans.powerjob.common.PowerJobException;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.common.PowerJobServerConfigKey; import tech.powerjob.server.common.PowerJobServerConfigKey;
import tech.powerjob.server.common.SJ; 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.defaultimpl.alram.module.Alarm;
import tech.powerjob.server.extension.Alarmable; import tech.powerjob.server.extension.Alarmable;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/MailAlarmService.java
View File

@ -1,6 +1,6 @@
package tech.powerjob.server.extension.defaultimpl.alram.impl; 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.defaultimpl.alram.module.Alarm;
import tech.powerjob.server.extension.Alarmable; import tech.powerjob.server.extension.Alarmable;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/alram/impl/WebHookAlarmService.java
View File

@ -3,7 +3,7 @@ package tech.powerjob.server.extension.defaultimpl.alram.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.OmsConstant;
import com.github.kfcfans.powerjob.common.utils.HttpUtils; 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.defaultimpl.alram.module.Alarm;
import tech.powerjob.server.extension.Alarmable; import tech.powerjob.server.extension.Alarmable;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DesignatedWorkerFilter.java
View File

@ -2,7 +2,7 @@ package tech.powerjob.server.extension.defaultimpl.workerfilter;
import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.SJ;
import tech.powerjob.server.extension.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 tech.powerjob.server.common.module.WorkerInfo;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/DisconnectedWorkerFilter.java
View File

@ -1,7 +1,7 @@
package tech.powerjob.server.extension.defaultimpl.workerfilter; package tech.powerjob.server.extension.defaultimpl.workerfilter;
import tech.powerjob.server.extension.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 tech.powerjob.server.common.module.WorkerInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
powerjob-server/powerjob-server-extension/src/main/java/tech/powerjob/server/extension/defaultimpl/workerfilter/SystemMetricsWorkerFilter.java
View File

@ -2,7 +2,7 @@ package tech.powerjob.server.extension.defaultimpl.workerfilter;
import com.github.kfcfans.powerjob.common.model.SystemMetrics; import com.github.kfcfans.powerjob.common.model.SystemMetrics;
import tech.powerjob.server.extension.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 tech.powerjob.server.common.module.WorkerInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

12
powerjob-server/powerjob-server-migrate/src/main/java/tech/powerjob/server/migrate/V3ToV4MigrateService.java
View File

@ -6,12 +6,12 @@ import com.github.kfcfans.powerjob.common.PowerJobException;
import com.github.kfcfans.powerjob.common.ProcessorType; import com.github.kfcfans.powerjob.common.ProcessorType;
import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowNodeInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowNodeInfoRepository;
import com.google.common.base.Stopwatch; import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/MultiDatasourceConfig.java
View File

@ -28,7 +28,7 @@ public class MultiDatasourceConfig {
private static final int H2_MAX_ACTIVE_SIZE = 10; private static final int H2_MAX_ACTIVE_SIZE = 10;
@Primary @Primary
@Bean("omsCoreDatasource") @Bean("omsRemoteDatasource")
@ConfigurationProperties(prefix = "spring.datasource.core") @ConfigurationProperties(prefix = "spring.datasource.core")
public DataSource initOmsCoreDatasource() { public DataSource initOmsCoreDatasource() {
return DataSourceBuilder.create().build(); return DataSourceBuilder.create().build();

28
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/CoreJpaConfig.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/config/RemoteJpaConfig.java
View File

@ -28,18 +28,18 @@ import java.util.Objects;
@EnableTransactionManagement @EnableTransactionManagement
@EnableJpaRepositories( @EnableJpaRepositories(
// repository包名 // repository包名
basePackages = CoreJpaConfig.CORE_PACKAGES, basePackages = RemoteJpaConfig.CORE_PACKAGES,
// 实体管理bean名称 // 实体管理bean名称
entityManagerFactoryRef = "coreEntityManagerFactory", entityManagerFactoryRef = "remoteEntityManagerFactory",
// 事务管理bean名称 // 事务管理bean名称
transactionManagerRef = "coreTransactionManager" transactionManagerRef = "remoteTransactionManager"
) )
public class CoreJpaConfig { public class RemoteJpaConfig {
@Resource(name = "omsCoreDatasource") @Resource(name = "omsRemoteDatasource")
private DataSource omsCoreDatasource; 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配置文件，相当于一下三个配置 * 生成配置文件，包括 JPA配置文件和Hibernate配置文件，相当于一下三个配置
@ -65,21 +65,21 @@ public class CoreJpaConfig {
} }
@Primary @Primary
@Bean(name = "coreEntityManagerFactory") @Bean(name = "remoteEntityManagerFactory")
public LocalContainerEntityManagerFactoryBean initCoreEntityManagerFactory(EntityManagerFactoryBuilder builder) { public LocalContainerEntityManagerFactoryBean initRemoteEntityManagerFactory(EntityManagerFactoryBuilder builder) {
return builder return builder
.dataSource(omsCoreDatasource) .dataSource(omsRemoteDatasource)
.properties(genDatasourceProperties()) .properties(genDatasourceProperties())
.packages(CORE_PACKAGES) .packages(CORE_PACKAGES)
.persistenceUnit("corePersistenceUnit") .persistenceUnit("remotePersistenceUnit")
.build(); .build();
} }
@Primary @Primary
@Bean(name = "coreTransactionManager") @Bean(name = "remoteTransactionManager")
public PlatformTransactionManager initCoreTransactionManager(EntityManagerFactoryBuilder builder) { public PlatformTransactionManager initRemoteTransactionManager(EntityManagerFactoryBuilder builder) {
return new JpaTransactionManager(Objects.requireNonNull(initCoreEntityManagerFactory(builder).getObject())); return new JpaTransactionManager(Objects.requireNonNull(initRemoteEntityManagerFactory(builder).getObject()));
} }
} }

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/AppInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/AppInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ContainerInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ContainerInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/InstanceInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/InstanceInfoDO.java
View File

@ -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 com.github.kfcfans.powerjob.common.InstanceStatus;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/JobInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/OmsLockDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/OmsLockDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/ServerInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/ServerInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/UserInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/UserInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowInstanceInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/model/WorkflowNodeInfoDO.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/WorkflowNodeInfoDO.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.persistence.core.model; package tech.powerjob.server.persistence.remote.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/package-info.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/package-info.java
View File

@ -5,4 +5,4 @@
* @author tjq * @author tjq
* @since 2020/6/3 * @since 2020/6/3
*/ */
package tech.powerjob.server.persistence.core; package tech.powerjob.server.persistence.remote;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/AppInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/AppInfoRepository.java
View File

@ -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.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ContainerInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ContainerInfoRepository.java
View File

@ -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 org.springframework.data.jpa.repository.JpaRepository;
import java.util.List; import java.util.List;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/InstanceInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/InstanceInfoRepository.java
View File

@ -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 com.google.errorprone.annotations.CanIgnoreReturnValue;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/JobInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/JobInfoRepository.java
View File

@ -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.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/OmsLockRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/OmsLockRepository.java
View File

@ -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.JpaRepository;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/ServerInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/ServerInfoRepository.java
View File

@ -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 com.google.errorprone.annotations.CanIgnoreReturnValue;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/UserInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/UserInfoRepository.java
View File

@ -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 org.springframework.data.jpa.repository.JpaRepository;
import java.util.List; import java.util.List;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInfoRepository.java
View File

@ -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.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowInstanceInfoRepository.java
View File

@ -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.JpaRepository;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

4
powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/core/repository/WorkflowNodeInfoRepository.java → powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/repository/WorkflowNodeInfoRepository.java
View File

@ -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 org.springframework.data.jpa.repository.JpaRepository;
import java.util.List; import java.util.List;

4
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/ServerInfoService.java
View File

@ -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.CommonUtils;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;
import tech.powerjob.server.persistence.core.model.ServerInfoDO; import tech.powerjob.server.persistence.remote.model.ServerInfoDO;
import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; import tech.powerjob.server.persistence.remote.repository.ServerInfoRepository;
import com.google.common.base.Stopwatch; import com.google.common.base.Stopwatch;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;

4
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java
View File

@ -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.response.AskResponse;
import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.github.kfcfans.powerjob.common.utils.JsonUtils;
import tech.powerjob.server.extension.LockService; import tech.powerjob.server.extension.LockService;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.transport.TransportService;
import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.transport.starter.AkkaStarter;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

4
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/redirector/DesignateServerAspect.java
View File

@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.PowerJobException;
import com.github.kfcfans.powerjob.common.RemoteConstant; import com.github.kfcfans.powerjob.common.RemoteConstant;
import com.github.kfcfans.powerjob.common.response.AskResponse; import com.github.kfcfans.powerjob.common.response.AskResponse;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.remote.transport.starter.AkkaStarter; import tech.powerjob.server.remote.transport.starter.AkkaStarter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

2
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java
View File

@ -3,7 +3,7 @@ package tech.powerjob.server.remote.worker;
import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo;
import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.common.module.WorkerInfo;
import tech.powerjob.server.extension.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.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/OmsEndpointConfigure.java → powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/OmsEndpointConfigure.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.common.config; package tech.powerjob.server.config;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/SwaggerConfig.java → powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.common.config; package tech.powerjob.server.config;
import tech.powerjob.server.common.PowerJobServerConfigKey; import tech.powerjob.server.common.PowerJobServerConfigKey;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/ThreadPoolConfig.java → powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/ThreadPoolConfig.java
View File

@ -1,4 +1,4 @@
package tech.powerjob.server.common.config; package tech.powerjob.server.config;
import tech.powerjob.server.common.RejectedExecutionHandlerFactory; import tech.powerjob.server.common.RejectedExecutionHandlerFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/common/config/WebConfig.java → powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/config/WebConfig.java
View File

@ -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.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/AppInfoController.java
View File

@ -2,9 +2,9 @@ package tech.powerjob.server.web.controller;
import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.PowerJobException;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.service.AppInfoService; import tech.powerjob.server.core.service.AppInfoService;
import tech.powerjob.server.web.request.AppAssertRequest; import tech.powerjob.server.web.request.AppAssertRequest;
import tech.powerjob.server.web.request.ModifyAppInfoRequest; import tech.powerjob.server.web.request.ModifyAppInfoRequest;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;

19
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ContainerController.java
View File

@ -7,11 +7,11 @@ import tech.powerjob.server.common.constants.ContainerSourceType;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.core.container.ContainerTemplateGenerator; import tech.powerjob.server.core.container.ContainerTemplateGenerator;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.model.ContainerInfoDO; import tech.powerjob.server.persistence.remote.model.ContainerInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.persistence.core.repository.ContainerInfoRepository; import tech.powerjob.server.persistence.remote.repository.ContainerInfoRepository;
import tech.powerjob.server.service.ContainerService; import tech.powerjob.server.core.container.ContainerService;
import tech.powerjob.server.web.request.GenerateContainerTemplateRequest; import tech.powerjob.server.web.request.GenerateContainerTemplateRequest;
import tech.powerjob.server.web.request.SaveContainerInfoRequest; import tech.powerjob.server.web.request.SaveContainerInfoRequest;
import tech.powerjob.server.web.response.ContainerInfoVO; import tech.powerjob.server.web.response.ContainerInfoVO;
@ -75,7 +75,14 @@ public class ContainerController {
@PostMapping("/save") @PostMapping("/save")
public ResultDTO<Void> saveContainer(@RequestBody SaveContainerInfoRequest request) { public ResultDTO<Void> 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); return ResultDTO.success(null);
} }

8
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/InstanceController.java
View File

@ -5,10 +5,10 @@ import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.persistence.PageResult; import tech.powerjob.server.persistence.PageResult;
import tech.powerjob.server.persistence.StringPage; import tech.powerjob.server.persistence.StringPage;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.service.CacheService; import tech.powerjob.server.core.service.CacheService;
import tech.powerjob.server.core.instance.InstanceLogService; import tech.powerjob.server.core.instance.InstanceLogService;
import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.instance.InstanceService;
import tech.powerjob.server.web.request.QueryInstanceRequest; import tech.powerjob.server.web.request.QueryInstanceRequest;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java
View File

@ -4,9 +4,9 @@ import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.persistence.PageResult; import tech.powerjob.server.persistence.PageResult;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.service.JobService; import tech.powerjob.server.core.service.JobService;
import tech.powerjob.server.web.request.QueryJobInfoRequest; import tech.powerjob.server.web.request.QueryJobInfoRequest;
import tech.powerjob.server.web.response.JobInfoVO; import tech.powerjob.server.web.response.JobInfoVO;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;

10
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java
View File

@ -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.JobInfoDTO;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO;
import tech.powerjob.server.service.AppInfoService; import tech.powerjob.server.core.service.AppInfoService;
import tech.powerjob.server.service.CacheService; import tech.powerjob.server.core.service.CacheService;
import tech.powerjob.server.service.JobService; import tech.powerjob.server.core.service.JobService;
import tech.powerjob.server.core.instance.InstanceService; import tech.powerjob.server.core.instance.InstanceService;
import tech.powerjob.server.core.workflow.WorkflowInstanceService; import tech.powerjob.server.core.workflow.WorkflowInstanceService;
import tech.powerjob.server.core.workflow.WorkflowService; import tech.powerjob.server.core.workflow.WorkflowService;

4
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ServerController.java
View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.CommonUtils;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.persistence.core.model.AppInfoDO; import tech.powerjob.server.persistence.remote.model.AppInfoDO;
import tech.powerjob.server.persistence.core.repository.AppInfoRepository; import tech.powerjob.server.persistence.remote.repository.AppInfoRepository;
import tech.powerjob.server.remote.server.election.ServerElectionService; import tech.powerjob.server.remote.server.election.ServerElectionService;
import tech.powerjob.server.remote.transport.TransportService; import tech.powerjob.server.remote.transport.TransportService;
import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService;

4
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/SystemInfoController.java
View File

@ -4,8 +4,8 @@ import com.github.kfcfans.powerjob.common.InstanceStatus;
import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.OmsConstant;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.remote.worker.WorkerClusterQueryService; import tech.powerjob.server.remote.worker.WorkerClusterQueryService;
import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.common.module.WorkerInfo;
import tech.powerjob.server.web.response.SystemOverviewVO; import tech.powerjob.server.web.response.SystemOverviewVO;

4
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/UserInfoController.java
View File

@ -2,8 +2,8 @@ package tech.powerjob.server.web.controller;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import tech.powerjob.server.persistence.core.model.UserInfoDO; import tech.powerjob.server.persistence.remote.model.UserInfoDO;
import tech.powerjob.server.persistence.core.repository.UserInfoRepository; import tech.powerjob.server.persistence.remote.repository.UserInfoRepository;
import tech.powerjob.server.core.service.UserService; import tech.powerjob.server.core.service.UserService;
import tech.powerjob.server.web.request.ModifyUserInfoRequest; import tech.powerjob.server.web.request.ModifyUserInfoRequest;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/ValidateController.java
View File

@ -2,7 +2,7 @@ package tech.powerjob.server.web.controller;
import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.TimeExpressionType;
import com.github.kfcfans.powerjob.common.response.ResultDTO; 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 com.google.common.collect.Lists;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowController.java
View File

@ -7,9 +7,9 @@ import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.persistence.PageResult; import tech.powerjob.server.persistence.PageResult;
import tech.powerjob.server.persistence.core.model.WorkflowInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInfoDO;
import tech.powerjob.server.persistence.core.model.WorkflowNodeInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowNodeInfoDO;
import tech.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInfoRepository;
import tech.powerjob.server.core.workflow.WorkflowService; import tech.powerjob.server.core.workflow.WorkflowService;
import tech.powerjob.server.web.request.QueryWorkflowInfoRequest; import tech.powerjob.server.web.request.QueryWorkflowInfoRequest;
import tech.powerjob.server.web.response.WorkflowInfoVO; import tech.powerjob.server.web.response.WorkflowInfoVO;

6
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/WorkflowInstanceController.java
View File

@ -3,9 +3,9 @@ package tech.powerjob.server.web.controller;
import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus;
import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO;
import tech.powerjob.server.persistence.PageResult; import tech.powerjob.server.persistence.PageResult;
import tech.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import tech.powerjob.server.persistence.remote.model.WorkflowInstanceInfoDO;
import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository;
import tech.powerjob.server.service.CacheService; import tech.powerjob.server.core.service.CacheService;
import tech.powerjob.server.core.workflow.WorkflowInstanceService; import tech.powerjob.server.core.workflow.WorkflowInstanceService;
import tech.powerjob.server.web.request.QueryWorkflowInstanceRequest; import tech.powerjob.server.web.request.QueryWorkflowInstanceRequest;
import tech.powerjob.server.web.response.WorkflowInstanceInfoVO; import tech.powerjob.server.web.response.WorkflowInstanceInfoVO;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/InstanceInfoVO.java
View File

@ -1,7 +1,7 @@
package tech.powerjob.server.web.response; package tech.powerjob.server.web.response;
import com.github.kfcfans.powerjob.common.OmsConstant; 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 lombok.Data;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java
View File

@ -7,7 +7,7 @@ import com.github.kfcfans.powerjob.common.utils.CommonUtils;
import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.SJ;
import com.github.kfcfans.powerjob.common.DispatchStrategy; import com.github.kfcfans.powerjob.common.DispatchStrategy;
import tech.powerjob.server.common.constants.SwitchableStatus; 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 com.google.common.collect.Lists;
import lombok.Data; import lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInfoVO.java
View File

@ -5,7 +5,7 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType;
import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG;
import tech.powerjob.server.common.SJ; import tech.powerjob.server.common.SJ;
import tech.powerjob.server.common.constants.SwitchableStatus; 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 lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

2
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkflowInstanceInfoVO.java
View File

@ -3,7 +3,7 @@ package tech.powerjob.server.web.response;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.OmsConstant;
import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; 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 lombok.Data;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

4
powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java
View File

@ -1,7 +1,7 @@
package tech.powerjob.server.web.websocket; package tech.powerjob.server.web.websocket;
import tech.powerjob.server.common.config.OmsEndpointConfigure; import tech.powerjob.server.config.OmsEndpointConfigure;
import tech.powerjob.server.service.ContainerService; import tech.powerjob.server.core.container.ContainerService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/OmsLogTest.java
View File

@ -2,7 +2,7 @@ package tech.powerjob.server.test;
import tech.powerjob.server.common.utils.OmsFileUtils; import tech.powerjob.server.common.utils.OmsFileUtils;
import tech.powerjob.server.persistence.mongodb.GridFsManager; 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 com.mongodb.client.gridfs.model.GridFSFile;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

2
powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/QueryConvertUtilsTest.java
View File

@ -3,7 +3,7 @@ package tech.powerjob.server.test;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.kfcfans.powerjob.common.PowerQuery; import com.github.kfcfans.powerjob.common.PowerQuery;
import com.github.kfcfans.powerjob.common.response.JobInfoDTO; 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.Getter;
import lombok.Setter; import lombok.Setter;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;

14
powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/RepositoryTest.java
View File

@ -5,13 +5,13 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType;
import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus;
import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.common.utils.NetUtils;
import tech.powerjob.server.common.constants.SwitchableStatus; import tech.powerjob.server.common.constants.SwitchableStatus;
import tech.powerjob.server.persistence.core.model.InstanceInfoDO; import tech.powerjob.server.persistence.remote.model.InstanceInfoDO;
import tech.powerjob.server.persistence.core.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.persistence.core.model.OmsLockDO; import tech.powerjob.server.persistence.remote.model.OmsLockDO;
import tech.powerjob.server.persistence.core.repository.InstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.InstanceInfoRepository;
import tech.powerjob.server.persistence.core.repository.JobInfoRepository; import tech.powerjob.server.persistence.remote.repository.JobInfoRepository;
import tech.powerjob.server.persistence.core.repository.OmsLockRepository; import tech.powerjob.server.persistence.remote.repository.OmsLockRepository;
import tech.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; import tech.powerjob.server.persistence.remote.repository.WorkflowInstanceInfoRepository;
import org.assertj.core.util.Lists; import org.assertj.core.util.Lists;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

4
powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServerInfoServiceTest.java
View File

@ -1,7 +1,7 @@
package tech.powerjob.server.test; package tech.powerjob.server.test;
import tech.powerjob.server.persistence.core.model.ServerInfoDO; import tech.powerjob.server.persistence.remote.model.ServerInfoDO;
import tech.powerjob.server.persistence.core.repository.ServerInfoRepository; import tech.powerjob.server.persistence.remote.repository.ServerInfoRepository;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
powerjob-server/powerjob-server-starter/src/test/java/tech/powerjob/server/test/ServiceTest.java
View File

@ -2,7 +2,7 @@ package tech.powerjob.server.test;
import tech.powerjob.server.core.uid.IdGenerateService; import tech.powerjob.server.core.uid.IdGenerateService;
import tech.powerjob.server.extension.LockService; 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.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;