diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/RemoteConstant.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/RemoteConstant.java index f4846dbf..19c50eb2 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/RemoteConstant.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/RemoteConstant.java @@ -26,7 +26,7 @@ public class RemoteConstant { /* ************************ AKKA SERVER ************************ */ public static final String SERVER_ACTOR_SYSTEM_NAME = "oms-server"; public static final String SERVER_ACTOR_NAME = "server_actor"; - public static final String SERVER_AKKA_CONFIG_NAME = "oms-worker.akka.conf"; + public static final String SERVER_AKKA_CONFIG_NAME = "oms-server.akka.conf"; /* ************************ OTHERS ************************ */ diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/CommonUtils.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/CommonUtils.java index 39ed50ca..3c5d2303 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/CommonUtils.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/CommonUtils.java @@ -31,7 +31,6 @@ public class CommonUtils { try { return executor.get(); }catch (Exception e) { - log.warn("[CommonUtils] executeWithRetry failed, system will retry after {}ms.", intervalMS, e); Thread.sleep(intervalMS); } } diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/NetUtils.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/NetUtils.java similarity index 99% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/NetUtils.java rename to oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/NetUtils.java index 3f8348aa..a1d94886 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/NetUtils.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/common/utils/NetUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.common.utils; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/config/SwaggerConfig.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java similarity index 96% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/config/SwaggerConfig.java rename to oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java index 63dc4cd4..0bf479e8 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/config/SwaggerConfig.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.config; +package com.github.kfcfans.oms.server.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/OhMyServer.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/OhMyServer.java new file mode 100644 index 00000000..ed1bc2aa --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/OhMyServer.java @@ -0,0 +1,44 @@ +package com.github.kfcfans.oms.server.core.actors; + +import akka.actor.ActorSystem; +import akka.actor.Props; +import com.github.kfcfans.common.RemoteConstant; +import com.github.kfcfans.common.utils.NetUtils; +import com.google.common.collect.Maps; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; + +/** + * 服务端 ActorSystem 启动器 + * + * @author tjq + * @since 2020/4/2 + */ +@Slf4j +public class OhMyServer { + + public static ActorSystem actorSystem; + private static String actorSystemAddress; + + public void init() { + + // 1. 启动 ActorSystem + Map overrideConfig = Maps.newHashMap(); + String localIP = NetUtils.getLocalHost(); + int port = NetUtils.getAvailablePort(); + overrideConfig.put("akka.remote.artery.canonical.hostname", localIP); + overrideConfig.put("akka.remote.artery.canonical.port", port); + actorSystemAddress = localIP + ":" + port; + log.info("[OhMyWorker] akka-remote server address: {}", actorSystemAddress); + + Config akkaBasicConfig = ConfigFactory.load(RemoteConstant.SERVER_AKKA_CONFIG_NAME); + Config akkaFinalConfig = ConfigFactory.parseMap(overrideConfig).withFallback(akkaBasicConfig); + actorSystem = ActorSystem.create(RemoteConstant.SERVER_ACTOR_NAME, akkaFinalConfig); + + actorSystem.actorOf(Props.create(ServerActor.class), RemoteConstant.SERVER_ACTOR_NAME); + + } +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/actors/ServerActor.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/ServerActor.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/actors/ServerActor.java rename to oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/ServerActor.java index 310b6db4..0ba32790 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/actors/ServerActor.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/core/actors/ServerActor.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.actors; +package com.github.kfcfans.oms.server.core.actors; import akka.actor.AbstractActor; import com.github.kfcfans.common.request.WorkerHeartbeat; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/JobInfoDO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/JobInfoDO.java index 8bab3779..b4894417 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/JobInfoDO.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/JobInfoDO.java @@ -45,7 +45,9 @@ public class JobInfoDO { private String processorInfo; /* ************************** 运行时配置 ************************** */ - // 并发度，同时执行的线程数量 + // 最大同时运行任务数 + private Integer maxInstanceNum; + // 并发度，同时执行某个任务的最大线程数量 private Integer concurrency; // 任务整体超时时间 private Long instanceTimeLimit; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/OmsLockDO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/OmsLockDO.java new file mode 100644 index 00000000..54ee4e4c --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/model/OmsLockDO.java @@ -0,0 +1,37 @@ +package com.github.kfcfans.oms.server.persistence.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.Date; + +/** + * 数据库锁 + * + * @author tjq + * @since 2020/4/2 + */ +@Data +@Entity +@NoArgsConstructor +@Table(name = "oms_lock", uniqueConstraints = {@UniqueConstraint(name = "lockNameUK", columnNames = {"lockName"})}) +public class OmsLockDO { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String lockName; + private String owner; + + private Date gmtCreate; + private Date gmtModified; + + public OmsLockDO(String lockName, String owner) { + this.lockName = lockName; + this.owner = owner; + this.gmtCreate = new Date(); + this.gmtModified = this.gmtCreate; + } +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/repository/OmsLockRepository.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/repository/OmsLockRepository.java new file mode 100644 index 00000000..36b38262 --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/repository/OmsLockRepository.java @@ -0,0 +1,22 @@ +package com.github.kfcfans.oms.server.persistence.repository; + +import com.github.kfcfans.oms.server.persistence.model.OmsLockDO; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +import javax.transaction.Transactional; + +/** + * 利用唯一性约束作为数据库锁 + * + * @author tjq + * @since 2020/4/2 + */ +public interface OmsLockRepository extends JpaRepository { + + @Modifying + @Transactional + @Query(value = "delete from oms_lock where lock_name = ?1", nativeQuery = true) + int deleteByLockName(String lockName); +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/LockService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/LockService.java new file mode 100644 index 00000000..e72bfddd --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/LockService.java @@ -0,0 +1,24 @@ +package com.github.kfcfans.oms.server.service; + +/** + * 锁服务 + * + * @author tjq + * @since 2020/4/2 + */ +public interface LockService { + + /** + * 上锁（获取锁），立即返回，不会阻塞等待锁 + * @param name 锁名称 + * @return true -> 获取到锁，false -> 未获取到锁 + */ + boolean lock(String name); + + /** + * 释放锁 + * @param name 锁名称 + */ + void unlock(String name); + +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/impl/DatabaseLockService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/impl/DatabaseLockService.java new file mode 100644 index 00000000..5c54fa05 --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/impl/DatabaseLockService.java @@ -0,0 +1,52 @@ +package com.github.kfcfans.oms.server.service.impl; + +import com.github.kfcfans.common.utils.CommonUtils; +import com.github.kfcfans.common.utils.NetUtils; +import com.github.kfcfans.oms.server.persistence.model.OmsLockDO; +import com.github.kfcfans.oms.server.persistence.repository.OmsLockRepository; +import com.github.kfcfans.oms.server.service.LockService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 基于数据库实现分布式锁 + * + * @author tjq + * @since 2020/4/2 + */ +@Slf4j +@Service +public class DatabaseLockService implements LockService { + + @Resource + private OmsLockRepository omsLockRepository; + + @Override + public boolean lock(String name) { + + try { + + OmsLockDO lock = new OmsLockDO(name, NetUtils.getLocalHost()); + omsLockRepository.saveAndFlush(lock); + + return true; + }catch (DataIntegrityViolationException ignore) { + log.info("[DatabaseLockService] other thread get the lock {}.", name); + } catch (Exception e) { + log.error("[DatabaseLockService] lock {} failed.", name, e); + } + return false; + } + + @Override + public void unlock(String name) { + try { + CommonUtils.executeWithRetry0(() -> omsLockRepository.deleteByLockName(name)); + }catch (Exception e) { + log.error("[DatabaseLockService] unlock {} failed.", name, e); + } + } +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java index b2805313..beb0bc17 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java @@ -1,6 +1,5 @@ package com.github.kfcfans.oms.server.web; -import com.github.kfcfans.oms.server.pojo.ResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/pojo/ResultDTO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ResultDTO.java similarity index 94% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/pojo/ResultDTO.java rename to oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ResultDTO.java index 2c1a10a8..4f799c18 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/pojo/ResultDTO.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ResultDTO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.pojo; +package com.github.kfcfans.oms.server.web; import lombok.Getter; import lombok.Setter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java index e7e4174a..50ff960f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java @@ -2,7 +2,7 @@ package com.github.kfcfans.oms.server.web.controller; import com.github.kfcfans.oms.server.persistence.model.AppInfoDO; import com.github.kfcfans.oms.server.persistence.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.pojo.ResultDTO; +import com.github.kfcfans.oms.server.web.ResultDTO; import com.github.kfcfans.oms.server.web.request.ModifyAppInfoRequest; import lombok.Data; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java index 63788294..a0ce3dce 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java @@ -4,7 +4,7 @@ import com.github.kfcfans.common.ExecuteType; import com.github.kfcfans.common.ProcessorType; import com.github.kfcfans.oms.server.common.constans.TimeExpressionType; import com.github.kfcfans.oms.server.persistence.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.pojo.ResultDTO; +import com.github.kfcfans.oms.server.web.ResultDTO; import com.github.kfcfans.oms.server.persistence.model.JobInfoDO; import com.github.kfcfans.oms.server.web.request.ModifyJobInfoRequest; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyJobInfoRequest.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyJobInfoRequest.java index de5d0d52..8499d265 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyJobInfoRequest.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyJobInfoRequest.java @@ -37,6 +37,8 @@ public class ModifyJobInfoRequest { private String processorInfo; /* ************************** 运行时配置 ************************** */ + // 最大同时运行任务数 + private Integer maxInstanceNum; // 并发度，同时执行的线程数量 private Integer concurrency; // 任务整体超时时间 diff --git a/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf b/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf index e1353bb8..c6657860 100644 --- a/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf +++ b/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf @@ -10,7 +10,7 @@ akka { transport = tcp # See Selecting a transport below # over write by code canonical.hostname = "127.0.0.1" - canonical.port = 10086 + canonical.port = 0 } } } \ No newline at end of file diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java b/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java new file mode 100644 index 00000000..7a39b66a --- /dev/null +++ b/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java @@ -0,0 +1,33 @@ +package com.github.kfcfans.oms.server.test; + +import com.github.kfcfans.oms.server.service.LockService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +/** + * 服务测试 + * + * @author tjq + * @since 2020/4/2 + */ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class ServiceTest { + + @Resource + private LockService lockService; + + @Test + public void testLockService() { + String lockName = "myLock"; + + lockService.lock(lockName); + lockService.lock(lockName); + lockService.unlock(lockName); + } + +} diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java index be9608eb..99836763 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java @@ -7,7 +7,7 @@ import com.github.kfcfans.oms.worker.actors.TaskTrackerActor; import com.github.kfcfans.oms.worker.background.WorkerHealthReportRunnable; import com.github.kfcfans.oms.worker.common.OhMyConfig; import com.github.kfcfans.common.RemoteConstant; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.common.utils.SpringUtils; import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; import com.google.common.base.Stopwatch; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java index 0255fdee..96a39e28 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java @@ -13,7 +13,7 @@ import com.github.kfcfans.common.RemoteConstant; import com.github.kfcfans.oms.worker.common.constants.TaskConstant; import com.github.kfcfans.oms.worker.common.constants.TaskStatus; import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.core.ha.ProcessorTrackerStatusHolder; import com.github.kfcfans.oms.worker.persistence.TaskDO; import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java index 525414f7..7dc8970e 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java @@ -1,6 +1,6 @@ package com.github.kfcfans.oms.worker.pojo.request; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java index 0d0a080c..f6b00dc6 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java @@ -1,6 +1,6 @@ package com.github.kfcfans.oms.worker.pojo.request; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.persistence.TaskDO; import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; import lombok.Getter; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java index 1276fa34..18578b1f 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java +++ b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java @@ -1,7 +1,7 @@ package com.github.kfcfans.oms; import com.github.kfcfans.oms.worker.common.constants.TaskStatus; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.persistence.TaskDO; import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; import com.google.common.collect.Lists; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java index e36e0539..8e6869ae 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java +++ b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java @@ -8,7 +8,7 @@ import com.github.kfcfans.oms.worker.OhMyWorker; import com.github.kfcfans.oms.worker.common.OhMyConfig; import com.github.kfcfans.common.RemoteConstant; import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStartTaskReq; import com.typesafe.config.ConfigFactory; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TaskTrackerTest.java b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TaskTrackerTest.java index 37fc8b33..4e7bf8c6 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TaskTrackerTest.java +++ b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TaskTrackerTest.java @@ -9,7 +9,7 @@ import com.github.kfcfans.common.request.ServerScheduleJobReq; import com.github.kfcfans.oms.worker.OhMyWorker; import com.github.kfcfans.oms.worker.common.OhMyConfig; import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.typesafe.config.ConfigFactory; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java index 2146b61f..50898a9e 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java +++ b/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java @@ -1,6 +1,6 @@ package com.github.kfcfans.oms; -import com.github.kfcfans.oms.worker.common.utils.NetUtils; +import com.github.kfcfans.common.utils.NetUtils; import com.github.kfcfans.oms.worker.common.utils.SystemInfoUtils; import org.junit.jupiter.api.Test;