diff --git a/powerjob-common/src/main/java/tech/powerjob/common/ProtocolConstant.java b/powerjob-common/src/main/java/tech/powerjob/common/ProtocolConstant.java deleted file mode 100644 index 9136ce35..00000000 --- a/powerjob-common/src/main/java/tech/powerjob/common/ProtocolConstant.java +++ /dev/null @@ -1,18 +0,0 @@ -package tech.powerjob.common; - -/** - * HttpProtocolConstant - * - * @author tjq - * @since 2021/2/8 - */ -public class ProtocolConstant { - - public static final String SERVER_PATH_HEARTBEAT = "/server/heartbeat"; - public static final String SERVER_PATH_STATUS_REPORT = "/server/statusReport"; - public static final String SERVER_PATH_LOG_REPORT = "/server/logReport"; - - public static final String WORKER_PATH_DISPATCH_JOB = "/worker/runJob"; - public static final String WORKER_PATH_STOP_INSTANCE = "/worker/stopInstance"; - public static final String WORKER_PATH_QUERY_INSTANCE_INFO = "/worker/queryInstanceInfo"; -} diff --git a/powerjob-common/src/main/java/tech/powerjob/common/RemoteConstant.java b/powerjob-common/src/main/java/tech/powerjob/common/RemoteConstant.java index a2d751ec..0ee242df 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/RemoteConstant.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/RemoteConstant.java @@ -12,18 +12,6 @@ public class RemoteConstant { /* ************************ AKKA WORKER ************************ */ public static final int DEFAULT_WORKER_PORT = 27777; - public static final String WORKER_ACTOR_SYSTEM_NAME = "oms"; - - public static final String WORKER_ACTOR_NAME = "worker"; - - - /* ************************ 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_FRIEND_ACTOR_NAME = "friend_actor"; - public static final String SERVER_AKKA_CONFIG_NAME = "oms-server.akka.conf"; - /* ************************ OTHERS ************************ */ public static final String EMPTY_ADDRESS = "N/A"; diff --git a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerQueryInstanceStatusReq.java b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerQueryInstanceStatusReq.java index 6cf1a985..a37dfbf2 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerQueryInstanceStatusReq.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerQueryInstanceStatusReq.java @@ -1,10 +1,9 @@ package tech.powerjob.common.request; -import tech.powerjob.common.PowerSerializable; -import tech.powerjob.common.ProtocolConstant; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import tech.powerjob.common.PowerSerializable; /** * 服务器查询实例运行状态,需要返回详细的运行数据 @@ -18,8 +17,4 @@ import lombok.NoArgsConstructor; public class ServerQueryInstanceStatusReq implements PowerSerializable { private Long instanceId; - @Override - public String path() { - return ProtocolConstant.WORKER_PATH_QUERY_INSTANCE_INFO; - } } diff --git a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerScheduleJobReq.java b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerScheduleJobReq.java index 364aba55..ac8df503 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerScheduleJobReq.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerScheduleJobReq.java @@ -1,8 +1,7 @@ package tech.powerjob.common.request; -import tech.powerjob.common.PowerSerializable; -import tech.powerjob.common.ProtocolConstant; import lombok.Data; +import tech.powerjob.common.PowerSerializable; import java.util.List; @@ -98,9 +97,4 @@ public class ServerScheduleJobReq implements PowerSerializable { * 日志配置 */ private String logConfig; - - @Override - public String path() { - return ProtocolConstant.WORKER_PATH_DISPATCH_JOB; - } } diff --git a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerStopInstanceReq.java b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerStopInstanceReq.java index 000eb993..765e6f07 100644 --- a/powerjob-common/src/main/java/tech/powerjob/common/request/ServerStopInstanceReq.java +++ b/powerjob-common/src/main/java/tech/powerjob/common/request/ServerStopInstanceReq.java @@ -1,10 +1,9 @@ package tech.powerjob.common.request; -import tech.powerjob.common.PowerSerializable; -import tech.powerjob.common.ProtocolConstant; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import tech.powerjob.common.PowerSerializable; /** @@ -18,9 +17,4 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class ServerStopInstanceReq implements PowerSerializable { private Long instanceId; - - @Override - public String path() { - return ProtocolConstant.WORKER_PATH_STOP_INSTANCE; - } }