From 8e1353f0614b9cf767ced1aeffc2a44ef5753c13 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 May 2020 07:07:49 +0800 Subject: [PATCH 01/17] [opt] optimize --- .../src/main/java/com/github/kfcfans/oms/client/OhMyClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java index fc9751d9..ef3d4989 100644 --- a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java +++ b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java @@ -44,6 +44,7 @@ public class OhMyClient { this(Lists.newArrayList(domain), appName); } + /** * 初始化 OhMyClient 客户端 * @param addressList IP:Port 列表 From ca684a0ea13d62f7136c41f207a97b20072c291d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 May 2020 07:11:58 +0800 Subject: [PATCH 02/17] [opt] opt code --- .../src/main/java/com/github/kfcfans/oms/client/OhMyClient.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java index ef3d4989..98f3e472 100644 --- a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java +++ b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java @@ -143,6 +143,8 @@ public class OhMyClient { .build(); String post = postHA(OpenAPIConstant.ENABLE_JOB, body); return JsonUtils.parseObject(post, ResultDTO.class); + + } /** From 8e5e4353398755d1fda4c1d28977e813aa5b4346 Mon Sep 17 00:00:00 2001 From: McDonaldFans Date: Tue, 19 May 2020 07:14:57 +0800 Subject: [PATCH 03/17] [opt] optimize code --- .../src/main/java/com/github/kfcfans/oms/client/OhMyClient.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java index 98f3e472..ef3d4989 100644 --- a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java +++ b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java @@ -143,8 +143,6 @@ public class OhMyClient { .build(); String post = postHA(OpenAPIConstant.ENABLE_JOB, body); return JsonUtils.parseObject(post, ResultDTO.class); - - } /** From e74b659f72c1dcddf662be064af35616b79429d7 Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 7 Jun 2020 22:45:18 +0800 Subject: [PATCH 04/17] [doc] add try online address --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a142596f..de505d68 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ OhMyScheduler是基于Akka架构的新一代分布式调度与计算框架，能 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。 +[在线使用地址](http://oms.sinhao.top/#/welcome) 试用应用名称：oms-agent-test ### 适用场景 * 有定时执行需求的业务场景：如每天凌晨全量同步数据、生成业务报表等。 * 有需要全部机器一同执行的业务场景：如使用广播执行模式清理集群日志。 From d95d12c4c84d7b223e5d7d3b9ba74523f24059bd Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 7 Jun 2020 23:19:30 +0800 Subject: [PATCH 05/17] [doc] add try online address --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de505d68..a1ad1e62 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ OhMyScheduler是基于Akka架构的新一代分布式调度与计算框架，能 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。 -[在线使用地址](http://oms.sinhao.top/#/welcome) 试用应用名称：oms-agent-test +[在线使用地址](https://www.yuque.com/ohmyscheduler/guidence/hnbskn) 试用应用名称：oms-agent-test ### 适用场景 * 有定时执行需求的业务场景：如每天凌晨全量同步数据、生成业务报表等。 * 有需要全部机器一同执行的业务场景：如使用广播执行模式清理集群日志。 From acfa2936781f48150540de76fea69c3d049450ed Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 7 Jun 2020 23:20:39 +0800 Subject: [PATCH 06/17] [doc] add try online address --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1ad1e62..0f5b39d8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ OhMyScheduler是基于Akka架构的新一代分布式调度与计算框架，能 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。 -[在线使用地址](https://www.yuque.com/ohmyscheduler/guidence/hnbskn) 试用应用名称：oms-agent-test +[在线试用地址](https://www.yuque.com/ohmyscheduler/guidence/hnbskn) 试用应用名称：oms-agent-test ### 适用场景 * 有定时执行需求的业务场景：如每天凌晨全量同步数据、生成业务报表等。 * 有需要全部机器一同执行的业务场景：如使用广播执行模式清理集群日志。 @@ -41,7 +41,7 @@ OhMyScheduler是基于Akka架构的新一代分布式调度与计算框架，能 # 文档 -**[超详细中文文档](https://www.yuque.com/ohmyscheduler/guidence/ztn4i5)** OR **[备用地址，内容可能更新不及时](https://kfcfans.github.io/)** +**[超详细中文文档](https://www.yuque.com/ohmyscheduler/guidence/ztn4i5)** OR **[备用地址（内容可能更新不及时）](https://kfcfans.github.io/)** PS：感谢文档翻译平台[breword](https://www.breword.com/)对本项目英文文档翻译做出的巨大贡献！ From 9e82ead51dc4a1465c32b94795fa318af813b114 Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 8 Jun 2020 07:55:37 +0800 Subject: [PATCH 07/17] [doc] opt readme.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f5b39d8..49550c89 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,10 @@

- - +actions +Maven Central +GitHub release (latest SemVer) +LICENSE

OhMyScheduler是基于Akka架构的新一代分布式调度与计算框架，能让您轻松完成作业的调度与繁杂任务的分布式计算。 From ebe30bc93a50d6520b23767b6dc8af383e7cfc38 Mon Sep 17 00:00:00 2001 From: tjq Date: Tue, 9 Jun 2020 09:57:21 +0800 Subject: [PATCH 08/17] [translate] translate oms-agent's prompt message to English --- .../github/kfcfans/oms/worker/MainApplication.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java b/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java index 3858dd22..61a7f966 100644 --- a/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java +++ b/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java @@ -17,22 +17,22 @@ import picocli.CommandLine.Option; * @since 2020/5/20 */ @Slf4j -@Command(name = "OhMyAgent", mixinStandardHelpOptions = true, version = "1.2.0", description = "OhMyScheduler-Worker代理") +@Command(name = "OhMyAgent", mixinStandardHelpOptions = true, version = "1.2.0", description = "OhMyScheduler-Worker agent") public class MainApplication implements Runnable { - @Option(names = {"-a", "--app"}, description = "worker-agent名称，可通过调度中心控制台创建", required = true) + @Option(names = {"-a", "--app"}, description = "worker-agent's name", required = true) private String appName; - @Option(names = {"-p", "--port"}, description = "worker-agent的ActorSystem监听端口，不建议更改") + @Option(names = {"-p", "--port"}, description = "akka ActorSystem working port, not recommended to change") private Integer port = RemoteConstant.DEFAULT_WORKER_PORT; - @Option(names = {"-e", "--persistence"}, description = "存储策略，枚举值，DISK 或 MEMORY") + @Option(names = {"-e", "--persistence"}, description = "storage strategy, DISK or MEMORY") private String storeStrategy = "DISK"; - @Option(names = {"-s", "--server"}, description = "调度中心地址，多值英文逗号分隔，格式 IP:Port OR domain") + @Option(names = {"-s", "--server"}, description = "oms-server's address, IP:Port OR domain", required = true) private String server = "localhost:7700"; - @Option(names = {"-l", "--length"}, description = "返回值最大长度") + @Option(names = {"-l", "--length"}, description = "ProcessResult#msg max length") private int length = 1024; public static void main(String[] args) { From 8a91a656709a9fff7bfaaf24a101cbc02f5c15c5 Mon Sep 17 00:00:00 2001 From: Yukino Date: Tue, 9 Jun 2020 10:10:43 +0800 Subject: [PATCH 09/17] [ops] remove docker build check in PR [ops] remove docker build check in PR --- .github/workflows/docker-image.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9bc0ac57..69ed35be 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,8 +3,6 @@ name: Docker Image CI on: push: branches: [ master ] - pull_request: - branches: [ master ] jobs: From 228f3e508ecdd3517ae8123701a35f987975bf1b Mon Sep 17 00:00:00 2001 From: glacier <21851017@zju.edu.cn> Date: Tue, 9 Jun 2020 10:17:59 +0800 Subject: [PATCH 10/17] remove a blankspace --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67a348ea..a4e202eb 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ https://github.com/KFCFans/OhMyScheduler https://github.com/KFCFans/OhMyScheduler.git + tengjiqi @@ -202,4 +203,4 @@ - \ No newline at end of file + From bc0f08409bffc5d8b53a7db18136745040d5ec8f Mon Sep 17 00:00:00 2001 From: ColaFans Date: Tue, 9 Jun 2020 11:16:59 +0800 Subject: [PATCH 11/17] [opt] optimize code --- .../src/main/java/com/github/kfcfans/oms/client/OhMyClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java index ef3d4989..7fa3b266 100644 --- a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java +++ b/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java @@ -20,7 +20,6 @@ import java.util.Objects; /** * OpenAPI 客户端 - * V1.0.0 摒弃一切优雅设计，先实现再说... * * @author tjq * @since 2020/4/15 From 984274c2f44904231f89e3ba03f2b191721f9e35 Mon Sep 17 00:00:00 2001 From: tjq Date: Thu, 11 Jun 2020 20:10:09 +0800 Subject: [PATCH 12/17] [dev] suit front-end's globalization and add userContext for TaskContext --- .../com/github/kfcfans/oms/common/model/InstanceDetail.java | 2 +- .../oms/server/service/instance/InstanceService.java | 2 +- .../kfcfans/oms/server/web/response/InstanceInfoVO.java | 4 ---- .../oms/server/web/response/WorkflowInstanceInfoVO.java | 3 --- .../com/github/kfcfans/oms/worker/common/OhMyConfig.java | 6 +++++- .../kfcfans/oms/worker/core/executor/ProcessorRunnable.java | 1 + .../kfcfans/oms/worker/core/processor/TaskContext.java | 4 ++++ .../oms/worker/core/tracker/task/CommonTaskTracker.java | 2 +- .../oms/worker/core/tracker/task/FrequentTaskTracker.java | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java index fd8e5e8b..0102d6e5 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java @@ -21,7 +21,7 @@ public class InstanceDetail implements OmsSerializable { // 任务整体结束时间（可能不存在） private Long finishedTime; // 任务状态（中文） - private String status; + private Integer status; // 任务执行结果（可能不存在） private String result; // TaskTracker地址 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java index a7e61a28..63a7f462 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java @@ -167,7 +167,7 @@ public class InstanceService { InstanceStatus instanceStatus = InstanceStatus.of(instanceInfoDO.getStatus()); InstanceDetail detail = new InstanceDetail(); - detail.setStatus(instanceStatus.getDes()); + detail.setStatus(instanceStatus.getV()); // 只要不是运行状态，只需要返回简要信息 if (instanceStatus != RUNNING) { diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java index bf91331d..8c58eb59 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java @@ -1,6 +1,5 @@ package com.github.kfcfans.oms.server.web.response; -import com.github.kfcfans.oms.common.InstanceStatus; import com.github.kfcfans.oms.common.OmsConstant; import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; import lombok.Data; @@ -36,7 +35,6 @@ public class InstanceInfoVO { private int status; /* ********** 不一致区域 ********** */ - private String statusStr; // 实际触发时间（需要格式化为人看得懂的时间） private String actualTriggerTime; // 结束时间（同理，需要格式化） @@ -46,8 +44,6 @@ public class InstanceInfoVO { InstanceInfoVO instanceInfoVO = new InstanceInfoVO(); BeanUtils.copyProperties(instanceInfoDo, instanceInfoVO); - // 状态转化为中文 - instanceInfoVO.setStatusStr(InstanceStatus.of(instanceInfoDo.getStatus()).getDes()); // 额外设置任务名称，提高可读性 instanceInfoVO.setJobName(jobName); diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java index 0a1722be..136cacc2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java @@ -2,7 +2,6 @@ package com.github.kfcfans.oms.server.web.response; import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.common.WorkflowInstanceStatus; import com.github.kfcfans.oms.common.model.PEWorkflowDAG; import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; import lombok.Data; @@ -27,7 +26,6 @@ public class WorkflowInstanceInfoVO { // workflow 状态（WorkflowInstanceStatus） private Integer status; - private String statusStr; private PEWorkflowDAG pEWorkflowDAG; private String result; @@ -42,7 +40,6 @@ public class WorkflowInstanceInfoVO { BeanUtils.copyProperties(wfInstanceDO, vo); vo.setWorkflowName(workflowName); - vo.setStatusStr(WorkflowInstanceStatus.of(wfInstanceDO.getStatus()).getDes()); vo.setPEWorkflowDAG(JSONObject.parseObject(wfInstanceDO.getDag(), PEWorkflowDAG.class)); // JS精度丢失问题 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java index 79b9d08c..3dcb6094 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java @@ -35,7 +35,11 @@ public class OhMyConfig { * {@link com.github.kfcfans.oms.worker.core.processor.ProcessResult}#msg 的最大长度 */ private int maxResultLength = 8096; - + /** + * 用户自定义上下文对象，该值会被透传到 TaskContext#userContext 属性 + * 使用场景：容器脚本Java处理器需要使用oms-worker宿主应用的Spring Bean，可在此处传入 ApplicationContext，在Processor中获取 bean + */ + private Object userContext; /** * 启动测试模式，true情况下，不再尝试连接 server 并验证appName * true -> 用于本地写单元测试调试； false -> 默认值，标准模式 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java index 4ee62557..8fd18757 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java @@ -65,6 +65,7 @@ public class ProcessorRunnable implements Runnable { if (task.getTaskContent() != null && task.getTaskContent().length > 0) { taskContext.setSubTask(SerializerUtils.deSerialized(task.getTaskContent())); } + taskContext.setUserContext(OhMyWorker.getConfig().getUserContext()); ThreadLocalStore.setTask(task); reportStatus(TaskStatus.WORKER_PROCESSING, null); diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java index f8d14e06..7acfc5e6 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java @@ -57,6 +57,10 @@ public class TaskContext { * 在线日志记录 */ private OmsLogger omsLogger; + /** + * 用户自定义上下文 + */ + private Object userContext; /** diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java index e1c613e6..c352f44f 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java @@ -64,7 +64,7 @@ public class CommonTaskTracker extends TaskTracker { InstanceDetail detail = new InstanceDetail(); // 填充基础信息 detail.setActualTriggerTime(createTime); - detail.setStatus(InstanceStatus.RUNNING.getDes()); + detail.setStatus(InstanceStatus.RUNNING.getV()); detail.setTaskTrackerAddress(OhMyWorker.getWorkerAddress()); // 填充详细信息 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java index 8b9d7f6d..0227544f 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java @@ -105,7 +105,7 @@ public class FrequentTaskTracker extends TaskTracker { InstanceDetail detail = new InstanceDetail(); // 填充基础信息 detail.setActualTriggerTime(createTime); - detail.setStatus(InstanceStatus.RUNNING.getDes()); + detail.setStatus(InstanceStatus.RUNNING.getV()); detail.setTaskTrackerAddress(OhMyWorker.getWorkerAddress()); List history = Lists.newLinkedList(); From 49b158e157285907c499f804a18452eaac19cc23 Mon Sep 17 00:00:00 2001 From: tjq Date: Fri, 12 Jun 2020 18:00:57 +0800 Subject: [PATCH 13/17] [dev] finished workflow alarm service --- .../persistence/core/model/JobInfoDO.java | 11 --- .../oms/server/service/UserService.java | 57 +++++++++++++++ .../oms/server/service/alarm/Alarmable.java | 14 +++- .../alarm/DefaultMailAlarmService.java | 34 ++++++--- ...tent.java => JobInstanceAlarmContent.java} | 4 +- .../service/alarm/OmsCenterAlarmService.java | 19 +++-- .../alarm/WorkflowInstanceAlarmContent.java | 37 ++++++++++ .../service/instance/InstanceManager.java | 15 ++-- .../workflow/WorkflowInstanceManager.java | 70 ++++++++++++------- .../web/controller/UserInfoController.java | 11 ++- .../resources/application-daily.properties | 2 +- 11 files changed, 202 insertions(+), 72 deletions(-) create mode 100644 oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java rename oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/{AlarmContent.java => JobInstanceAlarmContent.java} (93%) create mode 100644 oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java index a75eeeed..9dc4a47f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java @@ -1,17 +1,12 @@ package com.github.kfcfans.oms.server.persistence.core.model; -import com.google.common.base.Splitter; -import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.util.StringUtils; import javax.persistence.*; import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; /** * 任务信息表 @@ -94,10 +89,4 @@ public class JobInfoDO { private Date gmtCreate; private Date gmtModified; - public List fetchNotifyUserIds() { - if (StringUtils.isEmpty(notifyUserIds)) { - return Lists.newLinkedList(); - } - return Splitter.on(",").splitToList(notifyUserIds).stream().map(Long::valueOf).collect(Collectors.toList()); - } } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java new file mode 100644 index 00000000..c14c3d17 --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java @@ -0,0 +1,57 @@ +package com.github.kfcfans.oms.server.service; + +import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.oms.server.persistence.core.repository.UserInfoRepository; +import com.github.kfcfans.oms.server.web.request.ModifyUserInfoRequest; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 用户服务 + * + * @author tjq + * @since 2020/6/12 + */ +@Service +public class UserService { + + @Resource + private UserInfoRepository userInfoRepository; + + /** + * 保存/修改 用户 + * @param request 请求 + */ + public void save(ModifyUserInfoRequest request) { + UserInfoDO userInfoDO = new UserInfoDO(); + BeanUtils.copyProperties(request, userInfoDO); + userInfoDO.setGmtCreate(new Date()); + userInfoDO.setGmtModified(userInfoDO.getGmtCreate()); + userInfoRepository.saveAndFlush(userInfoDO); + } + + /** + * 根据用户ID字符串获取用户信息详细列表 + * @param userIds 逗号分割的用户ID信息 + * @return 用户信息详细列表 + */ + public List fetchNotifyUserList(String userIds) { + if (StringUtils.isEmpty(userIds)) { + return Lists.newLinkedList(); + } + // 去重 + Set userIdList = Splitter.on(",").splitToList(userIds).stream().map(Long::valueOf).collect(Collectors.toSet()); + List res = userInfoRepository.findByIdIn(Lists.newLinkedList(userIdList)); + res.forEach(x -> x.setPassword(null)); + return res; + } +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java index aab888c6..b10d371b 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java @@ -12,5 +12,17 @@ import java.util.List; */ public interface Alarmable { - void alarm(AlarmContent alarmContent, List targetUserList); + /** + * 任务执行失败报警 + * @param content 任务实例相关信息 + * @param targetUserList 目标用户列表 + */ + void onJobInstanceFailed(JobInstanceAlarmContent content, List targetUserList); + + /** + * 工作流执行失败报警 + * @param content 工作流实例相关信息 + * @param targetUserList 目标用户列表 + */ + void onWorkflowInstanceFailed(WorkflowInstanceAlarmContent content, List targetUserList); } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java index f2559ef9..4bee1446 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java @@ -27,8 +27,9 @@ public class DefaultMailAlarmService implements Alarmable { @Value("${spring.mail.username}") private String from; - private static final String MAIL_TITLE = "OhMyScheduler 任务执行失败报警"; - private static final String MAIL_CONTENT_PATTERN = "任务运行失败，详细信息如下：%s"; + private static final String MAIL_TITLE = "OhMyScheduler AlarmService"; + private static final String JOB_INSTANCE_FAILED_CONTENT_PATTERN = "Job run failed, detail is: %s"; + private static final String WF_INSTANCE_FAILED_CONTENT_PATTERN = "Workflow run failed, detail is: %s"; @Autowired(required = false) public DefaultMailAlarmService(JavaMailSender javaMailSender) { @@ -36,24 +37,35 @@ public class DefaultMailAlarmService implements Alarmable { } @Override - public void alarm(AlarmContent alarmContent, List targetUserList) { + public void onJobInstanceFailed(JobInstanceAlarmContent content, List targetUserList) { + String msg = String.format(JOB_INSTANCE_FAILED_CONTENT_PATTERN, JsonUtils.toJSONString(content)); + sendMail(msg, targetUserList); + } - log.debug("[DefaultMailAlarmService] content: {}, user: {}", alarmContent, targetUserList); + @Override + public void onWorkflowInstanceFailed(WorkflowInstanceAlarmContent content, List targetUserList) { + String msg = String.format(WF_INSTANCE_FAILED_CONTENT_PATTERN, JsonUtils.toJSONString(content)); + sendMail(msg, targetUserList); + } - if (CollectionUtils.isEmpty(targetUserList)) { + private void sendMail(String msg, List targetUserList) { + + log.debug("[OmsMailAlarmService] msg: {}, to: {}", msg, targetUserList); + + if (CollectionUtils.isEmpty(targetUserList) || javaMailSender == null) { return; } SimpleMailMessage sm = new SimpleMailMessage(); - sm.setFrom(from); - sm.setTo(targetUserList.stream().map(UserInfoDO::getEmail).toArray(String[]::new)); - sm.setSubject(MAIL_TITLE); - sm.setText(String.format(MAIL_CONTENT_PATTERN, JsonUtils.toJSONString(alarmContent))); - try { + sm.setFrom(from); + sm.setTo(targetUserList.stream().map(UserInfoDO::getEmail).toArray(String[]::new)); + sm.setSubject(MAIL_TITLE); + sm.setText(msg); + javaMailSender.send(sm); }catch (Exception e) { - log.error("[DefaultMailAlarmService] send mail({}) failed.", sm, e); + log.error("[OmsMailAlarmService] send mail({}) failed.", sm, e); } } } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/AlarmContent.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/AlarmContent.java rename to oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java index ba60cb59..1f9f0594 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/AlarmContent.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java @@ -3,13 +3,13 @@ package com.github.kfcfans.oms.server.service.alarm; import lombok.Data; /** - * 告警对象 + * 任务执行失败告警对象 * * @author tjq * @since 2020/4/30 */ @Data -public class AlarmContent { +public class JobInstanceAlarmContent { // 应用ID private long appId; // 任务ID diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java index 02aef993..35ef1304 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java @@ -6,13 +6,11 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; /** * 报警服务 @@ -36,11 +34,24 @@ public class OmsCenterAlarmService implements Alarmable { @Async("omsCommonPool") @Override - public void alarm(AlarmContent alarmContent, List targetUserList) { + public void onJobInstanceFailed(JobInstanceAlarmContent content, List targetUserList) { init(); alarmableList.forEach(alarmable -> { try { - alarmable.alarm(alarmContent, targetUserList); + alarmable.onJobInstanceFailed(content, targetUserList); + }catch (Exception e) { + log.warn("[OmsCenterAlarmService] alarm failed.", e); + } + }); + } + + @Async("omsCommonPool") + @Override + public void onWorkflowInstanceFailed(WorkflowInstanceAlarmContent content, List targetUserList) { + init(); + alarmableList.forEach(alarmable -> { + try { + alarmable.onWorkflowInstanceFailed(content, targetUserList); }catch (Exception e) { log.warn("[OmsCenterAlarmService] alarm failed.", e); } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java new file mode 100644 index 00000000..bf2b4df9 --- /dev/null +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java @@ -0,0 +1,37 @@ +package com.github.kfcfans.oms.server.service.alarm; + +import com.github.kfcfans.oms.common.model.PEWorkflowDAG; +import lombok.Data; + +/** + * 工作流执行失败告警对象 + * + * @author tjq + * @since 2020/6/12 + */ +@Data +public class WorkflowInstanceAlarmContent { + + private String workflowName; + + // 任务所属应用的ID，冗余提高查询效率 + private Long appId; + private Long workflowId; + // workflowInstanceId（任务实例表都使用单独的ID作为主键以支持潜在的分表需求） + private Long wfInstanceId; + // workflow 状态（WorkflowInstanceStatus） + private Integer status; + + private PEWorkflowDAG peWorkflowDAG; + private String result; + + // 实际触发时间 + private Long actualTriggerTime; + // 结束时间 + private Long finishedTime; + + // 时间表达式类型（CRON/API/FIX_RATE/FIX_DELAY） + private Integer timeExpressionType; + // 时间表达式，CRON/NULL/LONG/LONG + private String timeExpression; +} diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java index 0b43618e..6d7f2fe0 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java @@ -1,19 +1,19 @@ package com.github.kfcfans.oms.server.service.instance; import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; import com.github.kfcfans.oms.common.TimeExpressionType; +import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; import com.github.kfcfans.oms.server.common.utils.SpringUtils; import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.UserInfoRepository; import com.github.kfcfans.oms.server.service.DispatchService; import com.github.kfcfans.oms.server.service.InstanceLogService; -import com.github.kfcfans.oms.server.service.alarm.AlarmContent; +import com.github.kfcfans.oms.server.service.UserService; import com.github.kfcfans.oms.server.service.alarm.Alarmable; +import com.github.kfcfans.oms.server.service.alarm.JobInstanceAlarmContent; import com.github.kfcfans.oms.server.service.timing.schedule.HashedWheelTimerHolder; import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceManager; import com.google.common.collect.Maps; @@ -185,15 +185,12 @@ public class InstanceManager { } InstanceInfoDO instanceInfo = getInstanceInfoRepository().findByInstanceId(instanceId); - AlarmContent content = new AlarmContent(); + JobInstanceAlarmContent content = new JobInstanceAlarmContent(); BeanUtils.copyProperties(jobInfo, content); BeanUtils.copyProperties(instanceInfo, content); - List userIds = jobInfo.fetchNotifyUserIds(); - List userList = SpringUtils.getBean(UserInfoRepository.class).findByIdIn(userIds); - userList.forEach(x -> x.setPassword(null)); - - getAlarmService().alarm(content, userList); + List userList = SpringUtils.getBean(UserService.class).fetchNotifyUserList(jobInfo.getNotifyUserIds()); + getAlarmService().onJobInstanceFailed(content, userList); } } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java index a654f59e..464cfe13 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java @@ -11,11 +11,16 @@ import com.github.kfcfans.oms.common.utils.SegmentLock; import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; import com.github.kfcfans.oms.server.common.utils.WorkflowDAGUtils; import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInstanceInfoRepository; import com.github.kfcfans.oms.server.service.DispatchService; +import com.github.kfcfans.oms.server.service.UserService; +import com.github.kfcfans.oms.server.service.alarm.Alarmable; +import com.github.kfcfans.oms.server.service.alarm.WorkflowInstanceAlarmContent; import com.github.kfcfans.oms.server.service.id.IdGenerateService; import com.github.kfcfans.oms.server.service.instance.InstanceService; import com.google.common.collect.LinkedListMultimap; @@ -23,6 +28,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -50,8 +56,15 @@ public class WorkflowInstanceManager { @Resource private JobInfoRepository jobInfoRepository; @Resource + private UserService userService; + @Resource + private WorkflowInfoRepository workflowInfoRepository; + @Resource private WorkflowInstanceInfoRepository workflowInstanceInfoRepository; + @Resource(name = "omsCenterAlarmService") + private Alarmable omsCenterAlarmService; + private final SegmentLock segmentLock = new SegmentLock(16); /** @@ -86,12 +99,10 @@ public class WorkflowInstanceManager { if (dbNum < allJobIds.size()) { log.warn("[Workflow-{}|{}] this workflow need {} jobs, but just find {} jobs in database, maybe you delete or disable some job!", wfId, wfInstanceId, needNum, dbNum); - newWfInstance.setStatus(WorkflowInstanceStatus.FAILED.getV()); - newWfInstance.setFinishedTime(System.currentTimeMillis()); - newWfInstance.setResult(SystemInstanceResult.CAN_NOT_FIND_JOB); + onWorkflowInstanceFailed(SystemInstanceResult.CAN_NOT_FIND_JOB, newWfInstance); + }else { + workflowInstanceInfoRepository.save(newWfInstance); } - - workflowInstanceInfoRepository.save(newWfInstance); return wfInstanceId; } @@ -118,11 +129,7 @@ public class WorkflowInstanceManager { // 并发度控制 int instanceConcurrency = workflowInstanceInfoRepository.countByWorkflowIdAndStatusIn(wfInfo.getId(), WorkflowInstanceStatus.generalizedRunningStatus); if (instanceConcurrency > wfInfo.getMaxWfInstanceNum()) { - wfInstanceInfo.setStatus(WorkflowInstanceStatus.FAILED.getV()); - wfInstanceInfo.setResult(String.format(SystemInstanceResult.TOO_MUCH_INSTANCE, instanceConcurrency, wfInfo.getMaxWfInstanceNum())); - wfInstanceInfo.setFinishedTime(System.currentTimeMillis()); - - workflowInstanceInfoRepository.saveAndFlush(wfInstanceInfo); + onWorkflowInstanceFailed(String.format(SystemInstanceResult.TOO_MUCH_INSTANCE, instanceConcurrency, wfInfo.getMaxWfInstanceNum()), wfInstanceInfo); return; } @@ -151,13 +158,8 @@ public class WorkflowInstanceManager { roots.forEach(root -> runInstance(root.getJobId(), root.getInstanceId(), wfInstanceId, null)); }catch (Exception e) { - wfInstanceInfo.setStatus(WorkflowInstanceStatus.FAILED.getV()); - wfInstanceInfo.setResult(e.getMessage()); - wfInstanceInfo.setFinishedTime(System.currentTimeMillis()); - log.error("[Workflow-{}|{}] submit workflow: {} failed.", wfInfo.getId(), wfInstanceId, wfInfo, e); - - workflowInstanceInfoRepository.saveAndFlush(wfInstanceInfo); + onWorkflowInstanceFailed(e.getMessage(), wfInstanceInfo); } } @@ -222,12 +224,8 @@ public class WorkflowInstanceManager { // 任务失败，DAG流程被打断，整体失败 if (status == InstanceStatus.FAILED) { - wfInstance.setStatus(WorkflowInstanceStatus.FAILED.getV()); - wfInstance.setResult(SystemInstanceResult.MIDDLE_JOB_FAILED); - wfInstance.setFinishedTime(System.currentTimeMillis()); - workflowInstanceInfoRepository.saveAndFlush(wfInstance); - log.warn("[Workflow-{}|{}] workflow instance process failed because middle task(instanceId={}) failed", wfId, wfInstanceId, instanceId); + onWorkflowInstanceFailed(SystemInstanceResult.MIDDLE_JOB_FAILED, wfInstance); return; } @@ -297,11 +295,7 @@ public class WorkflowInstanceManager { jobId2InstanceId.forEach((jobId, newInstanceId) -> runInstance(jobId, newInstanceId, wfInstanceId, jobId2InstanceParams.get(jobId))); }catch (Exception e) { - wfInstance.setStatus(WorkflowInstanceStatus.FAILED.getV()); - wfInstance.setResult("MOVE NEXT STEP FAILED: " + e.getMessage()); - wfInstance.setFinishedTime(System.currentTimeMillis()); - workflowInstanceInfoRepository.saveAndFlush(wfInstance); - + onWorkflowInstanceFailed("MOVE NEXT STEP FAILED: " + e.getMessage(), wfInstance); log.error("[Workflow-{}|{}] update failed.", wfId, wfInstanceId, e); } @@ -326,4 +320,28 @@ public class WorkflowInstanceManager { dispatchService.dispatch(jobInfo, instanceId, 0, instanceParams, wfInstanceId); } + private void onWorkflowInstanceFailed(String result, WorkflowInstanceInfoDO wfInstance) { + + wfInstance.setStatus(WorkflowInstanceStatus.FAILED.getV()); + wfInstance.setResult(result); + wfInstance.setFinishedTime(System.currentTimeMillis()); + wfInstance.setGmtModified(new Date()); + + workflowInstanceInfoRepository.saveAndFlush(wfInstance); + + // 报警 + try { + workflowInfoRepository.findById(wfInstance.getWorkflowId()).ifPresent(wfInfo -> { + WorkflowInstanceAlarmContent content = new WorkflowInstanceAlarmContent(); + + BeanUtils.copyProperties(wfInfo, content); + BeanUtils.copyProperties(wfInstance, content); + content.setResult(result); + + List userList = userService.fetchNotifyUserList(wfInfo.getNotifyUserIds()); + omsCenterAlarmService.onWorkflowInstanceFailed(content, userList); + }); + }catch (Exception ignore) { + } + } } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java index 05dd619b..5f5567ff 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java @@ -3,18 +3,17 @@ package com.github.kfcfans.oms.server.web.controller; import com.github.kfcfans.oms.common.response.ResultDTO; import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; import com.github.kfcfans.oms.server.persistence.core.repository.UserInfoRepository; +import com.github.kfcfans.oms.server.service.UserService; import com.github.kfcfans.oms.server.web.request.ModifyUserInfoRequest; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -28,16 +27,14 @@ import java.util.stream.Collectors; @RequestMapping("/user") public class UserInfoController { + @Resource + private UserService userService; @Resource private UserInfoRepository userInfoRepository; @PostMapping("save") public ResultDTO save(@RequestBody ModifyUserInfoRequest request) { - UserInfoDO userInfoDO = new UserInfoDO(); - BeanUtils.copyProperties(request, userInfoDO); - userInfoDO.setGmtCreate(new Date()); - userInfoDO.setGmtModified(userInfoDO.getGmtCreate()); - userInfoRepository.saveAndFlush(userInfoDO); + userService.save(request); return ResultDTO.success(null); } diff --git a/oh-my-scheduler-server/src/main/resources/application-daily.properties b/oh-my-scheduler-server/src/main/resources/application-daily.properties index efb61ca3..3a6f60ac 100644 --- a/oh-my-scheduler-server/src/main/resources/application-daily.properties +++ b/oh-my-scheduler-server/src/main/resources/application-daily.properties @@ -13,7 +13,7 @@ spring.datasource.core.hikari.minimum-idle=5 spring.data.mongodb.uri=mongodb://remotehost:27017/oms-daily ####### 邮件配置（启用邮件报警则需要） ####### -spring.mail.host=smtp.qq.com +spring.mail.host=smtp.163.com spring.mail.username=zqq spring.mail.password=qqz spring.mail.properties.mail.smtp.auth=true From d933dc3baf852fb9611eab6f054adf22c422c386 Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 13 Jun 2020 11:17:46 +0800 Subject: [PATCH 14/17] [modify] bye, OhMyScheduler~ welcome, PowerJob~ --- oh-my-scheduler.iml | 2 - others/logs/BasicFunctionTestRecord.md | 34 ++++++------- others/logs/ContainerTestRecord.md | 6 +-- pom.xml | 16 +++--- .../pom.xml | 12 ++--- .../kfcfans/powerjob}/client/OhMyClient.java | 18 +++---- .../src/test/java/TestClient.java | 16 +++--- .../src/test/java/TestWorkflow.java | 8 +-- .../pom.xml | 6 +-- .../powerjob}/common/ContainerConstant.java | 2 +- .../github/kfcfans/powerjob}/common/Env.java | 2 +- .../kfcfans/powerjob}/common/ExecuteType.java | 2 +- .../powerjob}/common/InstanceStatus.java | 2 +- .../kfcfans/powerjob}/common/OmsConstant.java | 2 +- .../powerjob}/common/OmsException.java | 2 +- .../powerjob}/common/OmsSerializable.java | 2 +- .../powerjob}/common/OpenAPIConstant.java | 2 +- .../powerjob}/common/ProcessorType.java | 2 +- .../powerjob}/common/RemoteConstant.java | 2 +- .../common/SystemInstanceResult.java | 2 +- .../powerjob}/common/TimeExpressionType.java | 2 +- .../common/WorkflowInstanceStatus.java | 2 +- .../common/model/DeployedContainerInfo.java | 4 +- .../powerjob}/common/model/GitRepoInfo.java | 2 +- .../common/model/InstanceDetail.java | 4 +- .../common/model/InstanceLogContent.java | 4 +- .../powerjob}/common/model/PEWorkflowDAG.java | 2 +- .../powerjob}/common/model/SystemMetrics.java | 4 +- .../request/ServerDeployContainerRequest.java | 4 +- .../ServerDestroyContainerRequest.java | 4 +- .../request/ServerQueryInstanceStatusReq.java | 4 +- .../common/request/ServerScheduleJobReq.java | 4 +- .../common/request/ServerStopInstanceReq.java | 4 +- .../TaskTrackerReportInstanceStatusReq.java | 4 +- .../common/request/WorkerHeartbeat.java | 8 +-- .../common/request/WorkerLogReportReq.java | 6 +-- .../request/http/SaveJobInfoRequest.java | 8 +-- .../request/http/SaveWorkflowRequest.java | 6 +-- .../WorkerNeedDeployContainerRequest.java | 4 +- .../common/response/AskResponse.java | 6 +-- .../common/response/InstanceInfoDTO.java | 4 +- .../powerjob}/common/response/JobInfoDTO.java | 2 +- .../powerjob}/common/response/ResultDTO.java | 4 +- .../common/response/WorkflowInfoDTO.java | 2 +- .../response/WorkflowInstanceInfoDTO.java | 2 +- .../powerjob}/common/utils/CommonUtils.java | 2 +- .../powerjob}/common/utils/HttpUtils.java | 2 +- .../powerjob}/common/utils/JsonUtils.java | 4 +- .../powerjob}/common/utils/Meaningless.java | 2 +- .../powerjob}/common/utils/NetUtils.java | 2 +- .../powerjob}/common/utils/SegmentLock.java | 2 +- .../powerjob}/common/utils/SupplierPlus.java | 2 +- .../docker/Dockerfile | 0 .../docker/settings.xml | 0 .../pom.xml | 14 +++--- .../powerjob}/server/OhMyApplication.java | 4 +- .../powerjob}/server/akka/OhMyServer.java | 12 ++--- .../server/akka/actors/FriendActor.java | 12 ++--- .../server/akka/actors/ServerActor.java | 32 ++++++------ .../FriendQueryWorkerClusterStatusReq.java | 4 +- .../powerjob}/server/akka/requests/Ping.java | 4 +- .../kfcfans/powerjob}/server/common/SJ.java | 2 +- .../common/config/OmsEndpointConfigure.java | 2 +- .../server/common/config/SwaggerConfig.java | 2 +- .../common/config/ThreadPoolConfig.java | 2 +- .../server/common/config/WebConfig.java | 2 +- .../common/constans/ContainerSourceType.java | 2 +- .../common/constans/ContainerStatus.java | 2 +- .../server/common/constans/InstanceType.java | 2 +- .../common/constans/SwitchableStatus.java | 2 +- .../utils/ContainerTemplateGenerator.java | 4 +- .../server/common/utils/CronExpression.java | 2 +- .../server/common/utils/OmsFileUtils.java | 4 +- .../server/common/utils/PropertyUtils.java | 2 +- .../server/common/utils/SpringUtils.java | 2 +- .../server/common/utils/TimeUtils.java | 4 +- .../server/common/utils/WorkflowDAGUtils.java | 12 ++--- .../utils/timewheel/HashedWheelTimer.java | 4 +- .../server/common/utils/timewheel/Timer.java | 2 +- .../common/utils/timewheel/TimerFuture.java | 2 +- .../common/utils/timewheel/TimerTask.java | 2 +- .../powerjob}/server/model/WorkflowDAG.java | 2 +- .../server/persistence/PageResult.java | 2 +- .../server/persistence/StringPage.java | 2 +- .../persistence/config/CoreJpaConfig.java | 4 +- .../persistence/config/LocalJpaConfig.java | 4 +- .../config/MultiDatasourceConfig.java | 4 +- .../persistence/core/model/AppInfoDO.java | 2 +- .../core/model/ContainerInfoDO.java | 2 +- .../core/model/InstanceInfoDO.java | 4 +- .../persistence/core/model/JobInfoDO.java | 2 +- .../persistence/core/model/OmsLockDO.java | 2 +- .../persistence/core/model/ServerInfoDO.java | 2 +- .../persistence/core/model/UserInfoDO.java | 2 +- .../core/model/WorkflowInfoDO.java | 2 +- .../core/model/WorkflowInstanceInfoDO.java | 2 +- .../server/persistence/core/package-info.java | 2 +- .../core/repository/AppInfoRepository.java | 4 +- .../repository/ContainerInfoRepository.java | 4 +- .../repository/InstanceInfoRepository.java | 4 +- .../core/repository/JobInfoRepository.java | 4 +- .../core/repository/OmsLockRepository.java | 5 +- .../core/repository/ServerInfoRepository.java | 4 +- .../core/repository/UserInfoRepository.java | 4 +- .../repository/WorkflowInfoRepository.java | 4 +- .../WorkflowInstanceInfoRepository.java | 4 +- .../persistence/local/LocalInstanceLogDO.java | 2 +- .../local/LocalInstanceLogRepository.java | 2 +- .../persistence/mongodb/GridFsManager.java | 2 +- .../server/service/CacheService.java | 14 +++--- .../server/service/ContainerService.java | 38 +++++++-------- .../server/service/DispatchService.java | 20 ++++---- .../server/service/InstanceLogService.java | 26 +++++----- .../powerjob}/server/service/JobService.java | 26 +++++----- .../powerjob}/server/service/UserService.java | 8 +-- .../server/service/alarm/Alarmable.java | 4 +- .../alarm/DefaultMailAlarmService.java | 6 +-- .../alarm/JobInstanceAlarmContent.java | 2 +- .../service/alarm/OmsCenterAlarmService.java | 6 +-- .../alarm/WorkflowInstanceAlarmContent.java | 4 +- .../service/ha/ClusterStatusHolder.java | 8 +-- .../service/ha/ServerSelectService.java | 16 +++--- .../service/ha/WorkerManagerService.java | 8 +-- .../server/service/id/IdGenerateService.java | 8 +-- .../service/id/SnowFlakeIdGenerator.java | 2 +- .../service/instance/InstanceManager.java | 34 ++++++------- .../service/instance/InstanceService.java | 32 ++++++------ .../instance/InstanceStatusHolder.java | 2 +- .../service/lock/DatabaseLockService.java | 12 ++--- .../server/service/lock/LockService.java | 2 +- .../server/service/timing/CleanService.java | 14 +++--- .../timing/InstanceStatusCheckService.java | 24 ++++----- .../schedule/HashedWheelTimerHolder.java | 4 +- .../timing/schedule/OmsScheduleService.java | 36 +++++++------- .../workflow/WorkflowInstanceManager.java | 46 +++++++++--------- .../workflow/WorkflowInstanceService.java | 22 ++++----- .../service/workflow/WorkflowService.java | 22 ++++----- .../web/ControllerExceptionHandler.java | 6 +-- .../powerjob}/server/web/WebLogAspect.java | 4 +- .../web/controller/AppInfoController.java | 10 ++-- .../web/controller/ContainerController.java | 32 ++++++------ .../web/controller/InstanceController.java | 32 ++++++------ .../server/web/controller/JobController.java | 28 +++++------ .../web/controller/OpenAPIController.java | 26 +++++----- .../web/controller/ServerController.java | 12 ++--- .../web/controller/SystemInfoController.java | 30 ++++++------ .../web/controller/UserInfoController.java | 12 ++--- .../web/controller/WorkflowController.java | 20 ++++---- .../WorkflowInstanceController.java | 18 +++---- .../GenerateContainerTemplateRequest.java | 2 +- .../web/request/ModifyAppInfoRequest.java | 2 +- .../web/request/ModifyUserInfoRequest.java | 2 +- .../web/request/QueryInstanceRequest.java | 4 +- .../web/request/QueryJobInfoRequest.java | 2 +- .../web/request/QueryWorkflowInfoRequest.java | 2 +- .../request/QueryWorkflowInstanceRequest.java | 2 +- .../web/request/SaveContainerInfoRequest.java | 6 +-- .../server/web/response/ContainerInfoVO.java | 2 +- .../server/web/response/InstanceInfoVO.java | 6 +-- .../server/web/response/JobInfoVO.java | 2 +- .../server/web/response/SystemOverviewVO.java | 2 +- .../server/web/response/WorkerStatusVO.java | 4 +- .../server/web/response/WorkflowInfoVO.java | 12 ++--- .../web/response/WorkflowInstanceInfoVO.java | 8 +-- .../ContainerDeployServerEndpoint.java | 6 +-- .../resources/application-daily.properties | 0 .../main/resources/application-pre.properties | 0 .../resources/application-product.properties | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-dev.xml | 4 +- .../src/main/resources/logback-product.xml | 0 .../src/main/resources/oms-server.akka.conf | 2 +- .../main/resources/oms-template-origin.zip | Bin .../src/main/resources/static/favicon.ico | Bin .../static/fonts/element-icons.535877f5.woff | Bin .../static/fonts/element-icons.732389de.ttf | Bin .../resources/static/img/banner.f4c75b86.jpg | Bin .../static/img/oms-logo.de87211a.png | Bin .../src/main/resources/static/index.html | 0 .../src/main/resources/static/js/0.js | 0 .../src/main/resources/static/js/1.js | 0 .../src/main/resources/static/js/10.js | 0 .../src/main/resources/static/js/11.js | 0 .../src/main/resources/static/js/2.js | 0 .../src/main/resources/static/js/3.js | 0 .../src/main/resources/static/js/4.js | 0 .../src/main/resources/static/js/5.js | 0 .../src/main/resources/static/js/6.js | 0 .../src/main/resources/static/js/7.js | 0 .../src/main/resources/static/js/8.js | 0 .../src/main/resources/static/js/9.js | 0 .../src/main/resources/static/js/app.js | 0 .../main/resources/static/js/chunk-vendors.js | 0 .../powerjob}/server/test/DAGTest.java | 10 ++-- .../powerjob}/server/test/GridFsTest.java | 4 +- .../powerjob}/server/test/OmsLogTest.java | 8 +-- .../powerjob}/server/test/RepositoryTest.java | 20 ++++---- .../powerjob}/server/test/ServiceTest.java | 8 +-- .../powerjob}/server/test/UtilsTest.java | 10 ++-- .../src/test/resources/application.properties | 0 .../Dockerfile | 0 .../pom.xml | 14 +++--- .../powerjob}/worker/MainApplication.java | 8 +-- .../src/main/resources/logback.xml | 0 .../pom.xml | 14 +++--- .../powerjob}/samples/MysteryService.java | 2 +- .../samples/OhMySchedulerConfig.java | 8 +-- .../powerjob}/samples/SampleApplication.java | 2 +- .../samples/mr/DAGSimulationProcessor.java | 10 ++-- .../samples/mr/StaticSliceProcessor.java | 12 ++--- .../processors/BroadcastProcessorDemo.java | 12 ++--- .../samples/processors/MapProcessorDemo.java | 12 ++--- .../processors/MapReduceProcessorDemo.java | 14 +++--- .../processors/StandaloneProcessorDemo.java | 10 ++-- .../samples/processors/TimeoutProcessor.java | 8 +-- .../tester/OmsLogPerformanceTester.java | 10 ++-- .../workflow/WorkflowStandaloneProcessor.java | 10 ++-- .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 2 +- .../pom.xml | 12 ++--- .../kfcfans/powerjob}/worker/OhMyWorker.java | 36 +++++++------- .../worker/actors/ProcessorTrackerActor.java | 12 ++--- .../worker/actors/TaskTrackerActor.java | 26 +++++----- .../powerjob}/worker/actors/WorkerActor.java | 6 +-- .../worker/background/OmsLogHandler.java | 12 ++--- .../background/ReleaseCheckRunnable.java | 2 +- .../background/ServerDiscoveryService.java | 16 +++--- .../background/WorkerHealthReporter.java | 16 +++--- .../powerjob}/worker/common/OhMyConfig.java | 9 ++-- .../worker/common/OmsBannerPrinter.java | 2 +- .../worker/common/OmsWorkerVersion.java | 2 +- .../worker/common/ThreadLocalStore.java | 4 +- .../common/constants/StoreStrategy.java | 2 +- .../worker/common/constants/TaskConstant.java | 2 +- .../worker/common/constants/TaskStatus.java | 2 +- .../worker/common/utils/AkkaUtils.java | 6 +-- .../worker/common/utils/LRUCache.java | 2 +- .../common/utils/OmsWorkerFileUtils.java | 6 +-- .../worker/common/utils/SerializerUtils.java | 2 +- .../worker/common/utils/SpringUtils.java | 2 +- .../worker/common/utils/SystemInfoUtils.java | 4 +- .../powerjob}/worker/container/LifeCycle.java | 2 +- .../worker/container/OhMyClassLoader.java | 2 +- .../worker/container/OmsContainer.java | 4 +- .../worker/container/OmsContainerFactory.java | 18 +++---- .../worker/container/OmsJarContainer.java | 8 +-- .../worker/core/ProcessorBeanFactory.java | 4 +- .../core/executor/ProcessorRunnable.java | 38 +++++++-------- .../core/ha/ProcessorTrackerStatus.java | 4 +- .../core/ha/ProcessorTrackerStatusHolder.java | 4 +- .../worker/core/processor/ProcessResult.java | 2 +- .../worker/core/processor/TaskContext.java | 6 +-- .../worker/core/processor/TaskResult.java | 2 +- .../core/processor/built/PythonProcessor.java | 2 +- .../core/processor/built/ScriptProcessor.java | 10 ++-- .../core/processor/built/ShellProcessor.java | 2 +- .../core/processor/sdk/BasicProcessor.java | 6 +-- .../processor/sdk/BroadcastProcessor.java | 8 +-- .../core/processor/sdk/MapProcessor.java | 20 ++++---- .../processor/sdk/MapReduceProcessor.java | 8 +-- .../tracker/processor/ProcessorTracker.java | 42 ++++++++-------- .../processor/ProcessorTrackerPool.java | 2 +- .../core/tracker/task/CommonTaskTracker.java | 28 +++++------ .../tracker/task/FrequentTaskTracker.java | 22 ++++----- .../worker/core/tracker/task/TaskTracker.java | 38 +++++++-------- .../core/tracker/task/TaskTrackerPool.java | 3 +- .../powerjob}/worker/log/OmsLogger.java | 2 +- .../worker/log/impl/OmsServerLogger.java | 6 +-- .../worker/persistence/ConnectionFactory.java | 6 +-- .../worker/persistence/SimpleTaskQuery.java | 2 +- .../powerjob}/worker/persistence/TaskDAO.java | 4 +- .../worker/persistence/TaskDAOImpl.java | 6 +-- .../powerjob}/worker/persistence/TaskDO.java | 2 +- .../persistence/TaskPersistenceService.java | 14 +++--- .../worker/pojo/model/InstanceInfo.java | 2 +- .../BroadcastTaskPreExecuteFinishedReq.java | 4 +- .../pojo/request/ProcessorMapTaskRequest.java | 10 ++-- .../request/ProcessorReportTaskStatusReq.java | 4 +- .../ProcessorTrackerStatusReportReq.java | 6 +-- .../pojo/request/TaskTrackerStartTaskReq.java | 10 ++-- .../request/TaskTrackerStopInstanceReq.java | 4 +- .../src/main/resources/oms-logback.xml | 2 +- .../src/main/resources/oms-worker.akka.conf | 2 +- .../powerjob}/CommonTaskTrackerTest.java | 16 +++--- .../powerjob}/FrequentTaskTrackerTest.java | 16 +++--- .../powerjob}/PersistenceServiceTest.java | 10 ++-- .../powerjob}/ProcessorTrackerTest.java | 20 ++++---- .../powerjob}/ScriptProcessorTest.java | 9 ++-- .../github/kfcfans/powerjob}/TestUtils.java | 14 +++--- .../github/kfcfans/powerjob}/UtilsTest.java | 6 +-- .../processors/TestBasicProcessor.java | 10 ++-- .../processors/TestBroadcastProcessor.java | 12 ++--- .../processors/TestMapReduceProcessor.java | 12 ++--- .../processors/demo/BasicProcessorDemo.java | 10 ++-- .../demo/BroadcastProcessorDemo.java | 11 ++--- .../demo/MapReduceProcessorDemo.java | 12 ++--- .../src/test/resources/logback-test.xml | 2 +- .../src/test/resources/oms-akka-test.conf | 2 +- 299 files changed, 1069 insertions(+), 1080 deletions(-) delete mode 100644 oh-my-scheduler.iml rename {oh-my-scheduler-client => powerjob-client}/pom.xml (76%) rename {oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms => powerjob-client/src/main/java/com/github/kfcfans/powerjob}/client/OhMyClient.java (96%) rename {oh-my-scheduler-client => powerjob-client}/src/test/java/TestClient.java (83%) rename {oh-my-scheduler-client => powerjob-client}/src/test/java/TestWorkflow.java (89%) rename {oh-my-scheduler-common => powerjob-common}/pom.xml (94%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/ContainerConstant.java (91%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/Env.java (72%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/ExecuteType.java (92%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/InstanceStatus.java (95%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/OmsConstant.java (86%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/OmsException.java (93%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/OmsSerializable.java (78%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/OpenAPIConstant.java (97%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/ProcessorType.java (93%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/RemoteConstant.java (96%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/SystemInstanceResult.java (96%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/TimeExpressionType.java (94%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/WorkflowInstanceStatus.java (95%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/DeployedContainerInfo.java (81%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/GitRepoInfo.java (85%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/InstanceDetail.java (92%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/InstanceLogContent.java (79%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/PEWorkflowDAG.java (96%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/model/SystemMetrics.java (94%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/ServerDeployContainerRequest.java (84%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/ServerDestroyContainerRequest.java (74%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/ServerQueryInstanceStatusReq.java (76%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/ServerScheduleJobReq.java (94%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/ServerStopInstanceReq.java (74%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/TaskTrackerReportInstanceStatusReq.java (83%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/WorkerHeartbeat.java (70%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/WorkerLogReportReq.java (68%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/http/SaveJobInfoRequest.java (91%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/http/SaveWorkflowRequest.java (84%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/request/http/WorkerNeedDeployContainerRequest.java (74%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/AskResponse.java (87%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/InstanceInfoDTO.java (89%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/JobInfoDTO.java (97%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/ResultDTO.java (89%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/WorkflowInfoDTO.java (95%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/response/WorkflowInstanceInfoDTO.java (91%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/CommonUtils.java (98%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/HttpUtils.java (96%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/JsonUtils.java (93%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/Meaningless.java (77%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/NetUtils.java (99%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/SegmentLock.java (95%) rename {oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms => powerjob-common/src/main/java/com/github/kfcfans/powerjob}/common/utils/SupplierPlus.java (92%) rename {oh-my-scheduler-server => powerjob-server}/docker/Dockerfile (100%) rename {oh-my-scheduler-server => powerjob-server}/docker/settings.xml (100%) rename {oh-my-scheduler-server => powerjob-server}/pom.xml (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/OhMyApplication.java (84%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/akka/OhMyServer.java (89%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/akka/actors/FriendActor.java (75%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/akka/actors/ServerActor.java (75%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/akka/requests/FriendQueryWorkerClusterStatusReq.java (72%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/akka/requests/Ping.java (61%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/SJ.java (85%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/config/OmsEndpointConfigure.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/config/SwaggerConfig.java (96%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/config/ThreadPoolConfig.java (97%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/config/WebConfig.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/constans/ContainerSourceType.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/constans/ContainerStatus.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/constans/InstanceType.java (80%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/constans/SwitchableStatus.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/ContainerTemplateGenerator.java (97%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/CronExpression.java (99%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/OmsFileUtils.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/PropertyUtils.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/SpringUtils.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/TimeUtils.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/WorkflowDAGUtils.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/timewheel/HashedWheelTimer.java (98%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/timewheel/Timer.java (83%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/timewheel/TimerFuture.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/common/utils/timewheel/TimerTask.java (67%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/model/WorkflowDAG.java (94%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/PageResult.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/StringPage.java (91%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/config/CoreJpaConfig.java (96%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/config/LocalJpaConfig.java (97%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/config/MultiDatasourceConfig.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/AppInfoDO.java (91%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/ContainerInfoDO.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/InstanceInfoDO.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/JobInfoDO.java (97%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/OmsLockDO.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/ServerInfoDO.java (91%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/UserInfoDO.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/WorkflowInfoDO.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/model/WorkflowInstanceInfoDO.java (94%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/package-info.java (76%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/AppInfoRepository.java (82%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/ContainerInfoRepository.java (66%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/InstanceInfoRepository.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/JobInfoRepository.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/OmsLockRepository.java (78%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/ServerInfoRepository.java (63%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/UserInfoRepository.java (70%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/WorkflowInfoRepository.java (84%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/core/repository/WorkflowInstanceInfoRepository.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/local/LocalInstanceLogDO.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/local/LocalInstanceLogRepository.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/persistence/mongodb/GridFsManager.java (98%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/CacheService.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/ContainerService.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/DispatchService.java (89%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/InstanceLogService.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/JobService.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/UserService.java (84%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/alarm/Alarmable.java (82%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/alarm/DefaultMailAlarmService.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/alarm/JobInstanceAlarmContent.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/alarm/OmsCenterAlarmService.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/alarm/WorkflowInstanceAlarmContent.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/ha/ClusterStatusHolder.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/ha/ServerSelectService.java (89%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/ha/WorkerManagerService.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/id/IdGenerateService.java (82%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/id/SnowFlakeIdGenerator.java (98%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/instance/InstanceManager.java (89%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/instance/InstanceService.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/instance/InstanceStatusHolder.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/lock/DatabaseLockService.java (85%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/lock/LockService.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/timing/CleanService.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/timing/InstanceStatusCheckService.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/timing/schedule/HashedWheelTimerHolder.java (65%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/timing/schedule/OmsScheduleService.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/workflow/WorkflowInstanceManager.java (90%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/workflow/WorkflowInstanceService.java (78%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/service/workflow/WorkflowService.java (85%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/ControllerExceptionHandler.java (89%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/WebLogAspect.java (95%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/AppInfoController.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/ContainerController.java (79%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/InstanceController.java (80%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/JobController.java (83%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/OpenAPIController.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/ServerController.java (78%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/SystemInfoController.java (78%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/UserInfoController.java (79%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/WorkflowController.java (80%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/controller/WorkflowInstanceController.java (76%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/GenerateContainerTemplateRequest.java (88%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/ModifyAppInfoRequest.java (79%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/ModifyUserInfoRequest.java (84%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/QueryInstanceRequest.java (77%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/QueryJobInfoRequest.java (86%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/QueryWorkflowInfoRequest.java (86%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/QueryWorkflowInstanceRequest.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/request/SaveContainerInfoRequest.java (77%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/ContainerInfoVO.java (93%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/InstanceInfoVO.java (92%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/JobInfoVO.java (97%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/SystemOverviewVO.java (83%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/WorkerStatusVO.java (94%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/WorkflowInfoVO.java (81%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/response/WorkflowInstanceInfoVO.java (87%) rename {oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms => powerjob-server/src/main/java/com/github/kfcfans/powerjob}/server/web/websocket/ContainerDeployServerEndpoint.java (89%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/application-daily.properties (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/application-pre.properties (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/application-product.properties (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/application.properties (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/banner.txt (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/logback-dev.xml (88%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/logback-product.xml (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/oms-server.akka.conf (83%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/oms-template-origin.zip (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/favicon.ico (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/fonts/element-icons.535877f5.woff (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/fonts/element-icons.732389de.ttf (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/img/banner.f4c75b86.jpg (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/img/oms-logo.de87211a.png (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/index.html (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/0.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/1.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/10.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/11.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/2.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/3.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/4.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/5.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/6.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/7.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/8.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/9.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/app.js (100%) rename {oh-my-scheduler-server => powerjob-server}/src/main/resources/static/js/chunk-vendors.js (100%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/DAGTest.java (90%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/GridFsTest.java (91%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/OmsLogTest.java (85%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/RepositoryTest.java (76%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/ServiceTest.java (79%) rename {oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms => powerjob-server/src/test/java/com/github/kfcfans/powerjob}/server/test/UtilsTest.java (86%) rename {oh-my-scheduler-server => powerjob-server}/src/test/resources/application.properties (100%) rename {oh-my-scheduler-worker-agent => powerjob-worker-agent}/Dockerfile (100%) rename {oh-my-scheduler-worker-agent => powerjob-worker-agent}/pom.xml (84%) rename {oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms => powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob}/worker/MainApplication.java (89%) rename {oh-my-scheduler-worker-agent => powerjob-worker-agent}/src/main/resources/logback.xml (100%) rename {oh-my-scheduler-worker-samples => powerjob-worker-samples}/pom.xml (86%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/MysteryService.java (83%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/OhMySchedulerConfig.java (83%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/SampleApplication.java (90%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/mr/DAGSimulationProcessor.java (84%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/mr/StaticSliceProcessor.java (82%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/processors/BroadcastProcessorDemo.java (79%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/processors/MapProcessorDemo.java (83%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/processors/MapReduceProcessorDemo.java (87%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/processors/StandaloneProcessorDemo.java (81%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/processors/TimeoutProcessor.java (59%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/tester/OmsLogPerformanceTester.java (82%) rename {oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms => powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob}/samples/workflow/WorkflowStandaloneProcessor.java (74%) rename {oh-my-scheduler-worker-samples => powerjob-worker-samples}/src/main/resources/application.properties (100%) rename {oh-my-scheduler-worker-samples => powerjob-worker-samples}/src/main/resources/logback.xml (93%) rename {oh-my-scheduler-worker => powerjob-worker}/pom.xml (87%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/OhMyWorker.java (85%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/actors/ProcessorTrackerActor.java (81%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/actors/TaskTrackerActor.java (86%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/actors/WorkerActor.java (77%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/background/OmsLogHandler.java (90%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/background/ReleaseCheckRunnable.java (81%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/background/ServerDiscoveryService.java (88%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/background/WorkerHealthReporter.java (73%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/OhMyConfig.java (79%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/OmsBannerPrinter.java (98%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/OmsWorkerVersion.java (97%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/ThreadLocalStore.java (89%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/constants/StoreStrategy.java (78%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/constants/TaskConstant.java (90%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/constants/TaskStatus.java (93%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/AkkaUtils.java (82%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/LRUCache.java (90%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/OmsWorkerFileUtils.java (69%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/SerializerUtils.java (97%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/SpringUtils.java (95%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/common/utils/SystemInfoUtils.java (94%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/container/LifeCycle.java (85%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/container/OhMyClassLoader.java (97%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/container/OmsContainer.java (82%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/container/OmsContainerFactory.java (88%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/container/OmsJarContainer.java (96%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/ProcessorBeanFactory.java (92%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/executor/ProcessorRunnable.java (85%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/ha/ProcessorTrackerStatus.java (94%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/ha/ProcessorTrackerStatusHolder.java (93%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/ProcessResult.java (84%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/TaskContext.java (92%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/TaskResult.java (77%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/built/PythonProcessor.java (88%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/built/ScriptProcessor.java (92%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/built/ShellProcessor.java (89%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/sdk/BasicProcessor.java (73%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/sdk/BroadcastProcessor.java (79%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/sdk/MapProcessor.java (80%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/processor/sdk/MapReduceProcessor.java (70%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/processor/ProcessorTracker.java (89%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/processor/ProcessorTrackerPool.java (93%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/task/CommonTaskTracker.java (93%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/task/FrequentTaskTracker.java (95%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/task/TaskTracker.java (94%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/core/tracker/task/TaskTrackerPool.java (93%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/log/OmsLogger.java (95%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/log/impl/OmsServerLogger.java (92%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/ConnectionFactory.java (88%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/SimpleTaskQuery.java (97%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/TaskDAO.java (91%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/TaskDAOImpl.java (97%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/TaskDO.java (98%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/persistence/TaskPersistenceService.java (96%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/model/InstanceInfo.java (95%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java (76%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/ProcessorMapTaskRequest.java (80%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/ProcessorReportTaskStatusReq.java (80%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/ProcessorTrackerStatusReportReq.java (82%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/TaskTrackerStartTaskReq.java (79%) rename {oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms => powerjob-worker/src/main/java/com/github/kfcfans/powerjob}/worker/pojo/request/TaskTrackerStopInstanceReq.java (75%) rename {oh-my-scheduler-worker => powerjob-worker}/src/main/resources/oms-logback.xml (92%) rename {oh-my-scheduler-worker => powerjob-worker}/src/main/resources/oms-worker.akka.conf (83%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/CommonTaskTrackerTest.java (81%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/FrequentTaskTrackerTest.java (77%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/PersistenceServiceTest.java (88%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/ProcessorTrackerTest.java (80%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/ScriptProcessorTest.java (76%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/TestUtils.java (81%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/UtilsTest.java (75%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/TestBasicProcessor.java (61%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/TestBroadcastProcessor.java (76%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/TestMapReduceProcessor.java (84%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/demo/BasicProcessorDemo.java (75%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/demo/BroadcastProcessorDemo.java (74%) rename {oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms => powerjob-worker/src/test/java/com/github/kfcfans/powerjob}/processors/demo/MapReduceProcessorDemo.java (84%) rename {oh-my-scheduler-worker => powerjob-worker}/src/test/resources/logback-test.xml (93%) rename {oh-my-scheduler-worker => powerjob-worker}/src/test/resources/oms-akka-test.conf (79%) diff --git a/oh-my-scheduler.iml b/oh-my-scheduler.iml deleted file mode 100644 index 78b2cc53..00000000 --- a/oh-my-scheduler.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/others/logs/BasicFunctionTestRecord.md b/others/logs/BasicFunctionTestRecord.md index 1f50fe0e..4ffb171a 100644 --- a/others/logs/BasicFunctionTestRecord.md +++ b/others/logs/BasicFunctionTestRecord.md @@ -1,6 +1,6 @@ # 2020.4.8 第一轮测试 ## 测试用例 -* MapReduce任务：http://localhost:7700/job/save?appId=1&concurrency=5&executeType=MAP_REDUCE&groupName=null&instanceRetryNum=3&instanceTimeLimit=4545454545&jobDescription=jobDescription&jobName=testJob&jobParams=%7B%22a%22%3A%22b%22%7D&maxInstanceNum=1&processorInfo=com.github.kfcfans.oms.processors.TestMapReduceProcessor&processorType=EMBEDDED_JAVA&status=1&taskRetryNum=3&taskTimeLimit=564465656&timeExpression=0%20*%20*%20*%20*%20%3F%20&timeExpressionType=CRON +* MapReduce任务：http://localhost:7700/job/save?appId=1&concurrency=5&executeType=MAP_REDUCE&groupName=null&instanceRetryNum=3&instanceTimeLimit=4545454545&jobDescription=jobDescription&jobName=testJob&jobParams=%7B%22a%22%3A%22b%22%7D&maxInstanceNum=1&processorInfo=com.github.kfcfans.powerjob.processors.TestMapReduceProcessor&processorType=EMBEDDED_JAVA&status=1&taskRetryNum=3&taskTimeLimit=564465656&timeExpression=0%20*%20*%20*%20*%20%3F%20&timeExpressionType=CRON ## 问题记录 #### 任务执行成功，释放资源失败 @@ -11,11 +11,11 @@ java.lang.InterruptedException: sleep interrupted at java.lang.Thread.sleep(Native Method) at CommonUtils.executeWithRetry(CommonUtils.java:34) - at com.github.kfcfans.oms.worker.persistence.TaskPersistenceService.execute(TaskPersistenceService.java:297) - at com.github.kfcfans.oms.worker.persistence.TaskPersistenceService.deleteAllTasks(TaskPersistenceService.java:269) - at com.github.kfcfans.oms.worker.core.tracker.task.CommonTaskTracker.destroy(TaskTracker.java:231) - at com.github.kfcfans.oms.worker.core.tracker.task.CommonTaskTracker$StatusCheckRunnable.innerRun(TaskTracker.java:421) - at com.github.kfcfans.oms.worker.core.tracker.task.CommonTaskTracker$StatusCheckRunnable.run(TaskTracker.java:467) + at TaskPersistenceService.execute(TaskPersistenceService.java:297) + at TaskPersistenceService.deleteAllTasks(TaskPersistenceService.java:269) + at CommonTaskTracker.destroy(TaskTracker.java:231) + at CommonTaskTracker$StatusCheckRunnable.innerRun(TaskTracker.java:421) + at CommonTaskTracker$StatusCheckRunnable.run(TaskTracker.java:467) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:308) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:180) @@ -32,12 +32,12 @@ java.lang.InterruptedException: sleep interrupted 2020-04-08 10:10:08 ERROR - [TaskTracker-1586311804030] create root task failed. [ERROR] [04/08/2020 10:10:08.511] [oms-akka.actor.internal-dispatcher-20] [akka://oms/user/task_tracker] create root task failed. java.lang.RuntimeException: create root task failed. - at com.github.kfcfans.oms.worker.core.tracker.task.CommonTaskTracker.persistenceRootTask(TaskTracker.java:208) - at com.github.kfcfans.oms.worker.core.tracker.task.CommonTaskTracker.(TaskTracker.java:81) - at com.github.kfcfans.oms.worker.actors.TaskTrackerActor.lambda$onReceiveServerScheduleJobReq$2(TaskTrackerActor.java:138) + at CommonTaskTracker.persistenceRootTask(TaskTracker.java:208) + at CommonTaskTracker.(TaskTracker.java:81) + at TaskTrackerActor.lambda$onReceiveServerScheduleJobReq$2(TaskTrackerActor.java:138) at java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1660) - at com.github.kfcfans.oms.worker.core.tracker.task.TaskTrackerPool.atomicCreateTaskTracker(TaskTrackerPool.java:30) - at com.github.kfcfans.oms.worker.actors.TaskTrackerActor.onReceiveServerScheduleJobReq(TaskTrackerActor.java:138) + at TaskTrackerPool.atomicCreateTaskTracker(TaskTrackerPool.java:30) + at TaskTrackerActor.onReceiveServerScheduleJobReq(TaskTrackerActor.java:138) ``` *** 原因及解决方案：destroy方法调用了scheduledPool.shutdownNow()方法导致调用该方法的线程池被强制关闭，该方法也自然被中断，数据删到一半没删掉，破坏了数据库结构，后面的insert自然也就失败了。 @@ -60,13 +60,13 @@ java.lang.RuntimeException: create root task failed. java.lang.IndexOutOfBoundsException: Index: 0, Size: 0 at java.util.LinkedList.checkElementIndex(LinkedList.java:555) at java.util.LinkedList.get(LinkedList.java:476) - at com.github.kfcfans.oms.worker.persistence.TaskPersistenceService.lambda$getTaskStatus$10(TaskPersistenceService.java:214) + at TaskPersistenceService.lambda$getTaskStatus$10(TaskPersistenceService.java:214) at CommonUtils.executeWithRetry(CommonUtils.java:37) - at com.github.kfcfans.oms.worker.persistence.TaskPersistenceService.execute(TaskPersistenceService.java:310) - at com.github.kfcfans.oms.worker.persistence.TaskPersistenceService.getTaskStatus(TaskPersistenceService.java:212) - at com.github.kfcfans.oms.worker.core.tracker.task.TaskTracker.updateTaskStatus(TaskTracker.java:107) - at com.github.kfcfans.oms.worker.core.tracker.task.TaskTracker.broadcast(TaskTracker.java:214) - at com.github.kfcfans.oms.worker.actors.TaskTrackerActor.onReceiveBroadcastTaskPreExecuteFinishedReq(TaskTrackerActor.java:106) + at TaskPersistenceService.execute(TaskPersistenceService.java:310) + at TaskPersistenceService.getTaskStatus(TaskPersistenceService.java:212) + at TaskTracker.updateTaskStatus(TaskTracker.java:107) + at TaskTracker.broadcast(TaskTracker.java:214) + at TaskTrackerActor.onReceiveBroadcastTaskPreExecuteFinishedReq(TaskTrackerActor.java:106) at akka.japi.pf.UnitCaseStatement.apply(CaseStatements.scala:24) at akka.japi.pf.UnitCaseStatement.apply(CaseStatements.scala:20) at scala.PartialFunction.applyOrElse(PartialFunction.scala:187) diff --git a/others/logs/ContainerTestRecord.md b/others/logs/ContainerTestRecord.md index e390e336..7a0d3326 100644 --- a/others/logs/ContainerTestRecord.md +++ b/others/logs/ContainerTestRecord.md @@ -10,9 +10,9 @@ com.esotericsoftware.kryo.KryoException: Unable to find class: cn.edu.zju.oms.co at com.esotericsoftware.kryo.util.DefaultClassResolver.readClass(DefaultClassResolver.java:151) at com.esotericsoftware.kryo.Kryo.readClass(Kryo.java:684) at com.esotericsoftware.kryo.Kryo.readClassAndObject(Kryo.java:795) - at com.github.kfcfans.oms.worker.common.utils.SerializerUtils.deSerialized(SerializerUtils.java:48) - at com.github.kfcfans.oms.worker.core.executor.ProcessorRunnable.innerRun(ProcessorRunnable.java:63) - at com.github.kfcfans.oms.worker.core.executor.ProcessorRunnable.run(ProcessorRunnable.java:179) + at SerializerUtils.deSerialized(SerializerUtils.java:48) + at ProcessorRunnable.innerRun(ProcessorRunnable.java:63) + at ProcessorRunnable.run(ProcessorRunnable.java:179) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run$$$capture(FutureTask.java:266) at java.util.concurrent.FutureTask.run(FutureTask.java) diff --git a/pom.xml b/pom.xml index a4e202eb..ab2a2670 100644 --- a/pom.xml +++ b/pom.xml @@ -5,10 +5,10 @@ 4.0.0 com.github.kfcfans - oh-my-scheduler + powerjob 1.0.0 pom - oh-my-scheduler + powerjob https://github.com/KFCFans/OhMyScheduler Distributed scheduling and execution framework @@ -36,12 +36,12 @@ - oh-my-scheduler-worker - oh-my-scheduler-server - oh-my-scheduler-common - oh-my-scheduler-client - oh-my-scheduler-worker-samples - oh-my-scheduler-worker-agent + powerjob-worker + powerjob-server + powerjob-common + powerjob-client + powerjob-worker-samples + powerjob-worker-agent diff --git a/oh-my-scheduler-client/pom.xml b/powerjob-client/pom.xml similarity index 76% rename from oh-my-scheduler-client/pom.xml rename to powerjob-client/pom.xml index 5001f25c..40693039 100644 --- a/oh-my-scheduler-client/pom.xml +++ b/powerjob-client/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-client - 2.0.0 + powerjob-client + 3.0.0 jar - 2.0.0 + 3.0.0 5.6.1 @@ -22,8 +22,8 @@ com.github.kfcfans - oh-my-scheduler-common - ${oms.common.version} + powerjob-common + ${powerjob.common.version} diff --git a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java similarity index 96% rename from oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java rename to powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java index 7fa3b266..fbb0c1e4 100644 --- a/oh-my-scheduler-client/src/main/java/com/github/kfcfans/oms/client/OhMyClient.java +++ b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.oms.client; +package com.github.kfcfans.powerjob.client; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.OpenAPIConstant; -import com.github.kfcfans.oms.common.request.http.SaveJobInfoRequest; -import com.github.kfcfans.oms.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.oms.common.response.*; -import com.github.kfcfans.oms.common.utils.HttpUtils; -import com.github.kfcfans.oms.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.OpenAPIConstant; +import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; +import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; +import com.github.kfcfans.powerjob.common.response.*; +import com.github.kfcfans.powerjob.common.utils.HttpUtils; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import okhttp3.FormBody; diff --git a/oh-my-scheduler-client/src/test/java/TestClient.java b/powerjob-client/src/test/java/TestClient.java similarity index 83% rename from oh-my-scheduler-client/src/test/java/TestClient.java rename to powerjob-client/src/test/java/TestClient.java index a6297c4a..8b4a7fd7 100644 --- a/oh-my-scheduler-client/src/test/java/TestClient.java +++ b/powerjob-client/src/test/java/TestClient.java @@ -1,11 +1,11 @@ -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.ProcessorType; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.http.SaveJobInfoRequest; -import com.github.kfcfans.oms.common.response.JobInfoDTO; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.client.OhMyClient; -import com.github.kfcfans.oms.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.ProcessorType; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; +import com.github.kfcfans.powerjob.common.response.JobInfoDTO; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.client.OhMyClient; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/oh-my-scheduler-client/src/test/java/TestWorkflow.java b/powerjob-client/src/test/java/TestWorkflow.java similarity index 89% rename from oh-my-scheduler-client/src/test/java/TestWorkflow.java rename to powerjob-client/src/test/java/TestWorkflow.java index 09919b13..64ef1e4d 100644 --- a/oh-my-scheduler-client/src/test/java/TestWorkflow.java +++ b/powerjob-client/src/test/java/TestWorkflow.java @@ -1,7 +1,7 @@ -import com.github.kfcfans.oms.client.OhMyClient; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.common.request.http.SaveWorkflowRequest; +import com.github.kfcfans.powerjob.client.OhMyClient; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; import com.google.common.collect.Lists; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/oh-my-scheduler-common/pom.xml b/powerjob-common/pom.xml similarity index 94% rename from oh-my-scheduler-common/pom.xml rename to powerjob-common/pom.xml index 05edcf57..403835b7 100644 --- a/oh-my-scheduler-common/pom.xml +++ b/powerjob-common/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-common - 2.0.0 + powerjob-common + 3.0.0 jar diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ContainerConstant.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ContainerConstant.java similarity index 91% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ContainerConstant.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ContainerConstant.java index 6afc804f..ab8cc275 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ContainerConstant.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ContainerConstant.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * 容器常量 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/Env.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/Env.java similarity index 72% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/Env.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/Env.java index 95459eca..e5344061 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/Env.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/Env.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * 部署环境 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ExecuteType.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ExecuteType.java similarity index 92% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ExecuteType.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ExecuteType.java index 3a47e4d2..5f46d9ec 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ExecuteType.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ExecuteType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/InstanceStatus.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/InstanceStatus.java similarity index 95% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/InstanceStatus.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/InstanceStatus.java index e76e0eb5..7729b75b 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/InstanceStatus.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/InstanceStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsConstant.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java similarity index 86% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsConstant.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java index 904c4352..0bbb4b9c 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsConstant.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * 公共常量 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsException.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsException.java similarity index 93% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsException.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsException.java index f0ca2519..3d7db8c3 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsException.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsException.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * OhMyScheduler 运行时异常 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsSerializable.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java similarity index 78% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsSerializable.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java index 6c813570..07eeed9a 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OmsSerializable.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsSerializable.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import java.io.Serializable; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OpenAPIConstant.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OpenAPIConstant.java similarity index 97% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OpenAPIConstant.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OpenAPIConstant.java index 9ea18a7e..177b355c 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/OpenAPIConstant.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OpenAPIConstant.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * OpenAPI 常量 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ProcessorType.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ProcessorType.java similarity index 93% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ProcessorType.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ProcessorType.java index 98e3ba5c..bb6d7ed9 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/ProcessorType.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/ProcessorType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/RemoteConstant.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/RemoteConstant.java similarity index 96% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/RemoteConstant.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/RemoteConstant.java index f2cdcc84..b409347e 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/RemoteConstant.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/RemoteConstant.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * RemoteConstant diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/SystemInstanceResult.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/SystemInstanceResult.java similarity index 96% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/SystemInstanceResult.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/SystemInstanceResult.java index ad353d15..5dde06cb 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/SystemInstanceResult.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/SystemInstanceResult.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; /** * 系统生成的任务实例运行结果 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/TimeExpressionType.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java similarity index 94% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/TimeExpressionType.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java index d5a186fb..0a8b7634 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/TimeExpressionType.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/TimeExpressionType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/WorkflowInstanceStatus.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java similarity index 95% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/WorkflowInstanceStatus.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java index 34b93678..4a2a1e6f 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/WorkflowInstanceStatus.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common; +package com.github.kfcfans.powerjob.common; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/DeployedContainerInfo.java similarity index 81% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/DeployedContainerInfo.java index ca2073d0..56a0c7f0 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/DeployedContainerInfo.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/GitRepoInfo.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/GitRepoInfo.java similarity index 85% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/GitRepoInfo.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/GitRepoInfo.java index 7091391c..2ef2fa69 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/GitRepoInfo.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/GitRepoInfo.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceDetail.java similarity index 92% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceDetail.java index 0102d6e5..4f6a7fca 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceDetail.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceDetail.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceLogContent.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceLogContent.java similarity index 79% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceLogContent.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceLogContent.java index fd5056d9..a22db900 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/InstanceLogContent.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/InstanceLogContent.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/PEWorkflowDAG.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/PEWorkflowDAG.java similarity index 96% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/PEWorkflowDAG.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/PEWorkflowDAG.java index 4cac9236..afc967af 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/PEWorkflowDAG.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/PEWorkflowDAG.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/SystemMetrics.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/SystemMetrics.java similarity index 94% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/SystemMetrics.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/SystemMetrics.java index 478d576c..9e36fb94 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/SystemMetrics.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/model/SystemMetrics.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.model; +package com.github.kfcfans.powerjob.common.model; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; /** diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDeployContainerRequest.java similarity index 84% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDeployContainerRequest.java index b1c91324..6b6d8830 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDeployContainerRequest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDestroyContainerRequest.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDestroyContainerRequest.java similarity index 74% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDestroyContainerRequest.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDestroyContainerRequest.java index d6076a99..aa7ea83f 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDestroyContainerRequest.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerDestroyContainerRequest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerQueryInstanceStatusReq.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerQueryInstanceStatusReq.java similarity index 76% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerQueryInstanceStatusReq.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerQueryInstanceStatusReq.java index 22b101c4..644ab5f3 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerQueryInstanceStatusReq.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerQueryInstanceStatusReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerScheduleJobReq.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerScheduleJobReq.java similarity index 94% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerScheduleJobReq.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerScheduleJobReq.java index 08a11363..24491b01 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerScheduleJobReq.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerScheduleJobReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; import java.util.List; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerStopInstanceReq.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerStopInstanceReq.java similarity index 74% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerStopInstanceReq.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerStopInstanceReq.java index 5e72f47d..2361f55d 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerStopInstanceReq.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/ServerStopInstanceReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/TaskTrackerReportInstanceStatusReq.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/TaskTrackerReportInstanceStatusReq.java similarity index 83% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/TaskTrackerReportInstanceStatusReq.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/TaskTrackerReportInstanceStatusReq.java index 37719229..95489b59 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/TaskTrackerReportInstanceStatusReq.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/TaskTrackerReportInstanceStatusReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerHeartbeat.java similarity index 70% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerHeartbeat.java index bcd253f1..831088ea 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerHeartbeat.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.common.model.DeployedContainerInfo; -import com.github.kfcfans.oms.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; import lombok.Data; import java.util.List; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerLogReportReq.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerLogReportReq.java similarity index 68% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerLogReportReq.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerLogReportReq.java index b5abefc5..7c9ea22a 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerLogReportReq.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/WorkerLogReportReq.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.common.request; +package com.github.kfcfans.powerjob.common.request; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.common.model.InstanceLogContent; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.model.InstanceLogContent; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveJobInfoRequest.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveJobInfoRequest.java similarity index 91% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveJobInfoRequest.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveJobInfoRequest.java index 8a01a4fc..b2fa7f78 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveJobInfoRequest.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveJobInfoRequest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.common.request.http; +package com.github.kfcfans.powerjob.common.request.http; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.ProcessorType; -import com.github.kfcfans.oms.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.ProcessorType; +import com.github.kfcfans.powerjob.common.TimeExpressionType; import lombok.Data; import java.util.List; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveWorkflowRequest.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveWorkflowRequest.java similarity index 84% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveWorkflowRequest.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveWorkflowRequest.java index 3724466c..ec06754a 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/SaveWorkflowRequest.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/SaveWorkflowRequest.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.common.request.http; +package com.github.kfcfans.powerjob.common.request.http; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.google.common.collect.Lists; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/WorkerNeedDeployContainerRequest.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/WorkerNeedDeployContainerRequest.java similarity index 74% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/WorkerNeedDeployContainerRequest.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/WorkerNeedDeployContainerRequest.java index 48f9f5d3..52f0cdbe 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/http/WorkerNeedDeployContainerRequest.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/request/http/WorkerNeedDeployContainerRequest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.request.http; +package com.github.kfcfans.powerjob.common.request.http; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/AskResponse.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/AskResponse.java similarity index 87% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/AskResponse.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/AskResponse.java index 9ef59084..52331437 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/AskResponse.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/AskResponse.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; import lombok.*; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/InstanceInfoDTO.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/InstanceInfoDTO.java similarity index 89% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/InstanceInfoDTO.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/InstanceInfoDTO.java index 26bfc6bb..3f26e896 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/InstanceInfoDTO.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/InstanceInfoDTO.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; -import com.github.kfcfans.oms.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.InstanceStatus; import lombok.Data; import java.util.Date; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/JobInfoDTO.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/JobInfoDTO.java similarity index 97% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/JobInfoDTO.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/JobInfoDTO.java index 43217b50..68a53822 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/JobInfoDTO.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/JobInfoDTO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/ResultDTO.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/ResultDTO.java similarity index 89% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/ResultDTO.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/ResultDTO.java index 9b3202e7..9c7a2ec3 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/ResultDTO.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/ResultDTO.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInfoDTO.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInfoDTO.java similarity index 95% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInfoDTO.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInfoDTO.java index c414f4d5..004eaafc 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInfoDTO.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInfoDTO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInstanceInfoDTO.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInstanceInfoDTO.java similarity index 91% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInstanceInfoDTO.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInstanceInfoDTO.java index 67505911..610ce15b 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/response/WorkflowInstanceInfoDTO.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/response/WorkflowInstanceInfoDTO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.response; +package com.github.kfcfans.powerjob.common.response; import lombok.Data; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/CommonUtils.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/CommonUtils.java similarity index 98% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/CommonUtils.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/CommonUtils.java index b5973635..8126dde8 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/CommonUtils.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/HttpUtils.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/HttpUtils.java similarity index 96% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/HttpUtils.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/HttpUtils.java index f8156e09..3612f179 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/HttpUtils.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/JsonUtils.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/JsonUtils.java similarity index 93% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/JsonUtils.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/JsonUtils.java index 5be456c5..4cf47bfc 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/JsonUtils.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/JsonUtils.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.kfcfans.oms.common.OmsException; +import com.github.kfcfans.powerjob.common.OmsException; import org.apache.commons.lang3.exception.ExceptionUtils; /** diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/Meaningless.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/Meaningless.java similarity index 77% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/Meaningless.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/Meaningless.java index ebe62ed5..f8824908 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/Meaningless.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/Meaningless.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; /** * 毫无意义就是最大的意义 diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/NetUtils.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java similarity index 99% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/NetUtils.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java index 49459424..bac13c8c 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/NetUtils.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SegmentLock.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SegmentLock.java similarity index 95% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SegmentLock.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SegmentLock.java index c991f897..6475fda5 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SegmentLock.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SegmentLock.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SupplierPlus.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SupplierPlus.java similarity index 92% rename from oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SupplierPlus.java rename to powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SupplierPlus.java index a57fe856..15fadc0d 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/SupplierPlus.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/SupplierPlus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.common.utils; +package com.github.kfcfans.powerjob.common.utils; /** * Represents a supplier of results. diff --git a/oh-my-scheduler-server/docker/Dockerfile b/powerjob-server/docker/Dockerfile similarity index 100% rename from oh-my-scheduler-server/docker/Dockerfile rename to powerjob-server/docker/Dockerfile diff --git a/oh-my-scheduler-server/docker/settings.xml b/powerjob-server/docker/settings.xml similarity index 100% rename from oh-my-scheduler-server/docker/settings.xml rename to powerjob-server/docker/settings.xml diff --git a/oh-my-scheduler-server/pom.xml b/powerjob-server/pom.xml similarity index 93% rename from oh-my-scheduler-server/pom.xml rename to powerjob-server/pom.xml index 23db5184..f4b20453 100644 --- a/oh-my-scheduler-server/pom.xml +++ b/powerjob-server/pom.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-server - 2.0.0 + powerjob-server + 3.0.0 jar 2.9.2 2.2.6.RELEASE - 2.0.0 + 3.0.0 8.0.19 1.4.200 2.5.2 @@ -34,8 +34,8 @@ com.github.kfcfans - oh-my-scheduler-common - ${oms.common.version} + powerjob-common + ${powerjob.common.version} @@ -154,7 +154,7 @@ spring-boot-maven-plugin ${springboot.version} - com.github.kfcfans.oms.server.OhMyApplication + com.github.kfcfans.powerjob.server.OhMyApplication diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/OhMyApplication.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java similarity index 84% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/OhMyApplication.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java index ffeee5bc..3d35a2d7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/OhMyApplication.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/OhMyApplication.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server; +package com.github.kfcfans.powerjob.server; -import com.github.kfcfans.oms.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/OhMyServer.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/OhMyServer.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java index 6687ab39..d173801f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/OhMyServer.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/OhMyServer.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.oms.server.akka; +package com.github.kfcfans.powerjob.server.akka; import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.Props; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.server.akka.actors.FriendActor; -import com.github.kfcfans.oms.server.akka.actors.ServerActor; -import com.github.kfcfans.oms.server.common.utils.PropertyUtils; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.server.akka.actors.FriendActor; +import com.github.kfcfans.powerjob.server.akka.actors.ServerActor; +import com.github.kfcfans.powerjob.server.common.utils.PropertyUtils; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.typesafe.config.Config; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/FriendActor.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java similarity index 75% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/FriendActor.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java index 920a8ff3..f36aaa22 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/FriendActor.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/FriendActor.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.server.akka.actors; +package com.github.kfcfans.powerjob.server.akka.actors; import akka.actor.AbstractActor; -import com.github.kfcfans.oms.common.model.SystemMetrics; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.server.akka.requests.FriendQueryWorkerClusterStatusReq; -import com.github.kfcfans.oms.server.akka.requests.Ping; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.server.akka.requests.FriendQueryWorkerClusterStatusReq; +import com.github.kfcfans.powerjob.server.akka.requests.Ping; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java similarity index 75% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java index 8a243027..6c99e680 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/actors/ServerActor.java @@ -1,21 +1,21 @@ -package com.github.kfcfans.oms.server.akka.actors; +package com.github.kfcfans.powerjob.server.akka.actors; import akka.actor.AbstractActor; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.request.ServerDeployContainerRequest; -import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; -import com.github.kfcfans.oms.common.request.WorkerHeartbeat; -import com.github.kfcfans.oms.common.request.WorkerLogReportReq; -import com.github.kfcfans.oms.common.request.http.WorkerNeedDeployContainerRequest; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.server.common.utils.SpringUtils; -import com.github.kfcfans.oms.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.oms.server.service.InstanceLogService; -import com.github.kfcfans.oms.server.service.instance.InstanceManager; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.request.ServerDeployContainerRequest; +import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; +import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; +import com.github.kfcfans.powerjob.common.request.WorkerLogReportReq; +import com.github.kfcfans.powerjob.common.request.http.WorkerNeedDeployContainerRequest; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import com.github.kfcfans.powerjob.server.service.InstanceLogService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/FriendQueryWorkerClusterStatusReq.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java similarity index 72% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/FriendQueryWorkerClusterStatusReq.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java index 0758ecd1..ebc3f639 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/FriendQueryWorkerClusterStatusReq.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/FriendQueryWorkerClusterStatusReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.akka.requests; +package com.github.kfcfans.powerjob.server.akka.requests; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/Ping.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java similarity index 61% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/Ping.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java index 42aca994..18a2ace2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/requests/Ping.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/akka/requests/Ping.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.akka.requests; +package com.github.kfcfans.powerjob.server.akka.requests; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/SJ.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java similarity index 85% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/SJ.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java index 652d4378..901753e5 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/SJ.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/SJ.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common; +package com.github.kfcfans.powerjob.server.common; import com.google.common.base.Joiner; import com.google.common.base.Splitter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/OmsEndpointConfigure.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/OmsEndpointConfigure.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java index d41676b5..9fb35811 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/OmsEndpointConfigure.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/OmsEndpointConfigure.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.config; +package com.github.kfcfans.powerjob.server.common.config; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java similarity index 96% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java index 6004e8a5..eebbb62c 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/SwaggerConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.config; +package com.github.kfcfans.powerjob.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/common/config/ThreadPoolConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java similarity index 97% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java index 31bacc3f..3dc4fd71 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.config; +package com.github.kfcfans.powerjob.server.common.config; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/WebConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/WebConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java index d3c221e3..9841e750 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/WebConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.config; +package com.github.kfcfans.powerjob.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/common/constans/ContainerSourceType.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerSourceType.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/ContainerSourceType.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerSourceType.java index e526a081..187e764c 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/ContainerSourceType.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerSourceType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.constans; +package com.github.kfcfans.powerjob.server.common.constans; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/ContainerStatus.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerStatus.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/ContainerStatus.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerStatus.java index 61c90434..f93b4e90 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/ContainerStatus.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/ContainerStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.constans; +package com.github.kfcfans.powerjob.server.common.constans; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/InstanceType.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/InstanceType.java similarity index 80% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/InstanceType.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/InstanceType.java index c0a3a32c..04a84a78 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/InstanceType.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/InstanceType.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.constans; +package com.github.kfcfans.powerjob.server.common.constans; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/SwitchableStatus.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/SwitchableStatus.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/SwitchableStatus.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/SwitchableStatus.java index 9fdf87e6..26ebd74e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/constans/SwitchableStatus.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/constans/SwitchableStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.constans; +package com.github.kfcfans.powerjob.server.common.constans; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java similarity index 97% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java index c2377af6..8a42c5a1 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/ContainerTemplateGenerator.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; -import com.github.kfcfans.oms.common.ContainerConstant; +import com.github.kfcfans.powerjob.common.ContainerConstant; import net.lingala.zip4j.ZipFile; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/CronExpression.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java similarity index 99% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/CronExpression.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java index e8f68f74..e753cd49 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/CronExpression.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/CronExpression.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; import java.io.Serializable; import java.text.ParseException; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java index cb887261..147d475d 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/OmsFileUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -18,7 +18,7 @@ import java.util.UUID; public class OmsFileUtils { private static final String USER_HOME = System.getProperty("user.home", "oms"); - private static final String COMMON_PATH = USER_HOME + "/oms-server/"; + private static final String COMMON_PATH = USER_HOME + "/powerjob-server/"; /** * 获取在线日志的存放路径 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/PropertyUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/PropertyUtils.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java index 9ef100e6..e9c4c158 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/PropertyUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/PropertyUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/SpringUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/SpringUtils.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java index a099cfe7..53eb7bfd 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/SpringUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/TimeUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/TimeUtils.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java index 2e2d22b9..eba64bda 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/TimeUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/TimeUtils.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; -import com.github.kfcfans.oms.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.RemoteConstant; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ntp.NTPUDPClient; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/WorkflowDAGUtils.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/WorkflowDAGUtils.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java index e20b60ed..e96a913a 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/WorkflowDAGUtils.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/WorkflowDAGUtils.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.server.common.utils; +package com.github.kfcfans.powerjob.server.common.utils; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.server.model.WorkflowDAG; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.server.model.WorkflowDAG; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/HashedWheelTimer.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java similarity index 98% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/HashedWheelTimer.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java index 6b0cfcd2..41960391 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/HashedWheelTimer.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/HashedWheelTimer.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.common.utils.timewheel; +package com.github.kfcfans.powerjob.server.common.utils.timewheel; -import com.github.kfcfans.oms.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.google.common.collect.Queues; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/Timer.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java similarity index 83% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/Timer.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java index 8db4289d..d87630f2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/Timer.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/Timer.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils.timewheel; +package com.github.kfcfans.powerjob.server.common.utils.timewheel; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerFuture.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerFuture.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java index 8d5498d3..61ec9ed6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerFuture.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerFuture.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils.timewheel; +package com.github.kfcfans.powerjob.server.common.utils.timewheel; /** * description diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerTask.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java similarity index 67% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerTask.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java index 1fbb9c06..e85dd0c6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/timewheel/TimerTask.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/common/utils/timewheel/TimerTask.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.common.utils.timewheel; +package com.github.kfcfans.powerjob.server.common.utils.timewheel; /** * 时间任务接口 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/model/WorkflowDAG.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java similarity index 94% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/model/WorkflowDAG.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java index b21a48b8..c4819d29 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/model/WorkflowDAG.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/model/WorkflowDAG.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.model; +package com.github.kfcfans.powerjob.server.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/PageResult.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/PageResult.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java index 25c0909e..d3c4260a 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/PageResult.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/PageResult.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence; +package com.github.kfcfans.powerjob.server.persistence; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/StringPage.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java similarity index 91% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/StringPage.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java index c150792a..0cedbacd 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/StringPage.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/StringPage.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence; +package com.github.kfcfans.powerjob.server.persistence; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/CoreJpaConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java similarity index 96% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/CoreJpaConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java index 6c964ca9..6e11c2a4 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/CoreJpaConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/CoreJpaConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.config; +package com.github.kfcfans.powerjob.server.persistence.config; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; @@ -39,7 +39,7 @@ public class CoreJpaConfig { @Resource(name = "omsCoreDatasource") private DataSource omsCoreDatasource; - public static final String CORE_PACKAGES = "com.github.kfcfans.oms.server.persistence.core"; + public static final String CORE_PACKAGES = "com.github.kfcfans.powerjob.server.persistence.core"; /** * 生成配置文件，包括 JPA配置文件和Hibernate配置文件，相当于一下三个配置 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/LocalJpaConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java similarity index 97% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/LocalJpaConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java index 81e2383b..0a3b8f12 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/LocalJpaConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/LocalJpaConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.config; +package com.github.kfcfans.powerjob.server.persistence.config; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; @@ -41,7 +41,7 @@ public class LocalJpaConfig { @Resource(name = "omsLocalDatasource") private DataSource omsLocalDatasource; - public static final String LOCAL_PACKAGES = "com.github.kfcfans.oms.server.persistence.local"; + public static final String LOCAL_PACKAGES = "com.github.kfcfans.powerjob.server.persistence.local"; private static Map genDatasourceProperties() { diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/MultiDatasourceConfig.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/MultiDatasourceConfig.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java index 9c02e989..c2beeb49 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/config/MultiDatasourceConfig.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/config/MultiDatasourceConfig.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.config; +package com.github.kfcfans.powerjob.server.persistence.config; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; @@ -19,7 +19,7 @@ import javax.sql.DataSource; @Configuration public class MultiDatasourceConfig { - private static final String H2_JDBC_URL = "jdbc:h2:file:~/oms-server/h2/oms_server_db"; + private static final String H2_JDBC_URL = "jdbc:h2:file:~/powerjob-server/h2/powerjob_server_db"; @Primary @Bean("omsCoreDatasource") diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/AppInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java similarity index 91% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/AppInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java index ac46a039..401e1b2b 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/AppInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ContainerInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ContainerInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java index 777cbc61..3424a4a6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ContainerInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/InstanceInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/InstanceInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java index 6fbe55d7..39f8d0a6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/InstanceInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; -import com.github.kfcfans.oms.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.InstanceStatus; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java similarity index 97% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java index 9dc4a47f..5d214cf6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/JobInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/OmsLockDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/OmsLockDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java index 65b90bf8..03a1f6b7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/OmsLockDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ServerInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java similarity index 91% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ServerInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java index 0b41d8c0..be61cb34 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/ServerInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/UserInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/UserInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java index da8b3369..883a223f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/UserInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java index 25b9fab1..606efad7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInstanceInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java similarity index 94% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInstanceInfoDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java index 39c77fae..fca69561 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/model/WorkflowInstanceInfoDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.core.model; +package com.github.kfcfans.powerjob.server.persistence.core.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/package-info.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java similarity index 76% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/package-info.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java index c2874460..683787d9 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/package-info.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/package-info.java @@ -5,4 +5,4 @@ * @author tjq * @since 2020/6/3 */ -package com.github.kfcfans.oms.server.persistence.core; \ No newline at end of file +package com.github.kfcfans.powerjob.server.persistence.core; \ No newline at end of file diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/AppInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java similarity index 82% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/AppInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java index f09ecba7..66f11fa1 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/AppInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/AppInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ContainerInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java similarity index 66% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ContainerInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java index ef950425..1f913039 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ContainerInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ContainerInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.ContainerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/InstanceInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/InstanceInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java index 3b217b87..3c434699 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/InstanceInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/JobInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/JobInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java index ff2dd211..08ae7967 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/JobInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/JobInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/OmsLockRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java similarity index 78% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/OmsLockRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java index f9f8b58d..1a2ce112 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/OmsLockRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/OmsLockRepository.java @@ -1,12 +1,11 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.OmsLockDO; +import com.github.kfcfans.powerjob.server.persistence.core.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; -import java.util.List; /** * 利用唯一性约束作为数据库锁 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ServerInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java similarity index 63% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ServerInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java index 1710f092..615933f2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/ServerInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/ServerInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.ServerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.ServerInfoDO; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/UserInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java similarity index 70% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/UserInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java index abf1057b..bd025a11 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/UserInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java similarity index 84% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java index 34fe2fe0..aa0c7cfe 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInstanceInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInstanceInfoRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java index 0864bfc0..04910339 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInstanceInfoRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.persistence.core.repository; +package com.github.kfcfans.powerjob.server.persistence.core.repository; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogDO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java index 2ac16c23..040f8b2b 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogDO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.local; +package com.github.kfcfans.powerjob.server.persistence.local; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogRepository.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java index 539ce87f..d1a00329 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/local/LocalInstanceLogRepository.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/local/LocalInstanceLogRepository.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.local; +package com.github.kfcfans.powerjob.server.persistence.local; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/mongodb/GridFsManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java similarity index 98% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/mongodb/GridFsManager.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java index 29d11fe0..a8e4ea96 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/mongodb/GridFsManager.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.persistence.mongodb; +package com.github.kfcfans.powerjob.server.persistence.mongodb; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/CacheService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/CacheService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java index 3bed2ae6..0fe02dec 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/CacheService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/CacheService.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java index 27ebbdb9..aaf05ac8 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ContainerService.java @@ -1,24 +1,24 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.common.model.DeployedContainerInfo; -import com.github.kfcfans.oms.common.model.GitRepoInfo; -import com.github.kfcfans.oms.common.request.ServerDeployContainerRequest; -import com.github.kfcfans.oms.common.request.ServerDestroyContainerRequest; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.common.utils.SegmentLock; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.common.constans.ContainerSourceType; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.oms.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; -import com.github.kfcfans.oms.server.service.lock.LockService; -import com.github.kfcfans.oms.server.web.request.SaveContainerInfoRequest; +import com.github.kfcfans.powerjob.common.OmsConstant; +import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; +import com.github.kfcfans.powerjob.common.model.GitRepoInfo; +import com.github.kfcfans.powerjob.common.request.ServerDeployContainerRequest; +import com.github.kfcfans.powerjob.common.request.ServerDestroyContainerRequest; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.common.utils.SegmentLock; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.common.constans.ContainerSourceType; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.server.service.lock.LockService; +import com.github.kfcfans.powerjob.server.web.request.SaveContainerInfoRequest; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java index 649896f0..f5c60e1f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/DispatchService.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.*; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; -import com.github.kfcfans.oms.server.service.instance.InstanceManager; +import com.github.kfcfans.powerjob.common.*; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Set; -import static com.github.kfcfans.oms.common.InstanceStatus.*; +import static com.github.kfcfans.powerjob.common.InstanceStatus.*; /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/InstanceLogService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/InstanceLogService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java index 5746f2f0..3db9d990 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/InstanceLogService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/InstanceLogService.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; -import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.model.InstanceLogContent; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.SegmentLock; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.StringPage; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.local.LocalInstanceLogDO; -import com.github.kfcfans.oms.server.persistence.local.LocalInstanceLogRepository; -import com.github.kfcfans.oms.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.oms.server.service.instance.InstanceManager; +import com.github.kfcfans.powerjob.common.OmsConstant; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.model.InstanceLogContent; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.SegmentLock; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.StringPage; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.local.LocalInstanceLogDO; +import com.github.kfcfans.powerjob.server.persistence.local.LocalInstanceLogRepository; +import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; +import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/JobService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/JobService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java index a16ad463..6c187d45 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/JobService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.http.SaveJobInfoRequest; -import com.github.kfcfans.oms.common.response.JobInfoDTO; -import com.github.kfcfans.oms.server.common.SJ; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.common.utils.CronExpression; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; +import com.github.kfcfans.powerjob.common.response.JobInfoDTO; +import com.github.kfcfans.powerjob.server.common.SJ; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java similarity index 84% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java index c14c3d17..f95f7b1a 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/UserService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/UserService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.service; +package com.github.kfcfans.powerjob.server.service; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.UserInfoRepository; -import com.github.kfcfans.oms.server.web.request.ModifyUserInfoRequest; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.UserInfoRepository; +import com.github.kfcfans.powerjob.server.web.request.ModifyUserInfoRequest; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarmable.java similarity index 82% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarmable.java index b10d371b..2349a018 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/Alarmable.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarmable.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.service.alarm; +package com.github.kfcfans.powerjob.server.service.alarm; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; import java.util.List; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/DefaultMailAlarmService.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/DefaultMailAlarmService.java index 4bee1446..d96e20b1 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/DefaultMailAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/DefaultMailAlarmService.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.service.alarm; +package com.github.kfcfans.powerjob.server.service.alarm; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarmContent.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarmContent.java index 1f9f0594..1ff8011e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/JobInstanceAlarmContent.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/JobInstanceAlarmContent.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.service.alarm; +package com.github.kfcfans.powerjob.server.service.alarm; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/OmsCenterAlarmService.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/OmsCenterAlarmService.java index 35ef1304..8b18203e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/OmsCenterAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/OmsCenterAlarmService.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.service.alarm; +package com.github.kfcfans.powerjob.server.service.alarm; -import com.github.kfcfans.oms.server.common.utils.SpringUtils; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import lombok.Setter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarmContent.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarmContent.java index bf2b4df9..4a338a20 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/alarm/WorkflowInstanceAlarmContent.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/WorkflowInstanceAlarmContent.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.service.alarm; +package com.github.kfcfans.powerjob.server.service.alarm; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import lombok.Data; /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ClusterStatusHolder.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ClusterStatusHolder.java index 58347976..46c664cf 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ClusterStatusHolder.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.service.ha; +package com.github.kfcfans.powerjob.server.service.ha; -import com.github.kfcfans.oms.common.model.DeployedContainerInfo; -import com.github.kfcfans.oms.common.model.SystemMetrics; -import com.github.kfcfans.oms.common.request.WorkerHeartbeat; +import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ServerSelectService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ServerSelectService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java index 8e41db0f..5b232a3e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ServerSelectService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/ServerSelectService.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms.server.service.ha; +package com.github.kfcfans.powerjob.server.service.ha; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.akka.requests.Ping; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.service.lock.LockService; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.akka.requests.Ping; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.service.lock.LockService; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/WorkerManagerService.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/WorkerManagerService.java index de732b00..0ab2bf02 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/ha/WorkerManagerService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.service.ha; +package com.github.kfcfans.powerjob.server.service.ha; -import com.github.kfcfans.oms.common.model.DeployedContainerInfo; -import com.github.kfcfans.oms.common.model.SystemMetrics; -import com.github.kfcfans.oms.common.request.WorkerHeartbeat; +import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/IdGenerateService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java similarity index 82% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/IdGenerateService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java index 009a8dd3..51af339e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/IdGenerateService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/IdGenerateService.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.service.id; +package com.github.kfcfans.powerjob.server.service.id; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.server.persistence.core.model.ServerInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.ServerInfoRepository; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.ServerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.ServerInfoRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/SnowFlakeIdGenerator.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java similarity index 98% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/SnowFlakeIdGenerator.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java index 0a3aaa8a..637fef6d 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/id/SnowFlakeIdGenerator.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/id/SnowFlakeIdGenerator.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.service.id; +package com.github.kfcfans.powerjob.server.service.id; /** * Twitter SnowFlake（Scala -> Java） diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java index 6d7f2fe0..522cb263 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceManager.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceManager.java @@ -1,21 +1,21 @@ -package com.github.kfcfans.oms.server.service.instance; +package com.github.kfcfans.powerjob.server.service.instance; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; -import com.github.kfcfans.oms.server.common.utils.SpringUtils; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.service.DispatchService; -import com.github.kfcfans.oms.server.service.InstanceLogService; -import com.github.kfcfans.oms.server.service.UserService; -import com.github.kfcfans.oms.server.service.alarm.Alarmable; -import com.github.kfcfans.oms.server.service.alarm.JobInstanceAlarmContent; -import com.github.kfcfans.oms.server.service.timing.schedule.HashedWheelTimerHolder; -import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceManager; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; +import com.github.kfcfans.powerjob.server.common.utils.SpringUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.service.DispatchService; +import com.github.kfcfans.powerjob.server.service.InstanceLogService; +import com.github.kfcfans.powerjob.server.service.UserService; +import com.github.kfcfans.powerjob.server.service.alarm.Alarmable; +import com.github.kfcfans.powerjob.server.service.alarm.JobInstanceAlarmContent; +import com.github.kfcfans.powerjob.server.service.timing.schedule.HashedWheelTimerHolder; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java index 63a7f462..3765c81c 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceService.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.oms.server.service.instance; +package com.github.kfcfans.powerjob.server.service.instance; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.SystemInstanceResult; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.request.ServerQueryInstanceStatusReq; -import com.github.kfcfans.oms.common.request.ServerStopInstanceReq; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.common.response.InstanceInfoDTO; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.common.constans.InstanceType; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.service.id.IdGenerateService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.SystemInstanceResult; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.request.ServerQueryInstanceStatusReq; +import com.github.kfcfans.powerjob.common.request.ServerStopInstanceReq; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.common.response.InstanceInfoDTO; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.common.constans.InstanceType; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -25,8 +25,8 @@ import java.util.Date; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; -import static com.github.kfcfans.oms.common.InstanceStatus.RUNNING; -import static com.github.kfcfans.oms.common.InstanceStatus.STOPPED; +import static com.github.kfcfans.powerjob.common.InstanceStatus.RUNNING; +import static com.github.kfcfans.powerjob.common.InstanceStatus.STOPPED; /** * 任务运行实例服务 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceStatusHolder.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceStatusHolder.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceStatusHolder.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceStatusHolder.java index bc780072..75bb0803 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/instance/InstanceStatusHolder.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/instance/InstanceStatusHolder.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.service.instance; +package com.github.kfcfans.powerjob.server.service.instance; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/DatabaseLockService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java similarity index 85% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/DatabaseLockService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java index 3f73cd2d..19708f67 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/DatabaseLockService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java @@ -1,17 +1,15 @@ -package com.github.kfcfans.oms.server.service.lock; +package com.github.kfcfans.powerjob.server.service.lock; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.server.persistence.core.model.OmsLockDO; -import com.github.kfcfans.oms.server.persistence.core.repository.OmsLockRepository; -import com.google.common.collect.Lists; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.OmsLockRepository; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/LockService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/LockService.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/LockService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/LockService.java index 3a1e19a9..31536626 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/lock/LockService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/LockService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.service.lock; +package com.github.kfcfans.powerjob.server.service.lock; /** * 锁服务，所有方法都不允许抛出任何异常！ diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java index 93633e39..6d1993eb 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.server.service.timing; +package com.github.kfcfans.powerjob.server.service.timing; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; -import com.github.kfcfans.oms.server.service.instance.InstanceManager; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/InstanceStatusCheckService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/InstanceStatusCheckService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java index de3796f1..47ca26ff 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/InstanceStatusCheckService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/InstanceStatusCheckService.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms.server.service.timing; +package com.github.kfcfans.powerjob.server.service.timing; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.SystemInstanceResult; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.WorkflowInstanceStatus; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.persistence.core.model.*; -import com.github.kfcfans.oms.server.persistence.core.repository.*; -import com.github.kfcfans.oms.server.service.DispatchService; -import com.github.kfcfans.oms.server.service.instance.InstanceManager; -import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceManager; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.SystemInstanceResult; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.persistence.core.model.*; +import com.github.kfcfans.powerjob.server.persistence.core.repository.*; +import com.github.kfcfans.powerjob.server.service.DispatchService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceManager; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/HashedWheelTimerHolder.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java similarity index 65% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/HashedWheelTimerHolder.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java index c0cfba2f..193add88 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/HashedWheelTimerHolder.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/HashedWheelTimerHolder.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.service.timing.schedule; +package com.github.kfcfans.powerjob.server.service.timing.schedule; -import com.github.kfcfans.oms.server.common.utils.timewheel.HashedWheelTimer; +import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; /** * 时间轮单例 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/OmsScheduleService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/OmsScheduleService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java index 1d72c679..d5de14b7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/schedule/OmsScheduleService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/schedule/OmsScheduleService.java @@ -1,22 +1,22 @@ -package com.github.kfcfans.oms.server.service.timing.schedule; +package com.github.kfcfans.powerjob.server.service.timing.schedule; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.common.utils.CronExpression; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.oms.server.service.DispatchService; -import com.github.kfcfans.oms.server.service.JobService; -import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; -import com.github.kfcfans.oms.server.service.instance.InstanceService; -import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceManager; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import com.github.kfcfans.powerjob.server.service.DispatchService; +import com.github.kfcfans.powerjob.server.service.JobService; +import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceManager; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java similarity index 90% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java index 464cfe13..b5cfbd56 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceManager.java @@ -1,28 +1,28 @@ -package com.github.kfcfans.oms.server.service.workflow; +package com.github.kfcfans.powerjob.server.service.workflow; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.SystemInstanceResult; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.WorkflowInstanceStatus; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.common.utils.SegmentLock; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.oms.server.service.DispatchService; -import com.github.kfcfans.oms.server.service.UserService; -import com.github.kfcfans.oms.server.service.alarm.Alarmable; -import com.github.kfcfans.oms.server.service.alarm.WorkflowInstanceAlarmContent; -import com.github.kfcfans.oms.server.service.id.IdGenerateService; -import com.github.kfcfans.oms.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.SystemInstanceResult; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.utils.SegmentLock; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.DispatchService; +import com.github.kfcfans.powerjob.server.service.UserService; +import com.github.kfcfans.powerjob.server.service.alarm.Alarmable; +import com.github.kfcfans.powerjob.server.service.alarm.WorkflowInstanceAlarmContent; +import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java similarity index 78% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java index a7403199..f574d95e 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowInstanceService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowInstanceService.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms.server.service.workflow; +package com.github.kfcfans.powerjob.server.service.workflow; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.SystemInstanceResult; -import com.github.kfcfans.oms.common.WorkflowInstanceStatus; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.common.response.WorkflowInstanceInfoDTO; -import com.github.kfcfans.oms.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.oms.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.SystemInstanceResult; +import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.common.response.WorkflowInstanceInfoDTO; +import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java similarity index 85% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowService.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java index cb2b5822..c2884f65 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/workflow/WorkflowService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/workflow/WorkflowService.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms.server.service.workflow; +package com.github.kfcfans.powerjob.server.service.workflow; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.oms.common.response.WorkflowInfoDTO; -import com.github.kfcfans.oms.server.common.SJ; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.common.utils.CronExpression; -import com.github.kfcfans.oms.server.common.utils.WorkflowDAGUtils; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; +import com.github.kfcfans.powerjob.common.response.WorkflowInfoDTO; +import com.github.kfcfans.powerjob.server.common.SJ; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java index 7cf81812..65a7c682 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/ControllerExceptionHandler.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/ControllerExceptionHandler.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.web; +package com.github.kfcfans.powerjob.server.web; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.response.ResultDTO; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.response.ResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.messaging.handler.annotation.support.MethodArgumentTypeMismatchException; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/WebLogAspect.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java similarity index 95% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/WebLogAspect.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java index f09cdbbf..a91c7001 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/WebLogAspect.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/WebLogAspect.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web; +package com.github.kfcfans.powerjob.server.web; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -40,7 +40,7 @@ public class WebLogAspect { public void include() { } - @Pointcut("execution(public * com.github.kfcfans.oms.server.web.controller.ServerController.*(..))") + @Pointcut("execution(public * com.github.kfcfans.powerjob.server.web.controller.ServerController.*(..))") public void exclude() { } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java index d4a6e872..d408a8d2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/AppInfoController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/AppInfoController.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.web.request.ModifyAppInfoRequest; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.web.request.ModifyAppInfoRequest; import com.google.common.collect.Lists; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java similarity index 79% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java index cfd15d55..c11eae81 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ContainerController.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.common.constans.ContainerSourceType; -import com.github.kfcfans.oms.server.common.constans.ContainerStatus; -import com.github.kfcfans.oms.server.common.utils.ContainerTemplateGenerator; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.ContainerInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.ContainerInfoRepository; -import com.github.kfcfans.oms.server.service.ContainerService; -import com.github.kfcfans.oms.server.web.request.GenerateContainerTemplateRequest; -import com.github.kfcfans.oms.server.web.request.SaveContainerInfoRequest; -import com.github.kfcfans.oms.server.web.response.ContainerInfoVO; +import com.github.kfcfans.powerjob.common.OmsConstant; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.common.constans.ContainerSourceType; +import com.github.kfcfans.powerjob.server.common.constans.ContainerStatus; +import com.github.kfcfans.powerjob.server.common.utils.ContainerTemplateGenerator; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.ContainerInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.ContainerInfoRepository; +import com.github.kfcfans.powerjob.server.service.ContainerService; +import com.github.kfcfans.powerjob.server.web.request.GenerateContainerTemplateRequest; +import com.github.kfcfans.powerjob.server.web.request.SaveContainerInfoRequest; +import com.github.kfcfans.powerjob.server.web.response.ContainerInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/InstanceController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java similarity index 80% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/InstanceController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java index 95785aa4..af55157a 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/InstanceController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/InstanceController.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.PageResult; -import com.github.kfcfans.oms.server.persistence.StringPage; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.service.CacheService; -import com.github.kfcfans.oms.server.service.InstanceLogService; -import com.github.kfcfans.oms.server.service.instance.InstanceService; -import com.github.kfcfans.oms.server.web.request.QueryInstanceRequest; -import com.github.kfcfans.oms.server.web.response.InstanceInfoVO; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.PageResult; +import com.github.kfcfans.powerjob.server.persistence.StringPage; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.CacheService; +import com.github.kfcfans.powerjob.server.service.InstanceLogService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.server.web.request.QueryInstanceRequest; +import com.github.kfcfans.powerjob.server.web.response.InstanceInfoVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Example; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java similarity index 83% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java index d443117f..34b476e9 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/JobController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/JobController.java @@ -1,18 +1,18 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.ProcessorType; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.http.SaveJobInfoRequest; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.common.SJ; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.persistence.PageResult; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.service.JobService; -import com.github.kfcfans.oms.server.web.request.QueryJobInfoRequest; -import com.github.kfcfans.oms.server.web.response.JobInfoVO; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.ProcessorType; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.common.SJ; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.persistence.PageResult; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.service.JobService; +import com.github.kfcfans.powerjob.server.web.request.QueryJobInfoRequest; +import com.github.kfcfans.powerjob.server.web.response.JobInfoVO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/OpenAPIController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/OpenAPIController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java index baf8cada..5e7c1254 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/OpenAPIController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/OpenAPIController.java @@ -1,17 +1,17 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.OpenAPIConstant; -import com.github.kfcfans.oms.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.oms.common.response.*; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.service.CacheService; -import com.github.kfcfans.oms.server.service.JobService; -import com.github.kfcfans.oms.server.service.instance.InstanceService; -import com.github.kfcfans.oms.common.request.http.SaveJobInfoRequest; -import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceService; -import com.github.kfcfans.oms.server.service.workflow.WorkflowService; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.OpenAPIConstant; +import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.service.CacheService; +import com.github.kfcfans.powerjob.server.service.JobService; +import com.github.kfcfans.powerjob.server.service.instance.InstanceService; +import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceService; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowService; +import com.github.kfcfans.powerjob.common.response.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ServerController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java similarity index 78% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ServerController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java index c8999d7a..6a3c2588 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ServerController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/ServerController.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.service.ha.ServerSelectService; -import com.github.kfcfans.oms.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.service.ha.ServerSelectService; +import com.github.kfcfans.powerjob.common.response.ResultDTO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/SystemInfoController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java similarity index 78% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/SystemInfoController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java index 0ee21c1e..f238b75f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/SystemInfoController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/SystemInfoController.java @@ -1,21 +1,21 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.model.SystemMetrics; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.server.akka.OhMyServer; -import com.github.kfcfans.oms.server.akka.requests.FriendQueryWorkerClusterStatusReq; -import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.web.response.SystemOverviewVO; -import com.github.kfcfans.oms.server.web.response.WorkerStatusVO; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.server.akka.OhMyServer; +import com.github.kfcfans.powerjob.server.akka.requests.FriendQueryWorkerClusterStatusReq; +import com.github.kfcfans.powerjob.server.persistence.core.model.AppInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.AppInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.web.response.SystemOverviewVO; +import com.github.kfcfans.powerjob.server.web.response.WorkerStatusVO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java similarity index 79% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java index 5f5567ff..8c786177 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/UserInfoController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/UserInfoController.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.persistence.core.model.UserInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.UserInfoRepository; -import com.github.kfcfans.oms.server.service.UserService; -import com.github.kfcfans.oms.server.web.request.ModifyUserInfoRequest; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.persistence.core.model.UserInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.UserInfoRepository; +import com.github.kfcfans.powerjob.server.service.UserService; +import com.github.kfcfans.powerjob.server.web.request.ModifyUserInfoRequest; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java similarity index 80% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java index 41b343c3..25095922 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowController.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.persistence.PageResult; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInfoRepository; -import com.github.kfcfans.oms.server.service.workflow.WorkflowService; -import com.github.kfcfans.oms.server.web.request.QueryWorkflowInfoRequest; -import com.github.kfcfans.oms.server.web.response.WorkflowInfoVO; +import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.persistence.PageResult; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInfoRepository; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowService; +import com.github.kfcfans.powerjob.server.web.request.QueryWorkflowInfoRequest; +import com.github.kfcfans.powerjob.server.web.response.WorkflowInfoVO; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowInstanceController.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java similarity index 76% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowInstanceController.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java index b65bfef6..99258ec9 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowInstanceController.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/controller/WorkflowInstanceController.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.oms.server.web.controller; +package com.github.kfcfans.powerjob.server.web.controller; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.server.persistence.PageResult; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.repository.WorkflowInstanceInfoRepository; -import com.github.kfcfans.oms.server.service.CacheService; -import com.github.kfcfans.oms.server.service.workflow.WorkflowInstanceService; -import com.github.kfcfans.oms.server.web.request.QueryWorkflowInstanceRequest; -import com.github.kfcfans.oms.server.web.response.WorkflowInstanceInfoVO; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.server.persistence.PageResult; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository; +import com.github.kfcfans.powerjob.server.service.CacheService; +import com.github.kfcfans.powerjob.server.service.workflow.WorkflowInstanceService; +import com.github.kfcfans.powerjob.server.web.request.QueryWorkflowInstanceRequest; +import com.github.kfcfans.powerjob.server.web.response.WorkflowInstanceInfoVO; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/GenerateContainerTemplateRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java similarity index 88% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/GenerateContainerTemplateRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java index dbee16d0..e3835c5c 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/GenerateContainerTemplateRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/GenerateContainerTemplateRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyAppInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java similarity index 79% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyAppInfoRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java index e5ca3867..84b5b4d6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyAppInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyAppInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyUserInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java similarity index 84% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyUserInfoRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java index e395e7cb..e07b00f1 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/ModifyUserInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/ModifyUserInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryInstanceRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java similarity index 77% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryInstanceRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java index 4b41c5ec..dae309a7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryInstanceRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryInstanceRequest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; -import com.github.kfcfans.oms.server.common.constans.InstanceType; +import com.github.kfcfans.powerjob.server.common.constans.InstanceType; import lombok.Data; /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryJobInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java similarity index 86% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryJobInfoRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java index b596f00f..70c1fccd 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryJobInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryJobInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java similarity index 86% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInfoRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java index 2748b271..c35fb7d5 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInfoRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInstanceRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInstanceRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java index 7dea3356..f566f41b 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/QueryWorkflowInstanceRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/QueryWorkflowInstanceRequest.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/SaveContainerInfoRequest.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java similarity index 77% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/SaveContainerInfoRequest.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java index 4ebe8191..5e2536c7 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/request/SaveContainerInfoRequest.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/request/SaveContainerInfoRequest.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.web.request; +package com.github.kfcfans.powerjob.server.web.request; -import com.github.kfcfans.oms.server.common.constans.ContainerSourceType; -import com.github.kfcfans.oms.server.common.constans.ContainerStatus; +import com.github.kfcfans.powerjob.server.common.constans.ContainerSourceType; +import com.github.kfcfans.powerjob.server.common.constans.ContainerStatus; import lombok.Data; /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/ContainerInfoVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java similarity index 93% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/ContainerInfoVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java index 82bfceb0..e669bbdc 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/ContainerInfoVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/ContainerInfoVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java similarity index 92% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java index 8c58eb59..1cca6e38 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/InstanceInfoVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/InstanceInfoVO.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; -import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.common.OmsConstant; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/JobInfoVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java similarity index 97% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/JobInfoVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java index 91875b1b..5d384f86 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/JobInfoVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/JobInfoVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/SystemOverviewVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java similarity index 83% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/SystemOverviewVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java index e2f92881..39e8c1ab 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/SystemOverviewVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/SystemOverviewVO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; import lombok.Data; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkerStatusVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java similarity index 94% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkerStatusVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java index 1bc4af1a..258bdc2d 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkerStatusVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkerStatusVO.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; -import com.github.kfcfans.oms.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInfoVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java similarity index 81% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInfoVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java index e6050fa9..4de1a8d6 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInfoVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInfoVO.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.server.common.SJ; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInfoDO; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.server.common.SJ; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInfoDO; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.util.StringUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java similarity index 87% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java index 136cacc2..5d05e1c2 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/response/WorkflowInstanceInfoVO.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/response/WorkflowInstanceInfoVO.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.server.web.response; +package com.github.kfcfans.powerjob.server.web.response; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.OmsConstant; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.server.persistence.core.model.WorkflowInstanceInfoDO; +import com.github.kfcfans.powerjob.common.OmsConstant; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.server.persistence.core.model.WorkflowInstanceInfoDO; import lombok.Data; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/websocket/ContainerDeployServerEndpoint.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java similarity index 89% rename from oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/websocket/ContainerDeployServerEndpoint.java rename to powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java index 10a65746..e0aa1b26 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/websocket/ContainerDeployServerEndpoint.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/web/websocket/ContainerDeployServerEndpoint.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.server.web.websocket; +package com.github.kfcfans.powerjob.server.web.websocket; -import com.github.kfcfans.oms.server.common.config.OmsEndpointConfigure; -import com.github.kfcfans.oms.server.service.ContainerService; +import com.github.kfcfans.powerjob.server.common.config.OmsEndpointConfigure; +import com.github.kfcfans.powerjob.server.service.ContainerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Component; diff --git a/oh-my-scheduler-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties similarity index 100% rename from oh-my-scheduler-server/src/main/resources/application-daily.properties rename to powerjob-server/src/main/resources/application-daily.properties diff --git a/oh-my-scheduler-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties similarity index 100% rename from oh-my-scheduler-server/src/main/resources/application-pre.properties rename to powerjob-server/src/main/resources/application-pre.properties diff --git a/oh-my-scheduler-server/src/main/resources/application-product.properties b/powerjob-server/src/main/resources/application-product.properties similarity index 100% rename from oh-my-scheduler-server/src/main/resources/application-product.properties rename to powerjob-server/src/main/resources/application-product.properties diff --git a/oh-my-scheduler-server/src/main/resources/application.properties b/powerjob-server/src/main/resources/application.properties similarity index 100% rename from oh-my-scheduler-server/src/main/resources/application.properties rename to powerjob-server/src/main/resources/application.properties diff --git a/oh-my-scheduler-server/src/main/resources/banner.txt b/powerjob-server/src/main/resources/banner.txt similarity index 100% rename from oh-my-scheduler-server/src/main/resources/banner.txt rename to powerjob-server/src/main/resources/banner.txt diff --git a/oh-my-scheduler-server/src/main/resources/logback-dev.xml b/powerjob-server/src/main/resources/logback-dev.xml similarity index 88% rename from oh-my-scheduler-server/src/main/resources/logback-dev.xml rename to powerjob-server/src/main/resources/logback-dev.xml index 517961e8..94e07a92 100644 --- a/oh-my-scheduler-server/src/main/resources/logback-dev.xml +++ b/powerjob-server/src/main/resources/logback-dev.xml @@ -21,11 +21,11 @@ - + - + diff --git a/oh-my-scheduler-server/src/main/resources/logback-product.xml b/powerjob-server/src/main/resources/logback-product.xml similarity index 100% rename from oh-my-scheduler-server/src/main/resources/logback-product.xml rename to powerjob-server/src/main/resources/logback-product.xml diff --git a/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf b/powerjob-server/src/main/resources/oms-server.akka.conf similarity index 83% rename from oh-my-scheduler-server/src/main/resources/oms-server.akka.conf rename to powerjob-server/src/main/resources/oms-server.akka.conf index 6219b4df..8340bbf5 100644 --- a/oh-my-scheduler-server/src/main/resources/oms-server.akka.conf +++ b/powerjob-server/src/main/resources/oms-server.akka.conf @@ -5,7 +5,7 @@ akka { allow-java-serialization = off serialization-bindings { - "com.github.kfcfans.oms.common.OmsSerializable" = jackson-cbor + "com.github.kfcfans.powerjob.common.OmsSerializable" = jackson-cbor } } remote { diff --git a/oh-my-scheduler-server/src/main/resources/oms-template-origin.zip b/powerjob-server/src/main/resources/oms-template-origin.zip similarity index 100% rename from oh-my-scheduler-server/src/main/resources/oms-template-origin.zip rename to powerjob-server/src/main/resources/oms-template-origin.zip diff --git a/oh-my-scheduler-server/src/main/resources/static/favicon.ico b/powerjob-server/src/main/resources/static/favicon.ico similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/favicon.ico rename to powerjob-server/src/main/resources/static/favicon.ico diff --git a/oh-my-scheduler-server/src/main/resources/static/fonts/element-icons.535877f5.woff b/powerjob-server/src/main/resources/static/fonts/element-icons.535877f5.woff similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/fonts/element-icons.535877f5.woff rename to powerjob-server/src/main/resources/static/fonts/element-icons.535877f5.woff diff --git a/oh-my-scheduler-server/src/main/resources/static/fonts/element-icons.732389de.ttf b/powerjob-server/src/main/resources/static/fonts/element-icons.732389de.ttf similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/fonts/element-icons.732389de.ttf rename to powerjob-server/src/main/resources/static/fonts/element-icons.732389de.ttf diff --git a/oh-my-scheduler-server/src/main/resources/static/img/banner.f4c75b86.jpg b/powerjob-server/src/main/resources/static/img/banner.f4c75b86.jpg similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/img/banner.f4c75b86.jpg rename to powerjob-server/src/main/resources/static/img/banner.f4c75b86.jpg diff --git a/oh-my-scheduler-server/src/main/resources/static/img/oms-logo.de87211a.png b/powerjob-server/src/main/resources/static/img/oms-logo.de87211a.png similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/img/oms-logo.de87211a.png rename to powerjob-server/src/main/resources/static/img/oms-logo.de87211a.png diff --git a/oh-my-scheduler-server/src/main/resources/static/index.html b/powerjob-server/src/main/resources/static/index.html similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/index.html rename to powerjob-server/src/main/resources/static/index.html diff --git a/oh-my-scheduler-server/src/main/resources/static/js/0.js b/powerjob-server/src/main/resources/static/js/0.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/0.js rename to powerjob-server/src/main/resources/static/js/0.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/1.js b/powerjob-server/src/main/resources/static/js/1.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/1.js rename to powerjob-server/src/main/resources/static/js/1.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/10.js b/powerjob-server/src/main/resources/static/js/10.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/10.js rename to powerjob-server/src/main/resources/static/js/10.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/11.js b/powerjob-server/src/main/resources/static/js/11.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/11.js rename to powerjob-server/src/main/resources/static/js/11.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/2.js b/powerjob-server/src/main/resources/static/js/2.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/2.js rename to powerjob-server/src/main/resources/static/js/2.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/3.js b/powerjob-server/src/main/resources/static/js/3.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/3.js rename to powerjob-server/src/main/resources/static/js/3.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/4.js b/powerjob-server/src/main/resources/static/js/4.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/4.js rename to powerjob-server/src/main/resources/static/js/4.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/5.js b/powerjob-server/src/main/resources/static/js/5.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/5.js rename to powerjob-server/src/main/resources/static/js/5.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/6.js b/powerjob-server/src/main/resources/static/js/6.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/6.js rename to powerjob-server/src/main/resources/static/js/6.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/7.js b/powerjob-server/src/main/resources/static/js/7.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/7.js rename to powerjob-server/src/main/resources/static/js/7.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/8.js b/powerjob-server/src/main/resources/static/js/8.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/8.js rename to powerjob-server/src/main/resources/static/js/8.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/9.js b/powerjob-server/src/main/resources/static/js/9.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/9.js rename to powerjob-server/src/main/resources/static/js/9.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/app.js b/powerjob-server/src/main/resources/static/js/app.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/app.js rename to powerjob-server/src/main/resources/static/js/app.js diff --git a/oh-my-scheduler-server/src/main/resources/static/js/chunk-vendors.js b/powerjob-server/src/main/resources/static/js/chunk-vendors.js similarity index 100% rename from oh-my-scheduler-server/src/main/resources/static/js/chunk-vendors.js rename to powerjob-server/src/main/resources/static/js/chunk-vendors.js diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/DAGTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java similarity index 90% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/DAGTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java index db780af9..0dd76a11 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/DAGTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/DAGTest.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.model.PEWorkflowDAG; -import com.github.kfcfans.oms.server.model.WorkflowDAG; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.server.common.utils.WorkflowDAGUtils; +import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; +import com.github.kfcfans.powerjob.server.model.WorkflowDAG; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.server.common.utils.WorkflowDAGUtils; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/GridFsTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java similarity index 91% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/GridFsTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java index 18918db0..c69c2eb7 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/GridFsTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/GridFsTest.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; -import com.github.kfcfans.oms.server.persistence.mongodb.GridFsManager; +import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/OmsLogTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java similarity index 85% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/OmsLogTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java index 36770def..50d6998c 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/OmsLogTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/OmsLogTest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; -import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; -import com.github.kfcfans.oms.server.persistence.mongodb.GridFsManager; -import com.github.kfcfans.oms.server.service.timing.CleanService; +import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils; +import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager; +import com.github.kfcfans.powerjob.server.service.timing.CleanService; import com.mongodb.client.gridfs.model.GridFSFile; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/RepositoryTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java similarity index 76% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/RepositoryTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java index c38baf84..d44986d8 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/RepositoryTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/RepositoryTest.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.server.common.constans.SwitchableStatus; -import com.github.kfcfans.oms.server.persistence.core.model.InstanceInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.JobInfoDO; -import com.github.kfcfans.oms.server.persistence.core.model.OmsLockDO; -import com.github.kfcfans.oms.server.persistence.core.repository.InstanceInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.JobInfoRepository; -import com.github.kfcfans.oms.server.persistence.core.repository.OmsLockRepository; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.server.common.constans.SwitchableStatus; +import com.github.kfcfans.powerjob.server.persistence.core.model.InstanceInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.JobInfoDO; +import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO; +import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.JobInfoRepository; +import com.github.kfcfans.powerjob.server.persistence.core.repository.OmsLockRepository; import org.assertj.core.util.Lists; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java similarity index 79% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java index 4248943e..e7539a85 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/ServiceTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/ServiceTest.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; -import com.github.kfcfans.oms.server.service.id.IdGenerateService; -import com.github.kfcfans.oms.server.service.lock.LockService; -import com.github.kfcfans.oms.server.service.timing.CleanService; +import com.github.kfcfans.powerjob.server.service.id.IdGenerateService; +import com.github.kfcfans.powerjob.server.service.lock.LockService; +import com.github.kfcfans.powerjob.server.service.timing.CleanService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/UtilsTest.java b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java similarity index 86% rename from oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/UtilsTest.java rename to powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java index a78e1253..0703432f 100644 --- a/oh-my-scheduler-server/src/test/java/com/github/kfcfans/oms/server/test/UtilsTest.java +++ b/powerjob-server/src/test/java/com/github/kfcfans/powerjob/server/test/UtilsTest.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.server.test; +package com.github.kfcfans.powerjob.server.test; -import com.github.kfcfans.oms.server.common.utils.CronExpression; -import com.github.kfcfans.oms.server.common.utils.timewheel.HashedWheelTimer; -import com.github.kfcfans.oms.server.common.utils.timewheel.TimerFuture; -import com.github.kfcfans.oms.server.common.utils.timewheel.TimerTask; +import com.github.kfcfans.powerjob.server.common.utils.CronExpression; +import com.github.kfcfans.powerjob.server.common.utils.timewheel.HashedWheelTimer; +import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerFuture; +import com.github.kfcfans.powerjob.server.common.utils.timewheel.TimerTask; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/oh-my-scheduler-server/src/test/resources/application.properties b/powerjob-server/src/test/resources/application.properties similarity index 100% rename from oh-my-scheduler-server/src/test/resources/application.properties rename to powerjob-server/src/test/resources/application.properties diff --git a/oh-my-scheduler-worker-agent/Dockerfile b/powerjob-worker-agent/Dockerfile similarity index 100% rename from oh-my-scheduler-worker-agent/Dockerfile rename to powerjob-worker-agent/Dockerfile diff --git a/oh-my-scheduler-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml similarity index 84% rename from oh-my-scheduler-worker-agent/pom.xml rename to powerjob-worker-agent/pom.xml index 0a44226e..b7a8806f 100644 --- a/oh-my-scheduler-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-worker-agent - 2.0.0 + powerjob-worker-agent + 3.0.0 jar - 2.0.0 + 3.0.0 1.2.3 4.3.2 @@ -26,8 +26,8 @@ com.github.kfcfans - oh-my-scheduler-worker - ${oms.worker.version} + powerjob-worker + ${powerjob.worker.version} @@ -58,7 +58,7 @@ spring-boot-maven-plugin ${spring.boot.version} - com.github.kfcfans.oms.worker.MainApplication + com.github.kfcfans.powerjob.worker.MainApplication diff --git a/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java b/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java similarity index 89% rename from oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java rename to powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java index 61a7f966..ec5d3054 100644 --- a/oh-my-scheduler-worker-agent/src/main/java/com/github/kfcfans/oms/worker/MainApplication.java +++ b/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.worker; +package com.github.kfcfans.powerjob.worker; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.worker.common.OhMyConfig; -import com.github.kfcfans.oms.worker.common.constants.StoreStrategy; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy; import com.google.common.base.Splitter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/oh-my-scheduler-worker-agent/src/main/resources/logback.xml b/powerjob-worker-agent/src/main/resources/logback.xml similarity index 100% rename from oh-my-scheduler-worker-agent/src/main/resources/logback.xml rename to powerjob-worker-agent/src/main/resources/logback.xml diff --git a/oh-my-scheduler-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml similarity index 86% rename from oh-my-scheduler-worker-samples/pom.xml rename to powerjob-worker-samples/pom.xml index 17db767d..053491ed 100644 --- a/oh-my-scheduler-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-worker-samples - 1.0.0 + powerjob-samples + 3.0.0 2.2.6.RELEASE - 2.0.0 + 3.0.0 1.2.68 @@ -43,8 +43,8 @@ com.github.kfcfans - oh-my-scheduler-worker - ${oms.worker.version} + powerjob-worker + ${powerjob.worker.version} @@ -64,7 +64,7 @@ spring-boot-maven-plugin ${springboot.version} - com.github.kfcfans.oms.samples.SampleApplication + com.github.kfcfans.powerjob.samples.SampleApplication diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/MysteryService.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/MysteryService.java similarity index 83% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/MysteryService.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/MysteryService.java index d43dda60..b33b3281 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/MysteryService.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/MysteryService.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.samples; +package com.github.kfcfans.powerjob.samples; import org.springframework.stereotype.Service; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/OhMySchedulerConfig.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java similarity index 83% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/OhMySchedulerConfig.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java index a0536659..10bc9c26 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/OhMySchedulerConfig.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/OhMySchedulerConfig.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.samples; +package com.github.kfcfans.powerjob.samples; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.OhMyConfig; -import com.github.kfcfans.oms.worker.common.constants.StoreStrategy; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy; import com.google.common.collect.Lists; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/SampleApplication.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/SampleApplication.java similarity index 90% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/SampleApplication.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/SampleApplication.java index e06bd63b..308dd633 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/SampleApplication.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/SampleApplication.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.samples; +package com.github.kfcfans.powerjob.samples; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/DAGSimulationProcessor.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/DAGSimulationProcessor.java similarity index 84% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/DAGSimulationProcessor.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/DAGSimulationProcessor.java index e6d4a51e..232f1791 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/DAGSimulationProcessor.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/DAGSimulationProcessor.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.samples.mr; +package com.github.kfcfans.powerjob.samples.mr; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; import com.google.common.collect.Lists; import java.util.List; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/StaticSliceProcessor.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/StaticSliceProcessor.java similarity index 82% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/StaticSliceProcessor.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/StaticSliceProcessor.java index 7a4ac7b9..a30944db 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/mr/StaticSliceProcessor.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/mr/StaticSliceProcessor.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.samples.mr; +package com.github.kfcfans.powerjob.samples.mr; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/BroadcastProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java similarity index 79% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/BroadcastProcessorDemo.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java index a115752b..9d7e898f 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/BroadcastProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.samples.processors; +package com.github.kfcfans.powerjob.samples.processors; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.BroadcastProcessor; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BroadcastProcessor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapProcessorDemo.java similarity index 83% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapProcessorDemo.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapProcessorDemo.java index d86f7300..b60aae22 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapProcessorDemo.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.samples.processors; +package com.github.kfcfans.powerjob.samples.processors; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.samples.MysteryService; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapProcessor; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.samples.MysteryService; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapProcessor; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapReduceProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java similarity index 87% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapReduceProcessorDemo.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java index 42397c4d..fc6e7a68 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/MapReduceProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.oms.samples.processors; +package com.github.kfcfans.powerjob.samples.processors; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/StandaloneProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java similarity index 81% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/StandaloneProcessorDemo.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java index 18e8db81..66f606c9 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/StandaloneProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.samples.processors; +package com.github.kfcfans.powerjob.samples.processors; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/TimeoutProcessor.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/TimeoutProcessor.java similarity index 59% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/TimeoutProcessor.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/TimeoutProcessor.java index 0ba2a3ed..feb44630 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/TimeoutProcessor.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/TimeoutProcessor.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.samples.processors; +package com.github.kfcfans.powerjob.samples.processors; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; import org.springframework.stereotype.Component; /** diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/tester/OmsLogPerformanceTester.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/tester/OmsLogPerformanceTester.java similarity index 82% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/tester/OmsLogPerformanceTester.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/tester/OmsLogPerformanceTester.java index 480f319e..20cb5106 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/tester/OmsLogPerformanceTester.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/tester/OmsLogPerformanceTester.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.samples.tester; +package com.github.kfcfans.powerjob.samples.tester; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import org.springframework.stereotype.Component; /** diff --git a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/workflow/WorkflowStandaloneProcessor.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/workflow/WorkflowStandaloneProcessor.java similarity index 74% rename from oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/workflow/WorkflowStandaloneProcessor.java rename to powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/workflow/WorkflowStandaloneProcessor.java index 1fb34d62..efd133cf 100644 --- a/oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/workflow/WorkflowStandaloneProcessor.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/workflow/WorkflowStandaloneProcessor.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.samples.workflow; +package com.github.kfcfans.powerjob.samples.workflow; import com.alibaba.fastjson.JSONObject; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/oh-my-scheduler-worker-samples/src/main/resources/application.properties b/powerjob-worker-samples/src/main/resources/application.properties similarity index 100% rename from oh-my-scheduler-worker-samples/src/main/resources/application.properties rename to powerjob-worker-samples/src/main/resources/application.properties diff --git a/oh-my-scheduler-worker-samples/src/main/resources/logback.xml b/powerjob-worker-samples/src/main/resources/logback.xml similarity index 93% rename from oh-my-scheduler-worker-samples/src/main/resources/logback.xml rename to powerjob-worker-samples/src/main/resources/logback.xml index 136026ef..4d63c229 100644 --- a/oh-my-scheduler-worker-samples/src/main/resources/logback.xml +++ b/powerjob-worker-samples/src/main/resources/logback.xml @@ -16,7 +16,7 @@ - + diff --git a/oh-my-scheduler-worker/pom.xml b/powerjob-worker/pom.xml similarity index 87% rename from oh-my-scheduler-worker/pom.xml rename to powerjob-worker/pom.xml index babcfbfe..58a21d0f 100644 --- a/oh-my-scheduler-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - oh-my-scheduler + powerjob com.github.kfcfans 1.0.0 4.0.0 - oh-my-scheduler-worker - 2.0.0 + powerjob-worker + 3.0.0 jar 5.2.4.RELEASE - 2.0.0 + 3.0.0 1.4.200 3.4.2 5.6.1 @@ -34,8 +34,8 @@ com.github.kfcfans - oh-my-scheduler-common - ${oms.common.version} + powerjob-common + ${powerjob.common.version} diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java similarity index 85% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java index f768ef6b..4175bfe7 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/OhMyWorker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/OhMyWorker.java @@ -1,24 +1,24 @@ -package com.github.kfcfans.oms.worker; +package com.github.kfcfans.powerjob.worker; import akka.actor.ActorSystem; import akka.actor.Props; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.HttpUtils; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.worker.actors.ProcessorTrackerActor; -import com.github.kfcfans.oms.worker.actors.TaskTrackerActor; -import com.github.kfcfans.oms.worker.actors.WorkerActor; -import com.github.kfcfans.oms.worker.background.OmsLogHandler; -import com.github.kfcfans.oms.worker.background.ServerDiscoveryService; -import com.github.kfcfans.oms.worker.background.WorkerHealthReporter; -import com.github.kfcfans.oms.worker.common.OhMyConfig; -import com.github.kfcfans.oms.worker.common.OmsBannerPrinter; -import com.github.kfcfans.oms.worker.common.utils.SpringUtils; -import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.HttpUtils; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.actors.ProcessorTrackerActor; +import com.github.kfcfans.powerjob.worker.actors.TaskTrackerActor; +import com.github.kfcfans.powerjob.worker.actors.WorkerActor; +import com.github.kfcfans.powerjob.worker.background.OmsLogHandler; +import com.github.kfcfans.powerjob.worker.background.ServerDiscoveryService; +import com.github.kfcfans.powerjob.worker.background.WorkerHealthReporter; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.worker.common.OmsBannerPrinter; +import com.github.kfcfans.powerjob.worker.common.utils.SpringUtils; +import com.github.kfcfans.powerjob.worker.persistence.TaskPersistenceService; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/ProcessorTrackerActor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java similarity index 81% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/ProcessorTrackerActor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java index 602013f5..8d4a1796 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/ProcessorTrackerActor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.worker.actors; +package com.github.kfcfans.powerjob.worker.actors; import akka.actor.AbstractActor; -import com.github.kfcfans.oms.worker.core.tracker.processor.ProcessorTracker; -import com.github.kfcfans.oms.worker.core.tracker.processor.ProcessorTrackerPool; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStartTaskReq; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStopInstanceReq; +import com.github.kfcfans.powerjob.worker.core.tracker.processor.ProcessorTracker; +import com.github.kfcfans.powerjob.worker.core.tracker.processor.ProcessorTrackerPool; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStartTaskReq; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStopInstanceReq; import lombok.extern.slf4j.Slf4j; /** diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/TaskTrackerActor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/TaskTrackerActor.java similarity index 86% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/TaskTrackerActor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/TaskTrackerActor.java index 0a3d2871..ec3d296d 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/TaskTrackerActor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/TaskTrackerActor.java @@ -1,18 +1,18 @@ -package com.github.kfcfans.oms.worker.actors; +package com.github.kfcfans.powerjob.worker.actors; import akka.actor.AbstractActor; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.request.ServerQueryInstanceStatusReq; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.common.request.ServerStopInstanceReq; -import com.github.kfcfans.oms.worker.core.tracker.task.TaskTracker; -import com.github.kfcfans.oms.worker.core.tracker.task.TaskTrackerPool; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.pojo.request.BroadcastTaskPreExecuteFinishedReq; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorMapTaskRequest; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorReportTaskStatusReq; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorTrackerStatusReportReq; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.request.ServerQueryInstanceStatusReq; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.common.request.ServerStopInstanceReq; +import com.github.kfcfans.powerjob.worker.core.tracker.task.TaskTracker; +import com.github.kfcfans.powerjob.worker.core.tracker.task.TaskTrackerPool; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.pojo.request.BroadcastTaskPreExecuteFinishedReq; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorMapTaskRequest; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorReportTaskStatusReq; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorTrackerStatusReportReq; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/WorkerActor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/WorkerActor.java similarity index 77% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/WorkerActor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/WorkerActor.java index e276e9b6..6188d419 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/actors/WorkerActor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/WorkerActor.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.worker.actors; +package com.github.kfcfans.powerjob.worker.actors; import akka.actor.AbstractActor; -import com.github.kfcfans.oms.common.request.ServerDeployContainerRequest; -import com.github.kfcfans.oms.worker.container.OmsContainerFactory; +import com.github.kfcfans.powerjob.common.request.ServerDeployContainerRequest; +import com.github.kfcfans.powerjob.worker.container.OmsContainerFactory; import lombok.extern.slf4j.Slf4j; /** diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/OmsLogHandler.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/OmsLogHandler.java similarity index 90% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/OmsLogHandler.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/OmsLogHandler.java index 9aed04e6..0ad1261e 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/OmsLogHandler.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/OmsLogHandler.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms.worker.background; +package com.github.kfcfans.powerjob.worker.background; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.model.InstanceLogContent; -import com.github.kfcfans.oms.common.request.WorkerLogReportReq; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.model.InstanceLogContent; +import com.github.kfcfans.powerjob.common.request.WorkerLogReportReq; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; import com.google.common.collect.Lists; import com.google.common.collect.Queues; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ReleaseCheckRunnable.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ReleaseCheckRunnable.java similarity index 81% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ReleaseCheckRunnable.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ReleaseCheckRunnable.java index 3a5caf92..0ee0e470 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ReleaseCheckRunnable.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ReleaseCheckRunnable.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.background; +package com.github.kfcfans.powerjob.worker.background; /** * 定期检查资源释放情况（长时间未释放的 TaskTracker 和 DB记录） diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ServerDiscoveryService.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ServerDiscoveryService.java similarity index 88% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ServerDiscoveryService.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ServerDiscoveryService.java index 4c7f2fe1..d17c7982 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/ServerDiscoveryService.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/ServerDiscoveryService.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.oms.worker.background; +package com.github.kfcfans.powerjob.worker.background; -import com.github.kfcfans.oms.common.response.ResultDTO; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.common.utils.HttpUtils; -import com.github.kfcfans.oms.worker.core.tracker.task.TaskTracker; -import com.github.kfcfans.oms.worker.core.tracker.task.TaskTrackerPool; +import com.github.kfcfans.powerjob.common.response.ResultDTO; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.common.utils.HttpUtils; +import com.github.kfcfans.powerjob.worker.core.tracker.task.TaskTracker; +import com.github.kfcfans.powerjob.worker.core.tracker.task.TaskTrackerPool; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java similarity index 73% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java index 60498a01..74c84dbe 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/background/WorkerHealthReporter.java @@ -1,13 +1,13 @@ -package com.github.kfcfans.oms.worker.background; +package com.github.kfcfans.powerjob.worker.background; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.model.SystemMetrics; -import com.github.kfcfans.oms.common.request.WorkerHeartbeat; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.common.utils.SystemInfoUtils; -import com.github.kfcfans.oms.worker.container.OmsContainerFactory; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.request.WorkerHeartbeat; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.common.utils.SystemInfoUtils; +import com.github.kfcfans.powerjob.worker.container.OmsContainerFactory; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java similarity index 79% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java index 3dcb6094..8c60f627 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OhMyConfig.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OhMyConfig.java @@ -1,7 +1,8 @@ -package com.github.kfcfans.oms.worker.common; +package com.github.kfcfans.powerjob.worker.common; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.worker.common.constants.StoreStrategy; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; import lombok.Data; import java.util.List; @@ -32,7 +33,7 @@ public class OhMyConfig { private StoreStrategy storeStrategy = StoreStrategy.DISK; /** * 最大返回值长度，超过会被截断 - * {@link com.github.kfcfans.oms.worker.core.processor.ProcessResult}#msg 的最大长度 + * {@link ProcessResult}#msg 的最大长度 */ private int maxResultLength = 8096; /** diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsBannerPrinter.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java similarity index 98% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsBannerPrinter.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java index 8caf3c28..9b815174 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsBannerPrinter.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsBannerPrinter.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common; +package com.github.kfcfans.powerjob.worker.common; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsWorkerVersion.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java similarity index 97% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsWorkerVersion.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java index 099239b4..ce324db4 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/OmsWorkerVersion.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common; +package com.github.kfcfans.powerjob.worker.common; import java.io.File; import java.io.IOException; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/ThreadLocalStore.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/ThreadLocalStore.java similarity index 89% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/ThreadLocalStore.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/ThreadLocalStore.java index f4dbd2fa..73038ea1 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/ThreadLocalStore.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/ThreadLocalStore.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.common; +package com.github.kfcfans.powerjob.worker.common; -import com.github.kfcfans.oms.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; import java.util.concurrent.atomic.AtomicLong; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/StoreStrategy.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/StoreStrategy.java similarity index 78% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/StoreStrategy.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/StoreStrategy.java index 84bfe49d..aaaa669f 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/StoreStrategy.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/StoreStrategy.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.constants; +package com.github.kfcfans.powerjob.worker.common.constants; import lombok.AllArgsConstructor; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskConstant.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskConstant.java similarity index 90% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskConstant.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskConstant.java index 2f35d55f..bf06ce92 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskConstant.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskConstant.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.constants; +package com.github.kfcfans.powerjob.worker.common.constants; /** * task 常熟 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskStatus.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskStatus.java similarity index 93% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskStatus.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskStatus.java index be8ac5a8..2dada51d 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/constants/TaskStatus.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/constants/TaskStatus.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.constants; +package com.github.kfcfans.powerjob.worker.common.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/AkkaUtils.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/AkkaUtils.java similarity index 82% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/AkkaUtils.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/AkkaUtils.java index 331254a4..a0c168fb 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/AkkaUtils.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/AkkaUtils.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.common.RemoteConstant; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.common.RemoteConstant; import org.springframework.util.StringUtils; /** diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/LRUCache.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/LRUCache.java similarity index 90% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/LRUCache.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/LRUCache.java index d7c65df7..059fe7b3 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/LRUCache.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/LRUCache.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/OmsWorkerFileUtils.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/OmsWorkerFileUtils.java similarity index 69% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/OmsWorkerFileUtils.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/OmsWorkerFileUtils.java index 692df214..2cf9884b 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/OmsWorkerFileUtils.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/OmsWorkerFileUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; /** * 文件工具类 @@ -8,8 +8,8 @@ package com.github.kfcfans.oms.worker.common.utils; */ public class OmsWorkerFileUtils { - private static final String USER_HOME = System.getProperty("user.home", "oms"); - private static final String WORKER_DIR = USER_HOME + "/oms/"; + private static final String USER_HOME = System.getProperty("user.home", "powerjob"); + private static final String WORKER_DIR = USER_HOME + "/powerjob/"; public static String getScriptDir() { return WORKER_DIR + "script/"; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SerializerUtils.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SerializerUtils.java similarity index 97% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SerializerUtils.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SerializerUtils.java index 3bb982fb..c03895a5 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SerializerUtils.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SerializerUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; import com.esotericsoftware.kryo.Kryo; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SpringUtils.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SpringUtils.java similarity index 95% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SpringUtils.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SpringUtils.java index ed427a7a..b8cafad3 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SpringUtils.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; import org.springframework.context.ApplicationContext; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SystemInfoUtils.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SystemInfoUtils.java similarity index 94% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SystemInfoUtils.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SystemInfoUtils.java index 2d2f6ebc..cb6d1a58 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/common/utils/SystemInfoUtils.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SystemInfoUtils.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.common.utils; +package com.github.kfcfans.powerjob.worker.common.utils; -import com.github.kfcfans.oms.common.model.SystemMetrics; +import com.github.kfcfans.powerjob.common.model.SystemMetrics; import java.io.File; import java.lang.management.ManagementFactory; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/LifeCycle.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/LifeCycle.java similarity index 85% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/LifeCycle.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/LifeCycle.java index 1301a1fd..ceafc0a0 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/LifeCycle.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/LifeCycle.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.container; +package com.github.kfcfans.powerjob.worker.container; /** * 生命周期 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OhMyClassLoader.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OhMyClassLoader.java similarity index 97% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OhMyClassLoader.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OhMyClassLoader.java index d065793e..a691db80 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OhMyClassLoader.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OhMyClassLoader.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.container; +package com.github.kfcfans.powerjob.worker.container; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainer.java similarity index 82% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainer.java index 431e777a..76aab6d2 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainer.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.container; +package com.github.kfcfans.powerjob.worker.container; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; /** * OhMyScheduler 容器规范 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainerFactory.java similarity index 88% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainerFactory.java index 57bb9515..17cd16f5 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsContainerFactory.java @@ -1,15 +1,15 @@ -package com.github.kfcfans.oms.worker.container; +package com.github.kfcfans.powerjob.worker.container; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.model.DeployedContainerInfo; -import com.github.kfcfans.oms.common.request.ServerDeployContainerRequest; -import com.github.kfcfans.oms.common.request.http.WorkerNeedDeployContainerRequest; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.common.utils.OmsWorkerFileUtils; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.model.DeployedContainerInfo; +import com.github.kfcfans.powerjob.common.request.ServerDeployContainerRequest; +import com.github.kfcfans.powerjob.common.request.http.WorkerNeedDeployContainerRequest; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.common.utils.OmsWorkerFileUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsJarContainer.java similarity index 96% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsJarContainer.java index 7e6eec54..9d2f4ce1 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/container/OmsJarContainer.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.worker.container; +package com.github.kfcfans.powerjob.worker.container; -import com.github.kfcfans.oms.common.ContainerConstant; -import com.github.kfcfans.oms.common.OmsException; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.common.ContainerConstant; +import com.github.kfcfans.powerjob.common.OmsException; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ProcessorBeanFactory.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ProcessorBeanFactory.java similarity index 92% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ProcessorBeanFactory.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ProcessorBeanFactory.java index 2b480b62..ca92c950 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ProcessorBeanFactory.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ProcessorBeanFactory.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.core; +package com.github.kfcfans.powerjob.worker.core; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/executor/ProcessorRunnable.java similarity index 85% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/executor/ProcessorRunnable.java index 8fd18757..45eee519 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/executor/ProcessorRunnable.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/executor/ProcessorRunnable.java @@ -1,24 +1,24 @@ -package com.github.kfcfans.oms.worker.core.executor; +package com.github.kfcfans.powerjob.worker.core.executor; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.ThreadLocalStore; -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.SerializerUtils; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.log.OmsLogger; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; -import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; -import com.github.kfcfans.oms.worker.pojo.request.BroadcastTaskPreExecuteFinishedReq; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorReportTaskStatusReq; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; -import com.github.kfcfans.oms.worker.core.processor.sdk.BroadcastProcessor; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.ThreadLocalStore; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.common.utils.SerializerUtils; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.persistence.TaskPersistenceService; +import com.github.kfcfans.powerjob.worker.pojo.model.InstanceInfo; +import com.github.kfcfans.powerjob.worker.pojo.request.BroadcastTaskPreExecuteFinishedReq; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorReportTaskStatusReq; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BroadcastProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; import com.google.common.base.Stopwatch; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatus.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatus.java similarity index 94% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatus.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatus.java index a8d606be..1fae1bb3 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatus.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatus.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.core.ha; +package com.github.kfcfans.powerjob.worker.core.ha; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorTrackerStatusReportReq; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorTrackerStatusReportReq; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatusHolder.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatusHolder.java similarity index 93% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatusHolder.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatusHolder.java index f97a8320..461aca34 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/ha/ProcessorTrackerStatusHolder.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/ha/ProcessorTrackerStatusHolder.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.core.ha; +package com.github.kfcfans.powerjob.worker.core.ha; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorTrackerStatusReportReq; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorTrackerStatusReportReq; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/ProcessResult.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/ProcessResult.java similarity index 84% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/ProcessResult.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/ProcessResult.java index 0a6ca365..0edfee20 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/ProcessResult.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/ProcessResult.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.core.processor; +package com.github.kfcfans.powerjob.worker.core.processor; import lombok.*; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskContext.java similarity index 92% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskContext.java index 7acfc5e6..52e01b1c 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskContext.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskContext.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.core.processor; +package com.github.kfcfans.powerjob.worker.core.processor; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import com.google.common.collect.Maps; import lombok.Getter; import lombok.Setter; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskResult.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskResult.java similarity index 77% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskResult.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskResult.java index 17e35b08..813fad85 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/TaskResult.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/TaskResult.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.core.processor; +package com.github.kfcfans.powerjob.worker.core.processor; import lombok.Data; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/PythonProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/PythonProcessor.java similarity index 88% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/PythonProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/PythonProcessor.java index eb6df6a7..317319c2 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/PythonProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/PythonProcessor.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.core.processor.built; +package com.github.kfcfans.powerjob.worker.core.processor.built; /** * Python 处理器 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ScriptProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java similarity index 92% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ScriptProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java index a6bbc23c..32e8120c 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ScriptProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.worker.core.processor.built; +package com.github.kfcfans.powerjob.worker.core.processor.built; -import com.github.kfcfans.oms.worker.common.utils.OmsWorkerFileUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.common.utils.OmsWorkerFileUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ShellProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ShellProcessor.java similarity index 89% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ShellProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ShellProcessor.java index 85010b5c..02478e0c 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/built/ShellProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ShellProcessor.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.core.processor.built; +package com.github.kfcfans.powerjob.worker.core.processor.built; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BasicProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BasicProcessor.java similarity index 73% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BasicProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BasicProcessor.java index 9c4a3ef0..af2eae24 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BasicProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BasicProcessor.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.core.processor.sdk; +package com.github.kfcfans.powerjob.worker.core.processor.sdk; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; /** * 基础的处理器，适用于单机执行 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BroadcastProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BroadcastProcessor.java similarity index 79% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BroadcastProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BroadcastProcessor.java index 65e0a61b..b2bcb55c 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/BroadcastProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/BroadcastProcessor.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.worker.core.processor.sdk; +package com.github.kfcfans.powerjob.worker.core.processor.sdk; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; import java.util.List; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapProcessor.java similarity index 80% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapProcessor.java index 4e7cafca..a7a84f69 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapProcessor.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms.worker.core.processor.sdk; +package com.github.kfcfans.powerjob.worker.core.processor.sdk; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.ThreadLocalStore; -import com.github.kfcfans.oms.worker.common.constants.TaskConstant; -import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorMapTaskRequest; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.ThreadLocalStore; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorMapTaskRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapReduceProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapReduceProcessor.java similarity index 70% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapReduceProcessor.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapReduceProcessor.java index 9a1a2f42..1c73767a 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/processor/sdk/MapReduceProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/sdk/MapReduceProcessor.java @@ -1,8 +1,8 @@ -package com.github.kfcfans.oms.worker.core.processor.sdk; +package com.github.kfcfans.powerjob.worker.core.processor.sdk; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java similarity index 89% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTracker.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java index e76ac42a..0acfd455 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java @@ -1,26 +1,26 @@ -package com.github.kfcfans.oms.worker.core.tracker.processor; +package com.github.kfcfans.powerjob.worker.core.tracker.processor; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.*; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.worker.OhMyWorker; -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.SpringUtils; -import com.github.kfcfans.oms.worker.container.OmsContainer; -import com.github.kfcfans.oms.worker.container.OmsContainerFactory; -import com.github.kfcfans.oms.worker.core.ProcessorBeanFactory; -import com.github.kfcfans.oms.worker.core.executor.ProcessorRunnable; -import com.github.kfcfans.oms.worker.core.processor.built.PythonProcessor; -import com.github.kfcfans.oms.worker.core.processor.built.ShellProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; -import com.github.kfcfans.oms.worker.log.impl.OmsServerLogger; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorReportTaskStatusReq; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorTrackerStatusReportReq; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStartTaskReq; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.common.*; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.common.utils.SpringUtils; +import com.github.kfcfans.powerjob.worker.container.OmsContainer; +import com.github.kfcfans.powerjob.worker.container.OmsContainerFactory; +import com.github.kfcfans.powerjob.worker.core.ProcessorBeanFactory; +import com.github.kfcfans.powerjob.worker.core.executor.ProcessorRunnable; +import com.github.kfcfans.powerjob.worker.core.processor.built.PythonProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.built.ShellProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.log.impl.OmsServerLogger; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.pojo.model.InstanceInfo; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorReportTaskStatusReq; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorTrackerStatusReportReq; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStartTaskReq; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTrackerPool.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTrackerPool.java similarity index 93% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTrackerPool.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTrackerPool.java index e8b047c2..9c2bdc0d 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/processor/ProcessorTrackerPool.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTrackerPool.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.core.tracker.processor; +package com.github.kfcfans.powerjob.worker.core.tracker.processor; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/CommonTaskTracker.java similarity index 93% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/CommonTaskTracker.java index c352f44f..530b421d 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/CommonTaskTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/CommonTaskTracker.java @@ -1,20 +1,20 @@ -package com.github.kfcfans.oms.worker.core.tracker.task; +package com.github.kfcfans.powerjob.worker.core.tracker.task; import akka.actor.ActorSelection; import akka.pattern.Patterns; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.InstanceStatus; -import com.github.kfcfans.oms.common.SystemInstanceResult; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; -import com.github.kfcfans.oms.common.response.AskResponse; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.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.persistence.TaskDO; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.InstanceStatus; +import com.github.kfcfans.powerjob.common.SystemInstanceResult; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; +import com.github.kfcfans.powerjob.common.response.AskResponse; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.ToString; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java similarity index 95% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java index 0227544f..88e97861 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/FrequentTaskTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/FrequentTaskTracker.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms.worker.core.tracker.task; +package com.github.kfcfans.powerjob.worker.core.tracker.task; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.*; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.common.request.TaskTrackerReportInstanceStatusReq; -import com.github.kfcfans.oms.worker.OhMyWorker; -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.LRUCache; -import com.github.kfcfans.oms.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.common.*; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.common.request.TaskTrackerReportInstanceStatusReq; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.common.utils.LRUCache; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java similarity index 94% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java index bd928557..f57e5811 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTracker.java @@ -1,24 +1,24 @@ -package com.github.kfcfans.oms.worker.core.tracker.task; +package com.github.kfcfans.powerjob.worker.core.tracker.task; import akka.actor.ActorSelection; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.model.InstanceDetail; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.SegmentLock; -import com.github.kfcfans.oms.worker.OhMyWorker; -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.core.ha.ProcessorTrackerStatusHolder; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; -import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; -import com.github.kfcfans.oms.worker.pojo.request.ProcessorTrackerStatusReportReq; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStartTaskReq; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStopInstanceReq; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.model.InstanceDetail; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.SegmentLock; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.worker.core.ha.ProcessorTrackerStatusHolder; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.persistence.TaskPersistenceService; +import com.github.kfcfans.powerjob.worker.pojo.model.InstanceInfo; +import com.github.kfcfans.powerjob.worker.pojo.request.ProcessorTrackerStatusReportReq; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStartTaskReq; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStopInstanceReq; import com.google.common.base.Stopwatch; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTrackerPool.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTrackerPool.java similarity index 93% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTrackerPool.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTrackerPool.java index fbb4433d..01c865cf 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/core/tracker/task/TaskTrackerPool.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/task/TaskTrackerPool.java @@ -1,9 +1,8 @@ -package com.github.kfcfans.oms.worker.core.tracker.task; +package com.github.kfcfans.powerjob.worker.core.tracker.task; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/OmsLogger.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/OmsLogger.java similarity index 95% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/OmsLogger.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/OmsLogger.java index 4a827a1e..0ecc4e90 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/OmsLogger.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/OmsLogger.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.log; +package com.github.kfcfans.powerjob.worker.log; /** * OhMyScheduler 在线日志，直接上报到 Server，可在控制台直接查看 diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/impl/OmsServerLogger.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/impl/OmsServerLogger.java similarity index 92% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/impl/OmsServerLogger.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/impl/OmsServerLogger.java index a19d59bb..50021cc2 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/log/impl/OmsServerLogger.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/log/impl/OmsServerLogger.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.log.impl; +package com.github.kfcfans.powerjob.worker.log.impl; -import com.github.kfcfans.oms.worker.background.OmsLogHandler; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.background.OmsLogHandler; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import lombok.AllArgsConstructor; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.helpers.FormattingTuple; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/ConnectionFactory.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java similarity index 88% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/ConnectionFactory.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java index ec89fa4e..c1bd1b09 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/ConnectionFactory.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.constants.StoreStrategy; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.constants.StoreStrategy; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/SimpleTaskQuery.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/SimpleTaskQuery.java similarity index 97% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/SimpleTaskQuery.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/SimpleTaskQuery.java index 44ae1b82..cc5c541c 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/SimpleTaskQuery.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/SimpleTaskQuery.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; import lombok.Data; import org.springframework.util.StringUtils; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAO.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAO.java similarity index 91% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAO.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAO.java index baa295ec..6d2a59aa 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAO.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAO.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; import java.sql.SQLException; import java.util.Collection; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAOImpl.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAOImpl.java similarity index 97% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAOImpl.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAOImpl.java index 0c7921cb..a6fecde0 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDAOImpl.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDAOImpl.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; -import com.github.kfcfans.oms.worker.common.constants.TaskStatus; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDO.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDO.java similarity index 98% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDO.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDO.java index 1eacc38f..840b7088 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskDO.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskDO.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; import lombok.Getter; import lombok.Setter; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskPersistenceService.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskPersistenceService.java similarity index 96% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskPersistenceService.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskPersistenceService.java index 2d7d3eb6..7788adeb 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/persistence/TaskPersistenceService.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/TaskPersistenceService.java @@ -1,12 +1,12 @@ -package com.github.kfcfans.oms.worker.persistence; +package com.github.kfcfans.powerjob.worker.persistence; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.utils.CommonUtils; -import com.github.kfcfans.oms.common.utils.SupplierPlus; -import com.github.kfcfans.oms.worker.common.constants.TaskConstant; -import com.github.kfcfans.oms.worker.common.constants.TaskStatus; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.utils.CommonUtils; +import com.github.kfcfans.powerjob.common.utils.SupplierPlus; +import com.github.kfcfans.powerjob.worker.common.constants.TaskConstant; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/model/InstanceInfo.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/model/InstanceInfo.java similarity index 95% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/model/InstanceInfo.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/model/InstanceInfo.java index d730bf0a..144ba2de 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/model/InstanceInfo.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/model/InstanceInfo.java @@ -1,4 +1,4 @@ -package com.github.kfcfans.oms.worker.pojo.model; +package com.github.kfcfans.powerjob.worker.pojo.model; import lombok.Data; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java similarity index 76% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java index 0d0416ee..c0f671b8 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/BroadcastTaskPreExecuteFinishedReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorMapTaskRequest.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java similarity index 80% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorMapTaskRequest.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java index 12aaa5a1..fff6384f 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorMapTaskRequest.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorMapTaskRequest.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.worker.common.ThreadLocalStore; -import com.github.kfcfans.oms.worker.common.utils.SerializerUtils; -import com.github.kfcfans.oms.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.worker.common.ThreadLocalStore; +import com.github.kfcfans.powerjob.worker.common.utils.SerializerUtils; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorReportTaskStatusReq.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorReportTaskStatusReq.java similarity index 80% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorReportTaskStatusReq.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorReportTaskStatusReq.java index a2668549..c936f644 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorReportTaskStatusReq.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorReportTaskStatusReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorTrackerStatusReportReq.java similarity index 82% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorTrackerStatusReportReq.java index 46ac455f..8a924958 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/ProcessorTrackerStatusReportReq.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/ProcessorTrackerStatusReportReq.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.worker.OhMyWorker; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.worker.OhMyWorker; 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/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStartTaskReq.java similarity index 79% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStartTaskReq.java index f5dec349..6663d363 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStartTaskReq.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStartTaskReq.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; +import com.github.kfcfans.powerjob.common.OmsSerializable; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.pojo.model.InstanceInfo; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStopInstanceReq.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStopInstanceReq.java similarity index 75% rename from oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStopInstanceReq.java rename to powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStopInstanceReq.java index 56f53559..1744f303 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/pojo/request/TaskTrackerStopInstanceReq.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/pojo/request/TaskTrackerStopInstanceReq.java @@ -1,6 +1,6 @@ -package com.github.kfcfans.oms.worker.pojo.request; +package com.github.kfcfans.powerjob.worker.pojo.request; -import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.powerjob.common.OmsSerializable; import lombok.Data; diff --git a/oh-my-scheduler-worker/src/main/resources/oms-logback.xml b/powerjob-worker/src/main/resources/oms-logback.xml similarity index 92% rename from oh-my-scheduler-worker/src/main/resources/oms-logback.xml rename to powerjob-worker/src/main/resources/oms-logback.xml index 3cce4c64..6f7b322c 100644 --- a/oh-my-scheduler-worker/src/main/resources/oms-logback.xml +++ b/powerjob-worker/src/main/resources/oms-logback.xml @@ -15,7 +15,7 @@ - + diff --git a/oh-my-scheduler-worker/src/main/resources/oms-worker.akka.conf b/powerjob-worker/src/main/resources/oms-worker.akka.conf similarity index 83% rename from oh-my-scheduler-worker/src/main/resources/oms-worker.akka.conf rename to powerjob-worker/src/main/resources/oms-worker.akka.conf index 9a017936..740e802f 100644 --- a/oh-my-scheduler-worker/src/main/resources/oms-worker.akka.conf +++ b/powerjob-worker/src/main/resources/oms-worker.akka.conf @@ -5,7 +5,7 @@ akka { allow-java-serialization = off serialization-bindings { - "com.github.kfcfans.oms.common.OmsSerializable" = jackson-cbor + "com.github.kfcfans.powerjob.common.OmsSerializable" = jackson-cbor } } remote { diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/CommonTaskTrackerTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/CommonTaskTrackerTest.java similarity index 81% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/CommonTaskTrackerTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/CommonTaskTrackerTest.java index d1040d61..eacdec3f 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/CommonTaskTrackerTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/CommonTaskTrackerTest.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.TimeExpressionType; -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.common.utils.NetUtils; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.google.common.collect.Lists; import com.typesafe.config.ConfigFactory; import org.junit.jupiter.api.BeforeAll; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/FrequentTaskTrackerTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java similarity index 77% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/FrequentTaskTrackerTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java index 63342afd..048218e8 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/FrequentTaskTrackerTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/FrequentTaskTrackerTest.java @@ -1,14 +1,14 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.utils.NetUtils; -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.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; import com.google.common.collect.Lists; import com.typesafe.config.ConfigFactory; import org.junit.jupiter.api.BeforeAll; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/PersistenceServiceTest.java similarity index 88% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/PersistenceServiceTest.java index 33b173de..a35aeddf 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/PersistenceServiceTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/PersistenceServiceTest.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; -import com.github.kfcfans.oms.worker.common.constants.TaskStatus; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.worker.persistence.TaskDO; -import com.github.kfcfans.oms.worker.persistence.TaskPersistenceService; +import com.github.kfcfans.powerjob.worker.common.constants.TaskStatus; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.persistence.TaskDO; +import com.github.kfcfans.powerjob.worker.persistence.TaskPersistenceService; import com.google.common.collect.Lists; import org.junit.jupiter.api.*; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ProcessorTrackerTest.java similarity index 80% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ProcessorTrackerTest.java index d1b287b1..5d57643d 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ProcessorTrackerTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ProcessorTrackerTest.java @@ -1,16 +1,16 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.ProcessorType; -import com.github.kfcfans.oms.worker.OhMyWorker; -import com.github.kfcfans.oms.worker.common.OhMyConfig; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.worker.pojo.model.InstanceInfo; -import com.github.kfcfans.oms.worker.pojo.request.TaskTrackerStartTaskReq; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.ProcessorType; +import com.github.kfcfans.powerjob.worker.OhMyWorker; +import com.github.kfcfans.powerjob.worker.common.OhMyConfig; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.worker.common.utils.AkkaUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.pojo.model.InstanceInfo; +import com.github.kfcfans.powerjob.worker.pojo.request.TaskTrackerStartTaskReq; import com.typesafe.config.ConfigFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ScriptProcessorTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ScriptProcessorTest.java similarity index 76% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ScriptProcessorTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ScriptProcessorTest.java index 7e13621c..e4fbdba8 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/ScriptProcessorTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/ScriptProcessorTest.java @@ -1,12 +1,9 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; -import com.github.kfcfans.oms.worker.core.processor.built.PythonProcessor; -import com.github.kfcfans.oms.worker.core.processor.built.ShellProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.built.PythonProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.built.ShellProcessor; import org.junit.jupiter.api.Test; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - /** * 测试脚本处理器 * diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TestUtils.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java similarity index 81% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TestUtils.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java index 9d5885c4..427edd4f 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/TestUtils.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/TestUtils.java @@ -1,11 +1,11 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; -import com.github.kfcfans.oms.common.ExecuteType; -import com.github.kfcfans.oms.common.ProcessorType; -import com.github.kfcfans.oms.common.RemoteConstant; -import com.github.kfcfans.oms.common.TimeExpressionType; -import com.github.kfcfans.oms.common.request.ServerScheduleJobReq; -import com.github.kfcfans.oms.common.utils.NetUtils; +import com.github.kfcfans.powerjob.common.ExecuteType; +import com.github.kfcfans.powerjob.common.ProcessorType; +import com.github.kfcfans.powerjob.common.RemoteConstant; +import com.github.kfcfans.powerjob.common.TimeExpressionType; +import com.github.kfcfans.powerjob.common.request.ServerScheduleJobReq; +import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.google.common.collect.Lists; /** diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/UtilsTest.java similarity index 75% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/UtilsTest.java index b4927834..8a72fd04 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/UtilsTest.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/UtilsTest.java @@ -1,7 +1,7 @@ -package com.github.kfcfans.oms; +package com.github.kfcfans.powerjob; -import com.github.kfcfans.oms.common.utils.NetUtils; -import com.github.kfcfans.oms.worker.common.utils.SystemInfoUtils; +import com.github.kfcfans.powerjob.common.utils.NetUtils; +import com.github.kfcfans.powerjob.worker.common.utils.SystemInfoUtils; import org.junit.jupiter.api.Test; /** diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBasicProcessor.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBasicProcessor.java similarity index 61% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBasicProcessor.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBasicProcessor.java index ef6551c1..ef6f5bfa 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBasicProcessor.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBasicProcessor.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.processors; +package com.github.kfcfans.powerjob.processors; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; /** * 测试用的基础处理器 diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBroadcastProcessor.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBroadcastProcessor.java similarity index 76% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBroadcastProcessor.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBroadcastProcessor.java index 81af5927..583c7431 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestBroadcastProcessor.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestBroadcastProcessor.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.processors; +package com.github.kfcfans.powerjob.processors; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.BroadcastProcessor; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BroadcastProcessor; import java.util.List; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestMapReduceProcessor.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestMapReduceProcessor.java similarity index 84% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestMapReduceProcessor.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestMapReduceProcessor.java index a05d0b6c..0eafe961 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/TestMapReduceProcessor.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/TestMapReduceProcessor.java @@ -1,10 +1,10 @@ -package com.github.kfcfans.oms.processors; +package com.github.kfcfans.powerjob.processors; -import com.github.kfcfans.oms.common.utils.JsonUtils; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.common.utils.JsonUtils; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BasicProcessorDemo.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BasicProcessorDemo.java similarity index 75% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BasicProcessorDemo.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BasicProcessorDemo.java index ba334844..de1e08ac 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BasicProcessorDemo.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BasicProcessorDemo.java @@ -1,9 +1,9 @@ -package com.github.kfcfans.oms.processors.demo; +package com.github.kfcfans.powerjob.processors.demo; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor; -import com.github.kfcfans.oms.worker.log.OmsLogger; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BasicProcessor; +import com.github.kfcfans.powerjob.worker.log.OmsLogger; import org.springframework.stereotype.Component; /** diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BroadcastProcessorDemo.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BroadcastProcessorDemo.java similarity index 74% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BroadcastProcessorDemo.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BroadcastProcessorDemo.java index 7f31e179..2bde9e51 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/BroadcastProcessorDemo.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/BroadcastProcessorDemo.java @@ -1,12 +1,11 @@ -package com.github.kfcfans.oms.processors.demo; +package com.github.kfcfans.powerjob.processors.demo; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.BroadcastProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.BroadcastProcessor; import java.util.List; -import java.util.Map; /** * 示例-广播执行处理器 diff --git a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/MapReduceProcessorDemo.java b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/MapReduceProcessorDemo.java similarity index 84% rename from oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/MapReduceProcessorDemo.java rename to powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/MapReduceProcessorDemo.java index b9ec853e..89660dd4 100644 --- a/oh-my-scheduler-worker/src/test/java/com/github/kfcfans/oms/processors/demo/MapReduceProcessorDemo.java +++ b/powerjob-worker/src/test/java/com/github/kfcfans/powerjob/processors/demo/MapReduceProcessorDemo.java @@ -1,14 +1,12 @@ -package com.github.kfcfans.oms.processors.demo; +package com.github.kfcfans.powerjob.processors.demo; -import com.github.kfcfans.oms.worker.core.processor.ProcessResult; -import com.github.kfcfans.oms.worker.core.processor.TaskContext; -import com.github.kfcfans.oms.worker.core.processor.TaskResult; -import com.github.kfcfans.oms.worker.core.processor.sdk.MapReduceProcessor; +import com.github.kfcfans.powerjob.worker.core.processor.ProcessResult; +import com.github.kfcfans.powerjob.worker.core.processor.TaskContext; +import com.github.kfcfans.powerjob.worker.core.processor.TaskResult; +import com.github.kfcfans.powerjob.worker.core.processor.sdk.MapReduceProcessor; import com.google.common.collect.Lists; -import org.apache.commons.lang3.StringUtils; import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicLong; /** diff --git a/oh-my-scheduler-worker/src/test/resources/logback-test.xml b/powerjob-worker/src/test/resources/logback-test.xml similarity index 93% rename from oh-my-scheduler-worker/src/test/resources/logback-test.xml rename to powerjob-worker/src/test/resources/logback-test.xml index 4159de7a..4e9e8bfa 100644 --- a/oh-my-scheduler-worker/src/test/resources/logback-test.xml +++ b/powerjob-worker/src/test/resources/logback-test.xml @@ -16,7 +16,7 @@ - + diff --git a/oh-my-scheduler-worker/src/test/resources/oms-akka-test.conf b/powerjob-worker/src/test/resources/oms-akka-test.conf similarity index 79% rename from oh-my-scheduler-worker/src/test/resources/oms-akka-test.conf rename to powerjob-worker/src/test/resources/oms-akka-test.conf index d1783140..7615d41a 100644 --- a/oh-my-scheduler-worker/src/test/resources/oms-akka-test.conf +++ b/powerjob-worker/src/test/resources/oms-akka-test.conf @@ -5,7 +5,7 @@ akka { allow-java-serialization = off serialization-bindings { - "com.github.kfcfans.oms.common.OmsSerializable" = jackson-cbor + "OmsSerializable" = jackson-cbor } } remote { From 7ca8cbe3aab23e4d3d6c5387c597d8660d9967cb Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 13 Jun 2020 14:38:11 +0800 Subject: [PATCH 15/17] [modify] fix the problem occured in renaming project to powerjob --- others/script/build_docker.sh | 60 +++++++++---------- powerjob-server/docker/Dockerfile | 18 +++--- .../src/main/resources/logback-product.xml | 14 ++--- powerjob-worker-agent/Dockerfile | 6 +- .../src/main/resources/logback.xml | 2 +- .../worker/persistence/ConnectionFactory.java | 4 +- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/others/script/build_docker.sh b/others/script/build_docker.sh index 2e60564e..31e3f0a2 100755 --- a/others/script/build_docker.sh +++ b/others/script/build_docker.sh @@ -1,8 +1,8 @@ #!/bin/bash # -p：允许后面跟一个字符串作为提示 -r：保证读入的是原始内容，不会发生任何转义 read -r -p "请输入Dockedr镜像版本:" version -echo "即将构建的 server 镜像：oms-server:$version" -echo "即将构建的 agent 镜像：oms-agent:$version" +echo "即将构建的 server 镜像：powerjob-server:$version" +echo "即将构建的 agent 镜像：powerjob-agent:$version" read -r -p "任意键继续:" # 一键部署脚本，请勿挪动脚本 @@ -12,40 +12,40 @@ read -r -p "是否进行maven构建（y/n）:" needmvn if [ "$needmvn" = "y" ] || [ "$needmvn" = "Y" ]; then echo "================== 构建 jar ==================" # -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件 - mvn clean package -Pdev -DskipTests -U -e -pl oh-my-scheduler-server,oh-my-scheduler-worker-agent -am + mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am echo "================== 拷贝 jar ==================" - /bin/cp -rf oh-my-scheduler-server/target/*.jar oh-my-scheduler-server/docker/oms-server.jar - /bin/cp -rf oh-my-scheduler-worker-agent/target/*.jar oh-my-scheduler-worker-agent/oms-agent.jar - ls -l oh-my-scheduler-server/docker/oms-server.jar - ls -l oh-my-scheduler-worker-agent/oms-agent.jar + /bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar + /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar + ls -l powerjob-server/docker/powerjob-server.jar + ls -l powerjob-worker-agent/powerjob-agent.jar fi echo "================== 关闭老应用 ==================" -docker stop oms-server -docker stop oms-agent -docker stop oms-agent2 +docker stop powerjob-server +docker stop powerjob-agent +docker stop powerjob-agent2 echo "================== 删除老容器 ==================" -docker container rm oms-server -docker container rm oms-agent -docker container rm oms-agent2 +docker container rm powerjob-server +docker container rm powerjob-agent +docker container rm powerjob-agent2 read -r -p "是否重新构建镜像（y/n）:" rebuild if [ "$rebuild" = "y" ] || [ "$rebuild" = "Y" ]; then echo "================== 删除旧镜像 ==================" - docker rmi -f tjqq/oms-server:$version - docker rmi -f tjqq/oms-agent:$version - echo "================== 构建 oms-server 镜像 ==================" - docker build -t tjqq/oms-server:$version oh-my-scheduler-server/docker/. || exit - echo "================== 构建 oms-agent 镜像 ==================" - docker build -t tjqq/oms-agent:$version oh-my-scheduler-worker-agent/. || exit + docker rmi -f tjqq/powerjob-server:$version + docker rmi -f tjqq/powerjob-agent:$version + echo "================== 构建 powerjob-server 镜像 ==================" + docker build -t tjqq/powerjob-server:$version powerjob-server/docker/. || exit + echo "================== 构建 powerjob-agent 镜像 ==================" + docker build -t tjqq/powerjob-agent:$version powerjob-worker-agent/. || exit read -r -p "是否正式发布该镜像（y/n）:" needrelease if [ "$needrelease" = "y" ] || [ "$needrelease" = "Y" ]; then read -r -p "三思！请确保当前处于已发布的Master分支！（y/n）:" needrelease if [ "$needrelease" = "y" ] || [ "$needrelease" = "Y" ]; then echo "================== 正在推送 server 镜像到中央仓库 ==================" - docker push tjqq/oms-server:$version + docker push tjqq/powerjob-server:$version echo "================== 正在推送 agent 镜像到中央仓库 ==================" - docker push tjqq/oms-agent:$version + docker push tjqq/powerjob-agent:$version fi fi fi @@ -59,23 +59,23 @@ if [ "$startup" = "y" ] || [ "$startup" = "Y" ]; then ## --name：指定容器名称 ## -v（--volume）：挂载目录，宿主机目录：docker内目录，写入docker内路径的数据会被直接写到宿主机上，常用于日志文件 ## --net=host：容器和宿主机共享网络（容器直接使用宿主机IP，性能最好，但网络隔离较差） - echo "================== 准备启动 oms-server ==================" + echo "================== 准备启动 powerjob-server ==================" docker run -d \ - --name oms-server \ + --name powerjob-server \ -p 7700:7700 -p 10086:10086 \ -e PARAMS="--spring.profiles.active=pre" \ - -v ~/docker/oms-server:/root/oms-server -v ~/.m2:/root/.m2 \ - tjqq/oms-server:$version + -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ + tjqq/powerjob-server:$version sleep 1 # tail -f -n 1000 ~/docker/oms-server/logs/oms-server-application.log sleep 30 - echo "================== 准备启动 oms-client ==================" - serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' oms-server) + echo "================== 准备启动 powerjob-client ==================" + serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server) serverAddress="$serverIP:7700" echo "使用的Server地址：$serverAddress" - docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27777:27777 --name oms-agent -v ~/docker/oms-agent:/root tjqq/oms-agent:$version - docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27778:27777 --name oms-agent2 -v ~/docker/oms-agent2:/root tjqq/oms-agent:$version + docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27777:27777 --name powerjob-agent -v ~/docker/powerjob-agent:/root tjqq/powerjob-agent:$version + docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27778:27777 --name powerjob-agent2 -v ~/docker/powerjob-agent2:/root tjqq/powerjob-agent:$version - tail -f -n 100 ~/docker/oms-agent/oms/logs/oms-agent-application.log + tail -f -n 100 ~/docker/powerjob-agent/powerjob/logs/oms-agent-application.log fi \ No newline at end of file diff --git a/powerjob-server/docker/Dockerfile b/powerjob-server/docker/Dockerfile index d30c74e1..473d4f62 100644 --- a/powerjob-server/docker/Dockerfile +++ b/powerjob-server/docker/Dockerfile @@ -4,27 +4,27 @@ FROM openjdk:8 MAINTAINER tengjiqi@gmail.com # 下载并安装 maven RUN curl -O https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/oms-maven && rm -rf apache-maven-3.6.3-bin.tar.gz +RUN tar -zxvf apache-maven-3.6.3-bin.tar.gz && mv apache-maven-3.6.3 /opt/powerjob-maven && rm -rf apache-maven-3.6.3-bin.tar.gz # 替换 maven 配置文件 -RUN rm -rf /opt/oms-maven/conf/settings.xml -COPY settings.xml /opt/oms-maven/conf/settings.xml +RUN rm -rf /opt/powerjob-maven/conf/settings.xml +COPY settings.xml /opt/powerjob-maven/conf/settings.xml # 设置 maven 环境变量（maven invoker 读取该变量调用 maven） -ENV M2_HOME=/opt/oms-maven +ENV M2_HOME=/opt/powerjob-maven # 设置时区（Debian专用方法） ENV TZ=Asia/Shanghai # 设置其他环境变量 -ENV APP_NAME=oh-my-scheduler-server +ENV APP_NAME=powerjob-server # 传递 SpringBoot 启动参数 ENV PARAMS="" # 将应用 jar 包拷入 docker -COPY oms-server.jar /oms-server.jar +COPY powerjob-server.jar /powerjob-server.jar # 暴露端口（HTTP + AKKA） EXPOSE 7700 10086 # 创建 docker 文件目录（盲猜这是用户目录） -RUN mkdir -p /root/oms-server +RUN mkdir -p /root/powerjob-server # 挂载数据卷，将文件直接输出到宿主机（注意，此处挂载的是匿名卷，即在宿主机位置随机） -VOLUME /root/oms-server +VOLUME /root/powerjob-server # 启动应用 -ENTRYPOINT ["sh","-c","java -jar /oms-server.jar $PARAMS"] +ENTRYPOINT ["sh","-c","java -jar /powerjob-server.jar $PARAMS"] diff --git a/powerjob-server/src/main/resources/logback-product.xml b/powerjob-server/src/main/resources/logback-product.xml index ffad67d1..b14658f3 100644 --- a/powerjob-server/src/main/resources/logback-product.xml +++ b/powerjob-server/src/main/resources/logback-product.xml @@ -6,13 +6,13 @@ 日志路径，注意权限问题，否则无法打印日志。 大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹 --> - + - ${LOG_PATH}/oms-server-error.log + ${LOG_PATH}/powerjob-server-error.log - ${LOG_PATH}/oms-server-error.%d{yyyy-MM-dd}.log + ${LOG_PATH}/powerjob-server-error.%d{yyyy-MM-dd}.log 7 @@ -29,9 +29,9 @@ - ${LOG_PATH}/oms-server-web.log + ${LOG_PATH}/powerjob-server-web.log - ${LOG_PATH}/oms-server-web.%d{yyyy-MM-dd}.log + ${LOG_PATH}/powerjob-server-web.%d{yyyy-MM-dd}.log 7 @@ -47,9 +47,9 @@ - ${LOG_PATH}/oms-server-application.log + ${LOG_PATH}/powerjob-server-application.log - ${LOG_PATH}/oms-server-application.%d{yyyy-MM-dd}.log + ${LOG_PATH}/powerjob-server-application.%d{yyyy-MM-dd}.log 7 diff --git a/powerjob-worker-agent/Dockerfile b/powerjob-worker-agent/Dockerfile index bdef3695..2df95db9 100644 --- a/powerjob-worker-agent/Dockerfile +++ b/powerjob-worker-agent/Dockerfile @@ -4,13 +4,13 @@ MAINTAINER tengjiqi@gmail.com # 设置时区 ENV TZ=Asia/Shanghai -ENV APP_NAME=oh-my-scheduler-worker-agent +ENV APP_NAME=powerjob-worker-agent ENV PARAMS="" -COPY oms-agent.jar /oms-agent.jar +COPY powerjob-agent.jar /powerjob-agent.jar # 暴露端口（AKKA-Client） EXPOSE 27777 # 挂载数据卷，将文件直接输出到宿主机（注意，此处挂载的是匿名卷，即在宿主机位置随机） VOLUME /root # 启动应用 -ENTRYPOINT ["sh","-c","java -jar /oms-agent.jar $PARAMS"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -jar /powerjob-agent.jar $PARAMS"] \ No newline at end of file diff --git a/powerjob-worker-agent/src/main/resources/logback.xml b/powerjob-worker-agent/src/main/resources/logback.xml index a397f659..a1b0c953 100644 --- a/powerjob-worker-agent/src/main/resources/logback.xml +++ b/powerjob-worker-agent/src/main/resources/logback.xml @@ -6,7 +6,7 @@ 日志路径，注意权限问题，否则无法打印日志。 大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹 --> - + diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java index c1bd1b09..0a26f996 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/persistence/ConnectionFactory.java @@ -19,8 +19,8 @@ public class ConnectionFactory { private static volatile DataSource dataSource; - private static final String DISK_JDBC_URL = "jdbc:h2:file:~/oms/h2/oms_worker_db"; - private static final String MEMORY_JDBC_URL = "jdbc:h2:mem:~/oms/h2/oms_worker_db"; + private static final String DISK_JDBC_URL = "jdbc:h2:file:~/powerjob/h2/oms_worker_db"; + private static final String MEMORY_JDBC_URL = "jdbc:h2:mem:~/powerjob/h2/oms_worker_db"; public static Connection getConnection() throws SQLException { return getDataSource().getConnection(); From 4ad975a1c6cc9ed8d0c92b8dccc03621d17ba624 Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 13 Jun 2020 16:53:39 +0800 Subject: [PATCH 16/17] [dev] add akka log by slf4j, start to test --- others/script/build_docker.sh | 4 +- others/script/debug.sh | 8 +- others/script/jenkins_auto.sh | 48 ++- powerjob-common/pom.xml | 6 + .../resources/application-daily.properties | 2 +- .../main/resources/application-pre.properties | 2 +- .../resources/application-product.properties | 2 +- .../src/main/resources/oms-server.akka.conf | 4 + .../static/img/oms-logo.de87211a.png | Bin 20976 -> 0 bytes .../img/powerjob-console-logo.ac01c44b.png | Bin 0 -> 117129 bytes .../src/main/resources/static/js/0.js | 113 ------ .../src/main/resources/static/js/1.js | 8 +- .../src/main/resources/static/js/10.js | 10 +- .../src/main/resources/static/js/11.js | 10 +- .../src/main/resources/static/js/2.js | 127 +------ .../src/main/resources/static/js/3.js | 31 +- .../src/main/resources/static/js/4.js | 136 ++++--- .../src/main/resources/static/js/5.js | 124 +++---- .../src/main/resources/static/js/6.js | 12 +- .../src/main/resources/static/js/7.js | 10 +- .../src/main/resources/static/js/8.js | 10 +- .../src/main/resources/static/js/9.js | 10 +- .../src/main/resources/static/js/app.js | 104 ++++-- .../main/resources/static/js/chunk-vendors.js | 349 +++++++++++++++++- .../src/main/resources/logback.xml | 8 +- .../src/main/resources/oms-worker.akka.conf | 4 + 26 files changed, 642 insertions(+), 500 deletions(-) delete mode 100644 powerjob-server/src/main/resources/static/img/oms-logo.de87211a.png create mode 100644 powerjob-server/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png diff --git a/others/script/build_docker.sh b/others/script/build_docker.sh index 31e3f0a2..3d91f178 100755 --- a/others/script/build_docker.sh +++ b/others/script/build_docker.sh @@ -67,7 +67,7 @@ if [ "$startup" = "y" ] || [ "$startup" = "Y" ]; then -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ tjqq/powerjob-server:$version sleep 1 -# tail -f -n 1000 ~/docker/oms-server/logs/oms-server-application.log +# tail -f -n 1000 ~/docker/powerjob-server/logs/powerjob-server-application.log sleep 30 echo "================== 准备启动 powerjob-client ==================" @@ -77,5 +77,5 @@ if [ "$startup" = "y" ] || [ "$startup" = "Y" ]; then docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27777:27777 --name powerjob-agent -v ~/docker/powerjob-agent:/root tjqq/powerjob-agent:$version docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27778:27777 --name powerjob-agent2 -v ~/docker/powerjob-agent2:/root tjqq/powerjob-agent:$version - tail -f -n 100 ~/docker/powerjob-agent/powerjob/logs/oms-agent-application.log + tail -f -n 100 ~/docker/powerjob-agent/powerjob/logs/powerjob-agent-application.log fi \ No newline at end of file diff --git a/others/script/debug.sh b/others/script/debug.sh index 1b689646..e0fa1656 100644 --- a/others/script/debug.sh +++ b/others/script/debug.sh @@ -4,9 +4,9 @@ cd `dirname $0`/../.. || exit echo "================== 构建 jar ==================" mvn clean package -DskipTests -Pdev -e -U echo "================== 拷贝 jar ==================" -/bin/cp -rf oh-my-scheduler-server/target/*.jar others/oms-server.jar -ls -l others/oms-server.jar +/bin/cp -rf powerjob-server/target/*.jar others/powerjob-server.jar +ls -l others/powerjob-server.jar echo "================== debug 模式启动 ==================" -nohup java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar others/oms-server.jar > oms-server.log & +nohup java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar others/powerjob-server.jar > powerjob-server.log & sleep 100 -tail --pid=$$ -f -n 1000 others/oms-server.log +tail --pid=$$ -f -n 1000 others/powerjob-server.log diff --git a/others/script/jenkins_auto.sh b/others/script/jenkins_auto.sh index b293e465..3af4c6fa 100644 --- a/others/script/jenkins_auto.sh +++ b/others/script/jenkins_auto.sh @@ -1,39 +1,37 @@ #!/bin/bash cd `dirname $0`/../.. || exit echo "================== 构建 jar ==================" -mvn clean package -Pdev -DskipTests -U -e -pl oh-my-scheduler-server,oh-my-scheduler-worker-agent -am +mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am echo "================== 拷贝 jar ==================" -/bin/cp -rf oh-my-scheduler-server/target/*.jar oh-my-scheduler-server/docker/oms-server.jar -/bin/cp -rf oh-my-scheduler-worker-agent/target/*.jar oh-my-scheduler-worker-agent/oms-agent.jar -ls -l oh-my-scheduler-server/docker/oms-server.jar -ls -l oh-my-scheduler-worker-agent/oms-agent.jar +/bin/cp -rf powerjob-server/target/*.jar powerjob-server/docker/powerjob-server.jar +/bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar echo "================== 关闭老应用 ==================" -docker stop oms-server -docker stop oms-agent -docker stop oms-agent2 +docker stop powerjob-server +docker stop powerjob-agent +docker stop powerjob-agent2 echo "================== 删除老容器 ==================" -docker container rm oms-server -docker container rm oms-agent -docker container rm oms-agent2 +docker container rm powerjob-server +docker container rm powerjob-agent +docker container rm powerjob-agent2 echo "================== 删除旧镜像 ==================" -docker rmi -f tjqq/oms-server:latest -docker rmi -f tjqq/oms-agent:latest -echo "================== 构建 oms-server 镜像 ==================" -docker build -t tjqq/oms-server:latest oh-my-scheduler-server/docker/. || exit -echo "================== 构建 oms-agent 镜像 ==================" -docker build -t tjqq/oms-agent:latest oh-my-scheduler-worker-agent/. || exit -echo "================== 准备启动 oms-server ==================" +docker rmi -f tjqq/powerjob-server:latest +docker rmi -f tjqq/powerjob-agent:latest +echo "================== 构建 powerjob-server 镜像 ==================" +docker build -t tjqq/powerjob-server:latest powerjob-server/docker/. || exit +echo "================== 构建 powerjob-agent 镜像 ==================" +docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit +echo "================== 准备启动 powerjob-server ==================" docker run -d \ - --name oms-server \ + --name powerjob-server \ -p 7700:7700 -p 10086:10086 \ -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://172.27.147.252:3306/oms-product?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://172.27.147.252:27017/oms-product" \ - -v ~/docker/oms-server:/root/oms-server -v ~/.m2:/root/.m2 \ - tjqq/oms-server:latest + -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ + tjqq/powerjob-server:latest sleep 60 -echo "================== 准备启动 oms-client ==================" -serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' oms-server) +echo "================== 准备启动 powerjob-client ==================" +serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server) serverAddress="$serverIP:7700" echo "使用的Server地址：$serverAddress" -docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27777:27777 --name oms-agent -v ~/docker/oms-agent:/root tjqq/oms-agent:latest -docker run -d -e PARAMS="--app oms-agent-test --server $serverAddress" -p 27778:27777 --name oms-agent2 -v ~/docker/oms-agent2:/root tjqq/oms-agent:latest +docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27777:27777 --name powerjob-agent -v ~/docker/powerjob-agent:/root tjqq/powerjob-agent:latest +docker run -d -e PARAMS="--app powerjob-agent-test --server $serverAddress" -p 27778:27777 --name powerjob-agent2 -v ~/docker/powerjob-agent2:/root tjqq/powerjob-agent:latest diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index 403835b7..aa7ebbf5 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -62,6 +62,12 @@ akka-serialization-jackson_2.13 ${akka.version} + + com.typesafe.akka + akka-slf4j_2.13 + ${akka.version} + + diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index 3a6f60ac..d07ab9ad 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -3,7 +3,7 @@ logging.config=classpath:logback-dev.xml ####### 数据库配置 ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3391/oms-daily?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3391/powerjob-daily?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 spring.datasource.core.username=root spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.hikari.maximum-pool-size=20 diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties index 2a7845ac..3a25034c 100644 --- a/powerjob-server/src/main/resources/application-pre.properties +++ b/powerjob-server/src/main/resources/application-pre.properties @@ -3,7 +3,7 @@ logging.config=classpath:logback-product.xml ####### 数据库配置 ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3391/oms-pre?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3391/powerjob-pre?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 spring.datasource.core.username=root spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.hikari.maximum-pool-size=20 diff --git a/powerjob-server/src/main/resources/application-product.properties b/powerjob-server/src/main/resources/application-product.properties index 263bd5a3..d6987df5 100644 --- a/powerjob-server/src/main/resources/application-product.properties +++ b/powerjob-server/src/main/resources/application-product.properties @@ -3,7 +3,7 @@ logging.config=classpath:logback-product.xml ####### 数据库配置 ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/oms-product?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-product?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 spring.datasource.core.username=root spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.hikari.maximum-pool-size=20 diff --git a/powerjob-server/src/main/resources/oms-server.akka.conf b/powerjob-server/src/main/resources/oms-server.akka.conf index 8340bbf5..fe6ab702 100644 --- a/powerjob-server/src/main/resources/oms-server.akka.conf +++ b/powerjob-server/src/main/resources/oms-server.akka.conf @@ -1,4 +1,8 @@ akka { + + loggers = ["akka.event.slf4j.Slf4jLogger"] + loglevel = "WARNING" + actor { # cluster is better(recommend by official document), but I prefer remote provider = remote diff --git a/powerjob-server/src/main/resources/static/img/oms-logo.de87211a.png b/powerjob-server/src/main/resources/static/img/oms-logo.de87211a.png deleted file mode 100644 index c92c2fff216bbbadcda3680638506f84fe169a15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20976 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 aCHg1D1uYHd!+U|`D7V4oAI@cvD*87gIJxft diff --git a/powerjob-server/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png b/powerjob-server/src/main/resources/static/img/powerjob-console-logo.ac01c44b.png new file mode 100644 index 0000000000000000000000000000000000000000..050d04652d50f18a09ac9cbb7a87c766e24d9bed GIT binary patch literal 117129 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 gq+()M=Q0&<*QJZ!`ZEKAQ!! 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%0Dvr_pb!)sW(-8i5j<{#0JSFDlX!D%cI!f! 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 Y5AvPvYUK6CasU7T07*qoM6N<$g0W{j`~Uy| literal 0 HcmV?d00001 diff --git a/powerjob-server/src/main/resources/static/js/0.js b/powerjob-server/src/main/resources/static/js/0.js index 73e6e525..ea24a3d8 100644 --- a/powerjob-server/src/main/resources/static/js/0.js +++ b/powerjob-server/src/main/resources/static/js/0.js @@ -1,107 +1,5 @@ (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],{ -/***/ "./node_modules/core-js/internals/array-for-each.js": -/*!**********************************************************!*\ - !*** ./node_modules/core-js/internals/array-for-each.js ***! - \**********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar $forEach = __webpack_require__(/*! ../internals/array-iteration */ \"./node_modules/core-js/internals/array-iteration.js\").forEach;\nvar arrayMethodIsStrict = __webpack_require__(/*! ../internals/array-method-is-strict */ \"./node_modules/core-js/internals/array-method-is-strict.js\");\nvar arrayMethodUsesToLength = __webpack_require__(/*! ../internals/array-method-uses-to-length */ \"./node_modules/core-js/internals/array-method-uses-to-length.js\");\n\nvar STRICT_METHOD = arrayMethodIsStrict('forEach');\nvar USES_TO_LENGTH = arrayMethodUsesToLength('forEach');\n\n// `Array.prototype.forEach` method implementation\n// https://tc39.github.io/ecma262/#sec-array.prototype.foreach\nmodule.exports = (!STRICT_METHOD || !USES_TO_LENGTH) ? function forEach(callbackfn /* , thisArg */) {\n return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);\n} : [].forEach;\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-for-each.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-iteration.js": -/*!***********************************************************!*\ - !*** ./node_modules/core-js/internals/array-iteration.js ***! - \***********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var bind = __webpack_require__(/*! ../internals/function-bind-context */ \"./node_modules/core-js/internals/function-bind-context.js\");\nvar IndexedObject = __webpack_require__(/*! ../internals/indexed-object */ \"./node_modules/core-js/internals/indexed-object.js\");\nvar toObject = __webpack_require__(/*! ../internals/to-object */ \"./node_modules/core-js/internals/to-object.js\");\nvar toLength = __webpack_require__(/*! ../internals/to-length */ \"./node_modules/core-js/internals/to-length.js\");\nvar arraySpeciesCreate = __webpack_require__(/*! ../internals/array-species-create */ \"./node_modules/core-js/internals/array-species-create.js\");\n\nvar push = [].push;\n\n// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex }` methods implementation\nvar createMethod = function (TYPE) {\n var IS_MAP = TYPE == 1;\n var IS_FILTER = TYPE == 2;\n var IS_SOME = TYPE == 3;\n var IS_EVERY = TYPE == 4;\n var IS_FIND_INDEX = TYPE == 6;\n var NO_HOLES = TYPE == 5 || IS_FIND_INDEX;\n return function ($this, callbackfn, that, specificCreate) {\n var O = toObject($this);\n var self = IndexedObject(O);\n var boundFunction = bind(callbackfn, that, 3);\n var length = toLength(self.length);\n var index = 0;\n var create = specificCreate || arraySpeciesCreate;\n var target = IS_MAP ? create($this, length) : IS_FILTER ? create($this, 0) : undefined;\n var value, result;\n for (;length > index; index++) if (NO_HOLES || index in self) {\n value = self[index];\n result = boundFunction(value, index, O);\n if (TYPE) {\n if (IS_MAP) target[index] = result; // map\n else if (result) switch (TYPE) {\n case 3: return true; // some\n case 5: return value; // find\n case 6: return index; // findIndex\n case 2: push.call(target, value); // filter\n } else if (IS_EVERY) return false; // every\n }\n }\n return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;\n };\n};\n\nmodule.exports = {\n // `Array.prototype.forEach` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.foreach\n forEach: createMethod(0),\n // `Array.prototype.map` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.map\n map: createMethod(1),\n // `Array.prototype.filter` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.filter\n filter: createMethod(2),\n // `Array.prototype.some` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.some\n some: createMethod(3),\n // `Array.prototype.every` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.every\n every: createMethod(4),\n // `Array.prototype.find` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.find\n find: createMethod(5),\n // `Array.prototype.findIndex` method\n // https://tc39.github.io/ecma262/#sec-array.prototype.findIndex\n findIndex: createMethod(6)\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-iteration.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-method-has-species-support.js": -/*!****************************************************************************!*\ - !*** ./node_modules/core-js/internals/array-method-has-species-support.js ***! - \****************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\nvar wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ \"./node_modules/core-js/internals/well-known-symbol.js\");\nvar V8_VERSION = __webpack_require__(/*! ../internals/engine-v8-version */ \"./node_modules/core-js/internals/engine-v8-version.js\");\n\nvar SPECIES = wellKnownSymbol('species');\n\nmodule.exports = function (METHOD_NAME) {\n // We can't use this feature detection in V8 since it causes\n // deoptimization and serious performance degradation\n // https://github.com/zloirock/core-js/issues/677\n return V8_VERSION >= 51 || !fails(function () {\n var array = [];\n var constructor = array.constructor = {};\n constructor[SPECIES] = function () {\n return { foo: 1 };\n };\n return array[METHOD_NAME](Boolean).foo !== 1;\n });\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-method-has-species-support.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-method-is-strict.js": -/*!******************************************************************!*\ - !*** ./node_modules/core-js/internals/array-method-is-strict.js ***! - \******************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\n\nmodule.exports = function (METHOD_NAME, argument) {\n var method = [][METHOD_NAME];\n return !!method && fails(function () {\n // eslint-disable-next-line no-useless-call,no-throw-literal\n method.call(null, argument || function () { throw 1; }, 1);\n });\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-method-is-strict.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-method-uses-to-length.js": -/*!***********************************************************************!*\ - !*** ./node_modules/core-js/internals/array-method-uses-to-length.js ***! - \***********************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var DESCRIPTORS = __webpack_require__(/*! ../internals/descriptors */ \"./node_modules/core-js/internals/descriptors.js\");\nvar fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\nvar has = __webpack_require__(/*! ../internals/has */ \"./node_modules/core-js/internals/has.js\");\n\nvar defineProperty = Object.defineProperty;\nvar cache = {};\n\nvar thrower = function (it) { throw it; };\n\nmodule.exports = function (METHOD_NAME, options) {\n if (has(cache, METHOD_NAME)) return cache[METHOD_NAME];\n if (!options) options = {};\n var method = [][METHOD_NAME];\n var ACCESSORS = has(options, 'ACCESSORS') ? options.ACCESSORS : false;\n var argument0 = has(options, 0) ? options[0] : thrower;\n var argument1 = has(options, 1) ? options[1] : undefined;\n\n return cache[METHOD_NAME] = !!method && !fails(function () {\n if (ACCESSORS && !DESCRIPTORS) return true;\n var O = { length: -1 };\n\n if (ACCESSORS) defineProperty(O, 1, { enumerable: true, get: thrower });\n else O[1] = 1;\n\n method.call(O, argument0, argument1);\n });\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-method-uses-to-length.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-species-create.js": -/*!****************************************************************!*\ - !*** ./node_modules/core-js/internals/array-species-create.js ***! - \****************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var isObject = __webpack_require__(/*! ../internals/is-object */ \"./node_modules/core-js/internals/is-object.js\");\nvar isArray = __webpack_require__(/*! ../internals/is-array */ \"./node_modules/core-js/internals/is-array.js\");\nvar wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ \"./node_modules/core-js/internals/well-known-symbol.js\");\n\nvar SPECIES = wellKnownSymbol('species');\n\n// `ArraySpeciesCreate` abstract operation\n// https://tc39.github.io/ecma262/#sec-arrayspeciescreate\nmodule.exports = function (originalArray, length) {\n var C;\n if (isArray(originalArray)) {\n C = originalArray.constructor;\n // cross-realm fallback\n if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;\n else if (isObject(C)) {\n C = C[SPECIES];\n if (C === null) C = undefined;\n }\n } return new (C === undefined ? Array : C)(length === 0 ? 0 : length);\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-species-create.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/dom-iterables.js": -/*!*********************************************************!*\ - !*** ./node_modules/core-js/internals/dom-iterables.js ***! - \*********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports) { - -eval("// iterable DOM collections\n// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods\nmodule.exports = {\n CSSRuleList: 0,\n CSSStyleDeclaration: 0,\n CSSValueList: 0,\n ClientRectList: 0,\n DOMRectList: 0,\n DOMStringList: 0,\n DOMTokenList: 1,\n DataTransferItemList: 0,\n FileList: 0,\n HTMLAllCollection: 0,\n HTMLCollection: 0,\n HTMLFormElement: 0,\n HTMLSelectElement: 0,\n MediaList: 0,\n MimeTypeArray: 0,\n NamedNodeMap: 0,\n NodeList: 1,\n PaintRequestList: 0,\n Plugin: 0,\n PluginArray: 0,\n SVGLengthList: 0,\n SVGNumberList: 0,\n SVGPathSegList: 0,\n SVGPointList: 0,\n SVGStringList: 0,\n SVGTransformList: 0,\n SourceBufferList: 0,\n StyleSheetList: 0,\n TextTrackCueList: 0,\n TextTrackList: 0,\n TouchList: 0\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/dom-iterables.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/is-array.js": -/*!****************************************************!*\ - !*** ./node_modules/core-js/internals/is-array.js ***! - \****************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var classof = __webpack_require__(/*! ../internals/classof-raw */ \"./node_modules/core-js/internals/classof-raw.js\");\n\n// `IsArray` abstract operation\n// https://tc39.github.io/ecma262/#sec-isarray\nmodule.exports = Array.isArray || function isArray(arg) {\n return classof(arg) == 'Array';\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/is-array.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/modules/es.array.for-each.js": -/*!***********************************************************!*\ - !*** ./node_modules/core-js/modules/es.array.for-each.js ***! - \***********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/core-js/internals/export.js\");\nvar forEach = __webpack_require__(/*! ../internals/array-for-each */ \"./node_modules/core-js/internals/array-for-each.js\");\n\n// `Array.prototype.forEach` method\n// https://tc39.github.io/ecma262/#sec-array.prototype.foreach\n$({ target: 'Array', proto: true, forced: [].forEach != forEach }, {\n forEach: forEach\n});\n\n\n//# sourceURL=webpack:///./node_modules/core-js/modules/es.array.for-each.js?"); - -/***/ }), - /***/ "./node_modules/core-js/modules/es.array.map.js": /*!******************************************************!*\ !*** ./node_modules/core-js/modules/es.array.map.js ***! @@ -114,17 +12,6 @@ eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/ /***/ }), -/***/ "./node_modules/core-js/modules/web.dom-collections.for-each.js": -/*!**********************************************************************!*\ - !*** ./node_modules/core-js/modules/web.dom-collections.for-each.js ***! - \**********************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var global = __webpack_require__(/*! ../internals/global */ \"./node_modules/core-js/internals/global.js\");\nvar DOMIterables = __webpack_require__(/*! ../internals/dom-iterables */ \"./node_modules/core-js/internals/dom-iterables.js\");\nvar forEach = __webpack_require__(/*! ../internals/array-for-each */ \"./node_modules/core-js/internals/array-for-each.js\");\nvar createNonEnumerableProperty = __webpack_require__(/*! ../internals/create-non-enumerable-property */ \"./node_modules/core-js/internals/create-non-enumerable-property.js\");\n\nfor (var COLLECTION_NAME in DOMIterables) {\n var Collection = global[COLLECTION_NAME];\n var CollectionPrototype = Collection && Collection.prototype;\n // some Chrome versions have non-configurable methods on DOMTokenList\n if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {\n createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);\n } catch (error) {\n CollectionPrototype.forEach = forEach;\n }\n}\n\n\n//# sourceURL=webpack:///./node_modules/core-js/modules/web.dom-collections.for-each.js?"); - -/***/ }), - /***/ "./node_modules/d3-array/src/array.js": /*!********************************************!*\ !*** ./node_modules/d3-array/src/array.js ***! diff --git a/powerjob-server/src/main/resources/static/js/1.js b/powerjob-server/src/main/resources/static/js/1.js index c422ad74..bc9688bc 100644 --- a/powerjob-server/src/main/resources/static/js/1.js +++ b/powerjob-server/src/main/resources/static/js/1.js @@ -12,15 +12,15 @@ eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n/ /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true&": +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true&": /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true& ***! + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true& ***! \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { offset: 20 } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.fetchInstanceDetail }\n },\n [_vm._v(\"刷新\")]\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" 任务实例ID: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceId))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n { staticStyle: { \"margin-top\": \"-20px\" } },\n [\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" 状态: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceDetail.status))\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 16 } }, [\n _vm._v(\" 运行次数：\"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceDetail.runningTimes))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" TaskTracker地址: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\" \" + _vm._s(_vm.instanceDetail.taskTrackerAddress))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" 开始时间: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\n \" \" +\n _vm._s(\n this.common.timestamp2Str(\n _vm.instanceDetail.actualTriggerTime\n )\n )\n )\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" 结束时间: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\n _vm._s(\n this.common.timestamp2Str(_vm.instanceDetail.finishedTime)\n )\n )\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" 运行结果: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\" \" + _vm._s(_vm.instanceDetail.result))\n ])\n ])\n ],\n 1\n ),\n _c(\"el-row\", { attrs: { id: \"taskDetail\" } }, [\n _vm._v(\" 子任务数据: \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceDetail.taskDetail))\n ])\n ]),\n _c(\n \"el-row\",\n [\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\"最近10条秒级任务历史记录:\")\n ]),\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.instanceDetail.subInstanceDetails }\n },\n [\n _c(\"el-table-column\", {\n attrs: {\n prop: \"subInstanceId\",\n label: \"子实例ID\",\n width: \"100\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"startTime\", label: \"开始时间\", width: \"160\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"finishedTime\", label: \"结束时间\", width: \"160\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"status\", label: \"运行状态\", width: \"100\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"result\", label: \"运行结果\" }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/common/InstanceDetail.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { offset: 20 } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.fetchInstanceDetail }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.refresh\")))]\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.instanceId\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceId))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n { staticStyle: { \"margin-top\": \"-20px\" } },\n [\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.status\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\n _vm._s(\n this.common.translateInstanceStatus(_vm.instanceDetail.status)\n )\n )\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 16 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.runningTimes\")) + \"：\"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceDetail.runningTimes))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.taskTrackerAddress\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\" \" + _vm._s(_vm.instanceDetail.taskTrackerAddress))\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.startTime\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\n \" \" +\n _vm._s(\n this.common.timestamp2Str(\n _vm.instanceDetail.actualTriggerTime\n )\n )\n )\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 8 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.finishedTime\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\n _vm._s(\n this.common.timestamp2Str(_vm.instanceDetail.finishedTime)\n )\n )\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-col\", { attrs: { span: 24 } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.result\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(\" \" + _vm._s(_vm.instanceDetail.result))\n ])\n ])\n ],\n 1\n ),\n _c(\"el-row\", { attrs: { id: \"taskDetail\" } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.subTaskInfo\")) + \": \"),\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.instanceDetail.taskDetail))\n ])\n ]),\n _c(\n \"el-row\",\n [\n _c(\"span\", { staticClass: \"title\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.secondlyJobHistory\")) + \":\")\n ]),\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.instanceDetail.subInstanceDetails }\n },\n [\n _c(\"el-table-column\", {\n attrs: {\n prop: \"subInstanceId\",\n label: _vm.$t(\"message.subInstanceId\"),\n width: \"120\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: {\n prop: \"startTime\",\n label: _vm.$t(\"message.startTime\"),\n width: \"160\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: {\n prop: \"finishedTime\",\n label: _vm.$t(\"message.finishedTime\"),\n width: \"160\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: {\n prop: \"status\",\n label: _vm.$t(\"message.status\"),\n width: \"160\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"result\", label: _vm.$t(\"message.result\") }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/common/InstanceDetail.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -90,7 +90,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"dddd77cc-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/common/InstanceDetail.vue?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"41f1f4da-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/common/InstanceDetail.vue?vue&type=template&id=44a86d2a&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_InstanceDetail_vue_vue_type_template_id_44a86d2a_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/common/InstanceDetail.vue?"); /***/ }) diff --git a/powerjob-server/src/main/resources/static/js/10.js b/powerjob-server/src/main/resources/static/js/10.js index 1d8d5d11..2764670c 100644 --- a/powerjob-server/src/main/resources/static/js/10.js +++ b/powerjob-server/src/main/resources/static/js/10.js @@ -8,19 +8,19 @@ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"JobManager\",\n data: function data() {\n return {\n modifiedJobFormVisible: false,\n // 新建任务对象\n modifiedJobForm: {\n id: undefined,\n jobName: \"\",\n jobDescription: \"\",\n appId: this.$store.state.appInfo.id,\n jobParams: \"\",\n timeExpressionType: \"\",\n timeExpression: \"\",\n executeType: \"\",\n processorType: \"\",\n processorInfo: \"\",\n maxInstanceNum: 1,\n concurrency: 5,\n instanceTimeLimit: 0,\n instanceRetryNum: 0,\n taskRetryNum: 1,\n minCpuCores: 0,\n minMemorySpace: 0,\n minDiskSpace: 0,\n enable: true,\n designatedWorkers: \"\",\n maxWorkerCount: 0,\n notifyUserIds: []\n },\n // 任务查询请求对象\n jobQueryContent: {\n appId: this.$store.state.appInfo.id,\n index: 0,\n pageSize: 10,\n jobId: undefined,\n keyword: undefined\n },\n // 任务列表（查询结果），包含index、pageSize、totalPages、totalItems、data（List类型）\n jobInfoPageResult: {\n pageSize: 10,\n totalItems: 0,\n data: []\n },\n // 时间表达式选择类型\n timeExpressionTypeOptions: [{\n key: \"API\",\n label: \"API\"\n }, {\n key: \"CRON\",\n label: \"CRON\"\n }, {\n key: \"FIX_RATE\",\n label: \"固定频率（单位毫秒）\"\n }, {\n key: \"FIX_DELAY\",\n label: \"固定延迟（单位毫秒）\"\n }, {\n key: \"WORKFLOW\",\n label: \"工作流\"\n }],\n // 处理器类型\n processorTypeOptions: [{\n key: \"EMBEDDED_JAVA\",\n label: \"内置JAVA处理器\"\n }, {\n key: \"JAVA_CONTAINER\",\n label: \"JAVA容器\"\n }, {\n key: \"SHELL\",\n label: \"Shell脚本处理器\"\n }, {\n key: \"PYTHON\",\n label: \"Python处理器\"\n }],\n // 执行方式类型\n executeTypeOptions: [{\n key: \"STANDALONE\",\n label: \"单机执行\"\n }, {\n key: \"BROADCAST\",\n label: \"广播执行\"\n }, {\n key: \"MAP\",\n label: \"Map执行\"\n }, {\n key: \"MAP_REDUCE\",\n label: \"MapReduce执行\"\n }],\n // 用户列表\n userList: []\n };\n },\n methods: {\n // 保存变更，包括新增和修改\n saveJob: function saveJob() {\n var that = this;\n this.axios.post(\"/job/save\", this.modifiedJobForm).then(function () {\n that.modifiedJobFormVisible = false;\n that.$message.success(\"保存成功！\"); // 重新加载数据\n\n that.listJobInfos();\n }, function () {\n return that.modifiedJobFormVisible = false;\n });\n },\n // 列出符合当前搜索条件的任务\n listJobInfos: function listJobInfos() {\n var that = this;\n this.axios.post(\"/job/list\", this.jobQueryContent).then(function (res) {\n that.jobInfoPageResult = res;\n });\n },\n // 修改任务状态\n changeJobStatus: function changeJobStatus(data) {\n // switch 会自动更改 enable 的值\n var that = this;\n\n if (data.enable === false) {\n // 仅有，有特殊逻辑（关闭秒级任务），走单独接口\n that.axios.get(\"/job/disable?jobId=\" + data.id).then(function () {\n return that.listJobInfos();\n });\n } else {\n // 启用，则发起正常的保存操作\n this.modifiedJobForm = data;\n this.saveJob();\n }\n },\n // 新增任务，去除旧数据\n onClickNewJob: function onClickNewJob() {\n this.modifiedJobForm.id = undefined;\n this.modifiedJobForm.jobName = undefined;\n this.modifiedJobForm.jobDescription = undefined;\n this.modifiedJobForm.jobParams = undefined;\n this.modifiedJobForm.timeExpression = undefined;\n this.modifiedJobForm.timeExpressionType = undefined;\n this.modifiedJobForm.processorInfo = undefined;\n this.modifiedJobForm.processorType = undefined;\n this.modifiedJobForm.executeType = undefined;\n this.modifiedJobFormVisible = true;\n },\n // 点击 编辑按钮\n onClickModify: function onClickModify(data) {\n // 修复点击编辑后再点击新增 行数据被清空 的问题\n this.modifiedJobForm = JSON.parse(JSON.stringify(data));\n this.modifiedJobFormVisible = true;\n },\n // 点击 立即运行按钮\n onClickRun: function onClickRun(data) {\n var that = this;\n var url = \"/job/run?jobId=\" + data.id;\n this.axios.get(url).then(function () {\n return that.$message.success(\"触发成功\");\n });\n },\n // 点击 删除任务\n onClickDeleteJob: function onClickDeleteJob(data) {\n var that = this;\n var url = \"/job/delete?jobId=\" + data.id;\n this.axios.get(url).then(function () {\n that.$message.success(\"删除成功\");\n that.listJobInfos();\n });\n },\n // 点击 换页\n onClickChangePage: function onClickChangePage(index) {\n // 后端从0开始，前端从1开始\n this.jobQueryContent.index = index - 1;\n this.listJobInfos();\n },\n // 点击重置按钮\n onClickReset: function onClickReset() {\n this.jobQueryContent.keyword = undefined;\n this.jobQueryContent.jobId = undefined;\n },\n verifyPlaceholder: function verifyPlaceholder(processorType) {\n var res;\n\n switch (processorType) {\n case \"EMBEDDED_JAVA\":\n res = \"全限定类名，eg：com.github.kfcfans.DemoProcessor\";\n break;\n\n case \"JAVA_CONTAINER\":\n res = \"容器ID#全限定类名，eg：1#com.github.kfcfans.DemoProcessor\";\n break;\n\n case \"SHELL\":\n res = \"SHELL脚本文件内容\";\n break;\n\n case \"PYTHON\":\n res = \"Python脚本文件内容\";\n }\n\n return res;\n }\n },\n mounted: function mounted() {\n // 加载用户信息\n var that = this;\n that.axios.get(\"/user/list\").then(function (res) {\n return that.userList = res;\n }); // 加载任务信息\n\n this.listJobInfos();\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"JobManager\",\n data: function data() {\n return {\n modifiedJobFormVisible: false,\n // 新建任务对象\n modifiedJobForm: {\n id: undefined,\n jobName: \"\",\n jobDescription: \"\",\n appId: this.$store.state.appInfo.id,\n jobParams: \"\",\n timeExpressionType: \"\",\n timeExpression: \"\",\n executeType: \"\",\n processorType: \"\",\n processorInfo: \"\",\n maxInstanceNum: 1,\n concurrency: 5,\n instanceTimeLimit: 0,\n instanceRetryNum: 0,\n taskRetryNum: 1,\n minCpuCores: 0,\n minMemorySpace: 0,\n minDiskSpace: 0,\n enable: true,\n designatedWorkers: \"\",\n maxWorkerCount: 0,\n notifyUserIds: []\n },\n // 任务查询请求对象\n jobQueryContent: {\n appId: this.$store.state.appInfo.id,\n index: 0,\n pageSize: 10,\n jobId: undefined,\n keyword: undefined\n },\n // 任务列表（查询结果），包含index、pageSize、totalPages、totalItems、data（List类型）\n jobInfoPageResult: {\n pageSize: 10,\n totalItems: 0,\n data: []\n },\n // 时间表达式选择类型\n timeExpressionTypeOptions: [{\n key: \"API\",\n label: \"API\"\n }, {\n key: \"CRON\",\n label: \"CRON\"\n }, {\n key: \"FIX_RATE\",\n label: this.$t('message.fixRate')\n }, {\n key: \"FIX_DELAY\",\n label: this.$t('message.fixDelay')\n }, {\n key: \"WORKFLOW\",\n label: this.$t('message.workflow')\n }],\n // 处理器类型\n processorTypeOptions: [{\n key: \"EMBEDDED_JAVA\",\n label: \"JAVA\"\n }, {\n key: \"JAVA_CONTAINER\",\n label: this.$t('message.javaContainer')\n }, {\n key: \"SHELL\",\n label: \"SHELL\"\n }, {\n key: \"PYTHON\",\n label: \"PYTHON\"\n }],\n // 执行方式类型\n executeTypeOptions: [{\n key: \"STANDALONE\",\n label: this.$t('message.standalone')\n }, {\n key: \"BROADCAST\",\n label: this.$t('message.broadcast')\n }, {\n key: \"MAP\",\n label: this.$t('message.map')\n }, {\n key: \"MAP_REDUCE\",\n label: this.$t('message.mapReduce')\n }],\n // 用户列表\n userList: []\n };\n },\n methods: {\n // 保存变更，包括新增和修改\n saveJob: function saveJob() {\n var _this = this;\n\n var that = this;\n this.axios.post(\"/job/save\", this.modifiedJobForm).then(function () {\n that.modifiedJobFormVisible = false;\n that.$message.success(_this.$t('message.success')); // 重新加载数据\n\n that.listJobInfos();\n }, function () {\n return that.modifiedJobFormVisible = false;\n });\n },\n // 列出符合当前搜索条件的任务\n listJobInfos: function listJobInfos() {\n var that = this;\n this.axios.post(\"/job/list\", this.jobQueryContent).then(function (res) {\n that.jobInfoPageResult = res;\n });\n },\n // 修改任务状态\n changeJobStatus: function changeJobStatus(data) {\n // switch 会自动更改 enable 的值\n var that = this;\n\n if (data.enable === false) {\n // 仅有，有特殊逻辑（关闭秒级任务），走单独接口\n that.axios.get(\"/job/disable?jobId=\" + data.id).then(function () {\n return that.listJobInfos();\n });\n } else {\n // 启用，则发起正常的保存操作\n this.modifiedJobForm = data;\n this.saveJob();\n }\n },\n // 新增任务，去除旧数据\n onClickNewJob: function onClickNewJob() {\n this.modifiedJobForm.id = undefined;\n this.modifiedJobForm.jobName = undefined;\n this.modifiedJobForm.jobDescription = undefined;\n this.modifiedJobForm.jobParams = undefined;\n this.modifiedJobForm.timeExpression = undefined;\n this.modifiedJobForm.timeExpressionType = undefined;\n this.modifiedJobForm.processorInfo = undefined;\n this.modifiedJobForm.processorType = undefined;\n this.modifiedJobForm.executeType = undefined;\n this.modifiedJobFormVisible = true;\n },\n // 点击 编辑按钮\n onClickModify: function onClickModify(data) {\n // 修复点击编辑后再点击新增 行数据被清空 的问题\n this.modifiedJobForm = JSON.parse(JSON.stringify(data));\n this.modifiedJobFormVisible = true;\n },\n // 点击 立即运行按钮\n onClickRun: function onClickRun(data) {\n var _this2 = this;\n\n var that = this;\n var url = \"/job/run?jobId=\" + data.id;\n this.axios.get(url).then(function () {\n return that.$message.success(_this2.$t('message.success'));\n });\n },\n // 点击 删除任务\n onClickDeleteJob: function onClickDeleteJob(data) {\n var _this3 = this;\n\n var that = this;\n var url = \"/job/delete?jobId=\" + data.id;\n this.axios.get(url).then(function () {\n that.$message.success(_this3.$t('message.success'));\n that.listJobInfos();\n });\n },\n // 点击 换页\n onClickChangePage: function onClickChangePage(index) {\n // 后端从0开始，前端从1开始\n this.jobQueryContent.index = index - 1;\n this.listJobInfos();\n },\n // 点击重置按钮\n onClickReset: function onClickReset() {\n this.jobQueryContent.keyword = undefined;\n this.jobQueryContent.jobId = undefined;\n this.listJobInfos();\n },\n verifyPlaceholder: function verifyPlaceholder(processorType) {\n var res;\n\n switch (processorType) {\n case \"EMBEDDED_JAVA\":\n res = this.$t('message.javaProcessorInfoPLH');\n break;\n\n case \"JAVA_CONTAINER\":\n res = this.$t('message.containerProcessorInfoPLH');\n break;\n\n case \"SHELL\":\n res = this.$t('message.shellProcessorInfoPLH');\n break;\n\n case \"PYTHON\":\n res = this.$t('message.pythonProcessorInfoPLH');\n }\n\n return res;\n },\n // 翻译执行类型\n translateExecuteType: function translateExecuteType(executeType) {\n switch (executeType) {\n case \"STANDALONE\":\n return this.$t('message.standalone');\n\n case \"BROADCAST\":\n return this.$t('message.broadcast');\n\n case \"MAP_REDUCE\":\n return this.$t('message.mapReduce');\n\n case \"MAP\":\n return this.$t('message.map');\n\n default:\n return \"UNKNOWN\";\n }\n },\n // 翻译处理器类型\n translateProcessorType: function translateProcessorType(processorType) {\n if (processorType === \"JAVA_CONTAINER\") {\n return this.$t('message.javaContainer');\n }\n\n return processorType;\n }\n },\n mounted: function mounted() {\n // 加载用户信息\n var that = this;\n that.axios.get(\"/user/list\").then(function (res) {\n return that.userList = res;\n }); // 加载任务信息\n\n this.listJobInfos();\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true&": +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true&": /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true& ***! + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true& ***! \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"job_manager\" } },\n [\n _c(\n \"el-row\",\n { attrs: { gutter: 20 } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 20 } },\n [\n _c(\n \"el-form\",\n {\n staticClass: \"el-form--inline\",\n attrs: { inline: true, model: _vm.jobQueryContent }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"任务ID\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"任务ID\" },\n model: {\n value: _vm.jobQueryContent.jobId,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"jobId\", $$v)\n },\n expression: \"jobQueryContent.jobId\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"关键字\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"关键字\" },\n model: {\n value: _vm.jobQueryContent.keyword,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"keyword\", $$v)\n },\n expression: \"jobQueryContent.keyword\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.listJobInfos }\n },\n [_vm._v(\"查询\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { type: \"cancel\" },\n on: { click: _vm.onClickReset }\n },\n [_vm._v(\"重置\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\"el-col\", { attrs: { span: 4 } }, [\n _c(\n \"div\",\n { staticStyle: { float: \"right\", \"padding-right\": \"10px\" } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.onClickNewJob }\n },\n [_vm._v(\"新建任务\")]\n )\n ],\n 1\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.jobInfoPageResult.data }\n },\n [\n _c(\"el-table-column\", {\n attrs: { prop: \"id\", label: \"任务ID\", width: \"80\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"jobName\", label: \"任务名称\" }\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"定时信息\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(scope.row.timeExpressionType) +\n \" \" +\n _vm._s(scope.row.timeExpression) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"executeType\", label: \"执行类型\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"processorType\", label: \"处理器类型\" }\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"状态\", width: \"80\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\"el-switch\", {\n attrs: {\n \"active-color\": \"#13ce66\",\n \"inactive-color\": \"#ff4949\"\n },\n on: {\n change: function($event) {\n return _vm.changeJobStatus(scope.row)\n }\n },\n model: {\n value: scope.row.enable,\n callback: function($$v) {\n _vm.$set(scope.row, \"enable\", $$v)\n },\n expression: \"scope.row.enable\"\n }\n })\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"操作\", width: \"300\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickModify(scope.row)\n }\n }\n },\n [_vm._v(\"编辑\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickRun(scope.row)\n }\n }\n },\n [_vm._v(\"运行\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\", type: \"danger\" },\n on: {\n click: function($event) {\n return _vm.onClickDeleteJob(scope.row)\n }\n }\n },\n [_vm._v(\"删除\")]\n )\n ]\n }\n }\n ])\n })\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-pagination\", {\n attrs: {\n layout: \"prev, pager, next\",\n total: this.jobInfoPageResult.totalItems,\n \"page-size\": this.jobInfoPageResult.pageSize,\n \"hide-on-single-page\": true\n },\n on: { \"current-change\": _vm.onClickChangePage }\n })\n ],\n 1\n ),\n _c(\n \"el-dialog\",\n {\n attrs: {\n title: \"新建/修改任务\",\n visible: _vm.modifiedJobFormVisible\n },\n on: {\n \"update:visible\": function($event) {\n _vm.modifiedJobFormVisible = $event\n }\n }\n },\n [\n _c(\n \"el-form\",\n { attrs: { model: _vm.modifiedJobForm, \"label-width\": \"80px\" } },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"任务名称\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobName,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobName\", $$v)\n },\n expression: \"modifiedJobForm.jobName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"任务描述\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobDescription,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobDescription\", $$v)\n },\n expression: \"modifiedJobForm.jobDescription\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"任务参数\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobParams,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobParams\", $$v)\n },\n expression: \"modifiedJobForm.jobParams\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"定时信息\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-select\",\n {\n attrs: { placeholder: \"时间表达式类型\" },\n model: {\n value: _vm.modifiedJobForm.timeExpressionType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"timeExpressionType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.timeExpressionType\"\n }\n },\n _vm._l(_vm.timeExpressionTypeOptions, function(\n item\n ) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 16 } },\n [\n _c(\"el-input\", {\n attrs: {\n placeholder:\n \"CRON填写CRON表达式，秒级任务填写整数，API无需填写\"\n },\n model: {\n value: _vm.modifiedJobForm.timeExpression,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"timeExpression\",\n $$v\n )\n },\n expression: \"modifiedJobForm.timeExpression\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"执行配置\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 5 } },\n [\n _c(\n \"el-select\",\n {\n attrs: { placeholder: \"执行类型\" },\n model: {\n value: _vm.modifiedJobForm.executeType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"executeType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.executeType\"\n }\n },\n _vm._l(_vm.executeTypeOptions, function(item) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\n \"el-select\",\n {\n attrs: { placeholder: \"处理器类型\" },\n model: {\n value: _vm.modifiedJobForm.processorType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"processorType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.processorType\"\n }\n },\n _vm._l(_vm.processorTypeOptions, function(item) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 13 } },\n [\n _c(\"el-input\", {\n attrs: {\n placeholder: _vm.verifyPlaceholder(\n _vm.modifiedJobForm.processorType\n )\n },\n model: {\n value: _vm.modifiedJobForm.processorInfo,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"processorInfo\",\n $$v\n )\n },\n expression: \"modifiedJobForm.processorInfo\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"运行配置\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"最大实例数\" },\n model: {\n value: _vm.modifiedJobForm.maxInstanceNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"maxInstanceNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.maxInstanceNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"最大实例数\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"单机线程并发度\" },\n model: {\n value: _vm.modifiedJobForm.concurrency,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"concurrency\",\n $$v\n )\n },\n expression: \"modifiedJobForm.concurrency\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"单机线程并发度\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"运行时间限制\" },\n model: {\n value: _vm.modifiedJobForm.instanceTimeLimit,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"instanceTimeLimit\",\n $$v\n )\n },\n expression: \"modifiedJobForm.instanceTimeLimit\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"运行时间限制\")\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"重试配置\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"任务重试次数\" },\n model: {\n value: _vm.modifiedJobForm.instanceRetryNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"instanceRetryNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.instanceRetryNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"任务重试次数\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: \"仅MR和广播执行模式下生效\"\n },\n model: {\n value: _vm.modifiedJobForm.taskRetryNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"taskRetryNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.taskRetryNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"子任务重试次数\")\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"机器配置\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"最低CPU核心数\" },\n model: {\n value: _vm.modifiedJobForm.minCpuCores,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minCpuCores\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minCpuCores\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"最低CPU核心数\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"最低内存(GB)\" },\n model: {\n value: _vm.modifiedJobForm.minMemorySpace,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minMemorySpace\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minMemorySpace\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"最低内存（GB\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: \"最低磁盘空间(GB)\" },\n model: {\n value: _vm.modifiedJobForm.minDiskSpace,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minDiskSpace\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minDiskSpace\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"最低磁盘空间\")\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"集群配置\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 16 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder:\n \"执行机器地址（可选，不指定代表全部；多值英文逗号分割）\"\n },\n model: {\n value: _vm.modifiedJobForm.designatedWorkers,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"designatedWorkers\",\n $$v\n )\n },\n expression: \"modifiedJobForm.designatedWorkers\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"执行机器地址\")\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: \"最大执行机器数量（0代表不限）\"\n },\n model: {\n value: _vm.modifiedJobForm.maxWorkerCount,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"maxWorkerCount\",\n $$v\n )\n },\n expression: \"modifiedJobForm.maxWorkerCount\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\"最大执行机器数量\")\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"报警配置\" } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n multiple: \"\",\n filterable: \"\",\n placeholder: \"选择报警通知人员\"\n },\n model: {\n value: _vm.modifiedJobForm.notifyUserIds,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"notifyUserIds\", $$v)\n },\n expression: \"modifiedJobForm.notifyUserIds\"\n }\n },\n _vm._l(_vm.userList, function(user) {\n return _c(\"el-option\", {\n key: user.id,\n attrs: { label: user.username, value: user.id }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n { attrs: { type: \"primary\" }, on: { click: _vm.saveJob } },\n [_vm._v(\"保存\")]\n ),\n _c(\n \"el-button\",\n {\n on: {\n click: function($event) {\n _vm.modifiedJobFormVisible = false\n }\n }\n },\n [_vm._v(\"取消\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"job_manager\" } },\n [\n _c(\n \"el-row\",\n { attrs: { gutter: 20 } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 20 } },\n [\n _c(\n \"el-form\",\n {\n staticClass: \"el-form--inline\",\n attrs: { inline: true, model: _vm.jobQueryContent }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.jobId\") } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: _vm.$t(\"message.jobId\") },\n model: {\n value: _vm.jobQueryContent.jobId,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"jobId\", $$v)\n },\n expression: \"jobQueryContent.jobId\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.keyword\") } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: _vm.$t(\"message.keyword\") },\n model: {\n value: _vm.jobQueryContent.keyword,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"keyword\", $$v)\n },\n expression: \"jobQueryContent.keyword\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.listJobInfos }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.query\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { type: \"cancel\" },\n on: { click: _vm.onClickReset }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.reset\")))]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\"el-col\", { attrs: { span: 4 } }, [\n _c(\n \"div\",\n { staticStyle: { float: \"right\", \"padding-right\": \"10px\" } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.onClickNewJob }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.newJob\")))]\n )\n ],\n 1\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.jobInfoPageResult.data }\n },\n [\n _c(\"el-table-column\", {\n attrs: {\n prop: \"id\",\n label: _vm.$t(\"message.jobId\"),\n width: \"80\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"jobName\", label: _vm.$t(\"message.jobName\") }\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.scheduleInfo\") },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(scope.row.timeExpressionType) +\n \" \" +\n _vm._s(scope.row.timeExpression) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.executeType\") },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(\n _vm.translateExecuteType(scope.row.executeType)\n ) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.processorType\") },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(\n _vm.translateProcessorType(\n scope.row.processorType\n )\n ) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.status\"), width: \"80\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\"el-switch\", {\n attrs: {\n \"active-color\": \"#13ce66\",\n \"inactive-color\": \"#ff4949\"\n },\n on: {\n change: function($event) {\n return _vm.changeJobStatus(scope.row)\n }\n },\n model: {\n value: scope.row.enable,\n callback: function($$v) {\n _vm.$set(scope.row, \"enable\", $$v)\n },\n expression: \"scope.row.enable\"\n }\n })\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.operation\"), width: \"300\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickModify(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.edit\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickRun(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.run\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\", type: \"danger\" },\n on: {\n click: function($event) {\n return _vm.onClickDeleteJob(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.delete\")))]\n )\n ]\n }\n }\n ])\n })\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-pagination\", {\n attrs: {\n layout: \"prev, pager, next\",\n total: this.jobInfoPageResult.totalItems,\n \"page-size\": this.jobInfoPageResult.pageSize,\n \"hide-on-single-page\": true\n },\n on: { \"current-change\": _vm.onClickChangePage }\n })\n ],\n 1\n ),\n _c(\n \"el-dialog\",\n {\n attrs: { visible: _vm.modifiedJobFormVisible, width: \"60%\" },\n on: {\n \"update:visible\": function($event) {\n _vm.modifiedJobFormVisible = $event\n }\n }\n },\n [\n _c(\n \"el-form\",\n { attrs: { model: _vm.modifiedJobForm, \"label-width\": \"120px\" } },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.jobName\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobName,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobName\", $$v)\n },\n expression: \"modifiedJobForm.jobName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.jobDescription\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobDescription,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobDescription\", $$v)\n },\n expression: \"modifiedJobForm.jobDescription\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.jobParams\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.modifiedJobForm.jobParams,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"jobParams\", $$v)\n },\n expression: \"modifiedJobForm.jobParams\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.scheduleInfo\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n placeholder: _vm.$t(\n \"message.timeExpressionType\"\n )\n },\n model: {\n value: _vm.modifiedJobForm.timeExpressionType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"timeExpressionType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.timeExpressionType\"\n }\n },\n _vm._l(_vm.timeExpressionTypeOptions, function(\n item\n ) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\"el-input\", {\n attrs: {\n placeholder: _vm.$t(\n \"message.timeExpressionPlaceHolder\"\n )\n },\n model: {\n value: _vm.modifiedJobForm.timeExpression,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"timeExpression\",\n $$v\n )\n },\n expression: \"modifiedJobForm.timeExpression\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 4 } },\n [\n _c(\n \"el-link\",\n {\n attrs: {\n href: \"https://cron.qqe2.com/\",\n type: \"success\",\n target: \"_blank\"\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.onlineCronTool\")))]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.executeConfig\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 5 } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n placeholder: _vm.$t(\"message.executeType\")\n },\n model: {\n value: _vm.modifiedJobForm.executeType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"executeType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.executeType\"\n }\n },\n _vm._l(_vm.executeTypeOptions, function(item) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n placeholder: _vm.$t(\"message.processorType\")\n },\n model: {\n value: _vm.modifiedJobForm.processorType,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"processorType\",\n $$v\n )\n },\n expression: \"modifiedJobForm.processorType\"\n }\n },\n _vm._l(_vm.processorTypeOptions, function(item) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 13 } },\n [\n _c(\"el-input\", {\n attrs: {\n placeholder: _vm.verifyPlaceholder(\n _vm.modifiedJobForm.processorType\n )\n },\n model: {\n value: _vm.modifiedJobForm.processorInfo,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"processorInfo\",\n $$v\n )\n },\n expression: \"modifiedJobForm.processorInfo\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.runtimeConfig\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.maxInstanceNum\")\n },\n model: {\n value: _vm.modifiedJobForm.maxInstanceNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"maxInstanceNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.maxInstanceNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.maxInstanceNum\")))\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.threadConcurrency\")\n },\n model: {\n value: _vm.modifiedJobForm.concurrency,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"concurrency\",\n $$v\n )\n },\n expression: \"modifiedJobForm.concurrency\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\n _vm._s(_vm.$t(\"message.threadConcurrency\"))\n )\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: _vm.$t(\"message.timeout\") },\n model: {\n value: _vm.modifiedJobForm.instanceTimeLimit,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"instanceTimeLimit\",\n $$v\n )\n },\n expression: \"modifiedJobForm.instanceTimeLimit\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.timeout\")))\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.retryConfig\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.taskRetryTimes\")\n },\n model: {\n value: _vm.modifiedJobForm.instanceRetryNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"instanceRetryNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.instanceRetryNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.taskRetryTimes\")))\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.subTaskRetryTimes\")\n },\n model: {\n value: _vm.modifiedJobForm.taskRetryNum,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"taskRetryNum\",\n $$v\n )\n },\n expression: \"modifiedJobForm.taskRetryNum\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\n _vm._s(_vm.$t(\"message.subTaskRetryTimes\"))\n )\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.workerConfig\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: _vm.$t(\"message.minCPU\") },\n model: {\n value: _vm.modifiedJobForm.minCpuCores,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minCpuCores\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minCpuCores\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.minCPU\")))\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.minMemory\")\n },\n model: {\n value: _vm.modifiedJobForm.minMemorySpace,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minMemorySpace\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minMemorySpace\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.minMemory\")))\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: { placeholder: _vm.$t(\"message.minDisk\") },\n model: {\n value: _vm.modifiedJobForm.minDiskSpace,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"minDiskSpace\",\n $$v\n )\n },\n expression: \"modifiedJobForm.minDiskSpace\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.minDisk\")))\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.clusterConfig\") } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 16 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\n \"message.designatedWorkerAddressPLH\"\n )\n },\n model: {\n value: _vm.modifiedJobForm.designatedWorkers,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"designatedWorkers\",\n $$v\n )\n },\n expression: \"modifiedJobForm.designatedWorkers\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(\n _vm._s(\n _vm.$t(\"message.designatedWorkerAddress\")\n )\n )\n ])\n ],\n 2\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 8 } },\n [\n _c(\n \"el-input\",\n {\n staticClass: \"ruleContent\",\n attrs: {\n placeholder: _vm.$t(\"message.maxWorkerNumPLH\")\n },\n model: {\n value: _vm.modifiedJobForm.maxWorkerCount,\n callback: function($$v) {\n _vm.$set(\n _vm.modifiedJobForm,\n \"maxWorkerCount\",\n $$v\n )\n },\n expression: \"modifiedJobForm.maxWorkerCount\"\n }\n },\n [\n _c(\"template\", { slot: \"prepend\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.maxWorkerNum\")))\n ])\n ],\n 2\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.alarmConfig\") } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n multiple: \"\",\n filterable: \"\",\n placeholder: _vm.$t(\"message.alarmSelectorPLH\")\n },\n model: {\n value: _vm.modifiedJobForm.notifyUserIds,\n callback: function($$v) {\n _vm.$set(_vm.modifiedJobForm, \"notifyUserIds\", $$v)\n },\n expression: \"modifiedJobForm.notifyUserIds\"\n }\n },\n _vm._l(_vm.userList, function(user) {\n return _c(\"el-option\", {\n key: user.id,\n attrs: { label: user.username, value: user.id }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n { attrs: { type: \"primary\" }, on: { click: _vm.saveJob } },\n [_vm._v(_vm._s(_vm.$t(\"message.save\")))]\n ),\n _c(\n \"el-button\",\n {\n on: {\n click: function($event) {\n _vm.modifiedJobFormVisible = false\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.cancel\")))]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -56,7 +56,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./JobManager.vue?vue&type=template&id=392659be&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"dddd77cc-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./JobManager.vue?vue&type=template&id=392659be&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"41f1f4da-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/JobManager.vue?vue&type=template&id=392659be&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JobManager_vue_vue_type_template_id_392659be_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/JobManager.vue?"); /***/ }) diff --git a/powerjob-server/src/main/resources/static/js/11.js b/powerjob-server/src/main/resources/static/js/11.js index 79250d2c..d9848f12 100644 --- a/powerjob-server/src/main/resources/static/js/11.js +++ b/powerjob-server/src/main/resources/static/js/11.js @@ -8,19 +8,19 @@ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"WorkflowManager\",\n data: function data() {\n return {\n // 查询条件\n workflowQueryContent: {\n appId: this.$store.state.appInfo.id,\n index: 0,\n pageSize: 10,\n workflowId: undefined,\n keyword: undefined\n },\n // 工作流查询结果\n workflowPageResult: {\n pageSize: 10,\n totalItems: 0,\n data: []\n },\n // 新建工作流对象\n workflowObj: {}\n };\n },\n methods: {\n // 查询工作流\n listWorkflow: function listWorkflow() {\n var that = this;\n this.axios.post(\"/workflow/list\", this.workflowQueryContent).then(function (res) {\n that.workflowPageResult = res;\n });\n },\n // 点击重置\n onClickReset: function onClickReset() {\n this.workflowQueryContent.workflowId = undefined;\n this.workflowQueryContent.keyword = undefined;\n },\n // 开关工作流\n switchWorkflow: function switchWorkflow(data) {\n var that = this;\n var path = data.enable ? \"enable\" : \"disable\";\n var url = \"/workflow/\" + path + \"?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url, function (res) {\n console.log(res);\n that.listWorkflow();\n });\n },\n // 编辑工作流\n onClickModifyWorkflow: function onClickModifyWorkflow(data) {\n this.$router.push({\n name: 'workflowEditor',\n params: {\n modify: true,\n workflowInfo: data\n }\n });\n },\n // 立即运行工作流\n onClickRunWorkflow: function onClickRunWorkflow(data) {\n var that = this;\n var url = \"/workflow/run?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url).then(function () {\n return that.$message.success(\"触发成功\");\n });\n },\n // 删除工作流\n onClickDeleteWorkflow: function onClickDeleteWorkflow(data) {\n var that = this;\n var url = \"/workflow/delete?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url).then(function () {\n that.$message.success(\"删除成功\");\n that.listWorkflow();\n });\n },\n // 新建工作流\n onClickNewWorkflow: function onClickNewWorkflow() {\n this.$router.push({\n name: 'workflowEditor',\n params: {\n modify: false\n }\n });\n }\n },\n mounted: function mounted() {\n this.listWorkflow();\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"WorkflowManager\",\n data: function data() {\n return {\n // 查询条件\n workflowQueryContent: {\n appId: this.$store.state.appInfo.id,\n index: 0,\n pageSize: 10,\n workflowId: undefined,\n keyword: undefined\n },\n // 工作流查询结果\n workflowPageResult: {\n pageSize: 10,\n totalItems: 0,\n data: []\n },\n // 新建工作流对象\n workflowObj: {}\n };\n },\n methods: {\n // 查询工作流\n listWorkflow: function listWorkflow() {\n var that = this;\n this.axios.post(\"/workflow/list\", this.workflowQueryContent).then(function (res) {\n that.workflowPageResult = res;\n });\n },\n // 点击重置\n onClickReset: function onClickReset() {\n this.workflowQueryContent.workflowId = undefined;\n this.workflowQueryContent.keyword = undefined;\n },\n // 开关工作流\n switchWorkflow: function switchWorkflow(data) {\n var that = this;\n var path = data.enable ? \"enable\" : \"disable\";\n var url = \"/workflow/\" + path + \"?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url, function (res) {\n console.log(res);\n that.listWorkflow();\n });\n },\n // 编辑工作流\n onClickModifyWorkflow: function onClickModifyWorkflow(data) {\n this.$router.push({\n name: 'workflowEditor',\n params: {\n modify: true,\n workflowInfo: data\n }\n });\n },\n // 立即运行工作流\n onClickRunWorkflow: function onClickRunWorkflow(data) {\n var _this = this;\n\n var that = this;\n var url = \"/workflow/run?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url).then(function () {\n return that.$message.success(_this.$t('message.success'));\n });\n },\n // 删除工作流\n onClickDeleteWorkflow: function onClickDeleteWorkflow(data) {\n var _this2 = this;\n\n var that = this;\n var url = \"/workflow/delete?appId=\" + this.$store.state.appInfo.id + \"&workflowId=\" + data.id;\n this.axios.get(url).then(function () {\n that.$message.success(_this2.$t('message.success'));\n that.listWorkflow();\n });\n },\n // 新建工作流\n onClickNewWorkflow: function onClickNewWorkflow() {\n this.$router.push({\n name: 'workflowEditor',\n params: {\n modify: false\n }\n });\n }\n },\n mounted: function mounted() {\n this.listWorkflow();\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true&": +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true&": /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true& ***! + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true& ***! \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"workflow_manager\" } },\n [\n _c(\n \"el-row\",\n { attrs: { gutter: 20 } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 20 } },\n [\n _c(\n \"el-form\",\n {\n staticClass: \"el-form--inline\",\n attrs: { inline: true, model: _vm.workflowQueryContent }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"工作流ID\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"工作流ID\" },\n model: {\n value: _vm.workflowQueryContent.workflowId,\n callback: function($$v) {\n _vm.$set(\n _vm.workflowQueryContent,\n \"workflowId\",\n $$v\n )\n },\n expression: \"workflowQueryContent.workflowId\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"关键字\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"关键字\" },\n model: {\n value: _vm.workflowQueryContent.keyword,\n callback: function($$v) {\n _vm.$set(_vm.workflowQueryContent, \"keyword\", $$v)\n },\n expression: \"workflowQueryContent.keyword\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.listWorkflow }\n },\n [_vm._v(\"查询\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { type: \"cancel\" },\n on: { click: _vm.onClickReset }\n },\n [_vm._v(\"重置\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\"el-col\", { attrs: { span: 4 } }, [\n _c(\n \"div\",\n { staticStyle: { float: \"right\", \"padding-right\": \"10px\" } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.onClickNewWorkflow }\n },\n [_vm._v(\"新建工作流\")]\n )\n ],\n 1\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.workflowPageResult.data }\n },\n [\n _c(\"el-table-column\", {\n attrs: { prop: \"id\", label: \"工作流ID\", width: \"120\" }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"wfName\", label: \"工作流名称\" }\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"定时信息\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(scope.row.timeExpressionType) +\n \" \" +\n _vm._s(scope.row.timeExpression) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"状态\", width: \"80\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\"el-switch\", {\n attrs: {\n \"active-color\": \"#13ce66\",\n \"inactive-color\": \"#ff4949\"\n },\n on: {\n change: function($event) {\n return _vm.switchWorkflow(scope.row)\n }\n },\n model: {\n value: scope.row.enable,\n callback: function($$v) {\n _vm.$set(scope.row, \"enable\", $$v)\n },\n expression: \"scope.row.enable\"\n }\n })\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"操作\", width: \"300\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickModifyWorkflow(scope.row)\n }\n }\n },\n [_vm._v(\"编辑\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickRunWorkflow(scope.row)\n }\n }\n },\n [_vm._v(\"运行\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\", type: \"danger\" },\n on: {\n click: function($event) {\n return _vm.onClickDeleteWorkflow(scope.row)\n }\n }\n },\n [_vm._v(\"删除\")]\n )\n ]\n }\n }\n ])\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"workflow_manager\" } },\n [\n _c(\n \"el-row\",\n { attrs: { gutter: 20 } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 20 } },\n [\n _c(\n \"el-form\",\n {\n staticClass: \"el-form--inline\",\n attrs: { inline: true, model: _vm.workflowQueryContent }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.wfId\") } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: _vm.$t(\"message.wfId\") },\n model: {\n value: _vm.workflowQueryContent.workflowId,\n callback: function($$v) {\n _vm.$set(\n _vm.workflowQueryContent,\n \"workflowId\",\n $$v\n )\n },\n expression: \"workflowQueryContent.workflowId\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.keyword\") } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: _vm.$t(\"message.keyword\") },\n model: {\n value: _vm.workflowQueryContent.keyword,\n callback: function($$v) {\n _vm.$set(_vm.workflowQueryContent, \"keyword\", $$v)\n },\n expression: \"workflowQueryContent.keyword\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.listWorkflow }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.query\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { type: \"cancel\" },\n on: { click: _vm.onClickReset }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.reset\")))]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\"el-col\", { attrs: { span: 4 } }, [\n _c(\n \"div\",\n { staticStyle: { float: \"right\", \"padding-right\": \"10px\" } },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.onClickNewWorkflow }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.newWorkflow\")))]\n )\n ],\n 1\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: { data: _vm.workflowPageResult.data }\n },\n [\n _c(\"el-table-column\", {\n attrs: {\n prop: \"id\",\n label: _vm.$t(\"message.wfId\"),\n width: \"120\"\n }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"wfName\", label: _vm.$t(\"message.wfName\") }\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.scheduleInfo\") },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _vm._v(\n \" \" +\n _vm._s(scope.row.timeExpressionType) +\n \" \" +\n _vm._s(scope.row.timeExpression) +\n \" \"\n )\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.status\"), width: \"80\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\"el-switch\", {\n attrs: {\n \"active-color\": \"#13ce66\",\n \"inactive-color\": \"#ff4949\"\n },\n on: {\n change: function($event) {\n return _vm.switchWorkflow(scope.row)\n }\n },\n model: {\n value: scope.row.enable,\n callback: function($$v) {\n _vm.$set(scope.row, \"enable\", $$v)\n },\n expression: \"scope.row.enable\"\n }\n })\n ]\n }\n }\n ])\n }),\n _c(\"el-table-column\", {\n attrs: { label: _vm.$t(\"message.operation\"), width: \"300\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickModifyWorkflow(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.edit\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.onClickRunWorkflow(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.run\")))]\n ),\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\", type: \"danger\" },\n on: {\n click: function($event) {\n return _vm.onClickDeleteWorkflow(scope.row)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.delete\")))]\n )\n ]\n }\n }\n ])\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -56,7 +56,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"dddd77cc-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"41f1f4da-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/WorkflowManager.vue?vue&type=template&id=d5948a66&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WorkflowManager_vue_vue_type_template_id_d5948a66_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/WorkflowManager.vue?"); /***/ }) diff --git a/powerjob-server/src/main/resources/static/js/2.js b/powerjob-server/src/main/resources/static/js/2.js index ecd4eb93..2337571d 100644 --- a/powerjob-server/src/main/resources/static/js/2.js +++ b/powerjob-server/src/main/resources/static/js/2.js @@ -8,19 +8,19 @@ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.includes */ \"./node_modules/core-js/modules/es.array.includes.js\");\n/* harmony import */ var core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.array.splice */ \"./node_modules/core-js/modules/es.array.splice.js\");\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.regexp.exec */ \"./node_modules/core-js/modules/es.regexp.exec.js\");\n/* harmony import */ var core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.string.includes */ \"./node_modules/core-js/modules/es.string.includes.js\");\n/* harmony import */ var core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.string.replace */ \"./node_modules/core-js/modules/es.string.replace.js\");\n/* harmony import */ var core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4__);\n/* harmony import */ var core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.string.split */ \"./node_modules/core-js/modules/es.string.split.js\");\n/* harmony import */ var core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5__);\n/* harmony import */ var _main__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../main */ \"./src/main.js\");\n\n\n\n\n\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\nvar ws;\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"ContainerManager\",\n data: function data() {\n return {\n form: {\n sourceType: 'Git',\n containerName: ''\n },\n gitForm: {\n repo: '',\n branch: '',\n username: '',\n password: ''\n },\n sourceInfo: '',\n id: '',\n appId: this.$store.state.appInfo.id,\n dialogVisible: false,\n arrangeTitle: '',\n arrangeVisible: false,\n containerList: [],\n logs: [],\n requestUrl: \"\",\n fileList: []\n };\n },\n methods: {\n onSubmit: function onSubmit() {\n var _this = this;\n\n // 接口参数\n var data = {\n appId: this.appId,\n containerName: this.form.containerName,\n status: \"ENABLE\",\n id: this.id,\n sourceType: this.form.sourceType\n };\n\n if (this.form.sourceType == 'Git') {\n data.sourceInfo = JSON.stringify(this.gitForm);\n } else {\n data.sourceInfo = this.sourceInfo;\n data.sourceType = 'FatJar';\n }\n\n this.flyio.post(\"container/save\", data).then(function (res) {\n if (res.data.success) {\n var appId = _this.$store.state.appInfo.id;\n\n _this.flyio.get(\"/container/list?appId=\" + appId).then(function (res) {\n if (res.data.success) {\n _this.$message('成功创建/修改容器～'); // 恢复默认表单\n\n\n _this.dialogVisible = false;\n _this.form.containerName = '';\n _this.gitForm = {};\n _this.sourceInfo = '';\n _this.id = ''; // 刷新容器表单\n\n _this.containerList = res.data.data;\n }\n });\n } else {\n _this.$message('创建容器失败～');\n }\n });\n },\n // 文件上传成功后 修改来源信息\n onSuccess: function onSuccess(response) {\n this.sourceInfo = response.data;\n },\n deleteItem: function deleteItem(item, index) {\n var _this2 = this;\n\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/delete?containerId=\" + item.id + '&appId=' + appId).then(function (res) {\n console.log(res);\n\n _this2.containerList.splice(index, 1);\n\n _this2.$message(\"\\u5BB9\\u5668\".concat(item.containerName, \"\\u5DF2\\u5220\\u9664\"));\n });\n },\n editItem: function editItem(item) {\n if (item.sourceType == 'Git') {\n this.form.sourceType = 'Git';\n this.gitForm = JSON.parse(item.sourceInfo);\n } else {\n this.form.sourceType = 'FatJar';\n }\n\n this.form.containerName = item.containerName;\n this.id = item.id;\n this.dialogVisible = true;\n },\n arrangeItem: function arrangeItem(item) {\n var _this3 = this;\n\n var wsBase = this.requestUrl.replace(\"http\", \"ws\") + \"/container/deploy/\";\n var wsUrl = wsBase + item.id;\n ws = new WebSocket(wsUrl);\n\n ws.onopen = function () {\n _this3.arrangeTitle = \"机器部署\";\n _this3.arrangeVisible = true;\n console.log(\"Connection open ...\");\n ws.send(\"Hello WebSockets!\");\n };\n\n ws.onmessage = function (evt) {\n _this3.logs.push(evt.data);\n };\n\n ws.onclose = function () {\n console.log(\"Connection closed.\");\n };\n },\n // 关闭部署页面时 关闭ws避免dialog内的信息有上台机器信息\n closeArrange: function closeArrange() {\n ws.close();\n this.logs = [];\n },\n closeEdit: function closeEdit() {\n this.sourceInfo = '';\n this.fileList = [];\n },\n listOfItem: function listOfItem(item) {\n var _this4 = this;\n\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/listDeployedWorker?containerId=\" + item.id + '&appId=' + appId).then(function (res) {\n if (res.data.data) {\n _this4.logs = res.data.data.split('\\n');\n _this4.arrangeTitle = \"机器列表\";\n _this4.arrangeVisible = true;\n } // this.containerList.splice(index,1);\n // this.$message(`容器${item.containerName}已删除`);\n\n });\n },\n // 兼容 java build in 模式下 baseURL 为 / 的情况（将当前url作为请求路径）\n calculateRequestUrl: function calculateRequestUrl() {\n if (_main__WEBPACK_IMPORTED_MODULE_6__[\"default\"] === undefined || !_main__WEBPACK_IMPORTED_MODULE_6__[\"default\"].includes(\"http\")) {\n var url = window.location.href;\n var urlSplit = url.split('//'); // str1[0]--协议头\n\n var ip = urlSplit[1].split('/')[0];\n this.requestUrl = urlSplit[0] + '//' + ip;\n console.log(\"calculateRequestUrl: \" + this.requestUrl);\n } else {\n this.requestUrl = _main__WEBPACK_IMPORTED_MODULE_6__[\"default\"];\n }\n }\n },\n mounted: function mounted() {\n var _this5 = this;\n\n this.calculateRequestUrl();\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/list?appId=\" + appId).then(function (res) {\n console.log(res);\n\n if (res.data.success) {\n _this5.containerList = res.data.data;\n }\n });\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.includes */ \"./node_modules/core-js/modules/es.array.includes.js\");\n/* harmony import */ var core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.array.splice */ \"./node_modules/core-js/modules/es.array.splice.js\");\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.regexp.exec */ \"./node_modules/core-js/modules/es.regexp.exec.js\");\n/* harmony import */ var core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.string.includes */ \"./node_modules/core-js/modules/es.string.includes.js\");\n/* harmony import */ var core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.string.replace */ \"./node_modules/core-js/modules/es.string.replace.js\");\n/* harmony import */ var core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace__WEBPACK_IMPORTED_MODULE_4__);\n/* harmony import */ var core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.string.split */ \"./node_modules/core-js/modules/es.string.split.js\");\n/* harmony import */ var core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split__WEBPACK_IMPORTED_MODULE_5__);\n/* harmony import */ var _main__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../main */ \"./src/main.js\");\n\n\n\n\n\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\nvar ws;\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"ContainerManager\",\n data: function data() {\n return {\n form: {\n sourceType: 'Git',\n containerName: ''\n },\n gitForm: {\n repo: '',\n branch: '',\n username: '',\n password: ''\n },\n sourceInfo: '',\n id: '',\n appId: this.$store.state.appInfo.id,\n dialogVisible: false,\n arrangeTitle: '',\n arrangeVisible: false,\n containerList: [],\n logs: [],\n requestUrl: \"\",\n fileList: []\n };\n },\n methods: {\n onSubmit: function onSubmit() {\n var _this = this;\n\n // 接口参数\n var data = {\n appId: this.appId,\n containerName: this.form.containerName,\n status: \"ENABLE\",\n id: this.id,\n sourceType: this.form.sourceType\n };\n\n if (this.form.sourceType == 'Git') {\n data.sourceInfo = JSON.stringify(this.gitForm);\n } else {\n data.sourceInfo = this.sourceInfo;\n data.sourceType = 'FatJar';\n }\n\n this.flyio.post(\"container/save\", data).then(function (res) {\n if (res.data.success) {\n var appId = _this.$store.state.appInfo.id;\n\n _this.flyio.get(\"/container/list?appId=\" + appId).then(function (res) {\n if (res.data.success) {\n _this.$message.info(_this.$t('message.success')); // 恢复默认表单\n\n\n _this.dialogVisible = false;\n _this.form.containerName = '';\n _this.gitForm = {};\n _this.sourceInfo = '';\n _this.id = ''; // 刷新容器表单\n\n _this.containerList = res.data.data;\n }\n });\n } else {\n _this.$message.warning(_this.$t('message.failed'));\n }\n });\n },\n // 文件上传成功后 修改来源信息\n onSuccess: function onSuccess(response) {\n this.sourceInfo = response.data;\n },\n deleteItem: function deleteItem(item, index) {\n var _this2 = this;\n\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/delete?containerId=\" + item.id + '&appId=' + appId).then(function (res) {\n console.log(res);\n\n _this2.containerList.splice(index, 1);\n\n _this2.$message.info(_this2.$t('message.success'));\n });\n },\n editItem: function editItem(item) {\n if (item.sourceType == 'Git') {\n this.form.sourceType = 'Git';\n this.gitForm = JSON.parse(item.sourceInfo);\n } else {\n this.form.sourceType = 'FatJar';\n }\n\n this.form.containerName = item.containerName;\n this.id = item.id;\n this.dialogVisible = true;\n },\n arrangeItem: function arrangeItem(item) {\n var _this3 = this;\n\n var wsBase = this.requestUrl.replace(\"http\", \"ws\") + \"/container/deploy/\";\n var wsUrl = wsBase + item.id;\n ws = new WebSocket(wsUrl);\n\n ws.onopen = function () {\n _this3.arrangeTitle = _this3.$t('message.deploy');\n _this3.arrangeVisible = true;\n console.log(\"Connection open ...\");\n ws.send(\"Hello WebSockets!\");\n };\n\n ws.onmessage = function (evt) {\n _this3.logs.push(evt.data);\n };\n\n ws.onclose = function () {\n console.log(\"Connection closed.\");\n };\n },\n // 关闭部署页面时 关闭ws避免dialog内的信息有上台机器信息\n closeArrange: function closeArrange() {\n ws.close();\n this.logs = [];\n },\n closeEdit: function closeEdit() {\n this.sourceInfo = '';\n this.fileList = [];\n },\n listOfItem: function listOfItem(item) {\n var _this4 = this;\n\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/listDeployedWorker?containerId=\" + item.id + '&appId=' + appId).then(function (res) {\n if (res.data.data) {\n _this4.logs = res.data.data.split('\\n');\n _this4.arrangeTitle = _this4.$t('message.deployedWorkerList');\n _this4.arrangeVisible = true;\n } // this.containerList.splice(index,1);\n // this.$message(`容器${item.containerName}已删除`);\n\n });\n },\n // 兼容 java build in 模式下 baseURL 为 / 的情况（将当前url作为请求路径）\n calculateRequestUrl: function calculateRequestUrl() {\n if (_main__WEBPACK_IMPORTED_MODULE_6__[\"default\"] === undefined || !_main__WEBPACK_IMPORTED_MODULE_6__[\"default\"].includes(\"http\")) {\n var url = window.location.href;\n var urlSplit = url.split('//'); // str1[0]--协议头\n\n var ip = urlSplit[1].split('/')[0];\n this.requestUrl = urlSplit[0] + '//' + ip;\n console.log(\"calculateRequestUrl: \" + this.requestUrl);\n } else {\n this.requestUrl = _main__WEBPACK_IMPORTED_MODULE_6__[\"default\"];\n }\n }\n },\n mounted: function mounted() {\n var _this5 = this;\n\n this.calculateRequestUrl();\n var appId = this.$store.state.appInfo.id;\n this.flyio.get(\"/container/list?appId=\" + appId).then(function (res) {\n console.log(res);\n\n if (res.data.success) {\n _this5.containerList = res.data.data;\n }\n });\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true&": +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true&": /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true& ***! + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true& ***! \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n [\n _c(\"el-card\", { staticClass: \"box-card\" }, [\n _c(\n \"div\",\n {\n staticClass: \"clearfix\",\n attrs: { slot: \"header\" },\n slot: \"header\"\n },\n [\n _c(\"span\"),\n _c(\n \"el-button\",\n {\n staticStyle: { float: \"right\" },\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n _vm.dialogVisible = true\n }\n }\n },\n [_vm._v(\"新增容器\")]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"wrapper\" },\n _vm._l(_vm.containerList, function(item, key) {\n return _c(\"div\", { key: key, staticClass: \"item\" }, [\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\"容器ID：\")]),\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(_vm._s(item.id))])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\" 容器名称：\")]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.containerName))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\"地址类型：\")]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.sourceType))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\"文件版本：\")]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.version))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\"部署日期：\")]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.lastDeployTime))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(\"当前状态：\")]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.status))\n ])\n ]),\n _c(\"div\", { staticStyle: { width: \"240px\", margin: \"0 auto\" } }, [\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.arrangeItem(item)\n }\n }\n },\n [_vm._v(\"部署\")]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.editItem(item)\n }\n }\n },\n [_vm._v(\"编辑\")]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.deleteItem(item, key)\n }\n }\n },\n [_vm._v(\"删除\")]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.listOfItem(item)\n }\n }\n },\n [_vm._v(\"机器列表\")]\n )\n ],\n 1\n )\n ])\n ])\n }),\n 0\n )\n ]),\n _c(\n \"el-dialog\",\n {\n attrs: {\n title: \"新增容器\",\n visible: _vm.dialogVisible,\n width: \"50%\",\n \"before-close\": _vm.handleClose\n },\n on: {\n \"update:visible\": function($event) {\n _vm.dialogVisible = $event\n },\n close: _vm.closeEdit\n }\n },\n [\n _c(\n \"el-form\",\n {\n ref: \"form\",\n staticClass: \"genTable\",\n attrs: {\n model: _vm.form,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"Container Name\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.containerName,\n callback: function($$v) {\n _vm.$set(_vm.form, \"containerName\", $$v)\n },\n expression: \"form.containerName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"地址类型\" } },\n [\n _c(\n \"el-radio-group\",\n {\n model: {\n value: _vm.form.sourceType,\n callback: function($$v) {\n _vm.$set(_vm.form, \"sourceType\", $$v)\n },\n expression: \"form.sourceType\"\n }\n },\n [\n _c(\"el-radio\", { attrs: { label: \"Git\" } }),\n _c(\"el-radio\", { attrs: { label: \"FatJar\" } })\n ],\n 1\n )\n ],\n 1\n ),\n _vm.form.sourceType == \"Git\"\n ? _c(\n \"el-form\",\n {\n ref: \"gitform\",\n staticClass: \"gitTable\",\n attrs: {\n model: _vm.gitForm,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"Git仓库地址\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.repo,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"repo\", $$v)\n },\n expression: \"gitForm.repo\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"分支名称\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.branch,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"branch\", $$v)\n },\n expression: \"gitForm.branch\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"用户名\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.username,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"username\", $$v)\n },\n expression: \"gitForm.username\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"密码\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.password,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"password\", $$v)\n },\n expression: \"gitForm.password\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n : _vm._e(),\n _vm.form.sourceType == \"FatJar\"\n ? _c(\n \"el-form-item\",\n [\n _c(\n \"el-upload\",\n {\n staticClass: \"upload-demo\",\n attrs: {\n drag: \"\",\n \"file-list\": _vm.fileList,\n \"on-success\": _vm.onSuccess,\n action: _vm.requestUrl + \"/container/jarUpload\",\n multiple: \"\"\n }\n },\n [\n _c(\"i\", { staticClass: \"el-icon-upload\" }),\n _c(\"div\", { staticClass: \"el-upload__text\" }, [\n _vm._v(\"将文件拖到此处，或\"),\n _c(\"em\", [_vm._v(\"点击上传\")])\n ]),\n _c(\n \"div\",\n {\n staticClass: \"el-upload__tip\",\n attrs: { slot: \"tip\" },\n slot: \"tip\"\n },\n [_vm._v(\"拖拽或点击文件后会自动上传\")]\n )\n ]\n )\n ],\n 1\n )\n : _vm._e(),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: {\n type: \"primary\",\n disabled:\n _vm.form.sourceType == \"FatJar\" && !this.sourceInfo\n },\n on: { click: _vm.onSubmit }\n },\n [_vm._v(\"Save\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-dialog\",\n {\n attrs: { title: _vm.arrangeTitle, visible: _vm.arrangeVisible },\n on: {\n \"update:visible\": function($event) {\n _vm.arrangeVisible = $event\n },\n close: _vm.closeArrange\n }\n },\n _vm._l(_vm.logs, function(log) {\n return _c(\"h4\", { key: log }, [_vm._v(_vm._s(log))])\n }),\n 0\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n [\n _c(\"el-card\", { staticClass: \"box-card\" }, [\n _c(\n \"div\",\n {\n staticClass: \"clearfix\",\n attrs: { slot: \"header\" },\n slot: \"header\"\n },\n [\n _c(\"span\"),\n _c(\n \"el-button\",\n {\n staticStyle: { float: \"right\" },\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n _vm.dialogVisible = true\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.newContainer\")))]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"wrapper\" },\n _vm._l(_vm.containerList, function(item, key) {\n return _c(\"div\", { key: key, staticClass: \"item\" }, [\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.containerId\")))\n ]),\n _c(\"span\", { staticClass: \"value\" }, [_vm._v(_vm._s(item.id))])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.containerName\")) + \" \")\n ]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.containerName))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.containerType\")) + \" \")\n ]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.sourceType))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.containerVersion\")) + \" \")\n ]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.version))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.deployTime\")) + \" \")\n ]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.lastDeployTime))\n ])\n ]),\n _c(\"div\", { staticClass: \"containerText\" }, [\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.status\")) + \" \")\n ]),\n _c(\"span\", { staticClass: \"value\" }, [\n _vm._v(_vm._s(item.status))\n ])\n ]),\n _c(\"div\", { staticStyle: { width: \"240px\", margin: \"0 auto\" } }, [\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.arrangeItem(item)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.deploy\")))]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.editItem(item)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.edit\")))]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.deleteItem(item, key)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.delete\")))]\n )\n ],\n 1\n ),\n _c(\n \"div\",\n { staticClass: \"btnWrap\" },\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: {\n click: function($event) {\n return _vm.listOfItem(item)\n }\n }\n },\n [_vm._v(_vm._s(_vm.$t(\"message.deployedWorkerList\")))]\n )\n ],\n 1\n )\n ])\n ])\n }),\n 0\n )\n ]),\n _c(\n \"el-dialog\",\n {\n attrs: {\n title: _vm.$t(\"message.newContainer\"),\n visible: _vm.dialogVisible,\n width: \"50%\",\n \"before-close\": _vm.handleClose\n },\n on: {\n \"update:visible\": function($event) {\n _vm.dialogVisible = $event\n },\n close: _vm.closeEdit\n }\n },\n [\n _c(\n \"el-form\",\n {\n ref: \"form\",\n staticClass: \"genTable\",\n attrs: {\n model: _vm.form,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.containerName\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.containerName,\n callback: function($$v) {\n _vm.$set(_vm.form, \"containerName\", $$v)\n },\n expression: \"form.containerName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.containerType\") } },\n [\n _c(\n \"el-radio-group\",\n {\n model: {\n value: _vm.form.sourceType,\n callback: function($$v) {\n _vm.$set(_vm.form, \"sourceType\", $$v)\n },\n expression: \"form.sourceType\"\n }\n },\n [\n _c(\"el-radio\", { attrs: { label: \"Git\" } }),\n _c(\"el-radio\", { attrs: { label: \"FatJar\" } })\n ],\n 1\n )\n ],\n 1\n ),\n _vm.form.sourceType == \"Git\"\n ? _c(\n \"el-form\",\n {\n ref: \"gitform\",\n staticClass: \"gitTable\",\n attrs: {\n model: _vm.gitForm,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.containerGitURL\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.repo,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"repo\", $$v)\n },\n expression: \"gitForm.repo\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.branchName\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.branch,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"branch\", $$v)\n },\n expression: \"gitForm.branch\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.username\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.username,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"username\", $$v)\n },\n expression: \"gitForm.username\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: _vm.$t(\"message.password\") } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.gitForm.password,\n callback: function($$v) {\n _vm.$set(_vm.gitForm, \"password\", $$v)\n },\n expression: \"gitForm.password\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n : _vm._e(),\n _vm.form.sourceType == \"FatJar\"\n ? _c(\n \"el-form-item\",\n [\n _c(\n \"el-upload\",\n {\n staticClass: \"upload-demo\",\n attrs: {\n drag: \"\",\n \"file-list\": _vm.fileList,\n \"on-success\": _vm.onSuccess,\n action: _vm.requestUrl + \"/container/jarUpload\",\n multiple: \"\"\n }\n },\n [\n _c(\"i\", { staticClass: \"el-icon-upload\" }),\n _c(\"div\", { staticClass: \"el-upload__text\" }, [\n _vm._v(\"Drag the file here, or \"),\n _c(\"em\", [_vm._v(\"click on Upload\")])\n ]),\n _c(\n \"div\",\n {\n staticClass: \"el-upload__tip\",\n attrs: { slot: \"tip\" },\n slot: \"tip\"\n },\n [_vm._v(_vm._s(_vm.$t(\"message.uploadTips\")))]\n )\n ]\n )\n ],\n 1\n )\n : _vm._e(),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: {\n type: \"primary\",\n disabled:\n _vm.form.sourceType == \"FatJar\" && !this.sourceInfo\n },\n on: { click: _vm.onSubmit }\n },\n [_vm._v(\"Save\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-dialog\",\n {\n attrs: { title: _vm.arrangeTitle, visible: _vm.arrangeVisible },\n on: {\n \"update:visible\": function($event) {\n _vm.arrangeVisible = $event\n },\n close: _vm.closeArrange\n }\n },\n _vm._l(_vm.logs, function(log) {\n return _c(\"h4\", { key: log }, [_vm._v(_vm._s(log))])\n }),\n 0\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -36,39 +36,6 @@ eval("\nvar charAt = __webpack_require__(/*! ../internals/string-multibyte */ \" /***/ }), -/***/ "./node_modules/core-js/internals/array-method-has-species-support.js": -/*!****************************************************************************!*\ - !*** ./node_modules/core-js/internals/array-method-has-species-support.js ***! - \****************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\nvar wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ \"./node_modules/core-js/internals/well-known-symbol.js\");\nvar V8_VERSION = __webpack_require__(/*! ../internals/engine-v8-version */ \"./node_modules/core-js/internals/engine-v8-version.js\");\n\nvar SPECIES = wellKnownSymbol('species');\n\nmodule.exports = function (METHOD_NAME) {\n // We can't use this feature detection in V8 since it causes\n // deoptimization and serious performance degradation\n // https://github.com/zloirock/core-js/issues/677\n return V8_VERSION >= 51 || !fails(function () {\n var array = [];\n var constructor = array.constructor = {};\n constructor[SPECIES] = function () {\n return { foo: 1 };\n };\n return array[METHOD_NAME](Boolean).foo !== 1;\n });\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-method-has-species-support.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-method-uses-to-length.js": -/*!***********************************************************************!*\ - !*** ./node_modules/core-js/internals/array-method-uses-to-length.js ***! - \***********************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var DESCRIPTORS = __webpack_require__(/*! ../internals/descriptors */ \"./node_modules/core-js/internals/descriptors.js\");\nvar fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\nvar has = __webpack_require__(/*! ../internals/has */ \"./node_modules/core-js/internals/has.js\");\n\nvar defineProperty = Object.defineProperty;\nvar cache = {};\n\nvar thrower = function (it) { throw it; };\n\nmodule.exports = function (METHOD_NAME, options) {\n if (has(cache, METHOD_NAME)) return cache[METHOD_NAME];\n if (!options) options = {};\n var method = [][METHOD_NAME];\n var ACCESSORS = has(options, 'ACCESSORS') ? options.ACCESSORS : false;\n var argument0 = has(options, 0) ? options[0] : thrower;\n var argument1 = has(options, 1) ? options[1] : undefined;\n\n return cache[METHOD_NAME] = !!method && !fails(function () {\n if (ACCESSORS && !DESCRIPTORS) return true;\n var O = { length: -1 };\n\n if (ACCESSORS) defineProperty(O, 1, { enumerable: true, get: thrower });\n else O[1] = 1;\n\n method.call(O, argument0, argument1);\n });\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-method-uses-to-length.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/array-species-create.js": -/*!****************************************************************!*\ - !*** ./node_modules/core-js/internals/array-species-create.js ***! - \****************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var isObject = __webpack_require__(/*! ../internals/is-object */ \"./node_modules/core-js/internals/is-object.js\");\nvar isArray = __webpack_require__(/*! ../internals/is-array */ \"./node_modules/core-js/internals/is-array.js\");\nvar wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ \"./node_modules/core-js/internals/well-known-symbol.js\");\n\nvar SPECIES = wellKnownSymbol('species');\n\n// `ArraySpeciesCreate` abstract operation\n// https://tc39.github.io/ecma262/#sec-arrayspeciescreate\nmodule.exports = function (originalArray, length) {\n var C;\n if (isArray(originalArray)) {\n C = originalArray.constructor;\n // cross-realm fallback\n if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;\n else if (isObject(C)) {\n C = C[SPECIES];\n if (C === null) C = undefined;\n }\n } return new (C === undefined ? Array : C)(length === 0 ? 0 : length);\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-species-create.js?"); - -/***/ }), - /***/ "./node_modules/core-js/internals/correct-is-regexp-logic.js": /*!*******************************************************************!*\ !*** ./node_modules/core-js/internals/correct-is-regexp-logic.js ***! @@ -80,41 +47,6 @@ eval("var wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symb /***/ }), -/***/ "./node_modules/core-js/internals/create-property.js": -/*!***********************************************************!*\ - !*** ./node_modules/core-js/internals/create-property.js ***! - \***********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar toPrimitive = __webpack_require__(/*! ../internals/to-primitive */ \"./node_modules/core-js/internals/to-primitive.js\");\nvar definePropertyModule = __webpack_require__(/*! ../internals/object-define-property */ \"./node_modules/core-js/internals/object-define-property.js\");\nvar createPropertyDescriptor = __webpack_require__(/*! ../internals/create-property-descriptor */ \"./node_modules/core-js/internals/create-property-descriptor.js\");\n\nmodule.exports = function (object, key, value) {\n var propertyKey = toPrimitive(key);\n if (propertyKey in object) definePropertyModule.f(object, propertyKey, createPropertyDescriptor(0, value));\n else object[propertyKey] = value;\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/create-property.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/fix-regexp-well-known-symbol-logic.js": -/*!******************************************************************************!*\ - !*** ./node_modules/core-js/internals/fix-regexp-well-known-symbol-logic.js ***! - \******************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\n// TODO: Remove from `core-js@4` since it's moved to entry points\n__webpack_require__(/*! ../modules/es.regexp.exec */ \"./node_modules/core-js/modules/es.regexp.exec.js\");\nvar redefine = __webpack_require__(/*! ../internals/redefine */ \"./node_modules/core-js/internals/redefine.js\");\nvar fails = __webpack_require__(/*! ../internals/fails */ \"./node_modules/core-js/internals/fails.js\");\nvar wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ \"./node_modules/core-js/internals/well-known-symbol.js\");\nvar regexpExec = __webpack_require__(/*! ../internals/regexp-exec */ \"./node_modules/core-js/internals/regexp-exec.js\");\nvar createNonEnumerableProperty = __webpack_require__(/*! ../internals/create-non-enumerable-property */ \"./node_modules/core-js/internals/create-non-enumerable-property.js\");\n\nvar SPECIES = wellKnownSymbol('species');\n\nvar REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {\n // #replace needs built-in support for named groups.\n // #match works fine because it just return the exec results, even if it has\n // a \"grops\" property.\n var re = /./;\n re.exec = function () {\n var result = [];\n result.groups = { a: '7' };\n return result;\n };\n return ''.replace(re, '$') !== '7';\n});\n\n// IE <= 11 replaces $0 with the whole match, as if it was $&\n// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0\nvar REPLACE_KEEPS_$0 = (function () {\n return 'a'.replace(/./, '$0') === '$0';\n})();\n\nvar REPLACE = wellKnownSymbol('replace');\n// Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string\nvar REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {\n if (/./[REPLACE]) {\n return /./[REPLACE]('a', '$0') === '';\n }\n return false;\n})();\n\n// Chrome 51 has a buggy \"split\" implementation when RegExp#exec !== nativeExec\n// Weex JS has frozen built-in prototypes, so use try / catch wrapper\nvar SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails(function () {\n var re = /(?:)/;\n var originalExec = re.exec;\n re.exec = function () { return originalExec.apply(this, arguments); };\n var result = 'ab'.split(re);\n return result.length !== 2 || result[0] !== 'a' || result[1] !== 'b';\n});\n\nmodule.exports = function (KEY, length, exec, sham) {\n var SYMBOL = wellKnownSymbol(KEY);\n\n var DELEGATES_TO_SYMBOL = !fails(function () {\n // String methods call symbol-named RegEp methods\n var O = {};\n O[SYMBOL] = function () { return 7; };\n return ''[KEY](O) != 7;\n });\n\n var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {\n // Symbol-named RegExp methods call .exec\n var execCalled = false;\n var re = /a/;\n\n if (KEY === 'split') {\n // We can't use real regex here since it causes deoptimization\n // and serious performance degradation in V8\n // https://github.com/zloirock/core-js/issues/306\n re = {};\n // RegExp[@@split] doesn't call the regex's exec method, but first creates\n // a new one. We need to return the patched regex when creating the new one.\n re.constructor = {};\n re.constructor[SPECIES] = function () { return re; };\n re.flags = '';\n re[SYMBOL] = /./[SYMBOL];\n }\n\n re.exec = function () { execCalled = true; return null; };\n\n re[SYMBOL]('');\n return !execCalled;\n });\n\n if (\n !DELEGATES_TO_SYMBOL ||\n !DELEGATES_TO_EXEC ||\n (KEY === 'replace' && !(\n REPLACE_SUPPORTS_NAMED_GROUPS &&\n REPLACE_KEEPS_$0 &&\n !REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE\n )) ||\n (KEY === 'split' && !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC)\n ) {\n var nativeRegExpMethod = /./[SYMBOL];\n var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {\n if (regexp.exec === regexpExec) {\n if (DELEGATES_TO_SYMBOL && !forceStringMethod) {\n // The native String method already delegates to @@method (this\n // polyfilled function), leasing to infinite recursion.\n // We avoid it by directly calling the native @@method method.\n return { done: true, value: nativeRegExpMethod.call(regexp, str, arg2) };\n }\n return { done: true, value: nativeMethod.call(str, regexp, arg2) };\n }\n return { done: false };\n }, {\n REPLACE_KEEPS_$0: REPLACE_KEEPS_$0,\n REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE: REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE\n });\n var stringMethod = methods[0];\n var regexMethod = methods[1];\n\n redefine(String.prototype, KEY, stringMethod);\n redefine(RegExp.prototype, SYMBOL, length == 2\n // 21.2.5.8 RegExp.prototype[@@replace](string, replaceValue)\n // 21.2.5.11 RegExp.prototype[@@split](string, limit)\n ? function (string, arg) { return regexMethod.call(string, this, arg); }\n // 21.2.5.6 RegExp.prototype[@@match](string)\n // 21.2.5.9 RegExp.prototype[@@search](string)\n : function (string) { return regexMethod.call(string, this); }\n );\n }\n\n if (sham) createNonEnumerableProperty(RegExp.prototype[SYMBOL], 'sham', true);\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/fix-regexp-well-known-symbol-logic.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/is-array.js": -/*!****************************************************!*\ - !*** ./node_modules/core-js/internals/is-array.js ***! - \****************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var classof = __webpack_require__(/*! ../internals/classof-raw */ \"./node_modules/core-js/internals/classof-raw.js\");\n\n// `IsArray` abstract operation\n// https://tc39.github.io/ecma262/#sec-isarray\nmodule.exports = Array.isArray || function isArray(arg) {\n return classof(arg) == 'Array';\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/is-array.js?"); - -/***/ }), - /***/ "./node_modules/core-js/internals/is-regexp.js": /*!*****************************************************!*\ !*** ./node_modules/core-js/internals/is-regexp.js ***! @@ -137,41 +69,6 @@ eval("var isRegExp = __webpack_require__(/*! ../internals/is-regexp */ \"./node_ /***/ }), -/***/ "./node_modules/core-js/internals/regexp-exec-abstract.js": -/*!****************************************************************!*\ - !*** ./node_modules/core-js/internals/regexp-exec-abstract.js ***! - \****************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("var classof = __webpack_require__(/*! ./classof-raw */ \"./node_modules/core-js/internals/classof-raw.js\");\nvar regexpExec = __webpack_require__(/*! ./regexp-exec */ \"./node_modules/core-js/internals/regexp-exec.js\");\n\n// `RegExpExec` abstract operation\n// https://tc39.github.io/ecma262/#sec-regexpexec\nmodule.exports = function (R, S) {\n var exec = R.exec;\n if (typeof exec === 'function') {\n var result = exec.call(R, S);\n if (typeof result !== 'object') {\n throw TypeError('RegExp exec method returned something other than an Object or null');\n }\n return result;\n }\n\n if (classof(R) !== 'RegExp') {\n throw TypeError('RegExp#exec called on incompatible receiver');\n }\n\n return regexpExec.call(R, S);\n};\n\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/regexp-exec-abstract.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/regexp-exec.js": -/*!*******************************************************!*\ - !*** ./node_modules/core-js/internals/regexp-exec.js ***! - \*******************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar regexpFlags = __webpack_require__(/*! ./regexp-flags */ \"./node_modules/core-js/internals/regexp-flags.js\");\nvar stickyHelpers = __webpack_require__(/*! ./regexp-sticky-helpers */ \"./node_modules/core-js/internals/regexp-sticky-helpers.js\");\n\nvar nativeExec = RegExp.prototype.exec;\n// This always refers to the native implementation, because the\n// String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,\n// which loads this file before patching the method.\nvar nativeReplace = String.prototype.replace;\n\nvar patchedExec = nativeExec;\n\nvar UPDATES_LAST_INDEX_WRONG = (function () {\n var re1 = /a/;\n var re2 = /b*/g;\n nativeExec.call(re1, 'a');\n nativeExec.call(re2, 'a');\n return re1.lastIndex !== 0 || re2.lastIndex !== 0;\n})();\n\nvar UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y || stickyHelpers.BROKEN_CARET;\n\n// nonparticipating capturing group, copied from es5-shim's String#split patch.\nvar NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;\n\nvar PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y;\n\nif (PATCH) {\n patchedExec = function exec(str) {\n var re = this;\n var lastIndex, reCopy, match, i;\n var sticky = UNSUPPORTED_Y && re.sticky;\n var flags = regexpFlags.call(re);\n var source = re.source;\n var charsAdded = 0;\n var strCopy = str;\n\n if (sticky) {\n flags = flags.replace('y', '');\n if (flags.indexOf('g') === -1) {\n flags += 'g';\n }\n\n strCopy = String(str).slice(re.lastIndex);\n // Support anchored sticky behavior.\n if (re.lastIndex > 0 && (!re.multiline || re.multiline && str[re.lastIndex - 1] !== '\\n')) {\n source = '(?: ' + source + ')';\n strCopy = ' ' + strCopy;\n charsAdded++;\n }\n // ^(? + rx + ) is needed, in combination with some str slicing, to\n // simulate the 'y' flag.\n reCopy = new RegExp('^(?:' + source + ')', flags);\n }\n\n if (NPCG_INCLUDED) {\n reCopy = new RegExp('^' + source + '$(?!\\\\s)', flags);\n }\n if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;\n\n match = nativeExec.call(sticky ? reCopy : re, strCopy);\n\n if (sticky) {\n if (match) {\n match.input = match.input.slice(charsAdded);\n match[0] = match[0].slice(charsAdded);\n match.index = re.lastIndex;\n re.lastIndex += match[0].length;\n } else re.lastIndex = 0;\n } else if (UPDATES_LAST_INDEX_WRONG && match) {\n re.lastIndex = re.global ? match.index + match[0].length : lastIndex;\n }\n if (NPCG_INCLUDED && match && match.length > 1) {\n // Fix browsers whose `exec` methods don't consistently return `undefined`\n // for NPCG, like IE8. NOTE: This doesn' work for /(.?)?/\n nativeReplace.call(match[0], reCopy, function () {\n for (i = 1; i < arguments.length - 2; i++) {\n if (arguments[i] === undefined) match[i] = undefined;\n }\n });\n }\n\n return match;\n };\n}\n\nmodule.exports = patchedExec;\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/regexp-exec.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/regexp-sticky-helpers.js": -/*!*****************************************************************!*\ - !*** ./node_modules/core-js/internals/regexp-sticky-helpers.js ***! - \*****************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\n\nvar fails = __webpack_require__(/*! ./fails */ \"./node_modules/core-js/internals/fails.js\");\n\n// babel-minify transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError,\n// so we use an intermediate function.\nfunction RE(s, f) {\n return RegExp(s, f);\n}\n\nexports.UNSUPPORTED_Y = fails(function () {\n // babel-minify transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError\n var re = RE('a', 'y');\n re.lastIndex = 2;\n return re.exec('abcd') != null;\n});\n\nexports.BROKEN_CARET = fails(function () {\n // https://bugzilla.mozilla.org/show_bug.cgi?id=773687\n var re = RE('^r', 'gy');\n re.lastIndex = 2;\n return re.exec('str') != null;\n});\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/regexp-sticky-helpers.js?"); - -/***/ }), - /***/ "./node_modules/core-js/internals/string-multibyte.js": /*!************************************************************!*\ !*** ./node_modules/core-js/internals/string-multibyte.js ***! @@ -207,18 +104,6 @@ eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/ /***/ }), -/***/ "./node_modules/core-js/modules/es.regexp.exec.js": -/*!********************************************************!*\ - !*** ./node_modules/core-js/modules/es.regexp.exec.js ***! - \********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/core-js/internals/export.js\");\nvar exec = __webpack_require__(/*! ../internals/regexp-exec */ \"./node_modules/core-js/internals/regexp-exec.js\");\n\n$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {\n exec: exec\n});\n\n\n//# sourceURL=webpack:///./node_modules/core-js/modules/es.regexp.exec.js?"); - -/***/ }), - /***/ "./node_modules/core-js/modules/es.string.includes.js": /*!************************************************************!*\ !*** ./node_modules/core-js/modules/es.string.includes.js ***! @@ -262,7 +147,7 @@ eval("\nvar fixRegExpWellKnownSymbolLogic = __webpack_require__(/*! ../internals /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n.genTable[data-v-2290191d]{\\n padding:20px;\\n min-width: 500px;\\n width: 500px;\\n}\\n.clearfix[data-v-2290191d]:before,\\n .clearfix[data-v-2290191d]:after {\\n display: table;\\n content: \\\"\\\";\\n}\\n.clearfix[data-v-2290191d]:after {\\n clear: both\\n}\\n.wrapper[data-v-2290191d]{\\n display: flex;\\n flex-wrap: wrap;\\n}\\n.item[data-v-2290191d]{\\n flex:0 0 340px;\\n margin-right:20px;\\n margin-bottom:20px;\\n background-color: #f0f0f0;\\n}\\n.item button[data-v-2290191d]{\\n width:100px;\\n margin:0 auto;\\n}\\n.btnWrap[data-v-2290191d]{\\n width:50%;\\n float: left;\\n margin-bottom: 20px;\\n display: flex;\\n justify-content: center;\\n}\\n.containerText[data-v-2290191d]{\\n margin: 20px;\\n font-size: 16px;\\n box-sizing: border-box;\\n}\\n.value[data-v-2290191d]{\\n display: inline-block;\\n max-width: 200px;\\n overflow:hidden;\\n}\\n.el-dialog[data-v-2290191d]{\\n height: 100vh;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n.genTable[data-v-2290191d]{\\n padding:20px;\\n min-width: 500px;\\n width: 500px;\\n}\\n.clearfix[data-v-2290191d]:before,\\n .clearfix[data-v-2290191d]:after {\\n display: table;\\n content: \\\"\\\";\\n}\\n.clearfix[data-v-2290191d]:after {\\n clear: both\\n}\\n.wrapper[data-v-2290191d]{\\n display: flex;\\n flex-wrap: wrap;\\n}\\n.item[data-v-2290191d]{\\n flex:0 0 340px;\\n margin-right:20px;\\n margin-bottom:20px;\\n background-color: #f0f0f0;\\n}\\n.item button[data-v-2290191d]{\\n width:100px;\\n margin:0 auto;\\n}\\n.btnWrap[data-v-2290191d]{\\n width:50%;\\n float: left;\\n margin-bottom: 20px;\\n display: flex;\\n justify-content: center;\\n}\\n.containerText[data-v-2290191d]{\\n margin: 20px;\\n font-size: 16px;\\n box-sizing: border-box;\\n}\\n.value[data-v-2290191d]{\\n display: inline-block;\\n max-width: 200px;\\n overflow:hidden;\\n margin-left: 20px;\\n}\\n.el-dialog[data-v-2290191d]{\\n height: 100vh;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -321,7 +206,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./ContainerManager.vue?vue&type=template&id=2290191d&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"dddd77cc-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./ContainerManager.vue?vue&type=template&id=2290191d&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"41f1f4da-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerManager.vue?vue&type=template&id=2290191d&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerManager_vue_vue_type_template_id_2290191d_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerManager.vue?"); /***/ }) diff --git a/powerjob-server/src/main/resources/static/js/3.js b/powerjob-server/src/main/resources/static/js/3.js index 4165995f..161046ad 100644 --- a/powerjob-server/src/main/resources/static/js/3.js +++ b/powerjob-server/src/main/resources/static/js/3.js @@ -12,15 +12,15 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true&": +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true&": /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true& ***! + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true& ***! \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"el-card\",\n { staticClass: \"box-card\" },\n [\n _c(\n \"el-form\",\n {\n ref: \"form\",\n staticClass: \"genTable\",\n attrs: {\n model: _vm.form,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"Group\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.group,\n callback: function($$v) {\n _vm.$set(_vm.form, \"group\", $$v)\n },\n expression: \"form.group\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Artifact\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.artifact,\n callback: function($$v) {\n _vm.$set(_vm.form, \"artifact\", $$v)\n },\n expression: \"form.artifact\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Name\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.name,\n callback: function($$v) {\n _vm.$set(_vm.form, \"name\", $$v)\n },\n expression: \"form.name\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Package name\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.packageName,\n callback: function($$v) {\n _vm.$set(_vm.form, \"packageName\", $$v)\n },\n expression: \"form.packageName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Java Version\" } },\n [\n _c(\n \"el-radio-group\",\n {\n model: {\n value: _vm.form.javaVersion,\n callback: function($$v) {\n _vm.$set(_vm.form, \"javaVersion\", $$v)\n },\n expression: \"form.javaVersion\"\n }\n },\n [\n _c(\"el-radio\", { attrs: { label: \"8\" } }),\n _c(\"el-radio\", { attrs: { label: \"11\" } })\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n { attrs: { type: \"primary\" }, on: { click: _vm.onSubmit } },\n [_vm._v(\"Generate\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerTemplate.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"el-card\",\n { staticClass: \"box-card\" },\n [\n _c(\n \"el-form\",\n {\n ref: \"form\",\n staticClass: \"genTable\",\n attrs: {\n model: _vm.form,\n \"label-width\": \"150px\",\n \"label-position\": \"left\"\n }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"Group\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.group,\n callback: function($$v) {\n _vm.$set(_vm.form, \"group\", $$v)\n },\n expression: \"form.group\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Artifact\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.artifact,\n callback: function($$v) {\n _vm.$set(_vm.form, \"artifact\", $$v)\n },\n expression: \"form.artifact\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Name\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.name,\n callback: function($$v) {\n _vm.$set(_vm.form, \"name\", $$v)\n },\n expression: \"form.name\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Package name\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.form.packageName,\n callback: function($$v) {\n _vm.$set(_vm.form, \"packageName\", $$v)\n },\n expression: \"form.packageName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"Java Version\" } },\n [\n _c(\n \"el-radio-group\",\n {\n model: {\n value: _vm.form.javaVersion,\n callback: function($$v) {\n _vm.$set(_vm.form, \"javaVersion\", $$v)\n },\n expression: \"form.javaVersion\"\n }\n },\n [\n _c(\"el-radio\", { attrs: { label: \"8\" } }),\n _c(\"el-radio\", { attrs: { label: \"11\" } })\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n { attrs: { type: \"primary\" }, on: { click: _vm.onSubmit } },\n [_vm._v(\"Generate\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerTemplate.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), @@ -36,29 +36,6 @@ eval("\nvar bind = __webpack_require__(/*! ../internals/function-bind-context */ /***/ }), -/***/ "./node_modules/core-js/internals/create-property.js": -/*!***********************************************************!*\ - !*** ./node_modules/core-js/internals/create-property.js ***! - \***********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -eval("\nvar toPrimitive = __webpack_require__(/*! ../internals/to-primitive */ \"./node_modules/core-js/internals/to-primitive.js\");\nvar definePropertyModule = __webpack_require__(/*! ../internals/object-define-property */ \"./node_modules/core-js/internals/object-define-property.js\");\nvar createPropertyDescriptor = __webpack_require__(/*! ../internals/create-property-descriptor */ \"./node_modules/core-js/internals/create-property-descriptor.js\");\n\nmodule.exports = function (object, key, value) {\n var propertyKey = toPrimitive(key);\n if (propertyKey in object) definePropertyModule.f(object, propertyKey, createPropertyDescriptor(0, value));\n else object[propertyKey] = value;\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/create-property.js?"); - -/***/ }), - -/***/ "./node_modules/core-js/internals/dom-iterables.js": -/*!*********************************************************!*\ - !*** ./node_modules/core-js/internals/dom-iterables.js ***! - \*********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports) { - -eval("// iterable DOM collections\n// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods\nmodule.exports = {\n CSSRuleList: 0,\n CSSStyleDeclaration: 0,\n CSSValueList: 0,\n ClientRectList: 0,\n DOMRectList: 0,\n DOMStringList: 0,\n DOMTokenList: 1,\n DataTransferItemList: 0,\n FileList: 0,\n HTMLAllCollection: 0,\n HTMLCollection: 0,\n HTMLFormElement: 0,\n HTMLSelectElement: 0,\n MediaList: 0,\n MimeTypeArray: 0,\n NamedNodeMap: 0,\n NodeList: 1,\n PaintRequestList: 0,\n Plugin: 0,\n PluginArray: 0,\n SVGLengthList: 0,\n SVGNumberList: 0,\n SVGPathSegList: 0,\n SVGPointList: 0,\n SVGStringList: 0,\n SVGTransformList: 0,\n SourceBufferList: 0,\n StyleSheetList: 0,\n TextTrackCueList: 0,\n TextTrackList: 0,\n TouchList: 0\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/dom-iterables.js?"); - -/***/ }), - /***/ "./node_modules/core-js/internals/get-iterator.js": /*!********************************************************!*\ !*** ./node_modules/core-js/internals/get-iterator.js ***! @@ -217,7 +194,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"dddd77cc-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_dddd77cc_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerTemplate.vue?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib??vue-loader-options!./ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true& */ \"./node_modules/cache-loader/dist/cjs.js?{\\\"cacheDirectory\\\":\\\"node_modules/.cache/vue-loader\\\",\\\"cacheIdentifier\\\":\\\"41f1f4da-vue-loader-template\\\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/ContainerTemplate.vue?vue&type=template&id=a291308c&scoped=true&\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"render\"]; });\n\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_41f1f4da_vue_loader_template_node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ContainerTemplate_vue_vue_type_template_id_a291308c_scoped_true___WEBPACK_IMPORTED_MODULE_0__[\"staticRenderFns\"]; });\n\n\n\n//# sourceURL=webpack:///./src/components/views/ContainerTemplate.vue?"); /***/ }) diff --git a/powerjob-server/src/main/resources/static/js/4.js b/powerjob-server/src/main/resources/static/js/4.js index 967c28d4..86dffefb 100644 --- a/powerjob-server/src/main/resources/static/js/4.js +++ b/powerjob-server/src/main/resources/static/js/4.js @@ -1,132 +1,130 @@ (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{ -/***/ "./node_modules/cache-loader/dist/cjs.js?!./node_modules/babel-loader/lib/index.js!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/dag/WorkflowEditor.vue?vue&type=script&lang=js&": -/*!***************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dag/WorkflowEditor.vue?vue&type=script&lang=js& ***! - \***************************************************************************************************************************************************************************************************************************************************************/ +/***/ "./node_modules/cache-loader/dist/cjs.js?!./node_modules/babel-loader/lib/index.js!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/Home.vue?vue&type=script&lang=js&": +/*!*******************************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/Home.vue?vue&type=script&lang=js& ***! + \*******************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: default */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es_array_find_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.find-index */ \"./node_modules/core-js/modules/es.array.find-index.js\");\n/* harmony import */ var core_js_modules_es_array_find_index__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_index__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es_array_for_each__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.array.for-each */ \"./node_modules/core-js/modules/es.array.for-each.js\");\n/* harmony import */ var core_js_modules_es_array_for_each__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_for_each__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es_array_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.map */ \"./node_modules/core-js/modules/es.array.map.js\");\n/* harmony import */ var core_js_modules_es_array_map__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.splice */ \"./node_modules/core-js/modules/es.array.splice.js\");\n/* harmony import */ var core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each */ \"./node_modules/core-js/modules/web.dom-collections.for-each.js\");\n/* harmony import */ var core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each__WEBPACK_IMPORTED_MODULE_4__);\n/* harmony import */ var dagre_d3__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! dagre-d3 */ \"./node_modules/dagre-d3/index.js\");\n/* harmony import */ var dagre_d3__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(dagre_d3__WEBPACK_IMPORTED_MODULE_5__);\n/* harmony import */ var d3__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! d3 */ \"./node_modules/d3/index.js\");\n\n\n\n\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"WorkflowEditor\",\n data: function data() {\n return {\n workflowInfo: {\n appId: this.$store.state.appInfo.id,\n enable: true,\n maxWfInstanceNum: 1,\n notifyUserIds: [],\n peworkflowDAG: {\n nodes: [],\n edges: []\n },\n timeExpression: undefined,\n timeExpressionType: undefined,\n wfDescription: undefined,\n wfName: undefined\n },\n timeExpressionTypeOptions: [{\n key: \"API\",\n label: \"API\"\n }, {\n key: \"CRON\",\n label: \"CRON表达式\"\n }],\n userList: [],\n // 导入任务相关\n importDrawerVisible: false,\n jobQueryContent: {\n appId: this.$store.state.appInfo.id,\n index: 0,\n pageSize: 10,\n jobId: undefined,\n keyword: undefined\n },\n jobInfoPageResult: {\n pageSize: 20,\n totalItems: 0,\n data: []\n },\n // 事件（1：新增起点，2：新增终点，3：删除节点；4：删除边）\n event: undefined,\n from: undefined\n };\n },\n methods: {\n // 返回上一页\n back: function back() {\n this.$router.go(-1);\n },\n\n /* ******** 导入任务相关，所有函数与 JobManager 重复，需要前端大佬重构！ ******** */\n // 点击重置按钮\n onClickReset: function onClickReset() {\n this.jobQueryContent.keyword = undefined;\n this.jobQueryContent.jobId = undefined;\n },\n // 列出符合当前搜索条件的任务\n listJobInfos: function listJobInfos() {\n var that = this;\n this.axios.post(\"/job/list\", this.jobQueryContent).then(function (res) {\n that.jobInfoPageResult = res;\n });\n },\n // 点击 换页\n onClickChangePage: function onClickChangePage(index) {\n // 后端从0开始，前端从1开始\n this.jobQueryContent.index = index - 1;\n this.listJobInfos();\n },\n onClickImportNode: function onClickImportNode() {\n this.listJobInfos();\n this.importDrawerVisible = true;\n },\n // 导入任务，需要去重\n importNode: function importNode(data) {\n var canSave = true;\n this.workflowInfo.peworkflowDAG.nodes.forEach(function (node) {\n if (data.id === node.jobId) {\n canSave = false;\n console.log(\"nodes in workflow cannot be duplicated\");\n }\n });\n\n if (canSave) {\n console.log(\"add node: \" + data.id);\n this.workflowInfo.peworkflowDAG.nodes.push({\n jobId: data.id,\n jobName: data.jobName\n });\n this.draw();\n }\n },\n // 删除任务\n onClickRemoveNode: function onClickRemoveNode() {\n this.event = 3;\n this.$message.info(\"请点击需要删除的节点\");\n },\n onClickAddFrom: function onClickAddFrom() {\n this.event = 1;\n this.$message.info(\"请点击起始节点\");\n },\n onClickAddTo: function onClickAddTo() {\n this.event = 2;\n this.$message.info(\"请点击目标节点\");\n },\n onClickRemoveEdge: function onClickRemoveEdge() {\n this.event = 4;\n this.$message.info(\"请点击需要删除的边\");\n },\n // 保存工作流\n saveWorkflow: function saveWorkflow() {\n var that = this;\n this.axios.post(\"/workflow/save\", this.workflowInfo).then(function () {\n that.$message.success(\"保存成功！\");\n that.back();\n });\n },\n draw: function draw() {\n var _this = this;\n\n console.log(\"draw by data: \" + JSON.stringify(this.workflowInfo.peworkflowDAG)); //获取D3\n\n var g = new dagre_d3__WEBPACK_IMPORTED_MODULE_5___default.a.graphlib.Graph().setGraph({});\n var nodes = this.workflowInfo.peworkflowDAG.nodes.map(function (node) {\n return {\n id: node.jobId,\n label: \"jobId: \" + node.jobId + \"\\n\" + \"jobName: \" + node.jobName\n };\n }); // 添加节点\n\n nodes.forEach(function (node) {\n g.setNode(node.id, node);\n }); // 链接关系\n\n this.workflowInfo.peworkflowDAG.edges.forEach(function (item) {\n g.setEdge(item.from, item.to, {// style: \"stroke-width: 1.5;\"\n });\n }); //绘制图形\n\n var svg = d3__WEBPACK_IMPORTED_MODULE_6__[\"select\"](\"svg\"),\n inner = svg.select(\"g\"); //缩放\n\n var zoom = d3__WEBPACK_IMPORTED_MODULE_6__[\"zoom\"]().on(\"zoom\", function () {\n inner.attr(\"transform\", d3__WEBPACK_IMPORTED_MODULE_6__[\"event\"].transform);\n });\n svg.call(zoom);\n var render = new dagre_d3__WEBPACK_IMPORTED_MODULE_5___default.a.render();\n render(inner, g); // 添加节点监听\n\n inner.selectAll(\"g.node\").on(\"click\", function (e) {\n for (var i = 0; i < _this.workflowInfo.peworkflowDAG.nodes.length; i++) {\n if (e == _this.workflowInfo.peworkflowDAG.nodes[i].jobId) {\n console.log(\"onClickNode, jobId=\" + e);\n\n _this.onClickDAGNode(e, g);\n }\n }\n }); // 添加边监听\n\n inner.selectAll(\"path\").on(\"click\", function (e) {\n if (_this.event === 4) {\n var oldEdges = _this.workflowInfo.peworkflowDAG.edges;\n _this.workflowInfo.peworkflowDAG.edges = []; // 删除节点相关的所有边\n\n oldEdges.forEach(function (edge) {\n if (!(edge.from == e.v && edge.to == e.w)) {\n _this.workflowInfo.peworkflowDAG.edges.push(edge);\n }\n\n _this.draw();\n });\n }\n });\n },\n onClickDAGNode: function onClickDAGNode(nodeId, g) {\n var _this2 = this;\n\n switch (this.event) {\n case 3:\n {\n g.removeNode(nodeId);\n var nodesArr = this.workflowInfo.peworkflowDAG.nodes;\n var oldEdges = this.workflowInfo.peworkflowDAG.edges;\n this.workflowInfo.peworkflowDAG.edges = []; // 删除节点\n\n nodesArr.splice(nodesArr.findIndex(function (item) {\n return item.jobId == nodeId;\n }), 1); // 删除节点相关的所有边\n\n oldEdges.forEach(function (edge) {\n if (edge.from == nodeId || edge.to == nodeId) {\n console.log(\"remove edge: \" + JSON.stringify(edge));\n } else {\n _this2.workflowInfo.peworkflowDAG.edges.push(edge);\n }\n });\n this.draw();\n break;\n }\n\n case 1:\n {\n this.from = nodeId;\n break;\n }\n\n case 2:\n {\n var to = nodeId;\n\n if (this.from === undefined) {\n this.$message.warning(\"请先添加起点！\");\n break;\n }\n\n if (this.from === to) {\n this.$message.warning(\"非法操作（起点终点相同）！\");\n break;\n }\n\n var canSave = true;\n this.workflowInfo.peworkflowDAG.edges.forEach(function (edge) {\n if (edge.from === _this2.from && edge.to === to) {\n canSave = false;\n console.log(\"edge(%o -> %o) already exists!\", _this2.from, to);\n }\n });\n\n if (canSave) {\n this.workflowInfo.peworkflowDAG.edges.push({\n from: this.from,\n to: to\n });\n console.log(\"new edge(%o -> %o)\", this.from, to);\n }\n\n this.draw();\n break;\n }\n }\n }\n },\n mounted: function mounted() {\n // 加载用户信息\n var that = this;\n that.axios.get(\"/user/list\").then(function (res) {\n return that.userList = res;\n }); // 读取传递数据，如果是修改，需要先将数据绘制上去\n\n var modify = this.$route.params.modify;\n\n if (modify) {\n this.workflowInfo = this.$route.params.workflowInfo;\n this.workflowInfo.appId = this.$store.state.appInfo.id; // this.workflowInfo.peworkflowDAG.nodes = this.workflowInfo.peworkflowDAG.nodes.map(x => {\n // return {\n // jobId: x.jobId,\n // jobName: x.jobName\n // }\n // });\n\n this.draw();\n }\n }\n});\n\n//# sourceURL=webpack:///./src/components/dag/WorkflowEditor.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"Home\",\n data: function data() {\n return {\n systemInfo: {\n jobCount: \"N/A\",\n runningInstanceCount: \"N/A\",\n failedInstanceCount: \"N/A\",\n serverTime: undefined\n },\n activeWorkerCount: \"N/A\",\n workerList: []\n };\n },\n methods: {\n workerTableRowClassName: function workerTableRowClassName(_ref) {\n var row = _ref.row;\n\n switch (row.status) {\n case 1:\n return 'success-row';\n\n case 2:\n return 'warning-row';\n\n case 3:\n return 'error-row';\n }\n }\n },\n mounted: function mounted() {\n var _this = this;\n\n var that = this;\n var appId = that.$store.state.appInfo.id; // 请求 Worker 列表\n\n that.axios.get(\"/system/listWorker?appId=\" + appId).then(function (res) {\n that.workerList = res;\n that.activeWorkerCount = that.workerList.length;\n }); // 请求 Overview\n\n that.axios.get(\"/system/overview?appId=\" + appId).then(function (res) {\n that.systemInfo = res; // 对比服务器时间和本地时间\n\n var localTime = new Date().getTime();\n var serverTime = res.serverTime;\n console.log(\"localTime: %o, serverTime: %o\", localTime, serverTime);\n var offset = localTime - serverTime; // 误差大于一分钟，弹窗告警\n\n if (Math.abs(offset) > 60000) {\n _this.$notify({\n title: '警告',\n message: '调度中心服务器与本地存在时间差，可能影响任务调度准确性，建议排查时间问题！',\n type: 'warning',\n duration: 0\n });\n }\n });\n }\n});\n\n//# sourceURL=webpack:///./src/components/views/Home.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"dddd77cc-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/dag/WorkflowEditor.vue?vue&type=template&id=6eb224e1&scoped=true&": -/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ - !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"dddd77cc-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dag/WorkflowEditor.vue?vue&type=template&id=6eb224e1&scoped=true& ***! - \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ +/***/ "./node_modules/cache-loader/dist/cjs.js?{\"cacheDirectory\":\"node_modules/.cache/vue-loader\",\"cacheIdentifier\":\"41f1f4da-vue-loader-template\"}!./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/Home.vue?vue&type=template&id=069f7be0&scoped=true&": +/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"41f1f4da-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/Home.vue?vue&type=template&id=069f7be0&scoped=true& ***! + \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! exports provided: render, staticRenderFns */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n [\n _c(\n \"el-row\",\n { staticStyle: { margin: \"20px\" } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 1 } },\n [\n _c(\n \"el-button\",\n { attrs: { type: \"primary\" }, on: { click: _vm.back } },\n [_vm._v(\"返回\")]\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 1, offset: 22 } },\n [\n _c(\n \"el-button\",\n { attrs: { type: \"success\" }, on: { click: _vm.saveWorkflow } },\n [_vm._v(\"保存\")]\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-form\",\n { ref: \"form\", attrs: { model: _vm.workflowInfo } },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"工作流名称\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.workflowInfo.wfName,\n callback: function($$v) {\n _vm.$set(_vm.workflowInfo, \"wfName\", $$v)\n },\n expression: \"workflowInfo.wfName\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"工作流描述\" } },\n [\n _c(\"el-input\", {\n model: {\n value: _vm.workflowInfo.wfDescription,\n callback: function($$v) {\n _vm.$set(_vm.workflowInfo, \"wfDescription\", $$v)\n },\n expression: \"workflowInfo.wfDescription\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"定时信息\" } },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\n \"el-select\",\n {\n attrs: { placeholder: \"时间表达式类型\" },\n model: {\n value: _vm.workflowInfo.timeExpressionType,\n callback: function($$v) {\n _vm.$set(\n _vm.workflowInfo,\n \"timeExpressionType\",\n $$v\n )\n },\n expression: \"workflowInfo.timeExpressionType\"\n }\n },\n _vm._l(_vm.timeExpressionTypeOptions, function(\n item\n ) {\n return _c(\"el-option\", {\n key: item.key,\n attrs: { label: item.label, value: item.key }\n })\n }),\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 12 } },\n [\n _c(\"el-input\", {\n attrs: {\n placeholder: \"CRON填写CRON表达式，API无需填写\"\n },\n model: {\n value: _vm.workflowInfo.timeExpression,\n callback: function($$v) {\n _vm.$set(\n _vm.workflowInfo,\n \"timeExpression\",\n $$v\n )\n },\n expression: \"workflowInfo.timeExpression\"\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"最大实例\" } },\n [\n _c(\"el-input-number\", {\n model: {\n value: _vm.workflowInfo.maxWfInstanceNum,\n callback: function($$v) {\n _vm.$set(_vm.workflowInfo, \"maxWfInstanceNum\", $$v)\n },\n expression: \"workflowInfo.maxWfInstanceNum\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"报警配置\" } },\n [\n _c(\n \"el-select\",\n {\n attrs: {\n multiple: \"\",\n filterable: \"\",\n placeholder: \"选择报警通知人员\"\n },\n model: {\n value: _vm.workflowInfo.notifyUserIds,\n callback: function($$v) {\n _vm.$set(_vm.workflowInfo, \"notifyUserIds\", $$v)\n },\n expression: \"workflowInfo.notifyUserIds\"\n }\n },\n _vm._l(_vm.userList, function(user) {\n return _c(\"el-option\", {\n key: user.id,\n attrs: { label: user.username, value: user.id }\n })\n }),\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-row\",\n [\n _c(\"el-button\", { on: { click: _vm.onClickImportNode } }, [\n _vm._v(\"导入任务\")\n ]),\n _c(\"el-button\", { on: { click: _vm.onClickRemoveNode } }, [\n _vm._v(\"删除任务\")\n ]),\n _c(\"el-button\", { on: { click: _vm.onClickAddFrom } }, [\n _vm._v(\"新增起点\")\n ]),\n _c(\"el-button\", { on: { click: _vm.onClickAddTo } }, [\n _vm._v(\"新增终点\")\n ]),\n _c(\"el-button\", { on: { click: _vm.onClickRemoveEdge } }, [\n _vm._v(\"删除边\")\n ])\n ],\n 1\n ),\n _c(\"div\", [\n _c(\n \"svg\",\n { attrs: { width: \"80%\", height: \"1000px\", id: \"svgCanvas\" } },\n [_c(\"g\"), _c(\"rect\")]\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-drawer\",\n {\n attrs: {\n title: \"请选择需要导入工作流的任务\",\n visible: _vm.importDrawerVisible,\n direction: \"rtl\",\n size: \"50%\"\n },\n on: {\n \"update:visible\": function($event) {\n _vm.importDrawerVisible = $event\n }\n }\n },\n [\n _c(\n \"el-row\",\n [\n _c(\n \"el-form\",\n {\n staticClass: \"el-form--inline\",\n attrs: { inline: true, model: _vm.jobQueryContent }\n },\n [\n _c(\n \"el-form-item\",\n { attrs: { label: \"任务ID\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"任务ID\" },\n model: {\n value: _vm.jobQueryContent.jobId,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"jobId\", $$v)\n },\n expression: \"jobQueryContent.jobId\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n { attrs: { label: \"关键字\" } },\n [\n _c(\"el-input\", {\n attrs: { placeholder: \"关键字\" },\n model: {\n value: _vm.jobQueryContent.keyword,\n callback: function($$v) {\n _vm.$set(_vm.jobQueryContent, \"keyword\", $$v)\n },\n expression: \"jobQueryContent.keyword\"\n }\n })\n ],\n 1\n ),\n _c(\n \"el-form-item\",\n [\n _c(\n \"el-button\",\n {\n attrs: { type: \"primary\" },\n on: { click: _vm.listJobInfos }\n },\n [_vm._v(\"查询\")]\n ),\n _c(\n \"el-button\",\n {\n attrs: { type: \"cancel\" },\n on: { click: _vm.onClickReset }\n },\n [_vm._v(\"重置\")]\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-table\",\n { attrs: { data: _vm.jobInfoPageResult.data } },\n [\n _c(\"el-table-column\", {\n attrs: { property: \"id\", label: \"任务ID\" }\n }),\n _c(\"el-table-column\", {\n attrs: { property: \"jobName\", label: \"任务名称\" }\n }),\n _c(\"el-table-column\", {\n attrs: { label: \"操作\" },\n scopedSlots: _vm._u([\n {\n key: \"default\",\n fn: function(scope) {\n return [\n _c(\n \"el-button\",\n {\n attrs: { size: \"medium\" },\n on: {\n click: function($event) {\n return _vm.importNode(scope.row)\n }\n }\n },\n [_vm._v(\"导入\")]\n )\n ]\n }\n }\n ])\n })\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\"el-pagination\", {\n attrs: {\n layout: \"prev, pager, next\",\n total: this.jobInfoPageResult.totalItems,\n \"page-size\": this.jobInfoPageResult.pageSize\n },\n on: { \"current-change\": _vm.onClickChangePage }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/dag/WorkflowEditor.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%22dddd77cc-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n return _c(\n \"div\",\n { attrs: { id: \"home\" } },\n [\n _c(\n \"el-row\",\n { attrs: { gutter: 24 } },\n [\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\"el-card\", { attrs: { shadow: \"always\" } }, [\n _vm._v(\n \" \" +\n _vm._s(_vm.$t(\"message.omsServerTime\")) +\n \"：\" +\n _vm._s(\n this.common.timestamp2Str(_vm.systemInfo.serverTime)\n ) +\n \" \"\n )\n ])\n ],\n 1\n ),\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\"el-card\", { attrs: { shadow: \"always\" } }, [\n _vm._v(\n \" \" +\n _vm._s(_vm.$t(\"message.localBrowserTime\")) +\n \"：\" +\n _vm._s(this.common.timestamp2Str(new Date().getTime())) +\n \" \"\n )\n ])\n ],\n 1\n ),\n _c(\n \"a\",\n {\n attrs: {\n href: \"https://github.com/KFCFans/OhMyScheduler\",\n target: \"_blank\"\n }\n },\n [\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\n \"el-card\",\n {\n staticStyle: { \"text-align\": \"center\" },\n attrs: { shadow: \"always\" }\n },\n [_vm._v(\" \" + _vm._s(_vm.$t(\"message.githubURL\")) + \" \")]\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"a\",\n {\n staticStyle: { \"text-align\": \"center\" },\n attrs: {\n href: \"https://www.yuque.com/ohmyscheduler/guidence\",\n target: \"_blank\"\n }\n },\n [\n _c(\n \"el-col\",\n { attrs: { span: 6 } },\n [\n _c(\"el-card\", { attrs: { shadow: \"always\" } }, [\n _vm._v(\" \" + _vm._s(_vm.$t(\"message.docURL\")) + \" \")\n ])\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n ),\n _c(\n \"el-row\",\n { attrs: { gutter: 24 } },\n [\n _c(\"el-col\", { attrs: { span: 6 } }, [\n _c(\"div\", { staticClass: \"wrap\" }, [\n _c(\"div\", { staticClass: \"grid-content bg-purple\" }, [\n _c(\"div\", { staticClass: \"text mTitle\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.totalJobNum\")))\n ]),\n _c(\"div\", { staticClass: \"text mText\" }, [\n _vm._v(_vm._s(_vm.systemInfo.jobCount))\n ])\n ]),\n _c(\"i\", { staticClass: \"el-icon-orange\" })\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 6 } }, [\n _c(\"div\", { staticClass: \"wrap\" }, [\n _c(\"div\", { staticClass: \"grid-content bg-purple\" }, [\n _c(\"div\", { staticClass: \"text mTitle\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.runningInstanceNum\")))\n ]),\n _c(\"div\", { staticClass: \"text\" }, [\n _vm._v(_vm._s(_vm.systemInfo.runningInstanceCount))\n ])\n ]),\n _c(\"i\", { staticClass: \"el-icon-loading\" })\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 6 } }, [\n _c(\"div\", { staticClass: \"wrap\" }, [\n _c(\"div\", { staticClass: \"grid-content bg-purple\" }, [\n _c(\"div\", { staticClass: \"text mTitle\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.recentFailedInstanceNum\")))\n ]),\n _c(\"div\", { staticClass: \"text\" }, [\n _vm._v(_vm._s(_vm.systemInfo.failedInstanceCount))\n ])\n ]),\n _c(\"i\", { staticClass: \"el-icon-bell\" })\n ])\n ]),\n _c(\"el-col\", { attrs: { span: 6 } }, [\n _c(\"div\", { staticClass: \"wrap\" }, [\n _c(\"div\", { staticClass: \"grid-content bg-purple\" }, [\n _c(\"div\", { staticClass: \"text mTitle\" }, [\n _vm._v(_vm._s(_vm.$t(\"message.workerNum\")))\n ]),\n _c(\"div\", { staticClass: \"text\" }, [\n _vm._v(_vm._s(_vm.activeWorkerCount))\n ])\n ]),\n _c(\"i\", { staticClass: \"el-icon-cpu\" })\n ])\n ])\n ],\n 1\n ),\n _c(\n \"el-row\",\n [\n _c(\n \"el-col\",\n { attrs: { span: 24 } },\n [\n _c(\n \"el-table\",\n {\n staticStyle: { width: \"100%\" },\n attrs: {\n data: _vm.workerList,\n height: \"400px\",\n \"row-class-name\": _vm.workerTableRowClassName\n }\n },\n [\n _c(\"el-table-column\", {\n attrs: {\n prop: \"address\",\n label: _vm.$t(\"message.workerAddress\")\n }\n }),\n _c(\"el-table-column\", {\n attrs: { prop: \"cpuLoad\", label: _vm.$t(\"message.cpuLoad\") }\n }),\n _c(\"el-table-column\", {\n attrs: {\n prop: \"memoryLoad\",\n label: _vm.$t(\"message.memoryLoad\")\n }\n }),\n _c(\"el-table-column\", {\n attrs: {\n prop: \"diskLoad\",\n label: _vm.$t(\"message.diskLoad\")\n }\n })\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n ],\n 1\n )\n}\nvar staticRenderFns = []\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/components/views/Home.vue?./node_modules/cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%2241f1f4da-vue-loader-template%22%7D!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/core-js/internals/create-property.js": -/*!***********************************************************!*\ - !*** ./node_modules/core-js/internals/create-property.js ***! - \***********************************************************/ +/***/ "./node_modules/css-loader/dist/cjs.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/Home.vue?vue&type=style&index=0&id=069f7be0&scoped=true&lang=css&": +/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/Home.vue?vue&type=style&index=0&id=069f7be0&scoped=true&lang=css& ***! + \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; -eval("\nvar toPrimitive = __webpack_require__(/*! ../internals/to-primitive */ \"./node_modules/core-js/internals/to-primitive.js\");\nvar definePropertyModule = __webpack_require__(/*! ../internals/object-define-property */ \"./node_modules/core-js/internals/object-define-property.js\");\nvar createPropertyDescriptor = __webpack_require__(/*! ../internals/create-property-descriptor */ \"./node_modules/core-js/internals/create-property-descriptor.js\");\n\nmodule.exports = function (object, key, value) {\n var propertyKey = toPrimitive(key);\n if (propertyKey in object) definePropertyModule.f(object, propertyKey, createPropertyDescriptor(0, value));\n else object[propertyKey] = value;\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/create-property.js?"); +eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n\\n/* 头部信息 */\\n.wrap[data-v-069f7be0] {\\n background: #fff;\\n display: flex;\\n text-align: center;\\n justify-content: space-around;\\n align-items: center;\\n margin: 10px;\\n box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);\\n font-size: 1.5rem;\\n font-weight: bolder;\\n height: 131px;\\n}\\n.mTitle[data-v-069f7be0]{\\n font-size: 20px;\\n color:#0f0f0fad;\\n margin-bottom: 8px;\\n}\\n.el-card[data-v-069f7be0] {\\n margin: 10px;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/views/Home.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/core-js/modules/es.array.find-index.js": -/*!*************************************************************!*\ - !*** ./node_modules/core-js/modules/es.array.find-index.js ***! - \*************************************************************/ +/***/ "./node_modules/css-loader/dist/cjs.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/Home.vue?vue&type=style&index=1&lang=css&": +/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/Home.vue?vue&type=style&index=1&lang=css& ***! + \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; -eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/core-js/internals/export.js\");\nvar $findIndex = __webpack_require__(/*! ../internals/array-iteration */ \"./node_modules/core-js/internals/array-iteration.js\").findIndex;\nvar addToUnscopables = __webpack_require__(/*! ../internals/add-to-unscopables */ \"./node_modules/core-js/internals/add-to-unscopables.js\");\nvar arrayMethodUsesToLength = __webpack_require__(/*! ../internals/array-method-uses-to-length */ \"./node_modules/core-js/internals/array-method-uses-to-length.js\");\n\nvar FIND_INDEX = 'findIndex';\nvar SKIPS_HOLES = true;\n\nvar USES_TO_LENGTH = arrayMethodUsesToLength(FIND_INDEX);\n\n// Shouldn't skip holes\nif (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; });\n\n// `Array.prototype.findIndex` method\n// https://tc39.github.io/ecma262/#sec-array.prototype.findindex\n$({ target: 'Array', proto: true, forced: SKIPS_HOLES || !USES_TO_LENGTH }, {\n findIndex: function findIndex(callbackfn /* , that = undefined */) {\n return $findIndex(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);\n }\n});\n\n// https://tc39.github.io/ecma262/#sec-array.prototype-@@unscopables\naddToUnscopables(FIND_INDEX);\n\n\n//# sourceURL=webpack:///./node_modules/core-js/modules/es.array.find-index.js?"); +eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \"\\n.el-table .warning-row {\\n color: darkgoldenrod;\\n}\\n.el-table .success-row {\\n color: green;\\n}\\n.el-table .error-row {\\n color: red;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/views/Home.vue?./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options"); /***/ }), -/***/ "./node_modules/core-js/modules/es.array.splice.js": -/*!*********************************************************!*\ - !*** ./node_modules/core-js/modules/es.array.splice.js ***! - \*********************************************************/ +/***/ "./node_modules/vue-style-loader/index.js?!./node_modules/css-loader/dist/cjs.js?!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src/index.js?!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/views/Home.vue?vue&type=style&index=0&id=069f7be0&scoped=true&lang=css&": +/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/vue-style-loader??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/views/Home.vue?vue&type=style&index=0&id=069f7be0&scoped=true&lang=css& ***! + \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; -eval("\nvar $ = __webpack_require__(/*! ../internals/export */ \"./node_modules/core-js/internals/export.js\");\nvar toAbsoluteIndex = __webpack_require__(/*! ../internals/to-absolute-index */ \"./node_modules/core-js/internals/to-absolute-index.js\");\nvar toInteger = __webpack_require__(/*! ../internals/to-integer */ \"./node_modules/core-js/internals/to-integer.js\");\nvar toLength = __webpack_require__(/*! ../internals/to-length */ \"./node_modules/core-js/internals/to-length.js\");\nvar toObject = __webpack_require__(/*! ../internals/to-object */ \"./node_modules/core-js/internals/to-object.js\");\nvar arraySpeciesCreate = __webpack_require__(/*! ../internals/array-species-create */ \"./node_modules/core-js/internals/array-species-create.js\");\nvar createProperty = __webpack_require__(/*! ../internals/create-property */ \"./node_modules/core-js/internals/create-property.js\");\nvar arrayMethodHasSpeciesSupport = __webpack_require__(/*! ../internals/array-method-has-species-support */ \"./node_modules/core-js/internals/array-method-has-species-support.js\");\nvar arrayMethodUsesToLength = __webpack_require__(/*! ../internals/array-method-uses-to-length */ \"./node_modules/core-js/internals/array-method-uses-to-length.js\");\n\nvar HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('splice');\nvar USES_TO_LENGTH = arrayMethodUsesToLength('splice', { ACCESSORS: true, 0: 0, 1: 2 });\n\nvar max = Math.max;\nvar min = Math.min;\nvar MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF;\nvar MAXIMUM_ALLOWED_LENGTH_EXCEEDED = 'Maximum allowed length exceeded';\n\n// `Array.prototype.splice` method\n// https://tc39.github.io/ecma262/#sec-array.prototype.splice\n// with adding support of @@species\n$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT || !USES_TO_LENGTH }, {\n splice: function splice(start, deleteCount /* , ...items */) {\n var O = toObject(this);\n var len = toLength(O.length);\n var actualStart = toAbsoluteIndex(start, len);\n var argumentsLength = arguments.length;\n var insertCount, actualDeleteCount, A, k, from, to;\n if (argumentsLength === 0) {\n insertCount = actualDeleteCount = 0;\n } else if (argumentsLength === 1) {\n insertCount = 0;\n actualDeleteCount = len - actualStart;\n } else {\n insertCount = argumentsLength - 2;\n actualDeleteCount = min(max(toInteger(deleteCount), 0), len - actualStart);\n }\n if (len + insertCount - actualDeleteCount > MAX_SAFE_INTEGER) {\n throw TypeError(MAXIMUM_ALLOWED_LENGTH_EXCEEDED);\n }\n A = arraySpeciesCreate(O, actualDeleteCount);\n for (k = 0; k < actualDeleteCount; k++) {\n from = actualStart + k;\n if (from in O) createProperty(A, k, O[from]);\n }\n A.length = actualDeleteCount;\n if (insertCount < actualDeleteCount) {\n for (k = actualStart; k < len - actualDeleteCount; k++) {\n from = k + actualDeleteCount;\n to = k + insertCount;\n if (from in O) O[to] = O[from];\n else delete O[to];\n }\n for (k = len; k > len - actualDeleteCount + insertCount; k--) delete O[k - 1];\n } else if (insertCount > actualDeleteCount) {\n for (k = len - actualDeleteCount; k > actualStart; k--) {\n from = k + actualDeleteCount - 1;\n to = k + insertCount - 1;\n if (from in O) O[to] = O[from];\n else delete O[to];\n }\n }\n for (k = 0; k < insertCount; k++) {\n O[k + actualStart] = arguments[k + 2];\n }\n O.length = len - actualDeleteCount + insertCount;\n return A;\n }\n});\n\n\n//# sourceURL=webpack:///./node_modules/core-js/modules/es.array.splice.js?"); +eval("// style-loader: Adds some css to the DOM by adding a