diff --git a/README-zh.md b/README-zh.md index 2e78a63d..3afef454 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,30 +1,62 @@ +

+ + openjob + +

+ +

+ 一款分布式高性能任务调度框架 +

+ ## 介绍 -Openjob 是一款分布式高性能任务调度框架，支持多种定时任务和延时任务，采用无中心化设计，支持无线扩容。 +Openjob 是一款分布式高性能任务调度框架，支持多种定时任务、延时任务、工作流设计，采用无中心化架构，底层使用一致性分片算法，支持无线扩容。 ## 特性 ##### 高可靠 -分布式无状态设计，Master/Worker 架构，只依赖一种数据库(MySQL/PostgreSQL/Oracle) +分布式无状态设计，采用 Master/Worker 架构，只依赖一种数据库(MySQL/PostgreSQL/Oracle) ##### 高性能 -任务调度精确到秒级别，支持轻量级分布式计算，任务采用分片算法，支持无限扩容。 +任务调度精确到秒级别，支持轻量级分布式计算，底层使用一致性分片算法，支持无限扩容。 ##### 定时调度 支持分布式定时任务、固定频率任务、高性能秒级任务、一次性任务定时调度。 ##### 分布式计算 支持单机、广播、Map、MapReduce 和分片多种分布式编程模型，轻松实现大数据分布式计算。 ##### 工作流 -内置工作流调度引擎，支持可视化 DAG，方便高效实现复杂任务调度。 +内置工作流调度引擎，支持可视化 DAG 设计，简单高效实现复杂任务调度。 ##### 延时任务 -基于 Redis 实现高性能延时任务，同时支持延时任务多级存储、丰富的任务管理。 +基于 Redis 高性能延时任务，底层任务多级存储，提供丰富的任务管理。 ##### 跨语言 -官方提供 Java/Go/PHP 多余支持，以及Spring Boot、Gin、Swoft 等常见框架整合。 +支持 Java/Go/PHP/Python 多语言 ，以及Spring Boot、Gin、Swoft 常见框架整合。 ##### 权限管理 -命名空间设计，支持丰富的权限管理，精确到按钮级别。 +命名空间设计，丰富的按钮级别权限管理，。 ##### 报警监控 全面的监控指标，丰富及时的报警方式，便于运维人员快速定位和解决线上问题。 + +## 依赖 + +```xml +1.0.0 + + io.openjob.worker + openjob-worker-core + ${openjob.worker.version} + + + + + io.openjob.worker + openjob-worker-spring-boot-starter + ${openjob.worker.version} + +``` + ## 文档 -- 官网([https://openjob.io](https://openjob.io)) -- 文档([https://openjob.io/docs](https://openjob.io/docs/intro)) -- 体验([https://demo.openjob.io](https://demo.openjob.io)) - - openjob/123456 -## 交流 +- [官网](https://openjob.io) +- [文档](https://openjob.io/docs/intro) +- [试用](https://demo.openjob.io) +## 联系 +* Mail list: + * swoft@qq.com +- Online chat: + - [Gitter](https://gitter.im/openjob/openjob) ## 协议 -Please see [LICENSE](LICENSE) +Openjob is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details. diff --git a/README.md b/README.md index 2019470b..6b76ba7a 100644 --- a/README.md +++ b/README.md @@ -50,12 +50,22 @@ - [Official documentation](https://openjob.io/docs/intro) ## Live demo - Find the [live demo](https://demo.openjob.io) on our website. + - username: openjob + - password: openjob.io ## Contact * Mail list: - * openjob@vip.qq.com * swoft@qq.com - Online chat: +## Openjob ecosystem +- [Openjob Website](https://github.com/open-job/openjob-website) - Openjob official website +- [Openjob UI](https://github.com/open-job/openjob-ui) - UI for Openjob +- [Openjob Samples](https://github.com/open-job/openjob-samples) - Samples for Openjob +- [Openjob Docker](https://github.com/open-job/openjob-docker) - Openjob integration with docker + +## Contributors +This project exists thanks to all the people who contribute. [[Contributors](https://github.com/open-job/openjob/graphs/contributors)]. + ## License Openjob is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details. diff --git a/openjob-common/pom.xml b/openjob-common/pom.xml index bec64ab9..f9d79f98 100644 --- a/openjob-common/pom.xml +++ b/openjob-common/pom.xml @@ -10,6 +10,10 @@ 4.0.0 openjob-common + + 5.3.0 + + org.springframework @@ -19,7 +23,7 @@ com.esotericsoftware.kryo kryo5 - 5.3.0 + ${kryo.version} diff --git a/openjob-common/src/main/java/io/openjob/common/SpringContext.java b/openjob-common/src/main/java/io/openjob/common/SpringContext.java index e7c47fb6..58da8f01 100644 --- a/openjob-common/src/main/java/io/openjob/common/SpringContext.java +++ b/openjob-common/src/main/java/io/openjob/common/SpringContext.java @@ -7,7 +7,7 @@ import org.springframework.lang.Nullable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class SpringContext implements ApplicationContextAware { @@ -26,13 +26,14 @@ public static T getBean(String name, Class type) { return applicationContext.getBean(name, type); } + public static Object getBean(String name) { + return applicationContext.getBean(name); + } + public static Boolean containsBean(String name) { return applicationContext.containsBean(name); } - public static Object getBean(String name) { - return applicationContext.getBean(name); - } public static String[] getBeanNamesForType(@Nullable Class type, boolean includeNonSingletons, boolean allowEagerInit) { return applicationContext.getBeanNamesForType(type, includeNonSingletons, allowEagerInit); diff --git a/openjob-common/src/main/java/io/openjob/common/actor/BaseActor.java b/openjob-common/src/main/java/io/openjob/common/actor/BaseActor.java index bbb2e854..00c4e2cc 100644 --- a/openjob-common/src/main/java/io/openjob/common/actor/BaseActor.java +++ b/openjob-common/src/main/java/io/openjob/common/actor/BaseActor.java @@ -7,7 +7,7 @@ import scala.runtime.BoxedUnit; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-common/src/main/java/io/openjob/common/constant/AkkaConstant.java b/openjob-common/src/main/java/io/openjob/common/constant/AkkaConstant.java index 85f97171..71bf8ca9 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/AkkaConstant.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/AkkaConstant.java @@ -1,7 +1,7 @@ package io.openjob.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class AkkaConstant { diff --git a/openjob-common/src/main/java/io/openjob/common/constant/BoolIntEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/BoolIntEnum.java index c6aebc1e..d247c206 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/BoolIntEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/BoolIntEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author inhere + * @author inhere in.798@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/CommonConstant.java b/openjob-common/src/main/java/io/openjob/common/constant/CommonConstant.java index 369e398b..abb1c9d8 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/CommonConstant.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/CommonConstant.java @@ -1,7 +1,7 @@ package io.openjob.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CommonConstant { diff --git a/openjob-common/src/main/java/io/openjob/common/constant/DelayConstant.java b/openjob-common/src/main/java/io/openjob/common/constant/DelayConstant.java index 0e154237..0adc833e 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/DelayConstant.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/DelayConstant.java @@ -1,7 +1,7 @@ package io.openjob.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class DelayConstant { diff --git a/openjob-common/src/main/java/io/openjob/common/constant/ExecuteTypeEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/ExecuteTypeEnum.java index 2be3f244..c3114853 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/ExecuteTypeEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/ExecuteTypeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/InstanceStatusEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/InstanceStatusEnum.java index bc385321..b7fc2e65 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/InstanceStatusEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/InstanceStatusEnum.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/LogFieldConstant.java b/openjob-common/src/main/java/io/openjob/common/constant/LogFieldConstant.java index b912b2ce..725c2053 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/LogFieldConstant.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/LogFieldConstant.java @@ -1,7 +1,7 @@ package io.openjob.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class LogFieldConstant { diff --git a/openjob-common/src/main/java/io/openjob/common/constant/ProcessorTypeEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/ProcessorTypeEnum.java index 3a23ddc5..ef86b929 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/ProcessorTypeEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/ProcessorTypeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/ProtocolTypeEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/ProtocolTypeEnum.java index 4ff6d901..f081f85d 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/ProtocolTypeEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/ProtocolTypeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/StatusEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/StatusEnum.java index e9ee8507..409d0e08 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/StatusEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/StatusEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @AllArgsConstructor diff --git a/openjob-common/src/main/java/io/openjob/common/constant/TaskConstant.java b/openjob-common/src/main/java/io/openjob/common/constant/TaskConstant.java index b9a5b31f..d960065f 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/TaskConstant.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/TaskConstant.java @@ -1,7 +1,7 @@ package io.openjob.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TaskConstant { diff --git a/openjob-common/src/main/java/io/openjob/common/constant/TaskStatusEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/TaskStatusEnum.java index 6e6ae802..bb02a6a2 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/TaskStatusEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/TaskStatusEnum.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/constant/TimeExpressionTypeEnum.java b/openjob-common/src/main/java/io/openjob/common/constant/TimeExpressionTypeEnum.java index 36828f92..e06c6d10 100644 --- a/openjob-common/src/main/java/io/openjob/common/constant/TimeExpressionTypeEnum.java +++ b/openjob-common/src/main/java/io/openjob/common/constant/TimeExpressionTypeEnum.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-common/src/main/java/io/openjob/common/context/Node.java b/openjob-common/src/main/java/io/openjob/common/context/Node.java index 60c1d3f0..af36fbe0 100644 --- a/openjob-common/src/main/java/io/openjob/common/context/Node.java +++ b/openjob-common/src/main/java/io/openjob/common/context/Node.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/context/Slots.java b/openjob-common/src/main/java/io/openjob/common/context/Slots.java index 0ac4698d..a6d8f057 100644 --- a/openjob-common/src/main/java/io/openjob/common/context/Slots.java +++ b/openjob-common/src/main/java/io/openjob/common/context/Slots.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/dto/JobInstanceDTO.java b/openjob-common/src/main/java/io/openjob/common/dto/JobInstanceDTO.java index 1b84ee6e..61f08785 100644 --- a/openjob-common/src/main/java/io/openjob/common/dto/JobInstanceDTO.java +++ b/openjob-common/src/main/java/io/openjob/common/dto/JobInstanceDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/kryo/KryoSerializer.java b/openjob-common/src/main/java/io/openjob/common/kryo/KryoSerializer.java index 7976c77c..98065907 100644 --- a/openjob-common/src/main/java/io/openjob/common/kryo/KryoSerializer.java +++ b/openjob-common/src/main/java/io/openjob/common/kryo/KryoSerializer.java @@ -4,7 +4,7 @@ import io.openjob.common.util.KryoUtil; /** - * @author stelin + * @author stelin swoft@qq.com * @see akka https://doc.akka.io/docs/akka/current/serialization.html * @since 1.0.0 */ diff --git a/openjob-common/src/main/java/io/openjob/common/request/ServerCheckTaskMasterRequest.java b/openjob-common/src/main/java/io/openjob/common/request/ServerCheckTaskMasterRequest.java index 340be6fb..d56fd68d 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/ServerCheckTaskMasterRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/ServerCheckTaskMasterRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/ServerDelayInstanceStopRequest.java b/openjob-common/src/main/java/io/openjob/common/request/ServerDelayInstanceStopRequest.java index 5495c977..6d12f92a 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/ServerDelayInstanceStopRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/ServerDelayInstanceStopRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/ServerStopJobInstanceRequest.java b/openjob-common/src/main/java/io/openjob/common/request/ServerStopJobInstanceRequest.java index e72cb868..18305810 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/ServerStopJobInstanceRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/ServerStopJobInstanceRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/ServerSubmitJobInstanceRequest.java b/openjob-common/src/main/java/io/openjob/common/request/ServerSubmitJobInstanceRequest.java index e3d354a1..94266892 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/ServerSubmitJobInstanceRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/ServerSubmitJobInstanceRequest.java @@ -6,14 +6,17 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data public class ServerSubmitJobInstanceRequest implements Serializable { private Long jobId; private Long jobInstanceId; + private String jobParamType; private String jobParams; + private String jobExtendParamsType; + private String jobExtendParams; private Long workflowId; private String processorType; private String processorInfo; diff --git a/openjob-common/src/main/java/io/openjob/common/request/ServerWorkerHeartbeatRequest.java b/openjob-common/src/main/java/io/openjob/common/request/ServerWorkerHeartbeatRequest.java index 4dc75ad9..03501b47 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/ServerWorkerHeartbeatRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/ServerWorkerHeartbeatRequest.java @@ -3,7 +3,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ServerWorkerHeartbeatRequest implements Serializable { diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayAddRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayAddRequest.java index cc57c770..83e931f9 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayAddRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayAddRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data @@ -16,11 +16,6 @@ public class WorkerDelayAddRequest implements Serializable { */ private Long deliveryId; - /** - * Namespace id. - */ - private Long namespaceId; - /** * Delay task unique id. * If is null or blank, will to auto generate. diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayItemPullRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayItemPullRequest.java index 29d2d9e4..7d4c44f5 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayItemPullRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayItemPullRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayPullRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayPullRequest.java index 077b36f3..a3c8d2d9 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayPullRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayPullRequest.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayStatusRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayStatusRequest.java index e31fba18..6e932b8e 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayStatusRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayStatusRequest.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTaskRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTaskRequest.java index 05187d81..fa138d9d 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTaskRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTaskRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTopicPullRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTopicPullRequest.java index 7f4e751b..3885426e 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTopicPullRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerDelayTopicPullRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerHeartbeatRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerHeartbeatRequest.java index 56f83530..e47d614f 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerHeartbeatRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerHeartbeatRequest.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceLogRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceLogRequest.java index 3eb5b5db..aaa7796c 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceLogRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceLogRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceStatusRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceStatusRequest.java index 6273eab4..b1fd012e 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceStatusRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceStatusRequest.java @@ -8,7 +8,7 @@ import io.openjob.common.constant.InstanceStatusEnum; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogFieldRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogFieldRequest.java index 5d1a392b..0fff5622 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogFieldRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogFieldRequest.java @@ -6,7 +6,7 @@ import java.util.Map; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogRequest.java index 588a06fa..9512fe63 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskLogRequest.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskRequest.java index 87e47387..709157d2 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerJobInstanceTaskRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerStartRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerStartRequest.java index bd44a40d..fcb1c7d6 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerStartRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerStartRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/request/WorkerStopRequest.java b/openjob-common/src/main/java/io/openjob/common/request/WorkerStopRequest.java index d75e8786..328a4ae2 100644 --- a/openjob-common/src/main/java/io/openjob/common/request/WorkerStopRequest.java +++ b/openjob-common/src/main/java/io/openjob/common/request/WorkerStopRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/Result.java b/openjob-common/src/main/java/io/openjob/common/response/Result.java index 309ce20f..f7e3d180 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/Result.java +++ b/openjob-common/src/main/java/io/openjob/common/response/Result.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayAddResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayAddResponse.java index 8c6710e5..668af9a0 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayAddResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayAddResponse.java @@ -3,21 +3,18 @@ import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data -@EqualsAndHashCode(callSuper = true) -public class ServerDelayAddResponse extends ServerResponse { +public class ServerDelayAddResponse implements Serializable { /** * Delay task unique id. * If is null or blank, will to auto generate. */ private String taskId; - - public ServerDelayAddResponse(Long deliveryId) { - super(deliveryId); - } } diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayInstanceResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayInstanceResponse.java index 1346a8f6..a36aa12f 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayInstanceResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayInstanceResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayPullResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayPullResponse.java index 0273154e..6fd88422 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayPullResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayPullResponse.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicPullResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicPullResponse.java index 9bfe4c3c..ffaa41f6 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicPullResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicPullResponse.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicResponse.java index 7e2a1a14..eb32fb72 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerDelayTopicResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatResponse.java index 5208f3c0..4ac71012 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatResponse.java @@ -7,7 +7,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatSystemResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatSystemResponse.java index b3c53356..9ddc92c8 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatSystemResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerHeartbeatSystemResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerResponse.java index 042ae578..7fb7c754 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/ServerWorkerStartResponse.java b/openjob-common/src/main/java/io/openjob/common/response/ServerWorkerStartResponse.java index f770689d..30c9ba67 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/ServerWorkerStartResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/ServerWorkerStartResponse.java @@ -6,7 +6,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/response/WorkerResponse.java b/openjob-common/src/main/java/io/openjob/common/response/WorkerResponse.java index 4c8e9628..df208af4 100644 --- a/openjob-common/src/main/java/io/openjob/common/response/WorkerResponse.java +++ b/openjob-common/src/main/java/io/openjob/common/response/WorkerResponse.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/main/java/io/openjob/common/util/CommonUtil.java b/openjob-common/src/main/java/io/openjob/common/util/CommonUtil.java index f026eeaa..60e5ed05 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/CommonUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/CommonUtil.java @@ -5,7 +5,7 @@ import java.util.Objects; /** - * @author inhere + * @author inhere in.798@qq.com * @since 1.0.0 */ public class CommonUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/DateUtil.java b/openjob-common/src/main/java/io/openjob/common/util/DateUtil.java index 412b3b36..cae29262 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/DateUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/DateUtil.java @@ -4,7 +4,7 @@ import java.time.Instant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class DateUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/DelayUtil.java b/openjob-common/src/main/java/io/openjob/common/util/DelayUtil.java index ffaf7321..a14418ce 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/DelayUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/DelayUtil.java @@ -3,7 +3,7 @@ import io.openjob.common.constant.DelayConstant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class DelayUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/FutureUtil.java b/openjob-common/src/main/java/io/openjob/common/util/FutureUtil.java index db0a7738..870a7f5e 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/FutureUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/FutureUtil.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class FutureUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/IpUtil.java b/openjob-common/src/main/java/io/openjob/common/util/IpUtil.java index 513cc779..7e934d7b 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/IpUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/IpUtil.java @@ -11,7 +11,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class IpUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/KryoUtil.java b/openjob-common/src/main/java/io/openjob/common/util/KryoUtil.java index a97743de..619af115 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/KryoUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/KryoUtil.java @@ -8,7 +8,7 @@ import java.io.ByteArrayOutputStream; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class KryoUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/ResultUtil.java b/openjob-common/src/main/java/io/openjob/common/util/ResultUtil.java index 4c1cf3b3..be04b9b6 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/ResultUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/ResultUtil.java @@ -4,7 +4,7 @@ import io.openjob.common.response.Result; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ResultUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/RuntimeUtil.java b/openjob-common/src/main/java/io/openjob/common/util/RuntimeUtil.java index a87add41..95bf6dae 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/RuntimeUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/RuntimeUtil.java @@ -1,7 +1,7 @@ package io.openjob.common.util; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class RuntimeUtil { diff --git a/openjob-common/src/main/java/io/openjob/common/util/TaskUtil.java b/openjob-common/src/main/java/io/openjob/common/util/TaskUtil.java index 879076b1..f727536f 100644 --- a/openjob-common/src/main/java/io/openjob/common/util/TaskUtil.java +++ b/openjob-common/src/main/java/io/openjob/common/util/TaskUtil.java @@ -5,7 +5,7 @@ import java.util.UUID; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TaskUtil { diff --git a/openjob-common/src/test/java/io/openjob/common/dto/ChildDTO.java b/openjob-common/src/test/java/io/openjob/common/dto/ChildDTO.java index 2800a7a5..26ef9cfb 100644 --- a/openjob-common/src/test/java/io/openjob/common/dto/ChildDTO.java +++ b/openjob-common/src/test/java/io/openjob/common/dto/ChildDTO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/test/java/io/openjob/common/dto/OneDTO.java b/openjob-common/src/test/java/io/openjob/common/dto/OneDTO.java index 56ff02eb..89d32f59 100644 --- a/openjob-common/src/test/java/io/openjob/common/dto/OneDTO.java +++ b/openjob-common/src/test/java/io/openjob/common/dto/OneDTO.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/test/java/io/openjob/common/dto/TwoDTO.java b/openjob-common/src/test/java/io/openjob/common/dto/TwoDTO.java index b3dfcdc6..7346fde3 100644 --- a/openjob-common/src/test/java/io/openjob/common/dto/TwoDTO.java +++ b/openjob-common/src/test/java/io/openjob/common/dto/TwoDTO.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-common/src/test/java/io/openjob/common/mapper/TestMapper.java b/openjob-common/src/test/java/io/openjob/common/mapper/TestMapper.java index b72fdc34..850388a8 100644 --- a/openjob-common/src/test/java/io/openjob/common/mapper/TestMapper.java +++ b/openjob-common/src/test/java/io/openjob/common/mapper/TestMapper.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Mapper diff --git a/openjob-common/src/test/java/io/openjob/common/util/IpUtilTest.java b/openjob-common/src/test/java/io/openjob/common/util/IpUtilTest.java index 6a7d4392..990fa7f3 100644 --- a/openjob-common/src/test/java/io/openjob/common/util/IpUtilTest.java +++ b/openjob-common/src/test/java/io/openjob/common/util/IpUtilTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class IpUtilTest { diff --git a/openjob-common/src/test/java/io/openjob/common/util/KryoUtilTest.java b/openjob-common/src/test/java/io/openjob/common/util/KryoUtilTest.java index 073b453f..7bdbfdc8 100644 --- a/openjob-common/src/test/java/io/openjob/common/util/KryoUtilTest.java +++ b/openjob-common/src/test/java/io/openjob/common/util/KryoUtilTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class KryoUtilTest { diff --git a/openjob-common/src/test/java/io/openjob/common/util/MapperTest.java b/openjob-common/src/test/java/io/openjob/common/util/MapperTest.java index 6d4823d9..8fd39aad 100644 --- a/openjob-common/src/test/java/io/openjob/common/util/MapperTest.java +++ b/openjob-common/src/test/java/io/openjob/common/util/MapperTest.java @@ -11,7 +11,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ diff --git a/openjob-common/src/test/java/io/openjob/common/util/TaskUtilTest.java b/openjob-common/src/test/java/io/openjob/common/util/TaskUtilTest.java index bfbf7b88..2d65db2f 100644 --- a/openjob-common/src/test/java/io/openjob/common/util/TaskUtilTest.java +++ b/openjob-common/src/test/java/io/openjob/common/util/TaskUtilTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TaskUtilTest { diff --git a/openjob-server/openjob-server-admin/pom.xml b/openjob-server/openjob-server-admin/pom.xml index 101f50ec..af814ef9 100644 --- a/openjob-server/openjob-server-admin/pom.xml +++ b/openjob-server/openjob-server-admin/pom.xml @@ -25,11 +25,5 @@ io.openjob openjob-server-log - - - com.github.ben-manes.caffeine - caffeine - 2.9.2 - \ No newline at end of file diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminAutoConfiguration.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminAutoConfiguration.java index b088b02d..58a6b027 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminAutoConfiguration.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminAutoConfiguration.java @@ -1,44 +1,12 @@ package io.openjob.server.admin.autoconfigure; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import io.openjob.server.admin.constant.AdminConstant; -import io.openjob.server.admin.dto.AdminUserSessionDTO; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.concurrent.TimeUnit; - /** * @author inhere */ @Configuration @EnableConfigurationProperties(AdminUserProperties.class) public class AdminAutoConfiguration { - - private final AdminUserProperties userProperties; - - public AdminAutoConfiguration(AdminUserProperties userProperties) { - this.userProperties = userProperties; - } - - /** - * make loginCache bean - * - * @return bean - */ - @Bean - public Cache loginCache() { - return Caffeine.newBuilder() - // cache的初始容量 - .initialCapacity(userProperties.getCacheInitSize()) - // cache最大缓存数 - .maximumSize(userProperties.getCacheMaxSize()) - // 设置写缓存后n秒钟过期 - .expireAfterWrite(AdminConstant.LOGIN_EXPIRE_TIME, TimeUnit.SECONDS) - // 设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite - //.expireAfterAccess(17, TimeUnit.SECONDS) - .build(); - } } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminUserProperties.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminUserProperties.java index 28b448fb..b82c05b7 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminUserProperties.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminUserProperties.java @@ -14,9 +14,4 @@ public class AdminUserProperties { * passwd salt */ private String passwdSalt; - - private Integer cacheInitSize; - - private Long cacheMaxSize; - } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminInterceptorConfig.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/WebAdminConfigurer.java similarity index 82% rename from openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminInterceptorConfig.java rename to openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/WebAdminConfigurer.java index 4c228cdb..5d860888 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/AdminInterceptorConfig.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/autoconfigure/WebAdminConfigurer.java @@ -10,12 +10,12 @@ * @author inhere */ @Configuration -public class AdminInterceptorConfig implements WebMvcConfigurer { +public class WebAdminConfigurer implements WebMvcConfigurer { private final AccessInterceptor accessInterceptor; - @Autowired - public AdminInterceptorConfig(AccessInterceptor accessInterceptor) { + @Autowired() + public WebAdminConfigurer(AccessInterceptor accessInterceptor) { this.accessInterceptor = accessInterceptor; } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminCodeEnum.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminCodeEnum.java deleted file mode 100644 index 765ddac6..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminCodeEnum.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.openjob.server.admin.constant; - -import io.openjob.server.common.exception.CodeExceptionAssert; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author stelin - * @since 1.0.0 - */ -@Getter -@AllArgsConstructor -public enum AdminCodeEnum implements CodeExceptionAssert { - - /** - * Test - */ - TEST(1, "TEST"); - - /** - * Value - */ - private final Integer value; - - /** - * Message - */ - private final String message; -} diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminConstant.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminConstant.java index d2442bac..7ecbcaef 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminConstant.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminConstant.java @@ -5,35 +5,22 @@ */ public class AdminConstant { /** - * login expire time, default is 30min + * Login expire time, default is 30min */ public static final Integer LOGIN_EXPIRE_TIME = 1800; /** - * user login session key name in headers - * "session: session_key" + * User login session key name in headers */ public static final String HEADER_SESSION_KEY = "session"; - /** - * user api token header name in headers - * "token: user_token" - */ - public static final String HEADER_TOKEN_KEY = "token"; - /** * Request uid key. */ public static final String REQUEST_UID_KEY = "uid"; - - /** - * mark is permission data - */ - public static final Integer MENU_TYPE_PERM = 2; - /** - * mark is admin menu data + * Max time expression */ - public static final Integer MENU_TYPE_MENU = 1; + public static final Integer MAX_TIME_EXPRESSION = 7; } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminHttpStatusEnum.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminHttpStatusEnum.java index 62a54dbc..9628e179 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminHttpStatusEnum.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/AdminHttpStatusEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/CodeEnum.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/CodeEnum.java index 15c3d9f6..6e51161a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/CodeEnum.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/constant/CodeEnum.java @@ -5,13 +5,16 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter @AllArgsConstructor public enum CodeEnum implements CodeExceptionAssert { + /** + * App name not exist + */ NAME_EXIST(100, "App name must be globally unique!"); /** diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AdminController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AdminController.java index f2612df0..e2df5c6a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AdminController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AdminController.java @@ -38,20 +38,16 @@ public AdminController(AdminLoginService adminLoginService) { this.adminLoginService = adminLoginService; } - @ApiOperation("admin user login") + @ApiOperation("User login") @PostMapping("/login") public Result login(@Valid @RequestBody AdminUserLoginRequest request) { return Result.success(this.adminLoginService.login(request)); } /** - * login user info, menus, perms - * - * @param request request - * @param headers headers - * @return vo + * Login user info */ - @ApiOperation("login user info, menus, perms") + @ApiOperation("Login user") @GetMapping("/user-info") public Result loginUserInfo(@RequestBody LoginUserInfoRequest request, @RequestHeader HttpHeaders headers) { String sessKey = headers.getFirst(AdminConstant.HEADER_SESSION_KEY); @@ -60,13 +56,9 @@ public Result loginUserInfo(@RequestBody LoginUserInfoRequest r } /** - * admin user logout - * - * @param request request - * @param headers headers - * @return vo + * Login out */ - @ApiOperation("admin user logout") + @ApiOperation("User logout") @PostMapping("/logout") public Result logout(@RequestBody(required = false) AdminUserLogoutRequest request, @RequestHeader HttpHeaders headers) { String sessKey = headers.getFirst(AdminConstant.HEADER_SESSION_KEY); diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AppController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AppController.java index 2670599c..269d4fc5 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AppController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/AppController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "App", tags = "App") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ContactController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ContactController.java deleted file mode 100644 index 93c9e123..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ContactController.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.openjob.server.admin.controller; - -import io.openjob.common.response.Result; -import io.openjob.server.admin.request.notify.NotifyContactAddRequest; -import io.openjob.server.admin.request.notify.NotifyContactDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyContactListRequest; -import io.openjob.server.admin.request.notify.NotifyContactQueryRequest; -import io.openjob.server.admin.request.notify.NotifyContactUpdateRequest; -import io.openjob.server.admin.service.NotifyContactService; -import io.openjob.server.admin.vo.notify.NotifyContactAddVO; -import io.openjob.server.admin.vo.notify.NotifyContactQueryVO; -import io.openjob.server.admin.vo.notify.NotifyContactUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @author inhere - * @since 1.0.0 - */ -@Api(value = "NotifyContact", tags = "NotifyContact") -@RestController -@RequestMapping("/admin/notify-contacts") -public class ContactController { - - private final NotifyContactService notifyContactService; - - @Autowired - public ContactController(NotifyContactService notifyContactService) { - this.notifyContactService = notifyContactService; - } - - @ApiOperation("Add a notifyContact") - @PostMapping("/add") - public Result add(@Valid @RequestBody NotifyContactAddRequest addRequest) { - return Result.success(this.notifyContactService.add(addRequest)); - } - - @ApiOperation("Update a notifyContact") - @PostMapping("/update") - public Result update(@Valid @RequestBody NotifyContactUpdateRequest updateRequest) { - return Result.success(this.notifyContactService.update(updateRequest)); - } - - @ApiOperation("Delete a notifyContact") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody NotifyContactDeleteRequest deleteRequest) { - return Result.success(this.notifyContactService.delete(deleteRequest)); - } - - @ApiOperation("Get a notifyContact") - @GetMapping("/get") - public Result query(@Valid NotifyContactQueryRequest getRequest) { - return Result.success(this.notifyContactService.query(getRequest)); - } - - @ApiOperation("List notifyContact by page") - @GetMapping("/list") - public Result> list(@Valid NotifyContactListRequest listRequest) { - return Result.success(this.notifyContactService.getPageList(listRequest)); - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayController.java index 36806e55..246870a6 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "Delay", tags = "Delay") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayInstanceController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayInstanceController.java index 1484f65b..e44c2e80 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayInstanceController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/DelayInstanceController.java @@ -25,7 +25,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "Delay Instance", tags = "Delay Instance") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobController.java index 01c401a7..06147b50 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobController.java @@ -30,7 +30,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "Job", tags = "Job") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobInstanceController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobInstanceController.java index cec59132..f9c37221 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobInstanceController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/JobInstanceController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "JobInstance", tags = "JobInstance") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NamespaceController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NamespaceController.java index 8f11f145..6fbf8c6a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NamespaceController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NamespaceController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Api(value = "Namespace", tags = "Namespace") diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NotifyGroupController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NotifyGroupController.java deleted file mode 100644 index 13539730..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/NotifyGroupController.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.openjob.server.admin.controller; - -import io.openjob.common.response.Result; -import io.openjob.server.admin.request.notify.NotifyGroupAddRequest; -import io.openjob.server.admin.request.notify.NotifyGroupDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyGroupListRequest; -import io.openjob.server.admin.request.notify.NotifyGroupQueryRequest; -import io.openjob.server.admin.request.notify.NotifyGroupUpdateRequest; -import io.openjob.server.admin.service.NotifyGroupService; -import io.openjob.server.admin.vo.notify.NotifyGroupAddVO; -import io.openjob.server.admin.vo.notify.NotifyGroupQueryVO; -import io.openjob.server.admin.vo.notify.NotifyGroupUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @author inhere - * @since 1.0.0 - */ -@Api(value = "NotifyGroup", tags = "NotifyGroup") -@RestController -@RequestMapping("/admin/notify-groups") -public class NotifyGroupController { - - private final NotifyGroupService notifyGroupService; - - @Autowired - public NotifyGroupController(NotifyGroupService notifyGroupService) { - this.notifyGroupService = notifyGroupService; - } - - @ApiOperation("Add a notifyGroup") - @PostMapping("/add") - public Result add(@Valid @RequestBody NotifyGroupAddRequest addRequest) { - return Result.success(this.notifyGroupService.add(addRequest)); - } - - @ApiOperation("Update a notifyGroup") - @PostMapping("/update") - public Result update(@Valid @RequestBody NotifyGroupUpdateRequest updateRequest) { - return Result.success(this.notifyGroupService.update(updateRequest)); - } - - @ApiOperation("Delete a notifyGroup") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody NotifyGroupDeleteRequest deleteRequest) { - return Result.success(this.notifyGroupService.delete(deleteRequest)); - } - - @ApiOperation("Get a notifyGroup") - @GetMapping("/get") - public Result query(@Valid NotifyGroupQueryRequest getRequest) { - return Result.success(this.notifyGroupService.query(getRequest)); - } - - @ApiOperation("List notifyGroup by page") - @GetMapping("/list") - public Result> list(@Valid NotifyGroupListRequest listRequest) { - return Result.success(this.notifyGroupService.getPageList(listRequest)); - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/PermController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/PermController.java index 2ee0dee1..7f93aab4 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/PermController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/PermController.java @@ -2,25 +2,14 @@ import io.openjob.common.response.Result; import io.openjob.server.admin.constant.AdminConstant; -import io.openjob.server.admin.request.perm.AdminPermAddRequest; -import io.openjob.server.admin.request.perm.AdminPermDeleteRequest; -import io.openjob.server.admin.request.perm.AdminPermListRequest; -import io.openjob.server.admin.request.perm.AdminPermQueryRequest; -import io.openjob.server.admin.request.perm.AdminPermUpdateRequest; import io.openjob.server.admin.request.perm.AdminPermissionMenusRequest; import io.openjob.server.admin.service.AdminPermService; -import io.openjob.server.admin.vo.perm.AdminPermAddVO; -import io.openjob.server.admin.vo.perm.AdminPermQueryVO; -import io.openjob.server.admin.vo.perm.AdminPermUpdateVO; import io.openjob.server.admin.vo.perm.AdminPermissionMenusVO; -import io.openjob.server.common.dto.PageDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -43,36 +32,6 @@ public PermController(AdminPermService adminPermService) { this.adminPermService = adminPermService; } - @ApiOperation("Add adminPerm") - @PostMapping("/add") - public Result add(@Valid @RequestBody AdminPermAddRequest addRequest) { - return Result.success(this.adminPermService.add(addRequest)); - } - - @ApiOperation("Update adminPerm") - @PostMapping("/update") - public Result update(@Valid @RequestBody AdminPermUpdateRequest updateRequest) { - return Result.success(this.adminPermService.update(updateRequest)); - } - - @ApiOperation("Delete a adminPerm") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody AdminPermDeleteRequest deleteRequest) { - return Result.success(this.adminPermService.delete(deleteRequest)); - } - - @ApiOperation("Get a adminPerm") - @GetMapping("/get") - public Result query(@Valid @ModelAttribute AdminPermQueryRequest getRequest) { - return Result.success(this.adminPermService.query(getRequest)); - } - - @ApiOperation("List adminPerm") - @GetMapping("/list") - public Result> list(@Valid @ModelAttribute AdminPermListRequest listRequest) { - return Result.success(this.adminPermService.getPageList(listRequest)); - } - @ApiOperation("List menus") @GetMapping("/menus") public Result menus(@Valid @ModelAttribute AdminPermissionMenusRequest listRequest, HttpServletRequest request) { diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/RoleController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/RoleController.java deleted file mode 100644 index c492f2e1..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/RoleController.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.openjob.server.admin.controller; - -import io.openjob.common.response.Result; -import io.openjob.server.admin.request.user.AdminRoleAddRequest; -import io.openjob.server.admin.request.user.AdminRoleDeleteRequest; -import io.openjob.server.admin.request.user.AdminRoleListRequest; -import io.openjob.server.admin.request.user.AdminRoleQueryRequest; -import io.openjob.server.admin.request.user.AdminRoleUpdateRequest; -import io.openjob.server.admin.service.AdminRoleService; -import io.openjob.server.admin.vo.user.AdminRoleAddVO; -import io.openjob.server.admin.vo.user.AdminRoleQueryVO; -import io.openjob.server.admin.vo.user.AdminRoleUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @author inhere - * @since 1.0.0 - */ -@Api(value = "AdminRole", tags = "AdminRole") -@RestController -@RequestMapping("/admin/roles") -public class RoleController { - - private final AdminRoleService adminRoleService; - - @Autowired - public RoleController(AdminRoleService adminRoleService) { - this.adminRoleService = adminRoleService; - } - - @ApiOperation("Add a adminRole") - @PostMapping("/add") - public Result add(@Valid @RequestBody AdminRoleAddRequest addRequest) { - return Result.success(this.adminRoleService.add(addRequest)); - } - - @ApiOperation("Update a adminRole") - @PostMapping("/update") - public Result update(@Valid @RequestBody AdminRoleUpdateRequest updateRequest) { - return Result.success(this.adminRoleService.update(updateRequest)); - } - - @ApiOperation("Delete a adminRole") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody AdminRoleDeleteRequest deleteRequest) { - return Result.success(this.adminRoleService.delete(deleteRequest)); - } - - @ApiOperation("Get a adminRole") - @GetMapping("/get") - public Result query(@Valid AdminRoleQueryRequest getRequest) { - return Result.success(this.adminRoleService.query(getRequest)); - } - - @ApiOperation("List adminRole by page") - @GetMapping("/list") - public Result> list(@Valid AdminRoleListRequest listRequest) { - return Result.success(this.adminRoleService.getPageList(listRequest)); - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ServerController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ServerController.java index 001f58cf..2e6fce55 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ServerController.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/ServerController.java @@ -9,6 +9,7 @@ import io.openjob.server.common.vo.PageVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,6 +28,7 @@ public class ServerController { private final ServerService serverService; + @Autowired public ServerController(ServerService serverService) { this.serverService = serverService; } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/TemplateController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/TemplateController.java deleted file mode 100644 index 2b98c588..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/TemplateController.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.openjob.server.admin.controller; - -import io.openjob.common.response.Result; -import io.openjob.server.admin.request.notify.NotifyTemplateAddRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateListRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateQueryRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateUpdateRequest; -import io.openjob.server.admin.service.NotifyTemplateService; -import io.openjob.server.admin.vo.notify.NotifyTemplateAddVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateQueryVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @author inhere - * @since 1.0.0 - */ -@Api(value = "NotifyTemplate", tags = "NotifyTemplate") -@RestController -@RequestMapping("/admin/notify-templates") -public class TemplateController { - - private final NotifyTemplateService notifyTemplateService; - - @Autowired - public TemplateController(NotifyTemplateService notifyTemplateService) { - this.notifyTemplateService = notifyTemplateService; - } - - @ApiOperation("Add a notifyTemplate") - @PostMapping("/add") - public Result add(@Valid @RequestBody NotifyTemplateAddRequest addRequest) { - return Result.success(this.notifyTemplateService.add(addRequest)); - } - - @ApiOperation("Update a notifyTemplate") - @PostMapping("/update") - public Result update(@Valid @RequestBody NotifyTemplateUpdateRequest updateRequest) { - return Result.success(this.notifyTemplateService.update(updateRequest)); - } - - @ApiOperation("Delete a notifyTemplate") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody NotifyTemplateDeleteRequest deleteRequest) { - return Result.success(this.notifyTemplateService.delete(deleteRequest)); - } - - @ApiOperation("Get a notifyTemplate") - @GetMapping("/get") - public Result query(@Valid NotifyTemplateQueryRequest getRequest) { - return Result.success(this.notifyTemplateService.query(getRequest)); - } - - @ApiOperation("List notifyTemplate by page") - @GetMapping("/list") - public Result> list(@Valid NotifyTemplateListRequest listRequest) { - return Result.success(this.notifyTemplateService.getPageList(listRequest)); - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/UserController.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/UserController.java deleted file mode 100644 index 2d32d095..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/controller/UserController.java +++ /dev/null @@ -1,72 +0,0 @@ -package io.openjob.server.admin.controller; - -import io.openjob.common.response.Result; -import io.openjob.server.admin.request.user.AdminUserAddRequest; -import io.openjob.server.admin.request.user.AdminUserDeleteRequest; -import io.openjob.server.admin.request.user.AdminUserListRequest; -import io.openjob.server.admin.request.user.AdminUserQueryRequest; -import io.openjob.server.admin.request.user.AdminUserUpdateRequest; -import io.openjob.server.admin.service.AdminUserService; -import io.openjob.server.admin.vo.user.AdminUserAddVO; -import io.openjob.server.admin.vo.user.AdminUserQueryVO; -import io.openjob.server.admin.vo.user.AdminUserUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @author inhere - * @since 1.0.0 - */ -@Api(value = "AdminUser", tags = "AdminUser") -@RestController -@RequestMapping("/admin/users") -public class UserController { - - private final AdminUserService adminUserService; - - @Autowired - public UserController(AdminUserService adminUserService) { - this.adminUserService = adminUserService; - } - - @ApiOperation("Add AdminUser") - @PostMapping("/add") - public Result add(@Valid @RequestBody AdminUserAddRequest addRequest) { - return Result.success(this.adminUserService.add(addRequest)); - } - - @ApiOperation("Update a AdminUser") - @PostMapping("/update") - public Result update(@Valid @RequestBody AdminUserUpdateRequest updateRequest) { - return Result.success(this.adminUserService.update(updateRequest)); - } - - @ApiOperation("Delete a AdminUser") - @PostMapping("/delete") - public Result delete(@Valid @RequestBody AdminUserDeleteRequest deleteRequest) { - return Result.success(this.adminUserService.delete(deleteRequest)); - } - - @ApiOperation("Get a AdminUser") - @GetMapping("/get") - public Result query(@Valid AdminUserQueryRequest getRequest) { - return Result.success(this.adminUserService.query(getRequest)); - } - - @ApiOperation("List AdminUser by page") - @GetMapping("/list") - public Result> list(@Valid AdminUserListRequest listRequest) { - return Result.success(this.adminUserService.getPageList(listRequest)); - } - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/dto/AdminUserSessionDTO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/dto/AdminUserSessionDTO.java deleted file mode 100644 index 4be49e7c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/dto/AdminUserSessionDTO.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.openjob.server.admin.dto; - -import io.openjob.server.admin.vo.part.MenuItemVO; -import io.openjob.server.admin.vo.part.PermItemVO; -import lombok.Builder; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - */ -@Data -@Builder -public class AdminUserSessionDTO { - - /** - * PK admin_user.id - */ - private Long id; - - /** - * user is supper admin - */ - private Boolean supperAdmin; - - /** - * User name - */ - private String username; - - /** - * Nickname - */ - private String nickname; - - /** - * Api auth token - */ - private String token; - - /** - * Web auth key - */ - private String sessionKey; - - /** - * menus for current user. - */ - private List menus; - - /** - * perms for current user. - */ - private List perms; - -} diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/interceptor/AccessInterceptor.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/interceptor/AccessInterceptor.java index 1d8ba11d..e8afadf8 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/interceptor/AccessInterceptor.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/interceptor/AccessInterceptor.java @@ -5,9 +5,7 @@ import io.openjob.common.response.Result; import io.openjob.server.admin.constant.AdminConstant; import io.openjob.server.admin.constant.AdminHttpStatusEnum; -import io.openjob.server.admin.dto.AdminUserSessionDTO; import io.openjob.server.admin.service.AdminUserService; -import io.openjob.server.admin.vo.part.PermItemVO; import io.openjob.server.repository.entity.AdminUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,15 +14,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import org.springframework.web.servlet.HandlerInterceptor; +import javax.annotation.Nonnull; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * 请求访问拦截器 @@ -37,19 +34,12 @@ public class AccessInterceptor implements HandlerInterceptor { private static final String MAX_AGE = "18000L"; private final AdminUserService adminUserService; - private final List noLoginRoutes; - private final List noLoginPrefixes; - /** - * can access after login, not need config perms. - * - eg: logout - */ - private final List notAuthRoutes; - @Autowired public AccessInterceptor(AdminUserService adminUserService) { + // No login routes noLoginRoutes = new ArrayList<>(); noLoginRoutes.add("/"); noLoginRoutes.add("/csrf"); @@ -58,20 +48,17 @@ public AccessInterceptor(AdminUserService adminUserService) { noLoginRoutes.add("/favicon.ico"); noLoginRoutes.add("/swagger-ui.html"); + // No login prefix noLoginPrefixes = new ArrayList<>(); noLoginPrefixes.add("/webjars/"); noLoginPrefixes.add("/swagger-resources"); noLoginPrefixes.add("/null/swagger-resources"); - notAuthRoutes = new ArrayList<>(); - notAuthRoutes.add("/admin/logout"); - notAuthRoutes.add("/admin/user-info"); - this.adminUserService = adminUserService; } /** - * 前置处理器 + * Pre handle * * @param request request * @param response response @@ -79,26 +66,27 @@ public AccessInterceptor(AdminUserService adminUserService) { * @return bool */ @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws IOException { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, @Nonnull Object handler) throws IOException { String route = request.getRequestURI(); - // 跨域设置 + // Cross domain response.addHeader(HttpHeaders.ACCESS_CONTROL_MAX_AGE, MAX_AGE); response.addHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "*"); response.addHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "*"); response.addHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "*"); + // Options method if (HttpMethod.OPTIONS.name().equals(request.getMethod())) { response.setStatus(HttpStatus.NO_CONTENT.value()); return false; } - // web login + // Login if (!isNoLoginRoute(route)) { String sessKey = request.getHeader(AdminConstant.HEADER_SESSION_KEY); if (StringUtils.isEmpty(sessKey)) { - returnJson(response, AdminHttpStatusEnum.UNAUTHORIZED); + AdminHttpStatusEnum.UNAUTHORIZED.throwException(); return false; } @@ -110,7 +98,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons } /** - * is no login required route path. + * Whether is no login * * @param route route path * @return bool @@ -128,38 +116,4 @@ private Boolean isNoLoginRoute(String route) { return false; } - - private Boolean checkUserPerm(String route, AdminUserSessionDTO user) { - if (Objects.isNull(user)) { - AdminHttpStatusEnum.FORBIDDEN.throwException(); - } - - if (user.getSupperAdmin() || notAuthRoutes.contains(route)) { - return true; - } - - if (CollectionUtils.isEmpty(user.getPerms())) { - return false; - } - - // match by route path. - PermItemVO perm = user.getPerms() - .stream() - .filter(item -> Objects.equals(item.getPath(), route)) - .findAny() - .orElse(null); - - return Objects.nonNull(perm); - } - - private void returnJson(HttpServletResponse response, AdminHttpStatusEnum statusEnum) throws IOException { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - - Result result = new Result<>(new Object(), statusEnum.getValue(), statusEnum.getMessage()); - - response.addHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - response.setStatus(statusEnum.getValue()); - response.getWriter().print(mapper.writeValueAsString(result)); - } } diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigAddRequest.java deleted file mode 100644 index 213f16e7..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigAddRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigAddRequest", description = "AdminConfig add Request") -public class AdminConfigAddRequest { - - @ApiModelProperty(value = "Config name") - private String name; - - @ApiModelProperty(value = "Config value") - private String value; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigDeleteRequest.java deleted file mode 100644 index c5c77736..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigDeleteRequest", description = "AdminConfig delete request") -public class AdminConfigDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigListRequest.java deleted file mode 100644 index 5885ba7d..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigListRequest", description = "AdminConfig page list request") -public class AdminConfigListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigQueryRequest.java deleted file mode 100644 index 81f7a734..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigQueryRequest", description = "AdminConfig query request") -public class AdminConfigQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigUpdateRequest.java deleted file mode 100644 index 6338437e..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/admin/AdminConfigUpdateRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.openjob.server.admin.request.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigUpdateRequest", description = "AdminConfig update request") -public class AdminConfigUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Config name") - private String name; - - @ApiModelProperty(value = "Config value") - private String value; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/AddAppRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/AddAppRequest.java index cb08dfa4..42d9b94d 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/AddAppRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/AddAppRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/DeleteAppRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/DeleteAppRequest.java index 51a001bf..44af523f 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/DeleteAppRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/DeleteAppRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/ListAppRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/ListAppRequest.java index 53c9b200..f0059e13 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/ListAppRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/ListAppRequest.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/UpdateAppRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/UpdateAppRequest.java index fd2b6d90..7eb9d4f4 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/UpdateAppRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/app/UpdateAppRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @ApiModel() diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/AddDelayRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/AddDelayRequest.java index dcd7e9d3..96ab7cdf 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/AddDelayRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/AddDelayRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayInstanceRequest.java index 8f0ed783..1095e320 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayInstanceRequest.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayRequest.java index b3b20fac..90a1750c 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/DeleteDelayRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceLogRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceLogRequest.java index 18ecba31..2ff9a04f 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceLogRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceLogRequest.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceRequest.java index c8172029..44d59e0c 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayInstanceRequest.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayRequest.java index 918d8142..7d2b1f15 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/ListDelayRequest.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/StopDelayInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/StopDelayInstanceRequest.java index b03b1367..d063549b 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/StopDelayInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/StopDelayInstanceRequest.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/UpdateDelayRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/UpdateDelayRequest.java index ca981b7b..853629b6 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/UpdateDelayRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/delay/UpdateDelayRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/AddJobRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/AddJobRequest.java index b8108106..94d46a6c 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/AddJobRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/AddJobRequest.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/DeleteJobInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/DeleteJobInstanceRequest.java index 057a7726..ca668f8d 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/DeleteJobInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/DeleteJobInstanceRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ExecuteJobRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ExecuteJobRequest.java index 9b29f6cd..f549365b 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ExecuteJobRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ExecuteJobRequest.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @ApiModel diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/GetJobInstanceLogRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/GetJobInstanceLogRequest.java index a0663519..b8f9a8db 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/GetJobInstanceLogRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/GetJobInstanceLogRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListJobInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListJobInstanceRequest.java index 3287ebb0..c513e561 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListJobInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListJobInstanceRequest.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListProcessorLogRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListProcessorLogRequest.java index ca6b82de..96eb5781 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListProcessorLogRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/ListProcessorLogRequest.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/StopJobInstanceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/StopJobInstanceRequest.java index 2a90097b..e57cce49 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/StopJobInstanceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/StopJobInstanceRequest.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/TimeExpressionRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/TimeExpressionRequest.java index 4825d77d..d3b74410 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/TimeExpressionRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/TimeExpressionRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/UpdateJobRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/UpdateJobRequest.java index 5c50396e..7e9976d5 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/UpdateJobRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/job/UpdateJobRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @EqualsAndHashCode(callSuper = true) diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/AddNamespaceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/AddNamespaceRequest.java index b8eae3cc..8fb11791 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/AddNamespaceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/AddNamespaceRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/DeleteNamespaceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/DeleteNamespaceRequest.java index 4f609eb4..be028939 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/DeleteNamespaceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/DeleteNamespaceRequest.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/ListNamespaceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/ListNamespaceRequest.java index f3e589c1..7efa7104 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/ListNamespaceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/ListNamespaceRequest.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/UpdateNamespaceRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/UpdateNamespaceRequest.java index 64bb6163..64089015 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/UpdateNamespaceRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/namespace/UpdateNamespaceRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @ApiModel() diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactAddRequest.java deleted file mode 100644 index 4cdb03d8..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactAddRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactAddRequest", description = "NotifyContact add Request") -public class NotifyContactAddRequest { - - @ApiModelProperty(value = "User name") - private String name; - - @ApiModelProperty(value = "Phone") - private String phone; - - @ApiModelProperty(value = "Email address") - private String email; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactDeleteRequest.java deleted file mode 100644 index c4920db5..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactDeleteRequest", description = "NotifyContact delete request") -public class NotifyContactDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactListRequest.java deleted file mode 100644 index 4837276d..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactListRequest", description = "NotifyContact page list request") -public class NotifyContactListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactQueryRequest.java deleted file mode 100644 index 9ed41a91..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactQueryRequest", description = "NotifyContact query request") -public class NotifyContactQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactUpdateRequest.java deleted file mode 100644 index a43211b1..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyContactUpdateRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactUpdateRequest", description = "NotifyContact update request") -public class NotifyContactUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @NotNull - @ApiModelProperty(value = "User name") - private String name; - - @ApiModelProperty(value = "Phone") - private String phone; - - @ApiModelProperty(value = "Email address") - private String email; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupAddRequest.java deleted file mode 100644 index 83112c4d..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupAddRequest.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupAddRequest", description = "NotifyGroup add Request") -public class NotifyGroupAddRequest { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Group name") - private String name; - - @ApiModelProperty(value = "[12, 34]") - private List contactIds; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupDeleteRequest.java deleted file mode 100644 index 1bfe5c0f..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupDeleteRequest", description = "NotifyGroup delete request") -public class NotifyGroupDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupListRequest.java deleted file mode 100644 index fb682969..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupListRequest", description = "NotifyGroup page list request") -public class NotifyGroupListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupQueryRequest.java deleted file mode 100644 index ab18c3a0..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupQueryRequest", description = "NotifyGroup query request") -public class NotifyGroupQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupUpdateRequest.java deleted file mode 100644 index ae83fe8c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyGroupUpdateRequest.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupUpdateRequest", description = "NotifyGroup update request") -public class NotifyGroupUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @NotNull - @ApiModelProperty(value = "Group name") - private String name; - - @ApiModelProperty(value = "[12, 34]") - private List contactIds; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateAddRequest.java deleted file mode 100644 index 1427e146..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateAddRequest.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.openjob.server.admin.request.part.TemplateExtra; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateAddRequest", description = "NotifyTemplate add Request") -public class NotifyTemplateAddRequest { - - @NotNull - @ApiModelProperty(value = "Template name. eg: Wechat, DingTalk, Wecom, Feishu") - private String name; - - @ApiModelProperty(value = "notify type. 1 webhook 2 email 3 sms") - private Integer type; - - @ApiModelProperty(value = "Level. 1 notice 2 warning 3 error") - private String level; - - @ApiModelProperty(value = "notify events list. JSON: [task_fail, task_suc, task_cancel, task_skip]") - private List events; - - @ApiModelProperty(value = "related contact ids. JSON [12, 34]") - private List contactIds; - - @ApiModelProperty(value = "related group ids. JSON [12, 34]") - private List groupIds; - - @ApiModelProperty(value = "Webhook URL") - private String webhook; - - @Size(min = 2) - @NotBlank - @ApiModelProperty(value = "Template contents") - private String content; - - @ApiModelProperty(value = "Extra info. eg: third platform token") - private TemplateExtra extra; - - @ApiModelProperty(value = "Creator user ID") - private Integer userId; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateDeleteRequest.java deleted file mode 100644 index 361ef71a..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateDeleteRequest", description = "NotifyTemplate delete request") -public class NotifyTemplateDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateListRequest.java deleted file mode 100644 index f45b3332..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateListRequest", description = "NotifyTemplate page list request") -public class NotifyTemplateListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateQueryRequest.java deleted file mode 100644 index cc77a1e5..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateQueryRequest", description = "NotifyTemplate query request") -public class NotifyTemplateQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateUpdateRequest.java deleted file mode 100644 index 27cc50e5..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/notify/NotifyTemplateUpdateRequest.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.openjob.server.admin.request.notify; - -import io.openjob.server.admin.request.part.TemplateExtra; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateUpdateRequest", description = "NotifyTemplate update request") -public class NotifyTemplateUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Template name. eg: Wechat, DingTalk, Wecom, Feishu") - private String name; - - @ApiModelProperty(value = "notify type. 1 webhook 2 email 3 sms") - private Integer type; - - @ApiModelProperty(value = "Level. 1 notice 2 warning 3 error") - private String level; - - @ApiModelProperty(value = "notify events list. JSON: [task_fail, task_suc, task_cancel, task_skip]") - private List events; - - @ApiModelProperty(value = "related contact ids. JSON [12, 34]") - private List contactIds; - - @ApiModelProperty(value = "related group ids. JSON [12, 34]") - private List groupIds; - - @ApiModelProperty(value = "Webhook URL") - private String webhook; - - @Size(min = 2) - @NotBlank - @ApiModelProperty(value = "Template contents") - private String content; - - @ApiModelProperty(value = "Extra info. eg: third platform token") - private TemplateExtra extra; - - @ApiModelProperty(value = "Creator user ID") - private Integer userId; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMeta.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMetaRequest.java similarity index 90% rename from openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMeta.java rename to openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMetaRequest.java index b3f7c799..faa648ff 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMeta.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/MenuMetaRequest.java @@ -7,7 +7,7 @@ * @author inhere */ @Data -public class MenuMeta { +public class MenuMetaRequest { @ApiModelProperty(value = "icon name") private String icon; diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/TemplateExtra.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/TemplateExtra.java deleted file mode 100644 index 54829144..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/part/TemplateExtra.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.openjob.server.admin.request.part; - -import lombok.Data; - -/** - * @author inhere - */ -@Data -public class TemplateExtra { -} diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermAddRequest.java deleted file mode 100644 index 088fe567..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermAddRequest.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.openjob.server.admin.request.perm; - -import io.openjob.server.admin.request.part.MenuMeta; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermAddRequest", description = "Add AdminPerm") -public class AdminPermAddRequest { - - @NotNull - @Min(0) - @ApiModelProperty(value = "Parent ID") - private Integer pid; - - @NotNull - @ApiModelProperty(value = "Type. 1=menu 2=perm") - private Integer type; - - @NotNull - @ApiModelProperty(value = "Menu name") - private String name; - - @NotNull - @ApiModelProperty(value = "Route path or API path") - private String path; - - @ApiModelProperty(value = "Extra meta data. JSON object: {icon:xx,title:some.name}") - private MenuMeta meta; - - @ApiModelProperty(value = "Hidden status. 1=yes 2=no") - private Integer hidden; - - @NotNull - @ApiModelProperty(value = "Sort value") - private Integer sort; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermDeleteRequest.java deleted file mode 100644 index 5ed5b8c6..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel() -public class AdminPermDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermListRequest.java deleted file mode 100644 index 0038ea9c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel() -public class AdminPermListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermQueryRequest.java deleted file mode 100644 index 25b20d5c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermQuery", description = "Query AdminPerm") -public class AdminPermQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermUpdateRequest.java deleted file mode 100644 index 6dbf88fe..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermUpdateRequest.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.openjob.server.admin.request.perm; - -import io.openjob.server.admin.request.part.MenuMeta; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermUpdate", description = "Update AdminPerm") -public class AdminPermUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @NotNull - @ApiModelProperty(value = "Parent ID") - private Integer pid; - - @NotNull - @ApiModelProperty(value = "Type. 1=menu 2=perm") - private Integer type; - - @NotNull - @ApiModelProperty(value = "Menu name") - private String name; - - @ApiModelProperty(value = "Route path or API path") - private String path; - - @ApiModelProperty(value = "Extra meta data. JSON object: {icon:xx,title:some.name}") - private MenuMeta meta; - - @NotNull - @ApiModelProperty(value = "Hidden status. 1=yes 2=no") - private Integer hidden; - - @NotNull - @ApiModelProperty(value = "Sort value") - private Integer sort; - - @NotNull - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermissionMenusRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermissionMenusRequest.java index d63f5705..9f604ce0 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermissionMenusRequest.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/perm/AdminPermissionMenusRequest.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleAddRequest.java deleted file mode 100644 index ba7ca2fd..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleAddRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.openjob.common.constant.CommonConstant; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleAddRequest", description = "AdminRole add Request") -public class AdminRoleAddRequest { - - @NotNull - @NotBlank - @ApiModelProperty(value = "Role name") - private String name; - - @NotNull - @NotBlank - @ApiModelProperty(value = "Description") - private String desc; - - @NotNull - @ApiModelProperty(value = "Menu ids for role. JSON array") - private List menus; - - @NotNull - @ApiModelProperty(value = "Permissions ids for role. JSON array") - private List perms; - - @NotNull - @ApiModelProperty(value = "Is Admin. 1=yes 2=no") - private Integer admin = CommonConstant.NO; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleDeleteRequest.java deleted file mode 100644 index bf09492e..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleDeleteRequest", description = "AdminRole delete request") -public class AdminRoleDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleListRequest.java deleted file mode 100644 index 1a7a6c93..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleListRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleListRequest", description = "AdminRole page list request") -public class AdminRoleListRequest { - - @ApiModelProperty(value = "List page.") - private Integer page = 1; - - @ApiModelProperty(value = "List size. default 10") - private Integer size = 10; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleQueryRequest.java deleted file mode 100644 index a3b8d324..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleQueryRequest", description = "AdminRole query request") -public class AdminRoleQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleUpdateRequest.java deleted file mode 100644 index 751fc306..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminRoleUpdateRequest.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleUpdateRequest", description = "AdminRole update request") -public class AdminRoleUpdateRequest { - - @NotNull - @Min(1) - @ApiModelProperty(value = "PK") - private Long id; - - @Min(1) - @NotNull - @ApiModelProperty(value = "Role name") - private String name; - - @ApiModelProperty(value = "Description") - private String desc; - - @ApiModelProperty(value = "Menu ids for role. JSON array") - private List menus; - - @ApiModelProperty(value = "Permissions ids for role. JSON array") - private List perms; - - @NotNull - @ApiModelProperty(value = "Is Admin. 1=yes 2=no") - private Integer admin; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserAddRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserAddRequest.java deleted file mode 100644 index ed0307e4..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserAddRequest.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminUserAddRequest", description = "AdminUserAddRequest") -public class AdminUserAddRequest { - - @NotNull - @NotBlank - @ApiModelProperty(value = "User name") - private String username; - - @NotNull - @ApiModelProperty(value = "Nickname") - private String nickname; - - @NotNull - @NotBlank - @ApiModelProperty(value = "Password, md5 hashed before submit") - private String passwd; - - @NotNull - @ApiModelProperty(value = "Api auth token") - private String token; - - @NotNull - @Size(min = 1, max = 10) - @ApiModelProperty(value = "Role IDs. JSON: [1,2]") - private List roleIds; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserDeleteRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserDeleteRequest.java deleted file mode 100644 index 6af66543..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserDeleteRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminUserDeleteRequest", description = "AdminUserDeleteRequest") -public class AdminUserDeleteRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserListRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserListRequest.java deleted file mode 100644 index 07485609..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserListRequest.java +++ /dev/null @@ -1,19 +0,0 @@ - -package io.openjob.server.admin.request.user; - -import io.openjob.server.admin.request.PageRequest; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "AdminUserListRequest", description = "AdminUserListRequest") -public class AdminUserListRequest extends PageRequest { - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserQueryRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserQueryRequest.java deleted file mode 100644 index cb5930fa..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserQueryRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminUserQueryRequest", description = "AdminUserQueryRequest") -public class AdminUserQueryRequest { - - @Min(1) - @NotNull() - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserUpdateRequest.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserUpdateRequest.java deleted file mode 100644 index 54249c87..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/request/user/AdminUserUpdateRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.openjob.server.admin.request.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "UpdateAdminUserRequest", description = "Update Admin User Request") -public class AdminUserUpdateRequest { - - @Min(1) - @NotNull - @ApiModelProperty(value = "PK") - private Long id; - - @NotBlank - @ApiModelProperty(value = "User name") - private String username; - - @NotNull - @ApiModelProperty(value = "Nickname") - private String nickname; - - @ApiModelProperty(value = "Password, md5 hashed before submit") - private String passwd; - - @ApiModelProperty(value = "Api auth token") - private String token; - - @NotNull - @Size(min = 1) - @ApiModelProperty(value = "Role IDs. JSON: [1,2]") - private List roleIds; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminLoginService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminLoginService.java index a3de80d2..35213c61 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminLoginService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminLoginService.java @@ -37,4 +37,4 @@ public interface AdminLoginService { * @return vo */ LoginUserInfoVO loginUserInfo(LoginUserInfoRequest request, String sessKey); -} +} \ No newline at end of file diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminPermService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminPermService.java index 0b459211..b87518cf 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminPermService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminPermService.java @@ -1,16 +1,7 @@ package io.openjob.server.admin.service; -import io.openjob.server.admin.request.perm.AdminPermAddRequest; -import io.openjob.server.admin.request.perm.AdminPermDeleteRequest; -import io.openjob.server.admin.request.perm.AdminPermListRequest; -import io.openjob.server.admin.request.perm.AdminPermQueryRequest; -import io.openjob.server.admin.request.perm.AdminPermUpdateRequest; import io.openjob.server.admin.request.perm.AdminPermissionMenusRequest; -import io.openjob.server.admin.vo.perm.AdminPermAddVO; -import io.openjob.server.admin.vo.perm.AdminPermQueryVO; -import io.openjob.server.admin.vo.perm.AdminPermUpdateVO; import io.openjob.server.admin.vo.perm.AdminPermissionMenusVO; -import io.openjob.server.common.dto.PageDTO; /** * @author inhere @@ -18,46 +9,6 @@ */ public interface AdminPermService { - /** - * Add AdminPerm - * - * @param reqDTO reqDTO - * @return AdminPermAddVO - */ - AdminPermAddVO add(AdminPermAddRequest reqDTO); - - /** - * Get one AdminPerm - * - * @param reqDTO reqDTO - * @return AdminPermQueryVO - */ - AdminPermQueryVO query(AdminPermQueryRequest reqDTO); - - /** - * Update one AdminPerm - * - * @param reqDTO reqDTO - * @return AdminPermUpdateVO - */ - AdminPermUpdateVO update(AdminPermUpdateRequest reqDTO); - - /** - * Delete one AdminPerm - * - * @param reqDTO reqDTO - * @return AdminPermUpdateVO - */ - AdminPermUpdateVO delete(AdminPermDeleteRequest reqDTO); - - /** - * Get page list AdminPerm - * - * @param reqDTO reqDTO - * @return AdminPermListVO - */ - PageDTO getPageList(AdminPermListRequest reqDTO); - /** * Get permission menus. * @@ -65,5 +16,4 @@ public interface AdminPermService { * @return AdminPermissionMenusVO */ AdminPermissionMenusVO getMenus(AdminPermissionMenusRequest request); -} - +} \ No newline at end of file diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminRoleService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminRoleService.java deleted file mode 100644 index 763730d2..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminRoleService.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.openjob.server.admin.service; - -import io.openjob.server.admin.request.user.AdminRoleAddRequest; -import io.openjob.server.admin.request.user.AdminRoleDeleteRequest; -import io.openjob.server.admin.request.user.AdminRoleListRequest; -import io.openjob.server.admin.request.user.AdminRoleQueryRequest; -import io.openjob.server.admin.request.user.AdminRoleUpdateRequest; -import io.openjob.server.admin.vo.user.AdminRoleAddVO; -import io.openjob.server.admin.vo.user.AdminRoleQueryVO; -import io.openjob.server.admin.vo.user.AdminRoleUpdateVO; -import io.openjob.server.common.dto.PageDTO; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface AdminRoleService { - - /** - * Add AdminRole - * - * @param reqDTO reqDTO - * @return AdminRoleAddVO - */ - AdminRoleAddVO add(AdminRoleAddRequest reqDTO); - - /** - * Get one AdminRole - * - * @param reqDTO reqDTO - * @return AdminRoleQueryVO - */ - AdminRoleQueryVO query(AdminRoleQueryRequest reqDTO); - - /** - * Update one AdminRole - * - * @param reqDTO reqDTO - * @return AdminRoleUpdateVO - */ - AdminRoleUpdateVO update(AdminRoleUpdateRequest reqDTO); - - /** - * Delete one AdminRole - * - * @param reqDTO reqDTO - * @return AdminRoleUpdateVO - */ - AdminRoleUpdateVO delete(AdminRoleDeleteRequest reqDTO); - - /** - * Get page list AdminRole - * - * @param reqDTO reqDTO - * @return AdminRoleListVO - */ - PageDTO getPageList(AdminRoleListRequest reqDTO); -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminUserService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminUserService.java index 99918a19..cbe65561 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminUserService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AdminUserService.java @@ -1,14 +1,5 @@ package io.openjob.server.admin.service; -import io.openjob.server.admin.request.user.AdminUserAddRequest; -import io.openjob.server.admin.request.user.AdminUserDeleteRequest; -import io.openjob.server.admin.request.user.AdminUserListRequest; -import io.openjob.server.admin.request.user.AdminUserQueryRequest; -import io.openjob.server.admin.request.user.AdminUserUpdateRequest; -import io.openjob.server.admin.vo.user.AdminUserAddVO; -import io.openjob.server.admin.vo.user.AdminUserQueryVO; -import io.openjob.server.admin.vo.user.AdminUserUpdateVO; -import io.openjob.server.common.dto.PageDTO; import io.openjob.server.repository.entity.AdminUser; /** @@ -17,38 +8,6 @@ */ public interface AdminUserService { - /** - * Add AdminUser - * - * @param reqDTO reqDTO - * @return AdminUserAddVO - */ - AdminUserAddVO add(AdminUserAddRequest reqDTO); - - /** - * Get one AdminUser - * - * @param reqDTO reqDTO - * @return AdminUserDetailDTO - */ - AdminUserQueryVO query(AdminUserQueryRequest reqDTO); - - /** - * Update one AdminUser - * - * @param reqDTO reqDTO - * @return AdminUserUpdateVO - */ - AdminUserUpdateVO update(AdminUserUpdateRequest reqDTO); - - /** - * Delete one - * - * @param reqDTO reqDTO - * @return AdminUserUpdateVO - */ - AdminUserUpdateVO delete(AdminUserDeleteRequest reqDTO); - /** * Get by session key. * @@ -56,13 +15,4 @@ public interface AdminUserService { * @return AdminUserUpdateVO */ AdminUser getBySessionKey(String sessionKey); - - /** - * Get page list AdminUser - * - * @param reqDTO reqDTO - * @return AdminUserListVO - */ - PageDTO getPageList(AdminUserListRequest reqDTO); -} - +} \ No newline at end of file diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AppService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AppService.java index d0a45c22..28bf78a7 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AppService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/AppService.java @@ -11,7 +11,7 @@ import io.openjob.server.common.vo.PageVO; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface AppService { diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/DelayInstanceService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/DelayInstanceService.java index a5cb805d..2454b7fa 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/DelayInstanceService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/DelayInstanceService.java @@ -12,7 +12,7 @@ import io.openjob.server.common.vo.PageVO; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayInstanceService { diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/JobInstanceService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/JobInstanceService.java index ded60b83..4ca981a7 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/JobInstanceService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/JobInstanceService.java @@ -11,7 +11,7 @@ import io.openjob.server.common.vo.PageVO; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceService { diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NamespaceService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NamespaceService.java index e68388b4..472372e0 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NamespaceService.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NamespaceService.java @@ -11,7 +11,7 @@ import io.openjob.server.common.vo.PageVO; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface NamespaceService { diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyContactService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyContactService.java deleted file mode 100644 index 3b33eb5b..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyContactService.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.openjob.server.admin.service; - -import io.openjob.server.admin.request.notify.NotifyContactAddRequest; -import io.openjob.server.admin.request.notify.NotifyContactDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyContactListRequest; -import io.openjob.server.admin.request.notify.NotifyContactQueryRequest; -import io.openjob.server.admin.request.notify.NotifyContactUpdateRequest; -import io.openjob.server.admin.vo.notify.NotifyContactAddVO; -import io.openjob.server.admin.vo.notify.NotifyContactQueryVO; -import io.openjob.server.admin.vo.notify.NotifyContactUpdateVO; -import io.openjob.server.common.dto.PageDTO; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyContactService { - - /** - * Add NotifyContact - * - * @param reqDTO reqDTO - * @return NotifyContactAddVO - */ - NotifyContactAddVO add(NotifyContactAddRequest reqDTO); - - /** - * Get one NotifyContact - * - * @param reqDTO reqDTO - * @return NotifyContactQueryVO - */ - NotifyContactQueryVO query(NotifyContactQueryRequest reqDTO); - - /** - * Update one NotifyContact - * - * @param reqDTO reqDTO - * @return NotifyContactUpdateVO - */ - NotifyContactUpdateVO update(NotifyContactUpdateRequest reqDTO); - - /** - * Delete one NotifyContact - * - * @param reqDTO reqDTO - * @return NotifyContactUpdateVO - */ - NotifyContactUpdateVO delete(NotifyContactDeleteRequest reqDTO); - - /** - * Get page list NotifyContact - * - * @param reqDTO reqDTO - * @return NotifyContactListVO - */ - PageDTO getPageList(NotifyContactListRequest reqDTO); -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyGroupService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyGroupService.java deleted file mode 100644 index 60515490..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyGroupService.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.openjob.server.admin.service; - -import io.openjob.server.admin.request.notify.NotifyGroupAddRequest; -import io.openjob.server.admin.request.notify.NotifyGroupDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyGroupListRequest; -import io.openjob.server.admin.request.notify.NotifyGroupQueryRequest; -import io.openjob.server.admin.request.notify.NotifyGroupUpdateRequest; -import io.openjob.server.admin.vo.notify.NotifyGroupAddVO; -import io.openjob.server.admin.vo.notify.NotifyGroupQueryVO; -import io.openjob.server.admin.vo.notify.NotifyGroupUpdateVO; -import io.openjob.server.common.dto.PageDTO; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyGroupService { - - /** - * Add NotifyGroup - * - * @param reqDTO reqDTO - * @return NotifyGroupAddVO - */ - NotifyGroupAddVO add(NotifyGroupAddRequest reqDTO); - - /** - * Get one NotifyGroup - * - * @param reqDTO reqDTO - * @return NotifyGroupQueryVO - */ - NotifyGroupQueryVO query(NotifyGroupQueryRequest reqDTO); - - /** - * Update one NotifyGroup - * - * @param reqDTO reqDTO - * @return NotifyGroupUpdateVO - */ - NotifyGroupUpdateVO update(NotifyGroupUpdateRequest reqDTO); - - /** - * Delete one NotifyGroup - * - * @param reqDTO reqDTO - * @return NotifyGroupUpdateVO - */ - NotifyGroupUpdateVO delete(NotifyGroupDeleteRequest reqDTO); - - /** - * Get page list NotifyGroup - * - * @param reqDTO reqDTO - * @return NotifyGroupListVO - */ - PageDTO getPageList(NotifyGroupListRequest reqDTO); -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyTemplateService.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyTemplateService.java deleted file mode 100644 index ef1bd28b..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/NotifyTemplateService.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.openjob.server.admin.service; - -import io.openjob.server.admin.request.notify.NotifyTemplateAddRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateListRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateQueryRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateUpdateRequest; -import io.openjob.server.admin.vo.notify.NotifyTemplateAddVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateQueryVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateUpdateVO; -import io.openjob.server.common.dto.PageDTO; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyTemplateService { - - /** - * Add NotifyTemplate - * - * @param reqDTO reqDTO - * @return NotifyTemplateAddVO - */ - NotifyTemplateAddVO add(NotifyTemplateAddRequest reqDTO); - - /** - * Get one NotifyTemplate - * - * @param reqDTO reqDTO - * @return NotifyTemplateQueryVO - */ - NotifyTemplateQueryVO query(NotifyTemplateQueryRequest reqDTO); - - /** - * Update one NotifyTemplate - * - * @param reqDTO reqDTO - * @return NotifyTemplateUpdateVO - */ - NotifyTemplateUpdateVO update(NotifyTemplateUpdateRequest reqDTO); - - /** - * Delete one NotifyTemplate - * - * @param reqDTO reqDTO - * @return NotifyTemplateUpdateVO - */ - NotifyTemplateUpdateVO delete(NotifyTemplateDeleteRequest reqDTO); - - /** - * Get page list NotifyTemplate - * - * @param reqDTO reqDTO - * @return NotifyTemplateListVO - */ - PageDTO getPageList(NotifyTemplateListRequest reqDTO); -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminPermServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminPermServiceImpl.java index 8c40f082..a9e4baf6 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminPermServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminPermServiceImpl.java @@ -2,31 +2,19 @@ import io.openjob.common.constant.CommonConstant; import io.openjob.common.util.CommonUtil; -import io.openjob.server.admin.request.perm.AdminPermAddRequest; -import io.openjob.server.admin.request.perm.AdminPermDeleteRequest; -import io.openjob.server.admin.request.perm.AdminPermListRequest; -import io.openjob.server.admin.request.perm.AdminPermQueryRequest; -import io.openjob.server.admin.request.perm.AdminPermUpdateRequest; import io.openjob.server.admin.request.perm.AdminPermissionMenusRequest; import io.openjob.server.admin.service.AdminPermService; import io.openjob.server.admin.vo.part.MenuItemVO; import io.openjob.server.admin.vo.part.MenuMetaVO; -import io.openjob.server.admin.vo.perm.AdminPermAddVO; -import io.openjob.server.admin.vo.perm.AdminPermQueryVO; -import io.openjob.server.admin.vo.perm.AdminPermUpdateVO; import io.openjob.server.admin.vo.perm.AdminPermissionMenusVO; -import io.openjob.server.common.dto.PageDTO; import io.openjob.server.common.util.BeanMapperUtil; import io.openjob.server.repository.constant.PermissionTypeEnum; import io.openjob.server.repository.dao.AdminPermissionDAO; import io.openjob.server.repository.dao.AdminRoleDAO; import io.openjob.server.repository.dao.AdminUserDAO; -import io.openjob.server.repository.data.AdminPermissionData; -import io.openjob.server.repository.dto.AdminPermissionDTO; import io.openjob.server.repository.entity.AdminPermission; import io.openjob.server.repository.entity.AdminRole; import io.openjob.server.repository.entity.AdminUser; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,62 +36,16 @@ public class AdminPermServiceImpl implements AdminPermService { private final AdminRoleDAO adminRoleDAO; private final AdminUserDAO adminUserDAO; - private final AdminPermissionData adminPermData; private final AdminPermissionDAO adminPermissionDAO; @Autowired - public AdminPermServiceImpl(AdminPermissionData adminPermData, AdminPermissionDAO adminPermissionDAO, AdminRoleDAO adminRoleDAO, AdminUserDAO adminUserDAO) { - this.adminPermData = adminPermData; + public AdminPermServiceImpl(AdminPermissionDAO adminPermissionDAO, AdminRoleDAO adminRoleDAO, AdminUserDAO adminUserDAO) { this.adminPermissionDAO = adminPermissionDAO; this.adminRoleDAO = adminRoleDAO; this.adminUserDAO = adminUserDAO; } - @Override - public AdminPermAddVO add(AdminPermAddRequest reqDTO) { - AdminPermissionDTO entDTO = new AdminPermissionDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - AdminPermAddVO retVo = new AdminPermAddVO(); - retVo.setId(adminPermData.add(entDTO)); - return retVo; - } - - @Override - public AdminPermUpdateVO update(AdminPermUpdateRequest reqDTO) { - AdminPermissionDTO entDTO = new AdminPermissionDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - AdminPermUpdateVO retVo = new AdminPermUpdateVO(); - adminPermData.updateById(entDTO); - return retVo; - } - - @Override - public AdminPermUpdateVO delete(AdminPermDeleteRequest reqDTO) { - AdminPermissionDTO entDTO = new AdminPermissionDTO(); - entDTO.setId(reqDTO.getId()); - entDTO.setDeleted(CommonConstant.YES); - - AdminPermUpdateVO retVo = new AdminPermUpdateVO(); - adminPermData.updateById(entDTO); - - return retVo; - } - - @Override - public AdminPermQueryVO query(AdminPermQueryRequest reqDTO) { - AdminPermissionDTO entDTO = adminPermData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, AdminPermQueryVO.class); - } - - @Override - public PageDTO getPageList(AdminPermListRequest reqDTO) { - return null; - } - @Override public AdminPermissionMenusVO getMenus(AdminPermissionMenusRequest request) { AdminUser user = this.adminUserDAO.getById(request.getUid()); diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminRoleServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminRoleServiceImpl.java deleted file mode 100644 index f68a9935..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminRoleServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package io.openjob.server.admin.service.impl; - -import io.openjob.common.constant.CommonConstant; -import io.openjob.server.admin.request.user.AdminRoleAddRequest; -import io.openjob.server.admin.request.user.AdminRoleDeleteRequest; -import io.openjob.server.admin.request.user.AdminRoleListRequest; -import io.openjob.server.admin.request.user.AdminRoleQueryRequest; -import io.openjob.server.admin.request.user.AdminRoleUpdateRequest; -import io.openjob.server.admin.service.AdminRoleService; -import io.openjob.server.admin.vo.user.AdminRoleAddVO; -import io.openjob.server.admin.vo.user.AdminRoleQueryVO; -import io.openjob.server.admin.vo.user.AdminRoleUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.data.AdminRoleData; -import io.openjob.server.repository.dto.AdminRoleDTO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; - -/** - * @author inhere - * @since 1.0.0 - */ -@Service -public class AdminRoleServiceImpl implements AdminRoleService { - - private final AdminRoleData adminRoleData; - - @Autowired - public AdminRoleServiceImpl(AdminRoleData adminRoleData) { - this.adminRoleData = adminRoleData; - } - - @Override - public AdminRoleAddVO add(AdminRoleAddRequest reqDTO) { - AdminRoleDTO entDTO = new AdminRoleDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - AdminRoleAddVO retVo = new AdminRoleAddVO(); - retVo.setId(adminRoleData.add(entDTO)); - - return retVo; - } - - @Override - public AdminRoleUpdateVO update(AdminRoleUpdateRequest reqDTO) { - AdminRoleDTO entDTO = new AdminRoleDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - AdminRoleUpdateVO retVo = new AdminRoleUpdateVO(); - adminRoleData.updateById(entDTO); - return retVo; - } - - @Override - public AdminRoleUpdateVO delete(AdminRoleDeleteRequest reqDTO) { - AdminRoleDTO entDTO = new AdminRoleDTO(); - entDTO.setId(reqDTO.getId()); - entDTO.setDeleted(CommonConstant.YES); - - AdminRoleUpdateVO retVo = new AdminRoleUpdateVO(); - adminRoleData.updateById(entDTO); - - return retVo; - } - - @Override - public AdminRoleQueryVO query(AdminRoleQueryRequest reqDTO) { - AdminRoleDTO entDTO = adminRoleData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, AdminRoleQueryVO.class); - } - - @Override - public PageDTO getPageList(AdminRoleListRequest reqDTO) { - Page pageList = adminRoleData.getPageList(reqDTO.getPage(), reqDTO.getSize()); - - PageDTO pageVo = new PageDTO<>(); - pageVo.setTotal(pageList.getTotalElements()); - pageVo.setList(new ArrayList<>()); - - pageList.forEach(entDTO -> { - AdminRoleQueryVO retVo = new AdminRoleQueryVO(); - BeanUtils.copyProperties(entDTO, retVo); - - pageVo.getList().add(retVo); - }); - - return pageVo; - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminUserServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminUserServiceImpl.java index 4e535de6..5b5ca679 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminUserServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/AdminUserServiceImpl.java @@ -1,30 +1,12 @@ package io.openjob.server.admin.service.impl; -import io.openjob.common.constant.CommonConstant; -import io.openjob.server.admin.autoconfigure.AdminUserProperties; import io.openjob.server.admin.constant.AdminHttpStatusEnum; -import io.openjob.server.admin.request.user.AdminUserAddRequest; -import io.openjob.server.admin.request.user.AdminUserDeleteRequest; -import io.openjob.server.admin.request.user.AdminUserListRequest; -import io.openjob.server.admin.request.user.AdminUserQueryRequest; -import io.openjob.server.admin.request.user.AdminUserUpdateRequest; import io.openjob.server.admin.service.AdminUserService; -import io.openjob.server.admin.vo.user.AdminUserAddVO; -import io.openjob.server.admin.vo.user.AdminUserQueryVO; -import io.openjob.server.admin.vo.user.AdminUserUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.openjob.server.common.util.HmacUtil; -import io.openjob.server.common.util.BeanMapperUtil; import io.openjob.server.repository.dao.AdminUserDAO; -import io.openjob.server.repository.data.AdminUserData; -import io.openjob.server.repository.dto.AdminUserDTO; import io.openjob.server.repository.entity.AdminUser; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Objects; /** @@ -34,57 +16,14 @@ @Service public class AdminUserServiceImpl implements AdminUserService { - private final AdminUserData adminUserData; private final AdminUserDAO adminUserDAO; - private final AdminUserProperties userProperties; - @Autowired - public AdminUserServiceImpl(AdminUserData adminUserData, AdminUserDAO adminUserDAO, AdminUserProperties userProperties) { - this.adminUserData = adminUserData; + public AdminUserServiceImpl(AdminUserDAO adminUserDAO) { this.adminUserDAO = adminUserDAO; - this.userProperties = userProperties; - } - - @Override - public AdminUserAddVO add(AdminUserAddRequest reqDTO) { - AdminUserDTO entDto = BeanMapperUtil.mapObject(reqDTO, new AdminUserDTO()); - - // hash input passwd - entDto.setPasswd(HmacUtil.hashPasswd(reqDTO.getPasswd(), userProperties.getPasswdSalt())); - - AdminUserAddVO retVo = new AdminUserAddVO(); - retVo.setId(adminUserData.add(entDto)); - - return retVo; } - @Override - public AdminUserUpdateVO update(AdminUserUpdateRequest reqDTO) { - AdminUserDTO entDto = new AdminUserDTO(); - BeanUtils.copyProperties(reqDTO, entDto); - - adminUserData.updateById(entDto); - - AdminUserUpdateVO retVo = new AdminUserUpdateVO(); - retVo.setId(reqDTO.getId()); - - return retVo; - } - - @Override - public AdminUserUpdateVO delete(AdminUserDeleteRequest reqDTO) { - AdminUserUpdateVO retVo = new AdminUserUpdateVO(); - - AdminUserDTO entDto = new AdminUserDTO(); - entDto.setId(reqDTO.getId()); - entDto.setDeleted(CommonConstant.YES); - - adminUserData.updateById(entDto); - - return retVo; - } @Override public AdminUser getBySessionKey(String sessionKey) { @@ -94,28 +33,4 @@ public AdminUser getBySessionKey(String sessionKey) { } return adminUser; } - - @Override - public AdminUserQueryVO query(AdminUserQueryRequest reqDTO) { - AdminUserDTO entDTO = adminUserData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, AdminUserQueryVO.class); - } - - @Override - public PageDTO getPageList(AdminUserListRequest reqDTO) { - Page pageList = adminUserData.getPageList(reqDTO.getPage(), reqDTO.getSize()); - - PageDTO pageVo = new PageDTO<>(); - pageVo.setTotal(pageList.getTotalElements()); - pageVo.setList(new ArrayList<>()); - - pageList.forEach(entDTO -> { - pageVo.getList().add(BeanMapperUtil.map(entDTO, AdminUserQueryVO.class)); - }); - - return pageVo; - } - -} - +} \ No newline at end of file diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayInstanceServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayInstanceServiceImpl.java index 36dd941c..c402cf9a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayInstanceServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayInstanceServiceImpl.java @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicLong; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayServiceImpl.java index edac1268..3cf7283e 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/DelayServiceImpl.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceServiceImpl.java index 18d85411..c81b00da 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceServiceImpl.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicLong; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobServiceImpl.java index f41e09bb..2f8fcc7a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/JobServiceImpl.java @@ -3,6 +3,7 @@ import com.google.common.collect.Lists; import io.openjob.common.constant.CommonConstant; import io.openjob.common.constant.TimeExpressionTypeEnum; +import io.openjob.server.admin.constant.AdminConstant; import io.openjob.server.admin.request.job.AddJobRequest; import io.openjob.server.admin.request.job.DeleteJobRequest; import io.openjob.server.admin.request.job.ExecuteJobRequest; @@ -105,7 +106,7 @@ public TimeExpressionVO timeExpression(TimeExpressionRequest request) { try { Date date = null; - for (int i = 0; i < 7; i++) { + for (int i = 0; i < AdminConstant.MAX_TIME_EXPRESSION; i++) { date = Optional.ofNullable(date).orElseGet(Date::new); CronExpression cronExpression = new CronExpression(request.getTimeExpression()); long nextTime = cronExpression.getNextValidTimeAfter(date).toInstant().getEpochSecond(); @@ -143,7 +144,7 @@ public PageVO getPageList(ListJobRequest request) { listJobVO.setAppName(app.getName()); } - if (!TimeExpressionTypeEnum.isCron(j.getTimeExpressionType())){ + if (!TimeExpressionTypeEnum.isCron(j.getTimeExpressionType())) { listJobVO.setTimeExpressionValue(Long.valueOf(j.getTimeExpression())); } return listJobVO; diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NamespaceServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NamespaceServiceImpl.java index 2022d6c8..ac977963 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NamespaceServiceImpl.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NamespaceServiceImpl.java @@ -22,7 +22,7 @@ import java.util.UUID; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyContactServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyContactServiceImpl.java deleted file mode 100644 index 33d04316..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyContactServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.openjob.server.admin.service.impl; - -import io.openjob.common.constant.CommonConstant; -import io.openjob.server.admin.request.notify.NotifyContactAddRequest; -import io.openjob.server.admin.request.notify.NotifyContactDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyContactListRequest; -import io.openjob.server.admin.request.notify.NotifyContactQueryRequest; -import io.openjob.server.admin.request.notify.NotifyContactUpdateRequest; -import io.openjob.server.admin.service.NotifyContactService; -import io.openjob.server.admin.vo.notify.NotifyContactAddVO; -import io.openjob.server.admin.vo.notify.NotifyContactQueryVO; -import io.openjob.server.admin.vo.notify.NotifyContactUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.data.NotifyContactData; -import io.openjob.server.repository.dto.NotifyContactDTO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author inhere - * @since 1.0.0 - */ -@Service -public class NotifyContactServiceImpl implements NotifyContactService { - - private final NotifyContactData notifyContactData; - - @Autowired - public NotifyContactServiceImpl(NotifyContactData notifyContactData) { - this.notifyContactData = notifyContactData; - } - - @Override - public NotifyContactAddVO add(NotifyContactAddRequest reqDTO) { - NotifyContactDTO entDTO = new NotifyContactDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyContactAddVO retVo = new NotifyContactAddVO(); - retVo.setId(notifyContactData.add(entDTO)); - - return retVo; - } - - @Override - public NotifyContactUpdateVO update(NotifyContactUpdateRequest reqDTO) { - NotifyContactDTO entDTO = new NotifyContactDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyContactUpdateVO retVo = new NotifyContactUpdateVO(); - notifyContactData.updateById(entDTO); - return retVo; - } - - @Override - public NotifyContactUpdateVO delete(NotifyContactDeleteRequest reqDTO) { - NotifyContactDTO entDTO = new NotifyContactDTO(); - entDTO.setId(reqDTO.getId()); - entDTO.setDeleted(CommonConstant.YES); - - NotifyContactUpdateVO retVo = new NotifyContactUpdateVO(); - notifyContactData.updateById(entDTO); - - return retVo; - } - - @Override - public NotifyContactQueryVO query(NotifyContactQueryRequest reqDTO) { - NotifyContactDTO entDTO = notifyContactData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, NotifyContactQueryVO.class); - } - - @Override - public PageDTO getPageList(NotifyContactListRequest reqDTO) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyGroupServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyGroupServiceImpl.java deleted file mode 100644 index 68f76925..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyGroupServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.openjob.server.admin.service.impl; - -import io.openjob.common.constant.CommonConstant; -import io.openjob.server.admin.request.notify.NotifyGroupAddRequest; -import io.openjob.server.admin.request.notify.NotifyGroupDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyGroupListRequest; -import io.openjob.server.admin.request.notify.NotifyGroupQueryRequest; -import io.openjob.server.admin.request.notify.NotifyGroupUpdateRequest; -import io.openjob.server.admin.service.NotifyGroupService; -import io.openjob.server.admin.vo.notify.NotifyGroupAddVO; -import io.openjob.server.admin.vo.notify.NotifyGroupQueryVO; -import io.openjob.server.admin.vo.notify.NotifyGroupUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.data.NotifyGroupData; -import io.openjob.server.repository.dto.NotifyGroupDTO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author inhere - * @since 1.0.0 - */ -@Service -public class NotifyGroupServiceImpl implements NotifyGroupService { - - private final NotifyGroupData notifyGroupData; - - @Autowired - public NotifyGroupServiceImpl(NotifyGroupData notifyGroupData) { - this.notifyGroupData = notifyGroupData; - } - - @Override - public NotifyGroupAddVO add(NotifyGroupAddRequest reqDTO) { - NotifyGroupDTO entDTO = new NotifyGroupDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyGroupAddVO retVo = new NotifyGroupAddVO(); - retVo.setId(notifyGroupData.add(entDTO)); - - return retVo; - } - - @Override - public NotifyGroupUpdateVO update(NotifyGroupUpdateRequest reqDTO) { - NotifyGroupDTO entDTO = new NotifyGroupDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyGroupUpdateVO retVo = new NotifyGroupUpdateVO(); - notifyGroupData.updateById(entDTO); - return retVo; - } - - @Override - public NotifyGroupUpdateVO delete(NotifyGroupDeleteRequest reqDTO) { - NotifyGroupDTO entDTO = new NotifyGroupDTO(); - entDTO.setId(reqDTO.getId()); - entDTO.setDeleted(CommonConstant.YES); - - NotifyGroupUpdateVO retVo = new NotifyGroupUpdateVO(); - notifyGroupData.updateById(entDTO); - - return retVo; - } - - @Override - public NotifyGroupQueryVO query(NotifyGroupQueryRequest reqDTO) { - NotifyGroupDTO entDTO = notifyGroupData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, NotifyGroupQueryVO.class); - } - - @Override - public PageDTO getPageList(NotifyGroupListRequest reqDTO) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyTemplateServiceImpl.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyTemplateServiceImpl.java deleted file mode 100644 index 6feb7172..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/service/impl/NotifyTemplateServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.openjob.server.admin.service.impl; - -import io.openjob.common.constant.CommonConstant; -import io.openjob.server.admin.request.notify.NotifyTemplateAddRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateDeleteRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateListRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateQueryRequest; -import io.openjob.server.admin.request.notify.NotifyTemplateUpdateRequest; -import io.openjob.server.admin.service.NotifyTemplateService; -import io.openjob.server.admin.vo.notify.NotifyTemplateAddVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateQueryVO; -import io.openjob.server.admin.vo.notify.NotifyTemplateUpdateVO; -import io.openjob.server.common.dto.PageDTO; -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.data.NotifyTemplateData; -import io.openjob.server.repository.dto.NotifyTemplateDTO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author inhere - * @since 1.0.0 - */ -@Service -public class NotifyTemplateServiceImpl implements NotifyTemplateService { - - private final NotifyTemplateData notifyTemplateData; - - @Autowired - public NotifyTemplateServiceImpl(NotifyTemplateData notifyTemplateData) { - this.notifyTemplateData = notifyTemplateData; - } - - @Override - public NotifyTemplateAddVO add(NotifyTemplateAddRequest reqDTO) { - NotifyTemplateDTO entDTO = new NotifyTemplateDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyTemplateAddVO retVo = new NotifyTemplateAddVO(); - retVo.setId(notifyTemplateData.add(entDTO)); - - return retVo; - } - - @Override - public NotifyTemplateUpdateVO update(NotifyTemplateUpdateRequest reqDTO) { - NotifyTemplateDTO entDTO = new NotifyTemplateDTO(); - BeanUtils.copyProperties(reqDTO, entDTO); - - NotifyTemplateUpdateVO retVo = new NotifyTemplateUpdateVO(); - notifyTemplateData.updateById(entDTO); - return retVo; - } - - @Override - public NotifyTemplateUpdateVO delete(NotifyTemplateDeleteRequest reqDTO) { - NotifyTemplateDTO entDTO = new NotifyTemplateDTO(); - entDTO.setId(reqDTO.getId()); - entDTO.setDeleted(CommonConstant.YES); - - NotifyTemplateUpdateVO retVo = new NotifyTemplateUpdateVO(); - notifyTemplateData.updateById(entDTO); - - return retVo; - } - - @Override - public NotifyTemplateQueryVO query(NotifyTemplateQueryRequest reqDTO) { - NotifyTemplateDTO entDTO = notifyTemplateData.getById(reqDTO.getId()); - - return BeanMapperUtil.map(entDTO, NotifyTemplateQueryVO.class); - } - - @Override - public PageDTO getPageList(NotifyTemplateListRequest reqDTO) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/util/LogFormatUtil.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/util/LogFormatUtil.java index a7dcfacf..6d2108cf 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/util/LogFormatUtil.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/util/LogFormatUtil.java @@ -7,27 +7,46 @@ import org.apache.commons.lang3.StringUtils; import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class LogFormatUtil { + /** + * Default location + */ + private static final String DEFAULT_LOCATION = "-"; - public final static String LOG_FORMAT = "%-23s %-7s %-40s : %s"; + public static final String LOG_FORMAT = "%-23s %-7s %-40s : %s"; + /** + * Format show log message + * + * @param processorLog processorLog + * @return String + */ public static String formatLog(ProcessorLog processorLog) { Map fieldMap = processorLog.getFields().stream() .collect(Collectors.toMap(ProcessorLogField::getName, ProcessorLogField::getValue)); String location = fieldMap.get(LogFieldConstant.LOCATION); - return String.format( + String message = String.format( LOG_FORMAT, DateUtil.formatTimestamp(Long.parseLong(fieldMap.get(LogFieldConstant.TIME_STAMP))), fieldMap.get(LogFieldConstant.LEVEL), LogFormatUtil.formatLocation(location), fieldMap.get(LogFieldConstant.MESSAGE) ); + + // Throwable + String throwable = fieldMap.get(LogFieldConstant.THROWABLE); + if (StringUtils.isEmpty(throwable)) { + return message; + } + return String.format("%s \n %s", message, throwable); } /** @@ -37,8 +56,8 @@ public static String formatLog(ProcessorLog processorLog) { * @return String */ public static String formatLocation(String location) { - if (StringUtils.isEmpty(location) || "-".equals(location)){ - return "-"; + if (StringUtils.isEmpty(location) || DEFAULT_LOCATION.equals(location)) { + return DEFAULT_LOCATION; } String substring = location.substring(0, location.indexOf("(")); diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigAddVO.java deleted file mode 100644 index 676ec2a1..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigAddVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigVO", description = "AdminConfig add VO") -public class AdminConfigAddVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigDeleteVO.java deleted file mode 100644 index 2edb67c8..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigDeleteVO", description = "AdminConfig delete VO") -public class AdminConfigDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigListVO.java deleted file mode 100644 index 504e3afe..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigListVO", description = "AdminConfig list VO") -public class AdminConfigListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigQueryVO.java deleted file mode 100644 index 7b8d0228..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigQueryVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.openjob.server.admin.vo.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigQueryVO", description = "AdminConfig query VO") -public class AdminConfigQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Config name") - private String name; - - @ApiModelProperty(value = "Config value") - private String value; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigUpdateVO.java deleted file mode 100644 index 61b7f0a3..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/admin/AdminConfigUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.admin; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminConfigUpdateVO", description = "AdminConfig update VO") -public class AdminConfigUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/AddAppVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/AddAppVO.java index ec8ace9c..dcd687cc 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/AddAppVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/AddAppVO.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/DeleteAppVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/DeleteAppVO.java index 0aea7a7d..976cd917 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/DeleteAppVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/DeleteAppVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/ListAppVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/ListAppVO.java index 9afa0287..f6916945 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/ListAppVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/ListAppVO.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/UpdateAppVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/UpdateAppVO.java index e015296b..d44774a6 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/UpdateAppVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/app/UpdateAppVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/AddDelayVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/AddDelayVO.java index 7bb3caed..c73bf1cb 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/AddDelayVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/AddDelayVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayInstanceVO.java index 29e50639..27a7d530 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayInstanceVO.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayVO.java index 9aa0b7b1..64763139 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/DeleteDelayVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceLogVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceLogVO.java index 0dd9c9c2..37aba3df 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceLogVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceLogVO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceVO.java index b41614a9..8b5f234b 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayInstanceVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayVO.java index f76aeaed..ce72e715 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/ListDelayVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/StopDelayInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/StopDelayInstanceVO.java index 97051bb3..397a4595 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/StopDelayInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/StopDelayInstanceVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/UpdateDelayVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/UpdateDelayVO.java index 8cff18ca..33ecf74b 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/UpdateDelayVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/delay/UpdateDelayVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/AddJobVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/AddJobVO.java index 7d87a2ad..7168fb0e 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/AddJobVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/AddJobVO.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobInstanceVO.java index 0909f077..04f5fd8c 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobInstanceVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobVO.java index 90d5418a..8b91cca9 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/DeleteJobVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ExecuteJobVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ExecuteJobVO.java index 3d1f3e2d..d61b89bc 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ExecuteJobVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ExecuteJobVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @ApiModel diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/GetJobInstanceLogVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/GetJobInstanceLogVO.java index fdc21b62..f7895ba5 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/GetJobInstanceLogVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/GetJobInstanceLogVO.java @@ -5,7 +5,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListJobInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListJobInstanceVO.java index 4f6909cd..5f013254 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListJobInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListJobInstanceVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListProcessorLogVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListProcessorLogVO.java index 06a60d34..0238ef3a 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListProcessorLogVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/ListProcessorLogVO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/StopJobInstanceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/StopJobInstanceVO.java index 3fcbdd0b..799b0289 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/StopJobInstanceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/StopJobInstanceVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/TimeExpressionVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/TimeExpressionVO.java index 2890da0f..a24075b0 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/TimeExpressionVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/TimeExpressionVO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/UpdateJobVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/UpdateJobVO.java index 13f4e04d..a219ffe8 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/UpdateJobVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/job/UpdateJobVO.java @@ -5,7 +5,7 @@ import lombok.experimental.Accessors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/AddNamespaceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/AddNamespaceVO.java index d3f3fe61..6c1218f8 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/AddNamespaceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/AddNamespaceVO.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/DeleteNamespaceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/DeleteNamespaceVO.java index 162c522b..f5a487c8 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/DeleteNamespaceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/DeleteNamespaceVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/ListNamespaceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/ListNamespaceVO.java index 61bdd2b8..7da8a111 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/ListNamespaceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/ListNamespaceVO.java @@ -5,7 +5,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/UpdateNamespaceVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/UpdateNamespaceVO.java index 3a72ef70..e213a1cd 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/UpdateNamespaceVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/namespace/UpdateNamespaceVO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactAddVO.java deleted file mode 100644 index 935c9115..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactAddVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactVO", description = "NotifyContact add VO") -public class NotifyContactAddVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactDeleteVO.java deleted file mode 100644 index 068d32ee..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactDeleteVO", description = "NotifyContact delete VO") -public class NotifyContactDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactListVO.java deleted file mode 100644 index effe53a8..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactListVO", description = "NotifyContact list VO") -public class NotifyContactListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactQueryVO.java deleted file mode 100644 index ae601b48..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactQueryVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactQueryVO", description = "NotifyContact query VO") -public class NotifyContactQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "User name") - private String name; - - @ApiModelProperty(value = "Phone") - private String phone; - - @ApiModelProperty(value = "Email address") - private String email; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactUpdateVO.java deleted file mode 100644 index 6c9239f5..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyContactUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyContactUpdateVO", description = "NotifyContact update VO") -public class NotifyContactUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupAddVO.java deleted file mode 100644 index 2f5b1a14..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupAddVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupVO", description = "NotifyGroup add VO") -public class NotifyGroupAddVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupDeleteVO.java deleted file mode 100644 index 617355c4..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupDeleteVO", description = "NotifyGroup delete VO") -public class NotifyGroupDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupListVO.java deleted file mode 100644 index 13776712..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupListVO", description = "NotifyGroup list VO") -public class NotifyGroupListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupQueryVO.java deleted file mode 100644 index 58a7260a..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupQueryVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupQueryVO", description = "NotifyGroup query VO") -public class NotifyGroupQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Group name") - private String name; - - @ApiModelProperty(value = "[12, 34]") - private List contactIds; - - @ApiModelProperty(value = "Status. 1=OK 2=disabled") - private Integer status; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupUpdateVO.java deleted file mode 100644 index d0198bc0..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyGroupUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyGroupUpdateVO", description = "NotifyGroup update VO") -public class NotifyGroupUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateAddVO.java deleted file mode 100644 index 576c9ec2..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateAddVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateVO", description = "NotifyTemplate add VO") -public class NotifyTemplateAddVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateDeleteVO.java deleted file mode 100644 index c074e84b..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateDeleteVO", description = "NotifyTemplate delete VO") -public class NotifyTemplateDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateListVO.java deleted file mode 100644 index 04fdb45f..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateListVO", description = "NotifyTemplate list VO") -public class NotifyTemplateListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateQueryVO.java deleted file mode 100644 index b708b2ba..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateQueryVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.openjob.server.admin.vo.part.TemplateExtraVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateQueryVO", description = "NotifyTemplate query VO") -public class NotifyTemplateQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Template name. eg: Wechat, DingTalk, Wecom, Feishu") - private String name; - - @ApiModelProperty(value = "notify type. 1 webhook 2 email 3 sms") - private Integer type; - - @ApiModelProperty(value = "Level. 1 notice 2 warning 3 error") - private String level; - - @ApiModelProperty(value = "notify events list. JSON: [task_fail, task_suc, task_cancel, task_skip]") - private List events; - - @ApiModelProperty(value = "related contact ids. JSON [12, 34]") - private List contactIds; - - @ApiModelProperty(value = "related group ids. JSON [12, 34]") - private List groupIds; - - @ApiModelProperty(value = "Webhook URL") - private String webhook; - - @ApiModelProperty(value = "Template contents") - private String content; - - @ApiModelProperty(value = "Extra info. eg: third platform token") - private TemplateExtraVO extra; - - @ApiModelProperty(value = "Creator user ID") - private Integer userId; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateUpdateVO.java deleted file mode 100644 index 7d05e3a9..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/notify/NotifyTemplateUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.notify; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "NotifyTemplateUpdateVO", description = "NotifyTemplate update VO") -public class NotifyTemplateUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/part/TemplateExtraVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/part/TemplateExtraVO.java deleted file mode 100644 index 4f81979d..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/part/TemplateExtraVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.openjob.server.admin.vo.part; - -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -public class TemplateExtraVO { - private String aptToken; -} diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermAddVO.java deleted file mode 100644 index 8ddbb84c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermAddVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermAddVO", description = "AdminPermAddVO") -public class AdminPermAddVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermDeleteVO.java deleted file mode 100644 index f07db90c..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermDeleteVO", description = "AdminPermDeleteVO") -public class AdminPermDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermListVO.java deleted file mode 100644 index 3564a940..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermListVO", description = "AdminPerm list") -public class AdminPermListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermQueryVO.java deleted file mode 100644 index 90362aec..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermQueryVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package io.openjob.server.admin.vo.perm; - -import io.openjob.server.admin.vo.part.MenuMetaVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermQueryVO", description = "AdminPermQueryVO") -public class AdminPermQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Parent ID") - private Integer pid; - - @ApiModelProperty(value = "Type. 1=menu 2=perm") - private Integer type; - - @ApiModelProperty(value = "Menu name") - private String name; - - @ApiModelProperty(value = "Route path or API path") - private String path; - - @ApiModelProperty(value = "Extra meta data. JSON object: {icon:xx,title:some.name}") - private MenuMetaVO meta; - - @ApiModelProperty(value = "Hidden status. 1=yes 2=no") - private Integer hidden; - - @ApiModelProperty(value = "Sort value") - private Integer sort; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermUpdateVO.java deleted file mode 100644 index 08a3fdc6..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.perm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminPermUpdateVO", description = "AdminPermUpdateVO") -public class AdminPermUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermissionMenusVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermissionMenusVO.java index a53f8dca..3d299c87 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermissionMenusVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/perm/AdminPermissionMenusVO.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/system/SystemVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/system/SystemVO.java index bb054f68..1259438c 100644 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/system/SystemVO.java +++ b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/system/SystemVO.java @@ -5,7 +5,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleAddVO.java deleted file mode 100644 index 8bcb1ae2..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleAddVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleVO", description = "AdminRole add VO") -public class AdminRoleAddVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleDeleteVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleDeleteVO.java deleted file mode 100644 index 17f9005a..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleDeleteVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleDeleteVO", description = "AdminRole delete VO") -public class AdminRoleDeleteVO { - - @ApiModelProperty(value = "PK") - private Long id; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleListVO.java deleted file mode 100644 index aa919223..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleListVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleListVO", description = "AdminRole list VO") -public class AdminRoleListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleQueryVO.java deleted file mode 100644 index 1071460e..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleQueryVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleQueryVO", description = "AdminRole query VO") -public class AdminRoleQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "Role name") - private String name; - - @ApiModelProperty(value = "Description") - private String desc; - - @ApiModelProperty(value = "Menu ids for role. JSON array") - private List menus; - - @ApiModelProperty(value = "Permissions ids for role. JSON array") - private List perms; - - @ApiModelProperty(value = "Is Admin. 1=yes 2=no") - private Integer admin; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleUpdateVO.java deleted file mode 100644 index 8b050190..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminRoleUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminRoleUpdateVO", description = "AdminRole update VO") -public class AdminRoleUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserAddVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserAddVO.java deleted file mode 100644 index b94b7182..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserAddVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminUserAddVO", description = "AdminUserAddVO") -public class AdminUserAddVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserListVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserListVO.java deleted file mode 100644 index 069a77e7..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserListVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "ListAdminUserVO", description = "ListAdminUserVO") -public class AdminUserListVO { - - @ApiModelProperty(value = "total count") - private Integer total; - - @ApiModelProperty(value = "user list") - private List list; - -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserQueryVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserQueryVO.java deleted file mode 100644 index 19982fbf..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserQueryVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "AdminUserQueryVO", description = "AdminUserQueryVO") -public class AdminUserQueryVO { - - @ApiModelProperty(value = "PK") - private Long id; - - @ApiModelProperty(value = "User name") - private String username; - - @ApiModelProperty(value = "Nickname") - private String nickname; - - @ApiModelProperty(value = "Api auth token") - private String token; - - @ApiModelProperty(value = "Role IDs. JSON: [1,2]") - private List roleIds; - - @ApiModelProperty(value = "Delete status. 1=yes 2=no") - private Integer deleted; - - @ApiModelProperty(value = "Delete time") - private Long deleteTime; - - @ApiModelProperty(value = "Update time") - private Long updateTime; - - @ApiModelProperty(value = "Create time") - private Long createTime; -} - diff --git a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserUpdateVO.java b/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserUpdateVO.java deleted file mode 100644 index b9c11689..00000000 --- a/openjob-server/openjob-server-admin/src/main/java/io/openjob/server/admin/vo/user/AdminUserUpdateVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.openjob.server.admin.vo.user; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@ApiModel(value = "UpdateAdminUserVO", description = "UpdateAdminUserVO") -public class AdminUserUpdateVO { - - @ApiModelProperty(value = "PK") - private Long id; - -} - diff --git a/openjob-server/openjob-server-admin/src/test/java/io/openjob/server/admin/util/LogFormatTest.java b/openjob-server/openjob-server-admin/src/test/java/io/openjob/server/admin/util/LogFormatTest.java index 70e1288e..ecbd5f71 100644 --- a/openjob-server/openjob-server-admin/src/test/java/io/openjob/server/admin/util/LogFormatTest.java +++ b/openjob-server/openjob-server-admin/src/test/java/io/openjob/server/admin/util/LogFormatTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class LogFormatTest { diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/ClusterServer.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/ClusterServer.java index b3eba9a8..c9f6dc38 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/ClusterServer.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/ClusterServer.java @@ -21,7 +21,7 @@ import scala.concurrent.Future; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/ClusterActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/ClusterActor.java index a5dfd3b4..170835d2 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/ClusterActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/ClusterActor.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerActor.java index 8f4c4e25..ae573438 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerActor.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceActor.java index 3aa7b331..6f236b39 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceActor.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstancePullActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstancePullActor.java index a96227fa..d40dd9a6 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstancePullActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstancePullActor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceStatusActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceStatusActor.java index a2270b76..5c9053d7 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceStatusActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerDelayInstanceStatusActor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerHeartbeatActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerHeartbeatActor.java index 4c1c4e6f..5802f834 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerHeartbeatActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerHeartbeatActor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceActor.java index eb33e262..62e85fac 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceActor.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceTaskLogActor.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceTaskLogActor.java index d98622a1..6b8b5dcb 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceTaskLogActor.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/actor/WorkerJobInstanceTaskLogActor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterAutoConfiguration.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterAutoConfiguration.java index 8e59078f..26fa605e 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterAutoConfiguration.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterAutoConfiguration.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Configuration; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterProperties.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterProperties.java index bb4afd52..114c6e5d 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterProperties.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/autoconfigure/ClusterProperties.java @@ -4,7 +4,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/constant/ClusterConstant.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/constant/ClusterConstant.java index 1d4f705c..781318aa 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/constant/ClusterConstant.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/constant/ClusterConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.cluster.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ClusterConstant { diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeFailDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeFailDTO.java index 3c46ed77..4729d521 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeFailDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeFailDTO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeJoinDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeJoinDTO.java index 6e1540dc..68a7f89e 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeJoinDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeJoinDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePingDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePingDTO.java index a476448a..f2c88987 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePingDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePingDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePongDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePongDTO.java index dbf2e683..e901e5cb 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePongDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodePongDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeResponseDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeResponseDTO.java index 0b366730..829239d4 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeResponseDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeResponseDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeShutdownDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeShutdownDTO.java index 5008116a..5029d610 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeShutdownDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/NodeShutdownDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerFailDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerFailDTO.java index e84b7b82..52991bc7 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerFailDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerFailDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerJoinDTO.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerJoinDTO.java index b69e7460..9f32372c 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerJoinDTO.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/dto/WorkerJoinDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/exception/ClusterNodeOperatingException.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/exception/ClusterNodeOperatingException.java index 3a4523e1..d25c728c 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/exception/ClusterNodeOperatingException.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/exception/ClusterNodeOperatingException.java @@ -1,7 +1,7 @@ package io.openjob.server.cluster.exception; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ClusterNodeOperatingException extends RuntimeException { diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/FailManager.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/FailManager.java index d01c1d70..6d5ca6be 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/FailManager.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/FailManager.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/JoinManager.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/JoinManager.java index 58f7105b..879ded9c 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/JoinManager.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/JoinManager.java @@ -23,7 +23,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/RefreshManager.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/RefreshManager.java index 3cebc52d..03957c54 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/RefreshManager.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/manager/RefreshManager.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/HealthScheduling.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/HealthScheduling.java index 9cb81cef..9b013e81 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/HealthScheduling.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/HealthScheduling.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/WorkerScheduling.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/WorkerScheduling.java index 211f2572..e59ba399 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/WorkerScheduling.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/scheduling/WorkerScheduling.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/ClusterService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/ClusterService.java index 894b5f77..fd95c039 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/ClusterService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/ClusterService.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/HealthService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/HealthService.java index 0d125f5e..801bbe71 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/HealthService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/HealthService.java @@ -32,7 +32,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Log4j2 diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceService.java index 30a71834..685d54e3 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceService.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceTaskLogService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceTaskLogService.java index 5d6ae48a..d40178f9 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceTaskLogService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JobInstanceTaskLogService.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JoinService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JoinService.java index 2e64bce1..4347a0fb 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JoinService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/JoinService.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerHeartbeatService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerHeartbeatService.java index 5c61ab6a..49934676 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerHeartbeatService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerHeartbeatService.java @@ -23,7 +23,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerService.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerService.java index bac2016b..7568243b 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerService.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/service/WorkerService.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/util/ClusterUtil.java b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/util/ClusterUtil.java index 0ee4f215..07e02179 100644 --- a/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/util/ClusterUtil.java +++ b/openjob-server/openjob-server-cluster/src/main/java/io/openjob/server/cluster/util/ClusterUtil.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-cluster/src/test/java/io/openjob/server/cluster/util/ClusterUtilTest.java b/openjob-server/openjob-server-cluster/src/test/java/io/openjob/server/cluster/util/ClusterUtilTest.java index 200daca3..9998136a 100644 --- a/openjob-server/openjob-server-cluster/src/test/java/io/openjob/server/cluster/util/ClusterUtilTest.java +++ b/openjob-server/openjob-server-cluster/src/test/java/io/openjob/server/cluster/util/ClusterUtilTest.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ClusterUtilTest { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/ClusterContext.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/ClusterContext.java index 5a6b0584..65882c59 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/ClusterContext.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/ClusterContext.java @@ -14,7 +14,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ClusterContext { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/ActorProducer.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/ActorProducer.java index 6c3de7b2..43d7fdd0 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/ActorProducer.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/ActorProducer.java @@ -5,7 +5,7 @@ import org.springframework.context.ApplicationContext; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ActorProducer implements IndirectActorProducer { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactory.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactory.java index 2c37bdfc..c8af35a2 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactory.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactory.java @@ -5,7 +5,7 @@ import org.springframework.context.ApplicationContext; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class PropsFactory implements Extension { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactoryManager.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactoryManager.java index 35b2887b..86df3002 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactoryManager.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/actor/PropsFactoryManager.java @@ -4,7 +4,7 @@ import akka.actor.ExtendedActorSystem; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class PropsFactoryManager extends AbstractExtensionId { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/AkkaConfigConstant.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/AkkaConfigConstant.java index 9815721e..1af60895 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/AkkaConfigConstant.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/AkkaConfigConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class AkkaConfigConstant { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/BaseEnum.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/BaseEnum.java index c8970a3a..fdc07c3a 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/BaseEnum.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/BaseEnum.java @@ -1,7 +1,7 @@ package io.openjob.server.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface BaseEnum { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/ServerActorConstant.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/ServerActorConstant.java index 57f173bb..f817e4af 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/ServerActorConstant.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/constant/ServerActorConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.common.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ServerActorConstant { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/CronExpression.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/CronExpression.java index 614a96f7..e0f56dec 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/CronExpression.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/CronExpression.java @@ -15,7 +15,7 @@ import java.util.TreeSet; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CronExpression implements Serializable, Cloneable { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/ValueSet.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/ValueSet.java index dfe8f20a..e5b6cee9 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/ValueSet.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/cron/ValueSet.java @@ -1,7 +1,7 @@ package io.openjob.server.common.cron; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ValueSet { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/PageDTO.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/PageDTO.java index 8fb7a42a..beff3daa 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/PageDTO.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/PageDTO.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author inhere + * @author inhere in.798@qq.com */ @Data public class PageDTO { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/SystemDTO.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/SystemDTO.java index 93ba9c13..7ca37c3a 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/SystemDTO.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/SystemDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/WorkerDTO.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/WorkerDTO.java index 44390148..72b7a430 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/WorkerDTO.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/dto/WorkerDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/BaseExceptionAssert.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/BaseExceptionAssert.java index 45cb4df9..558250fa 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/BaseExceptionAssert.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/BaseExceptionAssert.java @@ -8,7 +8,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface BaseExceptionAssert extends BaseEnum { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeException.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeException.java index 806ee4e6..cf1e4891 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeException.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeException.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeExceptionAssert.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeExceptionAssert.java index a86b5dce..76073895 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeExceptionAssert.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/CodeExceptionAssert.java @@ -3,7 +3,7 @@ import java.text.MessageFormat; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface CodeExceptionAssert extends BaseExceptionAssert { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusException.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusException.java index f5237559..093f81ef 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusException.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusException.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusExceptionAssert.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusExceptionAssert.java index 069a57d5..79010970 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusExceptionAssert.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/exception/HttpStatusExceptionAssert.java @@ -3,7 +3,7 @@ import java.text.MessageFormat; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface HttpStatusExceptionAssert extends BaseExceptionAssert { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/BeanMapperUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/BeanMapperUtil.java index 462428c3..d7435060 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/BeanMapperUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/BeanMapperUtil.java @@ -5,7 +5,7 @@ import java.util.Objects; /** - * @author inhere + * @author inhere in.798@qq.com */ public class BeanMapperUtil { /** diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/CrcUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/CrcUtil.java index 148e7a5d..6518b3b2 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/CrcUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/CrcUtil.java @@ -1,7 +1,7 @@ package io.openjob.server.common.util; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CrcUtil { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/HmacUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/HmacUtil.java index 969a6809..c725aaa5 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/HmacUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/HmacUtil.java @@ -53,25 +53,19 @@ public static Boolean verifyPasswd(String hashed, String passwd, String key) { } /** - * 实现Hmac系列的加密算法HmacSHA1、HmacMD5等 - * - from csdn blog - * - * @param input 需要加密的输入参数 - * @param key 密钥 - * @param algorithm 选择加密算法 - * @return 加密后的值 + * @param input input + * @param key key + * @param algorithm algorithm + * @return encrypt value **/ public static String encrypt(String input, String key, String algorithm) { String cipher; try { byte[] data = key.getBytes(StandardCharsets.UTF_8); - // 根据给定的字节数组构造一个密钥，第二个参数指定一个密钥的算法名称，生成HmacSHA1专属密钥 SecretKey secretKey = new SecretKeySpec(data, algorithm); - // 生成一个指定Mac算法的Mac对象 Mac mac = Mac.getInstance(algorithm); - // 用给定密钥初始化Mac对象 mac.init(secretKey); byte[] text = input.getBytes(StandardCharsets.UTF_8); @@ -95,10 +89,10 @@ public static String md5(String input) { } /** - * byte数组转16进制字符串 + * bytes to hex string * - * @param bytes byte数组 - * @return hex字符串 + * @param bytes byte array + * @return hex string */ public static String bytesToHexStr(byte[] bytes) { StringBuilder hexStr = new StringBuilder(); diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/LogUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/LogUtil.java index 185560b7..0fe42b4e 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/LogUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/LogUtil.java @@ -3,7 +3,7 @@ import lombok.extern.log4j.Log4j2; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Log4j2 diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/PageUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/PageUtil.java index b27e2205..51f17073 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/PageUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/PageUtil.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class PageUtil { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/ServerUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/ServerUtil.java index c754056d..d312e137 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/ServerUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/ServerUtil.java @@ -7,7 +7,7 @@ import io.openjob.server.common.constant.ServerActorConstant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ServerUtil { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/SlotsUtil.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/SlotsUtil.java index 0ccb9014..ce508192 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/SlotsUtil.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/util/SlotsUtil.java @@ -3,7 +3,7 @@ import io.openjob.server.common.ClusterContext; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class SlotsUtil { diff --git a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/vo/PageVO.java b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/vo/PageVO.java index 115be073..a165ae1e 100644 --- a/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/vo/PageVO.java +++ b/openjob-server/openjob-server-common/src/main/java/io/openjob/server/common/vo/PageVO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/CodeTestEnum.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/CodeTestEnum.java index 2a47e96c..de6767a1 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/CodeTestEnum.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/CodeTestEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/HttpStatusTestEnum.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/HttpStatusTestEnum.java index 55e636be..b6da75c8 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/HttpStatusTestEnum.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/constant/HttpStatusTestEnum.java @@ -6,7 +6,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/cron/CronExpressionTest.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/cron/CronExpressionTest.java index cb2543ac..89b34bd1 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/cron/CronExpressionTest.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/cron/CronExpressionTest.java @@ -6,7 +6,7 @@ import java.util.Date; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CronExpressionTest { diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/CodeExceptionAssertTest.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/CodeExceptionAssertTest.java index 78fd3dce..a4e33fee 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/CodeExceptionAssertTest.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/CodeExceptionAssertTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CodeExceptionAssertTest { diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/HttpStatusExceptionAssertTest.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/HttpStatusExceptionAssertTest.java index bcda2d8d..d92d738c 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/HttpStatusExceptionAssertTest.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/exception/HttpStatusExceptionAssertTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class HttpStatusExceptionAssertTest { diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/CRC16UtilTest.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/CRC16UtilTest.java index 58f8b20e..77c39492 100644 --- a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/CRC16UtilTest.java +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/CRC16UtilTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CRC16UtilTest { diff --git a/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/HmacUtilTest.java b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/HmacUtilTest.java new file mode 100644 index 00000000..bf8d58b4 --- /dev/null +++ b/openjob-server/openjob-server-common/src/test/java/io/openjob/server/common/util/HmacUtilTest.java @@ -0,0 +1,18 @@ +package io.openjob.server.common.util; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * @author stelin swoft@qq.com + * @since 1.0.0 + */ +public class HmacUtilTest { + @Test + public void testHashPasswd() { + String key = "3TJPjpUanNqZ0N1"; + String password = "openjob.io"; + String hashValue = HmacUtil.hashPasswd(password, key); + Assertions.assertTrue(HmacUtil.verifyPasswd(hashValue, password, key)); + } +} diff --git a/openjob-server/openjob-server-dispatcher/src/main/java/io/openjob/server/dispatcher/Dispatcher.java b/openjob-server/openjob-server-dispatcher/src/main/java/io/openjob/server/dispatcher/Dispatcher.java index b32adb1b..03f92752 100644 --- a/openjob-server/openjob-server-dispatcher/src/main/java/io/openjob/server/dispatcher/Dispatcher.java +++ b/openjob-server/openjob-server-dispatcher/src/main/java/io/openjob/server/dispatcher/Dispatcher.java @@ -1,7 +1,7 @@ package io.openjob.server.dispatcher; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class Dispatcher { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogAutoConfiguration.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogAutoConfiguration.java index ba64ec98..c32a7f84 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogAutoConfiguration.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogAutoConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogProperties.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogProperties.java index 80d8307d..522dee23 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogProperties.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/autoconfigure/LogProperties.java @@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/AbstractJdbcHikariClient.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/AbstractJdbcHikariClient.java index 73670fbf..267512b7 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/AbstractJdbcHikariClient.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/AbstractJdbcHikariClient.java @@ -8,7 +8,7 @@ import java.sql.SQLException; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public abstract class AbstractJdbcHikariClient implements Client { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/Client.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/Client.java index 3c261749..8c09821c 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/Client.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/Client.java @@ -3,7 +3,7 @@ import java.io.IOException; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface Client { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/H2Client.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/H2Client.java index 7dd4251b..bb6dbbcd 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/H2Client.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/H2Client.java @@ -9,7 +9,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class H2Client extends AbstractJdbcHikariClient { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/MysqlClient.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/MysqlClient.java index 0608cba7..e68881d7 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/MysqlClient.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/MysqlClient.java @@ -6,7 +6,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class MysqlClient extends AbstractJdbcHikariClient { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/TidbClient.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/TidbClient.java index d8bf3264..ebbc5991 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/TidbClient.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/client/TidbClient.java @@ -1,7 +1,7 @@ package io.openjob.server.log.client; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TidbClient { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogJdbcDriverConstant.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogJdbcDriverConstant.java index c232ac92..ff0b3aee 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogJdbcDriverConstant.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogJdbcDriverConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.log.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class LogJdbcDriverConstant { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogStorageConstant.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogStorageConstant.java index c45d2fcf..b4bc865f 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogStorageConstant.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/constant/LogStorageConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.log.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class LogStorageConstant { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/LogDAO.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/LogDAO.java index 3a9b1a9b..d5c1b277 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/LogDAO.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/LogDAO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface LogDAO { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/H2LogDAOImpl.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/H2LogDAOImpl.java index 10c702a0..22bc7a41 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/H2LogDAOImpl.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/H2LogDAOImpl.java @@ -3,7 +3,7 @@ import io.openjob.server.log.client.H2Client; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class H2LogDAOImpl extends JdbcDAOImpl { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/JdbcDAOImpl.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/JdbcDAOImpl.java index f23e6fa7..920c3198 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/JdbcDAOImpl.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/JdbcDAOImpl.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class JdbcDAOImpl implements LogDAO { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/MysqlLogDAOImpl.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/MysqlLogDAOImpl.java index 21e03748..550d17c3 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/MysqlLogDAOImpl.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dao/impl/MysqlLogDAOImpl.java @@ -3,7 +3,7 @@ import io.openjob.server.log.client.MysqlClient; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class MysqlLogDAOImpl extends JdbcDAOImpl { diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLog.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLog.java index 5bd65d5e..3989b82a 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLog.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLog.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLogField.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLogField.java index eae19647..c765c061 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLogField.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/dto/ProcessorLogField.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/mapper/LogMapper.java b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/mapper/LogMapper.java index ab3eb325..fec17799 100644 --- a/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/mapper/LogMapper.java +++ b/openjob-server/openjob-server-log/src/main/java/io/openjob/server/log/mapper/LogMapper.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Mapper diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/constant/OpenapiConstant.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/constant/OpenapiConstant.java new file mode 100644 index 00000000..c3e86ff2 --- /dev/null +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/constant/OpenapiConstant.java @@ -0,0 +1,12 @@ +package io.openjob.server.openapi.constant; + +/** + * @author stelin swoft@qq.com + * @since 1.0.0 + */ +public class OpenapiConstant { + /** + * User api token header name in headers + */ + public static final String HEADER_TOKEN_KEY = "token"; +} diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/controller/OpenDelayInstanceController.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/controller/OpenDelayInstanceController.java index b8776897..dbc9028a 100644 --- a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/controller/OpenDelayInstanceController.java +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/controller/OpenDelayInstanceController.java @@ -15,11 +15,11 @@ import javax.validation.Valid; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @RestController -@Api(value = "delay-instance", tags = "delay-instance") +@Api(value = "Delay-instance", tags = "Delay-instance") @RequestMapping("/openapi/delay-instance") public class OpenDelayInstanceController { @@ -30,7 +30,7 @@ public OpenDelayInstanceController(OpenDelayInstanceService instanceService) { this.instanceService = instanceService; } - @ApiOperation("Add delay instance.") + @ApiOperation("Add delay instance") @PostMapping("/add") public Result add(@Valid @RequestBody DelayInstanceAddRequest addRequest) { return Result.success(this.instanceService.add(addRequest)); diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/request/DelayInstanceAddRequest.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/request/DelayInstanceAddRequest.java index 93e4447d..d1cdcc19 100644 --- a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/request/DelayInstanceAddRequest.java +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/request/DelayInstanceAddRequest.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/OpenDelayInstanceService.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/OpenDelayInstanceService.java index 16cb08ec..6b524341 100644 --- a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/OpenDelayInstanceService.java +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/OpenDelayInstanceService.java @@ -4,7 +4,7 @@ import io.openjob.server.openapi.vo.DelayInstanceAddVO; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface OpenDelayInstanceService { diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/impl/OpenDelayInstanceServiceImpl.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/impl/OpenDelayInstanceServiceImpl.java index 822fd359..02ee5187 100644 --- a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/impl/OpenDelayInstanceServiceImpl.java +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/service/impl/OpenDelayInstanceServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/vo/DelayInstanceAddVO.java b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/vo/DelayInstanceAddVO.java index a1fa02ab..65182a1f 100644 --- a/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/vo/DelayInstanceAddVO.java +++ b/openjob-server/openjob-server-openapi/src/main/java/io/openjob/server/openapi/vo/DelayInstanceAddVO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ExecuteStrategyEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ExecuteStrategyEnum.java index a8fa8b02..91954b33 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ExecuteStrategyEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ExecuteStrategyEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/JobStatusEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/JobStatusEnum.java index 36baf608..7bbb1b34 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/JobStatusEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/JobStatusEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/PermissionTypeEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/PermissionTypeEnum.java index 8b0261b3..80a93508 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/PermissionTypeEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/PermissionTypeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerReportStatusEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerReportStatusEnum.java index ee6ff47e..214f277d 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerReportStatusEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerReportStatusEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @AllArgsConstructor diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerStatusEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerStatusEnum.java index 149d0a8b..eebabca4 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerStatusEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/ServerStatusEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @AllArgsConstructor diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/WorkerStatusEnum.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/WorkerStatusEnum.java index 47ecfeaa..ec9b099d 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/WorkerStatusEnum.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/constant/WorkerStatusEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @AllArgsConstructor diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/AppDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/AppDAO.java index f5c79033..653acd7a 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/AppDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/AppDAO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface AppDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayDAO.java index 7235764e..1be0f3e6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayDAO.java @@ -8,7 +8,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayInstanceDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayInstanceDAO.java index 783cf483..f6c30fae 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayInstanceDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/DelayInstanceDAO.java @@ -8,7 +8,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayInstanceDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobDAO.java index 06fc3dbb..4fa8a9b4 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobDAO.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceDAO.java index a86a1a21..8cb828ab 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceDAO.java @@ -9,7 +9,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceLogDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceLogDAO.java index 4e9a48bd..92e183e9 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceLogDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceLogDAO.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceLogDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceTaskDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceTaskDAO.java index c58df33b..93ee92ee 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceTaskDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobInstanceTaskDAO.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceTaskDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobSlotsDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobSlotsDAO.java index 598a1690..52eb12a5 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobSlotsDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/JobSlotsDAO.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobSlotsDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NamespaceDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NamespaceDAO.java index 12b10f06..1aa1dfe9 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NamespaceDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NamespaceDAO.java @@ -7,7 +7,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface NamespaceDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyContactDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyContactDAO.java deleted file mode 100644 index 13085817..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyContactDAO.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.openjob.server.repository.dao; - -import io.openjob.server.repository.entity.NotifyContact; -import org.springframework.data.domain.Page; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyContactDAO { - - /** - * add NotifyContact - * - * @param entity entity - * @return id - */ - Long add(NotifyContact entity); - - /** - * batch add NotifyContact - * - * @param entityList entity list - */ - void batchAdd(List entityList); - - /** - * get NotifyContact by Id - * - * @param id id - * @return NotifyContact - */ - NotifyContact getById(Long id); - - /** - * update NotifyContact by ID - * - * @param entity entity - * @return number - */ - Integer updateById(NotifyContact entity); - - /** - * get NotifyContact list by page, size - * - * @param page page - * @param size size - * @return NotifyContact list - */ - Page getPageList(Integer page, Integer size); -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyGroupDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyGroupDAO.java deleted file mode 100644 index cbf5afbd..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyGroupDAO.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.openjob.server.repository.dao; - -import io.openjob.server.repository.entity.NotifyGroup; -import org.springframework.data.domain.Page; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyGroupDAO { - - /** - * add NotifyGroup - * - * @param entity entity - * @return id - */ - Long add(NotifyGroup entity); - - /** - * batch add NotifyGroup - * - * @param entityList entity list - */ - void batchAdd(List entityList); - - /** - * get NotifyGroup by Id - * - * @param id id - * @return NotifyGroup - */ - NotifyGroup getById(Long id); - - /** - * update NotifyGroup by ID - * - * @param entity entity - * @return number - */ - Integer updateById(NotifyGroup entity); - - /** - * get NotifyGroup list by page, size - * - * @param page page - * @param size size - * @return NotifyGroup list - */ - Page getPageList(Integer page, Integer size); - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyTemplateDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyTemplateDAO.java deleted file mode 100644 index 9ebfb316..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/NotifyTemplateDAO.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.openjob.server.repository.dao; - -import io.openjob.server.repository.entity.NotifyTemplate; -import org.springframework.data.domain.Page; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyTemplateDAO { - - /** - * add NotifyTemplate - * - * @param entity entity - * @return id - */ - Long add(NotifyTemplate entity); - - /** - * batch add NotifyTemplate - * - * @param entityList entity list - */ - void batchAdd(List entityList); - - /** - * get NotifyTemplate by Id - * - * @param id id - * @return NotifyTemplate - */ - NotifyTemplate getById(Long id); - - /** - * update NotifyTemplate by ID - * - * @param entity entity - * @return number - */ - Integer updateById(NotifyTemplate entity); - - /** - * get NotifyTemplate list by page, size - * - * @param page page - * @param size size - * @return NotifyTemplate list - */ - Page getPageList(Integer page, Integer size); -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerDAO.java index 751d27e8..695eaa46 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerDAO.java @@ -7,7 +7,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface ServerDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerReportsDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerReportsDAO.java index fce031e3..e8b52d7f 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerReportsDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/ServerReportsDAO.java @@ -3,7 +3,7 @@ import io.openjob.server.repository.entity.ServerReports; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface ServerReportsDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/SystemDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/SystemDAO.java index f6605432..9cce639e 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/SystemDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/SystemDAO.java @@ -3,7 +3,7 @@ import io.openjob.server.repository.entity.System; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface SystemDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/WorkerDAO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/WorkerDAO.java index 8085fe58..6cf1641b 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/WorkerDAO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/WorkerDAO.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface WorkerDAO { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminPermissionDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminPermissionDAOImpl.java index b78a7a92..67390b5b 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminPermissionDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminPermissionDAOImpl.java @@ -5,7 +5,6 @@ import io.openjob.server.repository.dao.AdminPermissionDAO; import io.openjob.server.repository.entity.AdminPermission; import io.openjob.server.repository.repository.AdminPermissionRepository; -import io.openjob.server.repository.util.EntityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; @@ -57,7 +56,7 @@ public List getByIds(List ids) { @Override public Page getPageList(Integer page, Integer size) { // TIP: page start from 0 on JPA. - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); + PageRequest pageReq = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createTime")); return adminPermRepository.findAll(pageReq); } diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminRoleDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminRoleDAOImpl.java index af3cb6c5..5814af8f 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminRoleDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminRoleDAOImpl.java @@ -3,10 +3,10 @@ import io.openjob.server.repository.dao.AdminRoleDAO; import io.openjob.server.repository.entity.AdminRole; import io.openjob.server.repository.repository.AdminRoleRepository; -import io.openjob.server.repository.util.EntityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.List; @@ -53,7 +53,7 @@ public List getByIds(List ids) { @Override public Page getPageList(Integer page, Integer size) { // TIP: page start from 0 on JPA. - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); + PageRequest pageReq = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createTime")); return adminRoleRepository.findAll(pageReq); } diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminUserDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminUserDAOImpl.java index 61a56401..4870adda 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminUserDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AdminUserDAOImpl.java @@ -4,10 +4,10 @@ import io.openjob.server.repository.dao.AdminUserDAO; import io.openjob.server.repository.entity.AdminUser; import io.openjob.server.repository.repository.AdminUserRepository; -import io.openjob.server.repository.util.EntityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.List; @@ -64,7 +64,7 @@ public AdminUser getBySessionKey(String sessionKey) { @Override public Page getPageList(Integer page, Integer size) { // TIP: page start from 0 on JPA. - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); + PageRequest pageReq = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createTime")); return adminUserRepository.findAll(pageReq); } diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AppDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AppDAOImpl.java index 3c9a0c2a..fb13c519 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AppDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/AppDAOImpl.java @@ -20,7 +20,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayDAOImpl.java index 044f4a11..1f744d94 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayDAOImpl.java @@ -21,7 +21,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayInstanceDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayInstanceDAOImpl.java index eb879126..5236f5d8 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayInstanceDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/DelayInstanceDAOImpl.java @@ -30,7 +30,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component @@ -194,7 +194,9 @@ public Integer batchUpdateStatus(List updateList) { }); // Update sql. - String sql = String.format("update `delay_instance` set `worker_address`=(case `task_id` %s ELSE `worker_address` END),`complete_time`=(case `task_id` %s ELSE `complete_time` END),`update_time`=%d, `status`=(case `task_id` %s ELSE `status` END) where `status`< (case `task_id` %s ELSE `status` END)", + String sql = String.format("update `delay_instance` set `worker_address`=(case `task_id` %s ELSE `worker_address` END)," + + "`complete_time`=(case `task_id` %s ELSE `complete_time` END),`update_time`=%d, " + + "`status`=(case `task_id` %s ELSE `status` END) where `status`< (case `task_id` %s ELSE `status` END)", addressWhenThen, completeWhenThen, DateUtil.timestamp(), diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobDAOImpl.java index 5ac92ee7..fc192870 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobDAOImpl.java @@ -24,7 +24,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceDAOImpl.java index d21aee45..1f7c2ab6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceDAOImpl.java @@ -25,7 +25,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceLogDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceLogDAOImpl.java index 49815d56..9d51779b 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceLogDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceLogDAOImpl.java @@ -9,7 +9,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceTaskDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceTaskDAOImpl.java index 83506bb2..a52c3d55 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceTaskDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobInstanceTaskDAOImpl.java @@ -9,7 +9,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobSlotsDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobSlotsDAOImpl.java index 7bdc939f..4a69e721 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobSlotsDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/JobSlotsDAOImpl.java @@ -17,7 +17,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NamespaceDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NamespaceDAOImpl.java index e57cf0ea..b190e613 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NamespaceDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NamespaceDAOImpl.java @@ -20,7 +20,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyContactDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyContactDAOImpl.java deleted file mode 100644 index 849be907..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyContactDAOImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package io.openjob.server.repository.dao.impl; - -import io.openjob.server.repository.dao.NotifyContactDAO; -import io.openjob.server.repository.entity.NotifyContact; -import io.openjob.server.repository.repository.NotifyContactRepository; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyContactDAOImpl implements NotifyContactDAO { - private final NotifyContactRepository notifyContactRepository; - - @Autowired - public NotifyContactDAOImpl(NotifyContactRepository notifyContactRepository) { - this.notifyContactRepository = notifyContactRepository; - } - - @Override - public Long add(NotifyContact entity) { - return notifyContactRepository.save(entity).getId(); - } - - @Override - public void batchAdd(List entityList) { - notifyContactRepository.saveAll(entityList); - } - - @Override - public NotifyContact getById(Long id) { - return notifyContactRepository.findById(id).orElse(null); - } - - @Override - public Integer updateById(NotifyContact entity) { - notifyContactRepository.save(entity); - return 1; - } - - @Override - public Page getPageList(Integer page, Integer size) { - // TIP: page start from 0 on JPA. - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); - - return notifyContactRepository.findAll(pageReq); - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyGroupDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyGroupDAOImpl.java deleted file mode 100644 index 3386095b..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyGroupDAOImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.openjob.server.repository.dao.impl; - -import io.openjob.server.repository.dao.NotifyGroupDAO; -import io.openjob.server.repository.entity.NotifyGroup; -import io.openjob.server.repository.repository.NotifyGroupRepository; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyGroupDAOImpl implements NotifyGroupDAO { - private final NotifyGroupRepository notifyGroupRepository; - - @Autowired - public NotifyGroupDAOImpl(NotifyGroupRepository notifyGroupRepository) { - this.notifyGroupRepository = notifyGroupRepository; - } - - @Override - public Long add(NotifyGroup entity) { - return notifyGroupRepository.save(entity).getId(); - } - - @Override - public void batchAdd(List entityList) { - notifyGroupRepository.saveAll(entityList); - } - - @Override - public NotifyGroup getById(Long id) { - return notifyGroupRepository.findById(id).orElse(null); - } - - @Override - public Integer updateById(NotifyGroup entity) { - notifyGroupRepository.save(entity); - return 1; - } - - @Override - public Page getPageList(Integer page, Integer size) { - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); - - return notifyGroupRepository.findAll(pageReq); - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyTemplateDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyTemplateDAOImpl.java deleted file mode 100644 index 7c02e4c5..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/NotifyTemplateDAOImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.openjob.server.repository.dao.impl; - -import io.openjob.server.repository.dao.NotifyTemplateDAO; -import io.openjob.server.repository.entity.NotifyTemplate; -import io.openjob.server.repository.repository.NotifyTemplateRepository; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyTemplateDAOImpl implements NotifyTemplateDAO { - private final NotifyTemplateRepository notifyTemplateRepository; - - @Autowired - public NotifyTemplateDAOImpl(NotifyTemplateRepository notifyTemplateRepository) { - this.notifyTemplateRepository = notifyTemplateRepository; - } - - @Override - public Long add(NotifyTemplate entity) { - return notifyTemplateRepository.save(entity).getId(); - } - - @Override - public void batchAdd(List entityList) { - notifyTemplateRepository.saveAll(entityList); - } - - @Override - public NotifyTemplate getById(Long id) { - return notifyTemplateRepository.findById(id).orElse(null); - } - - @Override - public Integer updateById(NotifyTemplate entity) { - notifyTemplateRepository.save(entity); - return 1; - } - - @Override - public Page getPageList(Integer page, Integer size) { - PageRequest pageReq = PageRequest.of(page - 1, size, EntityUtil.DEFAULT_SORT); - - return notifyTemplateRepository.findAll(pageReq); - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerDAOImpl.java index 026cf18a..213e9e85 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerDAOImpl.java @@ -22,7 +22,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerReportsImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerReportsImpl.java index 5c4cdbc8..10564d28 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerReportsImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/ServerReportsImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/SystemDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/SystemDAOImpl.java index ff0e1163..57116f61 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/SystemDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/SystemDAOImpl.java @@ -11,7 +11,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/WorkerDAOImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/WorkerDAOImpl.java index d015ed2d..ff55602c 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/WorkerDAOImpl.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dao/impl/WorkerDAOImpl.java @@ -21,7 +21,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminPermissionData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminPermissionData.java deleted file mode 100644 index dfb1f056..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminPermissionData.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.AdminPermissionDTO; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface AdminPermissionData { - - /** - * add AdminPermission - * - * @param dto dto - * @return id - */ - Long add(AdminPermissionDTO dto); - - /** - * batch add AdminPermission - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get AdminPermission by ID - * - * @param id id - * @return AdminPermission - */ - AdminPermissionDTO getById(Long id); - - /** - * update AdminPermission by ID - * - * @param dto dto - * @return number - */ - Integer updateById(AdminPermissionDTO dto); - - /** - * get AdminPermission list by params - * - * @param id id - * @return AdminPermission list - */ - List getPageList(Long id); - - - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminRoleData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminRoleData.java deleted file mode 100644 index da8682d0..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminRoleData.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.AdminRoleDTO; -import org.springframework.data.domain.Page; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface AdminRoleData { - - /** - * add AdminRole - * - * @param dto dto - * @return id - */ - Long add(AdminRoleDTO dto); - - /** - * batch add AdminRole - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get AdminRole by ID - * - * @param id id - * @return AdminRole - */ - AdminRoleDTO getById(Long id); - - /** - * get AdminRole list by IDs - * - * @param ids ids - * @return AdminRole list - */ - List getByIds(List ids); - - /** - * update AdminRole by ID - * - * @param dto dto - * @return number - */ - Integer updateById(AdminRoleDTO dto); - - /** - * get AdminRole list by params - * - * @param page page - * @param size size - * @return AdminRole list - */ - Page getPageList(Integer page, Integer size); - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminUserData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminUserData.java deleted file mode 100644 index ee5ff037..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/AdminUserData.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.AdminUserDTO; -import org.springframework.data.domain.Page; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface AdminUserData { - - /** - * add AdminUser - * - * @param dto dto - * @return id - */ - Long add(AdminUserDTO dto); - - /** - * batch add AdminUser - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get AdminUser by ID - * - * @param id id - * @return AdminUser - */ - AdminUserDTO getById(Long id); - - /** - * get AdminUser by username - * - * @param username username - * @return AdminUser - */ - AdminUserDTO getByUsername(String username); - - /** - * get AdminUser by token - * - * @param token token - * @return AdminUserDTO or null - */ - AdminUserDTO getByToken(String token); - - /** - * update AdminUser by ID - * - * @param dto dto - * @return number - */ - Integer updateById(AdminUserDTO dto); - - /** - * get AdminUser list by page - * - * @param page page - * @param size size - * @return AdminUser list - */ - Page getPageList(Integer page, Integer size); -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyContactData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyContactData.java deleted file mode 100644 index 8e0abd0a..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyContactData.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.NotifyContactDTO; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyContactData { - - /** - * add NotifyContact - * - * @param dto dto - * @return id - */ - Long add(NotifyContactDTO dto); - - /** - * batch add NotifyContact - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get NotifyContact by ID - * - * @param id id - * @return NotifyContact - */ - NotifyContactDTO getById(Long id); - - /** - * update NotifyContact by ID - * - * @param dto dto - * @return number - */ - Integer updateById(NotifyContactDTO dto); - - /** - * get NotifyContact list by params - * - * @param id id - * @return NotifyContact list - */ - List getPageList(Long id); - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyGroupData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyGroupData.java deleted file mode 100644 index 4940237c..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyGroupData.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.NotifyGroupDTO; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyGroupData { - - /** - * add NotifyGroup - * - * @param dto dto - * @return id - */ - Long add(NotifyGroupDTO dto); - - /** - * batch add NotifyGroup - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get NotifyGroup by ID - * - * @param id id - * @return NotifyGroup - */ - NotifyGroupDTO getById(Long id); - - /** - * update NotifyGroup by ID - * - * @param dto dto - * @return number - */ - Integer updateById(NotifyGroupDTO dto); - - /** - * get NotifyGroup list by params - * - * @param id id - * @return NotifyGroup list - */ - List getPageList(Long id); - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyTemplateData.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyTemplateData.java deleted file mode 100644 index 95faf2fa..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/NotifyTemplateData.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.openjob.server.repository.data; - -import io.openjob.server.repository.dto.NotifyTemplateDTO; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyTemplateData { - - /** - * add NotifyTemplate - * - * @param dto dto - * @return id - */ - Long add(NotifyTemplateDTO dto); - - /** - * batch add NotifyTemplate - * - * @param dtoList dto list - */ - void batchAdd(List dtoList); - - /** - * get NotifyTemplate by ID - * - * @param id id - * @return NotifyTemplate - */ - NotifyTemplateDTO getById(Long id); - - /** - * update NotifyTemplate by ID - * - * @param dto dto - * @return number - */ - Integer updateById(NotifyTemplateDTO dto); - - /** - * get NotifyTemplate list by params - * - * @param id id - * @return NotifyTemplate list - */ - List getPageList(Long id); - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminPermissionDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminPermissionDataImpl.java deleted file mode 100644 index 489f4d4b..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminPermissionDataImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.AdminPermissionDAO; -import io.openjob.server.repository.data.AdminPermissionData; -import io.openjob.server.repository.dto.AdminPermissionDTO; -import io.openjob.server.repository.entity.AdminPermission; -import io.openjob.server.repository.mapper.AdminPermissionMapper; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class AdminPermissionDataImpl implements AdminPermissionData { - - private final AdminPermissionDAO adminPermDAO; - - private final AdminPermissionMapper adminPermMapper; - - @Autowired - public AdminPermissionDataImpl(AdminPermissionDAO adminPermDAO, AdminPermissionMapper adminPermMapper) { - this.adminPermDAO = adminPermDAO; - this.adminPermMapper = adminPermMapper; - } - - @Override - public Long add(AdminPermissionDTO dto) { - AdminPermission entity = new AdminPermission(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return adminPermDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - adminPermDAO.batchAdd(entityList); - } - - @Override - public AdminPermissionDTO getById(Long id) { - AdminPermission entity = adminPermDAO.getById(id); - - return BeanMapperUtil.map(entity, AdminPermissionDTO.class); - } - - @Override - public Integer updateById(AdminPermissionDTO dto) { - AdminPermission entity = adminPermMapper.partialUpdate(dto, new AdminPermission()); - - return adminPermDAO.updateById(entity); - } - - @Override - public List getPageList(Long id) { - return null; - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminRoleDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminRoleDataImpl.java deleted file mode 100644 index 4f1b1c67..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminRoleDataImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.AdminRoleDAO; -import io.openjob.server.repository.data.AdminRoleData; -import io.openjob.server.repository.dto.AdminRoleDTO; -import io.openjob.server.repository.entity.AdminRole; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class AdminRoleDataImpl implements AdminRoleData { - - private final AdminRoleDAO adminRoleDAO; - // private final RedisOperation redisOperation; - - @Autowired - public AdminRoleDataImpl(AdminRoleDAO adminRoleDAO) { - this.adminRoleDAO = adminRoleDAO; - } - - @Override - public Long add(AdminRoleDTO dto) { - AdminRole entity = new AdminRole(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return adminRoleDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - adminRoleDAO.batchAdd(entityList); - } - - @Override - public AdminRoleDTO getById(Long id) { - AdminRole entity = adminRoleDAO.getById(id); - - return BeanMapperUtil.map(entity, AdminRoleDTO.class); - } - - @Override - public List getByIds(List ids) { - List entList = adminRoleDAO.getByIds(ids); - List dtoList = new ArrayList<>(); - - entList.forEach(entity -> { - dtoList.add(BeanMapperUtil.mapObject(entity, new AdminRoleDTO())); - }); - - return dtoList; - } - - @Override - public Integer updateById(AdminRoleDTO dto) { - AdminRole entity = new AdminRole(); - BeanUtils.copyProperties(dto, entity); - - return adminRoleDAO.updateById(entity); - } - - @Override - public Page getPageList(Integer page, Integer size) { - Page entPage = adminRoleDAO.getPageList(page, size); - List dtoList = new ArrayList<>(); - - entPage.forEach(entity -> { - dtoList.add(BeanMapperUtil.mapObject(entity, new AdminRoleDTO())); - }); - - return new PageImpl<>(dtoList, entPage.getPageable(), entPage.getTotalElements()); - } - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminUserDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminUserDataImpl.java deleted file mode 100644 index de908027..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/AdminUserDataImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.AdminUserDAO; -import io.openjob.server.repository.data.AdminUserData; -import io.openjob.server.repository.dto.AdminUserDTO; -import io.openjob.server.repository.entity.AdminUser; -import io.openjob.server.repository.mapper.AdminUserMapper; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class AdminUserDataImpl implements AdminUserData { - - private final AdminUserDAO adminUserDAO; - - private final AdminUserMapper adminUserMapper; - - @Autowired - public AdminUserDataImpl(AdminUserDAO adminUserDAO, AdminUserMapper adminUserMapper) { - this.adminUserDAO = adminUserDAO; - this.adminUserMapper = adminUserMapper; - } - - @Override - public Long add(AdminUserDTO dto) { - AdminUser entity = new AdminUser(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return adminUserDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - adminUserDAO.batchAdd(entityList); - } - - @Override - public AdminUserDTO getById(Long id) { - return BeanMapperUtil.map(adminUserDAO.getById(id), AdminUserDTO.class); - } - - @Override - public AdminUserDTO getByUsername(String username) { - return BeanMapperUtil.mapOrNull(adminUserDAO.getByUsername(username), AdminUserDTO.class); - } - - @Override - public AdminUserDTO getByToken(String token) { - return BeanMapperUtil.mapOrNull(adminUserDAO.getByToken(token), AdminUserDTO.class); - } - - @Override - public Integer updateById(AdminUserDTO dto) { - AdminUser entity = adminUserMapper.partialUpdate(dto, new AdminUser()); - - return adminUserDAO.updateById(entity); - } - - @Override - public Page getPageList(Integer page, Integer size) { - Page entPage = adminUserDAO.getPageList(page, size); - List dtoList = new ArrayList<>(); - - entPage.forEach(entity -> dtoList.add(BeanMapperUtil.mapObject(entity, new AdminUserDTO()))); - - return new PageImpl<>(dtoList, entPage.getPageable(), entPage.getTotalElements()); - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyContactDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyContactDataImpl.java deleted file mode 100644 index c8b47ef8..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyContactDataImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.NotifyContactDAO; -import io.openjob.server.repository.data.NotifyContactData; -import io.openjob.server.repository.dto.NotifyContactDTO; -import io.openjob.server.repository.entity.NotifyContact; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyContactDataImpl implements NotifyContactData { - - private final NotifyContactDAO notifyContactDAO; - // private final RedisOperation redisOperation; - - @Autowired - public NotifyContactDataImpl(NotifyContactDAO notifyContactDAO) { - this.notifyContactDAO = notifyContactDAO; - } - - @Override - public Long add(NotifyContactDTO dto) { - NotifyContact entity = new NotifyContact(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return notifyContactDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - notifyContactDAO.batchAdd(entityList); - } - - @Override - public NotifyContactDTO getById(Long id) { - return BeanMapperUtil.map(notifyContactDAO.getById(id), NotifyContactDTO.class); - } - - @Override - public Integer updateById(NotifyContactDTO dto) { - NotifyContact entity = new NotifyContact(); - BeanUtils.copyProperties(dto, entity); - - return notifyContactDAO.updateById(entity); - } - - @Override - public List getPageList(Long id) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyGroupDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyGroupDataImpl.java deleted file mode 100644 index 59524203..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyGroupDataImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.NotifyGroupDAO; -import io.openjob.server.repository.data.NotifyGroupData; -import io.openjob.server.repository.dto.NotifyGroupDTO; -import io.openjob.server.repository.entity.NotifyGroup; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyGroupDataImpl implements NotifyGroupData { - - private final NotifyGroupDAO notifyGroupDAO; - - @Autowired - public NotifyGroupDataImpl(NotifyGroupDAO notifyGroupDAO) { - this.notifyGroupDAO = notifyGroupDAO; - } - - @Override - public Long add(NotifyGroupDTO dto) { - NotifyGroup entity = new NotifyGroup(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return notifyGroupDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - notifyGroupDAO.batchAdd(entityList); - } - - @Override - public NotifyGroupDTO getById(Long id) { - return BeanMapperUtil.map(notifyGroupDAO.getById(id), NotifyGroupDTO.class); - } - - @Override - public Integer updateById(NotifyGroupDTO dto) { - NotifyGroup entity = new NotifyGroup(); - BeanUtils.copyProperties(dto, entity); - - return notifyGroupDAO.updateById(entity); - } - - @Override - public List getPageList(Long id) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyTemplateDataImpl.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyTemplateDataImpl.java deleted file mode 100644 index 4dd83a4a..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/data/impl/NotifyTemplateDataImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.openjob.server.repository.data.impl; - -import io.openjob.server.common.util.BeanMapperUtil; -import io.openjob.server.repository.dao.NotifyTemplateDAO; -import io.openjob.server.repository.data.NotifyTemplateData; -import io.openjob.server.repository.dto.NotifyTemplateDTO; -import io.openjob.server.repository.entity.NotifyTemplate; -import io.openjob.server.repository.util.EntityUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - - -/** - * @author inhere - * @since 1.0.0 - */ -@Component -public class NotifyTemplateDataImpl implements NotifyTemplateData { - - private final NotifyTemplateDAO notifyTemplateDAO; - // private final RedisOperation redisOperation; - - @Autowired - public NotifyTemplateDataImpl(NotifyTemplateDAO notifyTemplateDAO) { - this.notifyTemplateDAO = notifyTemplateDAO; - } - - @Override - public Long add(NotifyTemplateDTO dto) { - NotifyTemplate entity = new NotifyTemplate(); - BeanUtils.copyProperties(EntityUtil.initDefaults(dto), entity); - - return notifyTemplateDAO.add(entity); - } - - @Override - public void batchAdd(List dtoList) { - List entityList = new ArrayList<>(); - // TODO copy data - - notifyTemplateDAO.batchAdd(entityList); - } - - @Override - public NotifyTemplateDTO getById(Long id) { - return BeanMapperUtil.map(notifyTemplateDAO.getById(id), NotifyTemplateDTO.class); - } - - @Override - public Integer updateById(NotifyTemplateDTO dto) { - NotifyTemplate entity = new NotifyTemplate(); - BeanUtils.copyProperties(dto, entity); - - return notifyTemplateDAO.updateById(entity); - } - - @Override - public List getPageList(Long id) { - // TODO - return null; - } -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminConfigDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminConfigDTO.java deleted file mode 100644 index 86298bfd..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminConfigDTO.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class AdminConfigDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * Config name - */ - private String name; - - /** - * Config value - */ - private String value; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminPermissionDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminPermissionDTO.java deleted file mode 100644 index 88f413aa..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminPermissionDTO.java +++ /dev/null @@ -1,75 +0,0 @@ -package io.openjob.server.repository.dto; - -import io.openjob.server.repository.entity.json.MenuMeta; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class AdminPermissionDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * Parent ID - */ - private Long pid; - - /** - * Type. 1=menu 2=perm - */ - private Integer type; - - /** - * Menu name key(perm,i18n) - */ - private String name; - - /** - * Route path or API path - */ - private String path; - - /** - * Extra meta data. JSON object: {icon:xx,title:some.name} - */ - private MenuMeta meta; - - /** - * Hidden status. 1=yes 2=no - */ - private Integer hidden; - - /** - * Sort value - */ - private Integer sort; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminRoleDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminRoleDTO.java deleted file mode 100644 index 43d0a91a..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminRoleDTO.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class AdminRoleDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * Role name - */ - private String name; - - /** - * Description - */ - private String desc; - - /** - * Menu ids for role. JSON array - */ - private List menuIds; - - /** - * Menu ids for role. JSON array - */ - private List permIds; - - /** - * Namespace ids for role. JSON array - */ - private List namespaceIds; - - /** - * App ids for role. JSON array - */ - private List appIds; - - /** - * Is supper admin. 1=yes 2=no - */ - private Integer admin; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSessionDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSessionDTO.java deleted file mode 100644 index 42d6168e..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSessionDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; - -/** - * @author inhere - * @since 1.0.0 - */ -@Data -public class AdminSessionDTO { - - /** - * PK - */ - private Long id; - - /** - * User Id - */ - private Long userId; - - /** - * User name - */ - private String username; - - /** - * Session token - */ - private String token; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSystemDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSystemDTO.java deleted file mode 100644 index 59c9c56e..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminSystemDTO.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; - -/** - * @author riki - * @since 1.0.0 - */ -@Data -public class AdminSystemDTO { - /** - * pk - */ - private Integer id; - - /** - * System version - */ - private String version; - - /** - * Cluster version - */ - private Long clusterVersion; - - /** - * Cluster delay version - */ - private Long clusterDelayVersion; - - /** - * Cluster supervisor slot. - */ - private Integer clusterSupervisorSlot; - - /** - * Worker supervisor slot. - */ - private Integer workerSupervisorSlot; - - /** - * Delay zset slot. - */ - private Integer delayZsetSlot; - - /** - * Delay list slot. - */ - private Integer delayAddListSlot; - - /** - * Delay list slot. - */ - private Integer delayStatusListSlot; - - /** - * Delay list slot. - */ - private Integer delayDeleteListSlot; - - /** - * Max slot - */ - private Integer maxSlot; - -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminUserDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminUserDTO.java deleted file mode 100644 index eef5a19c..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/AdminUserDTO.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class AdminUserDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * User name - */ - private String username; - - /** - * Nickname - */ - private String nickname; - - /** - * Password - */ - private String passwd; - - /** - * Api auth token - */ - private String token; - - /** - * Role IDs. JSON: [1,2] - */ - private List roleIds; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/BaseFieldsDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/BaseFieldsDTO.java deleted file mode 100644 index 0b184eaa..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/BaseFieldsDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; - -/** - * @author inhere - */ -@Data -public abstract class BaseFieldsDTO { - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstancePageDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstancePageDTO.java index 990dcf0d..c637858f 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstancePageDTO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstancePageDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstanceTotalDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstanceTotalDTO.java index ce88e5ac..22720466 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstanceTotalDTO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayInstanceTotalDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayPageDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayPageDTO.java index 701b4143..614c139b 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayPageDTO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/DelayPageDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobInstancePageDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobInstancePageDTO.java index 6645d5b0..2cd26420 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobInstancePageDTO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobInstancePageDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobPageDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobPageDTO.java index 776d40e8..5522d391 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobPageDTO.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/JobPageDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyContactDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyContactDTO.java deleted file mode 100644 index 54d469a2..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyContactDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class NotifyContactDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * User name - */ - private String name; - - /** - * Phone - */ - private String phone; - - /** - * Email address - */ - private String email; - - /** - * Status. 1=OK 2=disabled - */ - private Integer status; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyGroupDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyGroupDTO.java deleted file mode 100644 index 89a17239..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyGroupDTO.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.openjob.server.repository.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class NotifyGroupDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * Group name - */ - private String name; - - /** - * [12, 34] - */ - private String notifyUserIds; - - /** - * Status. 1=OK 2=disabled - */ - private Integer status; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyTemplateDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyTemplateDTO.java deleted file mode 100644 index c0265963..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/NotifyTemplateDTO.java +++ /dev/null @@ -1,93 +0,0 @@ -package io.openjob.server.repository.dto; - -import io.openjob.server.repository.dto.json.TemplateExtraDTO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @author inhere - * @since 1.0.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class NotifyTemplateDTO extends BaseFieldsDTO { - - /** - * PK - */ - private Long id; - - /** - * Template name. eg: Wechat, DingTalk, Wecom, Feishu - */ - private String name; - - /** - * notify type. 1 webhook 2 email 3 sms - */ - private Integer type; - - /** - * Level. 1 notice 2 warning 3 error - */ - private String level; - - /** - * notify events list. JSON: [task_fail, task_suc, task_cancel, task_skip] - */ - private List events; - - /** - * related contact ids. JSON [12, 34] - */ - private List contactIds; - - /** - * related group ids. JSON [12, 34] - */ - private List groupIds; - - /** - * Webhook URL - */ - private String webhook; - - /** - * Template contents - */ - private String content; - - /** - * Extra info. eg: third platform token - */ - private TemplateExtraDTO extra; - - /** - * Creator user ID - */ - private Integer userId; - - /** - * Delete status. 1=yes 2=no - */ - private Integer deleted; - - /** - * Delete time - */ - private Long deleteTime; - - /** - * Update time - */ - private Long updateTime; - - /** - * Create time - */ - private Long createTime; - -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/MenuMetaDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/MenuMetaDTO.java deleted file mode 100644 index eb533027..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/MenuMetaDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.openjob.server.repository.dto.json; - -import lombok.Data; - -/** - * @author inhere - */ -@Data -public class MenuMetaDTO { - private String icon; - - private String title; - - private String component; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/TemplateExtraDTO.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/TemplateExtraDTO.java deleted file mode 100644 index cf979a22..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/dto/json/TemplateExtraDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.openjob.server.repository.dto.json; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @author inhere - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemplateExtraDTO implements Serializable { - private String aptToken; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/AdminConfig.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/AdminConfig.java deleted file mode 100644 index 2ff013ab..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/AdminConfig.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.openjob.server.repository.entity; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * Job admin config - * - * @author inhere - */ -@Getter -@Setter -@Entity -@Table(name = "admin_config") -public class AdminConfig { - - /** - * PK - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - /** - * Config name - */ - @Column(name = "name") - private String name; - - /** - * Config value - */ - @Column(name = "value") - private String value; - - /** - * Delete status. 1=yes 2=no - */ - @Column(name = "deleted") - private Integer deleted; - - /** - * Delete time - */ - @Column(name = "delete_time") - private Long deleteTime; - - /** - * Update time - */ - @Column(name = "update_time") - private Long updateTime; - - /** - * Create time - */ - @Column(name = "create_time") - private Long createTime; - -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/App.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/App.java index ed6c8710..6b1dd7e1 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/App.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/App.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Delay.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Delay.java index 44b47956..8095782f 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Delay.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Delay.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/DelayInstance.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/DelayInstance.java index def497a8..6290e75c 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/DelayInstance.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/DelayInstance.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Job.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Job.java index 1ff0fe99..dab3907c 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Job.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Job.java @@ -11,7 +11,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstance.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstance.java index a92b3fe7..141325b8 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstance.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstance.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceLog.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceLog.java index 7847ad53..628da8fa 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceLog.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceLog.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceTask.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceTask.java index d125a7ba..f626061a 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceTask.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobInstanceTask.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobSlots.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobSlots.java index 7a11a322..1c764639 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobSlots.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/JobSlots.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Namespace.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Namespace.java index 86a734b3..8886eb00 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Namespace.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Namespace.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyContact.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyContact.java deleted file mode 100644 index f718469f..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyContact.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.openjob.server.repository.entity; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * Job notify contact - * - * @author inhere - */ -@Getter -@Setter -@Entity -@Table(name = "notify_contact") -public class NotifyContact { - - /** - * PK - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - /** - * User name - */ - @Column(name = "name") - private String name; - - /** - * Phone - */ - @Column(name = "phone") - private String phone; - - /** - * Email address - */ - @Column(name = "email") - private String email; - - /** - * Status. 1=OK 2=disabled - */ - @Column(name = "status") - private Integer status; - - /** - * Delete status. 1=yes 2=no - */ - @Column(name = "deleted") - private Integer deleted; - - /** - * Delete time - */ - @Column(name = "delete_time") - private Long deleteTime; - - /** - * Update time - */ - @Column(name = "update_time") - private Long updateTime; - - /** - * Create time - */ - @Column(name = "create_time") - private Long createTime; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyGroup.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyGroup.java deleted file mode 100644 index fa7835db..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyGroup.java +++ /dev/null @@ -1,72 +0,0 @@ -package io.openjob.server.repository.entity; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * Notify contact group - * - * @author inhere - */ -@Getter -@Setter -@Entity -@Table(name = "notify_group") -public class NotifyGroup { - - /** - * PK - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - /** - * Group name - */ - @Column(name = "name") - private String name; - - /** - * contact ids [12, 34] - */ - @Column(name = "contact_ids") - private String contactIds; - - /** - * Status. 1=OK 2=disabled - */ - @Column(name = "status") - private Integer status; - - /** - * Delete status. 1=yes 2=no - */ - @Column(name = "deleted") - private Integer deleted; - - /** - * Delete time - */ - @Column(name = "delete_time") - private Long deleteTime; - - /** - * Update time - */ - @Column(name = "update_time") - private Long updateTime; - - /** - * Create time - */ - @Column(name = "create_time") - private Long createTime; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyTemplate.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyTemplate.java deleted file mode 100644 index 46fdb64b..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/NotifyTemplate.java +++ /dev/null @@ -1,123 +0,0 @@ -package io.openjob.server.repository.entity; - -import com.vladmihalcea.hibernate.type.json.JsonType; -import io.openjob.server.repository.entity.json.TemplateExtra; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.Type; -import org.hibernate.annotations.TypeDef; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import java.util.List; - -/** - * Job notify template table - * - * @author inhere - */ -@Getter -@Setter -@Entity -@Table(name = "notify_template") -@TypeDef(name = "json", typeClass = JsonType.class) -public class NotifyTemplate { - - /** - * PK - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - /** - * Template name - */ - @Column(name = "name") - private String name; - - /** - * Template notify type. 1 webhook 2 email 3 sms - */ - @Column(name = "type") - private Integer type; - - /** - * Template contents - */ - @Column(name = "content") - private String content; - - /** - * Level. 1 notice 2 warning 3 error - */ - @Column(name = "level") - private String level; - - /** - * notify events list. JSON: ["task_fail", "task_suc", "task_cancel", "task_skip"] - */ - @Type(type = "json") - @Column(name = "events", columnDefinition = "json") - private List events; - - /** - * related contact ids. JSON [12, 34] - */ - @Type(type = "json") - @Column(name = "contact_ids", columnDefinition = "json") - private List contactIds; - - /** - * related group ids. JSON [12, 34] - */ - @Type(type = "json") - @Column(name = "group_ids", columnDefinition = "json") - private List groupIds; - - /** - * Webhook URL - */ - @Column(name = "webhook") - private String webhook; - - /** - * Third info. JSON: Dingding, wecom, feishu - */ - @Column(name = "extra") - private TemplateExtra extra; - - /** - * Creator user ID - */ - @Column(name = "user_id") - private Integer userId; - - /** - * Delete status. 1=yes 2=no - */ - @Column(name = "deleted") - private Integer deleted; - - /** - * Delete time - */ - @Column(name = "delete_time") - private Long deleteTime; - - /** - * Update time - */ - @Column(name = "update_time") - private Long updateTime; - - /** - * Create time - */ - @Column(name = "create_time") - private Long createTime; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Server.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Server.java index 6fefcecf..5ad5c50c 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Server.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Server.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/ServerReports.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/ServerReports.java index 1f1e3cf0..bcdfe39d 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/ServerReports.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/ServerReports.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/System.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/System.java index 3e2116fb..6c0f7e83 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/System.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/System.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Worker.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Worker.java index 260a98b1..e7eb2cb6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Worker.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/Worker.java @@ -10,7 +10,7 @@ import javax.persistence.Table; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/MenuMeta.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/MenuMeta.java index d53a71da..3dcb6a62 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/MenuMeta.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/MenuMeta.java @@ -1,6 +1,5 @@ package io.openjob.server.repository.entity.json; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/TemplateExtra.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/TemplateExtra.java deleted file mode 100644 index 05fbbe06..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/entity/json/TemplateExtra.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.openjob.server.repository.entity.json; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @author inhere - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemplateExtra implements Serializable { - private String aptToken; -} diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminPermissionMapper.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminPermissionMapper.java deleted file mode 100644 index a89e5fad..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminPermissionMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.openjob.server.repository.mapper; - -import io.openjob.server.repository.dto.AdminPermissionDTO; -import io.openjob.server.repository.entity.AdminPermission; -import org.mapstruct.BeanMapping; -import org.mapstruct.Mapper; -import org.mapstruct.MappingTarget; -import org.mapstruct.NullValuePropertyMappingStrategy; -import org.mapstruct.ReportingPolicy; - -/** - * @author inhere - */ -@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = "spring") -public interface AdminPermissionMapper { - /** - * dto to entity - * - * @param adminPermDTO dto - * @return entity - */ - AdminPermission toEntity(AdminPermissionDTO adminPermDTO); - - /** - * entity to dto - * - * @param adminPerm entity - * @return dto - */ - AdminPermissionDTO toDto(AdminPermission adminPerm); - - /** - * partial update entity from dto - * - * @param adminPermDTO dto - * @param adminPerm entity - * @return entity - */ - @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) - AdminPermission partialUpdate(AdminPermissionDTO adminPermDTO, @MappingTarget AdminPermission adminPerm); -} \ No newline at end of file diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminUserMapper.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminUserMapper.java deleted file mode 100644 index 12b52a88..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/mapper/AdminUserMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.openjob.server.repository.mapper; - -import io.openjob.server.repository.dto.AdminUserDTO; -import io.openjob.server.repository.entity.AdminUser; -import org.mapstruct.BeanMapping; -import org.mapstruct.Mapper; -import org.mapstruct.MappingTarget; -import org.mapstruct.NullValuePropertyMappingStrategy; -import org.mapstruct.ReportingPolicy; - -/** - * @author inhere - */ -@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = "spring") -public interface AdminUserMapper { - /** - * dto to entity - * - * @param adminUserDTO dto - * @return entity - */ - AdminUser toEntity(AdminUserDTO adminUserDTO); - - /** - * entity to dto - * - * @param adminUser entity - * @return dto - */ - AdminUserDTO toDto(AdminUser adminUser); - - /** - * partial update entity from dto - * - * @param adminUserDTO dto - * @param adminUser entity - * @return entity - */ - @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) - AdminUser partialUpdate(AdminUserDTO adminUserDTO, @MappingTarget AdminUser adminUser); -} \ No newline at end of file diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminPermissionRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminPermissionRepository.java index 692a9039..7f7fb7a6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminPermissionRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminPermissionRepository.java @@ -12,7 +12,7 @@ */ public interface AdminPermissionRepository extends JpaRepository { /** - * find by ID In given list + * Find by ID In given list * * @param ids ids * @return list diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminRoleRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminRoleRepository.java index 21d1be76..c54a89c6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminRoleRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminRoleRepository.java @@ -12,7 +12,7 @@ */ public interface AdminRoleRepository extends JpaRepository { /** - * find by ID In given list + * Find by ID In given list * * @param ids ids * @return list diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminUserRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminUserRepository.java index 870dab9a..0f579989 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminUserRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AdminUserRepository.java @@ -9,7 +9,7 @@ */ public interface AdminUserRepository extends JpaRepository { /** - * find user by username + * Find user by username * * @param username username * @return AdminUser @@ -17,7 +17,7 @@ public interface AdminUserRepository extends JpaRepository { AdminUser findByUsername(String username); /** - * find user by token + * Find user by token * * @param token token * @param deleted deleted @@ -26,7 +26,7 @@ public interface AdminUserRepository extends JpaRepository { AdminUser findByTokenAndDeleted(String token, Integer deleted); /** - * find user by sessionKey + * Find user by sessionKey * * @param sessionKey session * @param deleted deleted diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AppRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AppRepository.java index 53db7f49..530e4e06 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AppRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/AppRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.jpa.repository.JpaRepository; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface AppRepository extends JpaRepository { @@ -16,4 +16,4 @@ public interface AppRepository extends JpaRepository { * @return App */ App findAppByName(String name); -} +} \ No newline at end of file diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/DelayInstanceRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/DelayInstanceRepository.java index 66cbd0fd..0416f503 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/DelayInstanceRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/DelayInstanceRepository.java @@ -11,7 +11,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayInstanceRepository extends JpaRepository, JpaSpecificationExecutor { @@ -43,6 +43,7 @@ public interface DelayInstanceRepository extends JpaRepository + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceLogRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceLogRepository.java index 58ff59e2..449bcf98 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceLogRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceLogRepository.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceLogRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceRepository.java index 9ca569a4..4de6163a 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceRepository.java @@ -11,7 +11,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceTaskRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceTaskRepository.java index 08c86b8e..886d2a76 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceTaskRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobInstanceTaskRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.jpa.repository.JpaRepository; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobInstanceTaskRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobRepository.java index d61eb8c1..4a1608ba 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobRepository.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobSlotsRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobSlotsRepository.java index 95c5af99..6e0b12a7 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobSlotsRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/JobSlotsRepository.java @@ -10,7 +10,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface JobSlotsRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NamespaceRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NamespaceRepository.java index 56fb4f5f..03e58c63 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NamespaceRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NamespaceRepository.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.Transactional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface NamespaceRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyContactRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyContactRepository.java deleted file mode 100644 index e7221363..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyContactRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.openjob.server.repository.repository; - -import io.openjob.server.repository.entity.NotifyContact; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyContactRepository extends JpaRepository { -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyGroupRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyGroupRepository.java deleted file mode 100644 index 61c85fd2..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyGroupRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.openjob.server.repository.repository; - -import io.openjob.server.repository.entity.NotifyGroup; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyGroupRepository extends JpaRepository { -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyTemplateRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyTemplateRepository.java deleted file mode 100644 index 55833d50..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/NotifyTemplateRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.openjob.server.repository.repository; - -import io.openjob.server.repository.entity.NotifyTemplate; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author inhere - * @since 1.0.0 - */ -public interface NotifyTemplateRepository extends JpaRepository { -} - diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerReportsRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerReportsRepository.java index d4d4f760..a731fcd1 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerReportsRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerReportsRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.jpa.repository.JpaRepository; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface ServerReportsRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerRepository.java index 43d49a0c..52c58aa8 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/ServerRepository.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.Transactional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface ServerRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/SystemRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/SystemRepository.java index 22f5fa1f..646992f6 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/SystemRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/SystemRepository.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.Transactional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface SystemRepository extends JpaRepository { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/WorkerRepository.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/WorkerRepository.java index c0b1bb7b..3b86a899 100644 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/WorkerRepository.java +++ b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/repository/WorkerRepository.java @@ -7,7 +7,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface WorkerRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/util/EntityUtil.java b/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/util/EntityUtil.java deleted file mode 100644 index 46f558d8..00000000 --- a/openjob-server/openjob-server-repository/src/main/java/io/openjob/server/repository/util/EntityUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.openjob.server.repository.util; - -import io.openjob.common.constant.CommonConstant; -import io.openjob.common.util.DateUtil; -import io.openjob.server.repository.dto.BaseFieldsDTO; -import org.springframework.data.domain.Sort; - -/** - * @author inhere - */ -public class EntityUtil { - - /** - * default sort - *

- * - tip: the second param is entity property name, is not table column name. - */ - public static final Sort DEFAULT_SORT = Sort.by(Sort.Direction.DESC, "createTime"); - - /** - * init entity dto - * - * @param dto dto - * @param BaseFieldsDTO - * @return T dto - */ - public static T initDefaults(T dto) { - long curTime = DateUtil.timestamp(); - - dto.setCreateTime(curTime); - dto.setUpdateTime(curTime); - dto.setDeleted(CommonConstant.NO); - dto.setDeleteTime(CommonConstant.LONG_ZERO); - - return dto; - } -} diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryApplication.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryApplication.java index c79d37c6..58e19e47 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryApplication.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @SpringBootApplication diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryTest.java index 812c0a9b..2c394377 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/RepositoryTest.java @@ -6,7 +6,7 @@ import org.springframework.transaction.annotation.Transactional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @SpringBootTest(classes = {H2Config.class, RepositoryApplication.class}) diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/config/H2Config.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/config/H2Config.java index 77e8d44a..f6679f65 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/config/H2Config.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/config/H2Config.java @@ -10,7 +10,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration() diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/AppDAOTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/AppDAOTest.java index 95032e84..75324502 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/AppDAOTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/AppDAOTest.java @@ -12,7 +12,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Sql(scripts = "classpath:db/schema/app.sql") diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/DelayInstanceDAOTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/DelayInstanceDAOTest.java index 94c37115..841de681 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/DelayInstanceDAOTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/DelayInstanceDAOTest.java @@ -13,7 +13,7 @@ import java.util.UUID; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Sql(scripts = "classpath:db/schema/delay_instance.sql") diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/JobInstanceDAOTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/JobInstanceDAOTest.java index 67b0afb0..1fb95ad7 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/JobInstanceDAOTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/JobInstanceDAOTest.java @@ -13,7 +13,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Sql(scripts = "classpath:db/schema/job_instance.sql") diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/ServerDAOTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/ServerDAOTest.java index 302368c9..f1a9b83e 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/ServerDAOTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/ServerDAOTest.java @@ -14,7 +14,7 @@ import java.util.Optional; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Sql(scripts = "classpath:db/schema/server.sql") diff --git a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/WorkerDAOTest.java b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/WorkerDAOTest.java index 3438728e..2fe75b19 100644 --- a/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/WorkerDAOTest.java +++ b/openjob-server/openjob-server-repository/src/test/java/io/openjob/server/repository/dao/WorkerDAOTest.java @@ -13,7 +13,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Sql(scripts = "classpath:db/schema/worker.sql") diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/Scheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/Scheduler.java index 913f84f1..4e123518 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/Scheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/Scheduler.java @@ -13,7 +13,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/RedisAutoConfiguration.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/RedisAutoConfiguration.java index e457ac0d..f47e967d 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/RedisAutoConfiguration.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/RedisAutoConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration(proxyBeanMethods = false) diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerAutoConfiguration.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerAutoConfiguration.java index 7183ed08..4e3c2b6a 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerAutoConfiguration.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerAutoConfiguration.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Configuration; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerProperties.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerProperties.java index 4e4fa967..01d82f2f 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerProperties.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/autoconfigure/SchedulerProperties.java @@ -4,7 +4,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/CacheConst.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/CacheConst.java index 9be60c08..86b0afaa 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/CacheConst.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/CacheConst.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CacheConst { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/SchedulerConstant.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/SchedulerConstant.java index 28e3daff..5e60bd1e 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/SchedulerConstant.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/SchedulerConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class SchedulerConstant { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/TimerConstant.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/TimerConstant.java index da805f00..9c9a85b5 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/TimerConstant.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/constant/TimerConstant.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.constant; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TimerConstant { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/DelayScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/DelayScheduler.java index 4381ab7f..10a7ed62 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/DelayScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/DelayScheduler.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.contract; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface DelayScheduler { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/KeyGenerator.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/KeyGenerator.java index addf90ab..5d1338d2 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/KeyGenerator.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/KeyGenerator.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.contract; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @FunctionalInterface diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/Timer.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/Timer.java index 5b577a03..5649e1e4 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/Timer.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/contract/Timer.java @@ -3,7 +3,7 @@ import io.openjob.server.scheduler.timer.AbstractTimerTask; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface Timer { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/data/DelayData.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/data/DelayData.java index 4137e0a7..5d786021 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/data/DelayData.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/data/DelayData.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component @@ -47,6 +47,12 @@ public Delay getDelay(String topic) { }, Duration.ofDays(1)); } + /** + * Get delay + * + * @param id id + * @return Delay + */ public Delay getDelayById(Long id) { String delayKey = CacheUtil.getDelayDetailIdKey(id); return RedisUtil.orElseGet(delayKey, () -> { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayDTO.java index a80e490b..40f97711 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddRequestDTO.java index d2ebf75b..1d52ce74 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddRequestDTO.java @@ -4,7 +4,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddResponseDTO.java index 050eee9f..3924b538 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceAddResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteRequestDTO.java index 2e3b004f..98b3564c 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteResponseDTO.java index 18cd02a4..9120a82f 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceDeleteResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstancePullResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstancePullResponseDTO.java index 2831157e..06f27adb 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstancePullResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstancePullResponseDTO.java @@ -5,7 +5,7 @@ import javax.persistence.Column; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStatusRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStatusRequestDTO.java index 1259c119..2cdd5a35 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStatusRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStatusRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopRequestDTO.java index cd814a8e..ccd4ebab 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopResponseDTO.java index 3ca16e9f..8703acb1 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayInstanceStopResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullDTO.java index fa105441..698c2afe 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullRequestDTO.java index 54a5a2f1..f26a89d9 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayItemPullRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullRequestDTO.java index 403e2aaa..adfb84e2 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullResponseDTO.java index 5f2ffa86..2b2661cf 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayPullResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullDTO.java index c423ea51..e0fd6f40 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullRequestDTO.java index 7d36842b..430260b8 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullResponseDTO.java index a8ea17be..6bc182a5 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/DelayTopicPullResponseDTO.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteRequestDTO.java index 93a9469b..686ecfbf 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteResponseDTO.java index 5be1918b..abbd6d43 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobExecuteResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopRequestDTO.java index 55d8dedc..fb70dbc2 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopResponseDTO.java index d9a3acdc..b0f583f0 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobInstanceStopResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopRequestDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopRequestDTO.java index 7d2f72b3..c7342778 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopRequestDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopRequestDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopResponseDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopResponseDTO.java index 25dc319f..6a2daef3 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopResponseDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/JobStopResponseDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicFailCounterDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicFailCounterDTO.java index d825abd8..8687ceff 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicFailCounterDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicFailCounterDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicReadyCounterDTO.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicReadyCounterDTO.java index 86609ced..624c8444 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicReadyCounterDTO.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/dto/TopicReadyCounterDTO.java @@ -3,7 +3,7 @@ import lombok.Data; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/factory/SchedulerFactoryBean.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/factory/SchedulerFactoryBean.java index 9717f75a..3f68a33c 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/factory/SchedulerFactoryBean.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/factory/SchedulerFactoryBean.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Log4j2 diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/mapper/SchedulerMapper.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/mapper/SchedulerMapper.java index cfc8f300..99c35826 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/mapper/SchedulerMapper.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/mapper/SchedulerMapper.java @@ -21,7 +21,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Mapper diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayScheduler.java index 8b587b72..78d6190b 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayScheduler.java @@ -15,7 +15,7 @@ import java.util.function.Function; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public abstract class AbstractDelayScheduler implements DelayScheduler { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayZsetScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayZsetScheduler.java index b8297155..0b852fa6 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayZsetScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/AbstractDelayZsetScheduler.java @@ -27,12 +27,12 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j public abstract class AbstractDelayZsetScheduler extends AbstractDelayScheduler { - public static abstract class AbstractZsetRunnable extends AbstractRunnable { + public abstract static class AbstractZsetRunnable extends AbstractRunnable { protected final LogDAO logDAO; protected final DelayData delayData; protected Boolean isFailZset = false; @@ -48,6 +48,12 @@ public AbstractZsetRunnable(Long currentSlotId) { this.logDAO = SpringContext.getBean(LogDAO.class); } + /** + * Get cache key + * + * @param topic topic + * @return String + */ protected abstract String getCacheKey(String topic); /** @@ -115,9 +121,9 @@ protected void pushAndRemoveDelayInstance(String key, Set rangeObjects) Map> delayMap = this.delayData.getDelayList(new ArrayList<>(detailListMap.keySet())).stream() .collect(Collectors.groupingBy(Delay::getTopic)); - Map> push2FailZsetMap = new HashMap<>(); - Map> push2TopicMap = new HashMap<>(); - Map> ignoreMap = new HashMap<>(); + Map> push2FailZsetMap = new HashMap<>(32); + Map> push2TopicMap = new HashMap<>(32); + Map> ignoreMap = new HashMap<>(32); this.getFailAndTopicAndIgnoreMap(timesMap, detailListMap, delayMap, push2FailZsetMap, push2TopicMap, ignoreMap); @@ -243,7 +249,7 @@ private Map getTaskRetryTimes(List timingMembers) { List retryKeys = timingMembers.stream().map(CacheUtil::getDelayRetryTimesKey) .collect(Collectors.toList()); List times = RedisUtil.getTemplate().opsForValue().multiGet(retryKeys); - Map timesMap = new HashMap<>(); + Map timesMap = new HashMap<>(32); for (int i = 0; i < retryKeys.size(); i++) { if (Objects.isNull(times)) { continue; diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayAddListScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayAddListScheduler.java index 76ebef4c..3339e8eb 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayAddListScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayAddListScheduler.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -157,8 +157,8 @@ public void batchSaveFromList(String key) throws InterruptedException { delayInstance.setTaskId(d.getTaskId()); delayInstance.setTopic(d.getTopic()); delayInstance.setStatus(TaskStatusEnum.INIT.getStatus()); - delayInstance.setDelayParams(d.getParams()); - delayInstance.setDelayExtra(d.getExtra()); + delayInstance.setDelayParams(Optional.ofNullable(d.getParams()).orElse("")); + delayInstance.setDelayExtra(Optional.ofNullable(d.getExtra()).orElse("")); delayInstance.setDeleted(CommonConstant.NO); delayInstance.setDeleteTime(0L); delayInstance.setExecuteTime(d.getExecuteTime()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayDeleteListScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayDeleteListScheduler.java index d7a81e9c..9a30d526 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayDeleteListScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayDeleteListScheduler.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -31,7 +31,7 @@ public class DelayDeleteListScheduler extends AbstractDelayScheduler { public void start() { List slots = DelaySlotUtil.getCurrentDeleteListSlots(); // Not slots on current node. - if (CollectionUtils.isEmpty(slots)){ + if (CollectionUtils.isEmpty(slots)) { return; } diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayFailZsetScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayFailZsetScheduler.java index 598515f4..26fe2834 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayFailZsetScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayFailZsetScheduler.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayInstanceScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayInstanceScheduler.java index a2037f81..c6d82b2d 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayInstanceScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayInstanceScheduler.java @@ -59,7 +59,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -119,8 +119,8 @@ public List getTopicReadyCount(List topics) { counterDTO.setTopic(t); // Ready - long Count = Optional.ofNullable(template.opsForList().size(cacheListKey)).orElse(0L); - counterDTO.setReady(Count); + long count = Optional.ofNullable(template.opsForList().size(cacheListKey)).orElse(0L); + counterDTO.setReady(count); counters.add(counterDTO); }); return counters; @@ -141,8 +141,8 @@ public List getTopicFailCount(List topics) { counterDTO.setTopic(t); // Ready - long Count = Optional.ofNullable(template.opsForList().size(cacheListKey)).orElse(0L); - counterDTO.setCount(Count); + long count = Optional.ofNullable(template.opsForList().size(cacheListKey)).orElse(0L); + counterDTO.setCount(count); counters.add(counterDTO); }); return counters; diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayScheduler.java index b77099cd..b3cab7bc 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayScheduler.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayStatusListScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayStatusListScheduler.java index 0637fb68..4bedd262 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayStatusListScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayStatusListScheduler.java @@ -13,7 +13,6 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,10 +21,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -35,7 +33,7 @@ public class DelayStatusListScheduler extends AbstractDelayScheduler { public void start() { List slots = DelaySlotUtil.getCurrentStatusListSlots(); // Not slots on current node. - if (CollectionUtils.isEmpty(slots)){ + if (CollectionUtils.isEmpty(slots)) { return; } @@ -118,7 +116,7 @@ public void batchUpdateStatus(String key) throws InterruptedException { return; } - Map listMap = new HashMap<>(); + Map listMap = new HashMap<>(32); popObjects.forEach(o -> { DelayInstanceStatusRequestDTO delayStatus = (DelayInstanceStatusRequestDTO) o; DelayInstance mapInstance = listMap.get(delayStatus.getTaskId()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayZsetScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayZsetScheduler.java index 6b80e642..67d5bcf7 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayZsetScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/DelayZsetScheduler.java @@ -33,7 +33,7 @@ import java.util.stream.Stream; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Log4j2 diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/JobInstanceScheduler.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/JobInstanceScheduler.java index fe10e273..4a8cae47 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/JobInstanceScheduler.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduler/JobInstanceScheduler.java @@ -17,7 +17,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -29,6 +29,12 @@ public JobInstanceScheduler(JobInstanceDAO jobInstanceDAO) { this.jobInstanceDAO = jobInstanceDAO; } + /** + * Stop + * + * @param stopRequest stopRequest + * @return JobInstanceStopResponseDTO + */ public JobInstanceStopResponseDTO stop(JobInstanceStopRequestDTO stopRequest) { JobInstanceStopResponseDTO jobInstanceStopResponseDTO = new JobInstanceStopResponseDTO(); JobInstance jobInstance = this.jobInstanceDAO.getById(stopRequest.getJobInstanceId()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduling/JobScheduling.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduling/JobScheduling.java index e00da918..3d2f5ca4 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduling/JobScheduling.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/scheduling/JobScheduling.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/DelayInstanceService.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/DelayInstanceService.java index b40e0e5e..142ebfef 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/DelayInstanceService.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/DelayInstanceService.java @@ -25,7 +25,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -66,7 +66,7 @@ public ServerDelayPullResponse pullInstance(WorkerDelayPullRequest pullRequest) * @return ServerDelayAddResponse */ public ServerDelayAddResponse addDelayInstance(WorkerDelayAddRequest addRequest) { - ServerDelayAddResponse serverDelayAddResponse = new ServerDelayAddResponse(addRequest.getDeliveryId()); + ServerDelayAddResponse serverDelayAddResponse = new ServerDelayAddResponse(); DelayInstanceAddRequestDTO addRequestDTO = SchedulerMapper.INSTANCE.toDelayInstanceAddRequestDTO(addRequest); DelayInstanceAddResponseDTO addResponseDTO = this.delayInstanceScheduler.add(addRequestDTO); serverDelayAddResponse.setTaskId(addResponseDTO.getTaskId()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/JobSchedulingService.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/JobSchedulingService.java index f9b2c267..673ed871 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/JobSchedulingService.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/JobSchedulingService.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service @@ -228,7 +228,10 @@ private void createJobInstance(List jobs) { private AbstractTimerTask convertToTimerTask(JobInstance js) { SchedulerTimerTask schedulerTask = new SchedulerTimerTask(js.getId(), js.getSlotsId(), js.getExecuteTime()); schedulerTask.setJobId(js.getJobId()); + schedulerTask.setJobParamType(js.getParamsType()); schedulerTask.setJobParams(js.getParams()); + schedulerTask.setJobExtendParamsType(js.getExtendParamsType()); + schedulerTask.setJobExtendParams(js.getExtendParams()); schedulerTask.setAppid(js.getAppId()); schedulerTask.setWorkflowId(0L); schedulerTask.setProcessorInfo(js.getProcessorInfo()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/SchedulerTimerService.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/SchedulerTimerService.java index d4863fc2..e2be0054 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/SchedulerTimerService.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/SchedulerTimerService.java @@ -27,7 +27,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -73,7 +73,10 @@ public void doRun(SchedulerTimerTask task, Set failoverList) { ServerSubmitJobInstanceRequest submitReq = new ServerSubmitJobInstanceRequest(); submitReq.setJobId(task.getJobId()); submitReq.setJobInstanceId(task.getTaskId()); + submitReq.setJobParamType(task.getJobParamType()); submitReq.setJobParams(task.getJobParams()); + submitReq.setJobExtendParamsType(task.getJobExtendParamsType()); + submitReq.setJobExtendParams(task.getJobExtendParams()); submitReq.setWorkflowId(task.getWorkflowId()); submitReq.setProcessorType(task.getProcessorType()); submitReq.setProcessorInfo(task.getProcessorInfo()); diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/WorkflowSchedulingService.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/WorkflowSchedulingService.java index f52d0b47..f09d046d 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/WorkflowSchedulingService.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/service/WorkflowSchedulingService.java @@ -3,7 +3,7 @@ import org.springframework.stereotype.Service; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Service diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/AbstractTimerTask.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/AbstractTimerTask.java index acb0705a..01b8ae45 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/AbstractTimerTask.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/AbstractTimerTask.java @@ -6,7 +6,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SchedulerTimerTask.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SchedulerTimerTask.java index 7eaf6f03..c9e42f83 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SchedulerTimerTask.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SchedulerTimerTask.java @@ -17,7 +17,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j @@ -25,7 +25,10 @@ @Setter public class SchedulerTimerTask extends AbstractTimerTask { protected Long jobId; + protected String jobParamType; protected String jobParams; + protected String jobExtendParamsType; + protected String jobExtendParams; protected Long appid; protected Long workflowId; protected String processorType; diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SystemTimer.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SystemTimer.java index 268db28c..3c372e3b 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SystemTimer.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/SystemTimer.java @@ -14,7 +14,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class SystemTimer implements Timer { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskEntry.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskEntry.java index 932b38d5..17567a17 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskEntry.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskEntry.java @@ -5,7 +5,7 @@ import java.util.Objects; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Getter diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskList.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskList.java index 63fac1aa..d011c714 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskList.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimerTaskList.java @@ -10,7 +10,7 @@ import java.util.function.Function; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TimerTaskList implements Delayed { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimingWheel.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimingWheel.java index 81d34762..564a5519 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimingWheel.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/TimingWheel.java @@ -11,7 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class TimingWheel { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/WorkflowTimerTask.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/WorkflowTimerTask.java index 15f4987d..228f36f7 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/WorkflowTimerTask.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/timer/WorkflowTimerTask.java @@ -1,7 +1,7 @@ package io.openjob.server.scheduler.timer; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class WorkflowTimerTask extends AbstractTimerTask { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/CacheUtil.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/CacheUtil.java index 9eff115e..6e7b6faf 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/CacheUtil.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/CacheUtil.java @@ -4,7 +4,7 @@ import io.openjob.server.scheduler.constant.CacheConst; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class CacheUtil { @@ -24,11 +24,11 @@ public static String getDelayDetailTaskIdKey(String taskId) { return String.format("%s:%s", CacheConst.DELAY_DETAIL_TASKID_PREFIX, taskId); } - public static String getDelayDetailWorkerAddressKey(String taskId){ + public static String getDelayDetailWorkerAddressKey(String taskId) { return String.format("%s:%s", CacheConst.DELAY_DETAIL_WORKER_ADDRESS_PREFIX, taskId); } - public static String getDelayRetryTimesKey(String taskId){ + public static String getDelayRetryTimesKey(String taskId) { return String.format("%s:%s", CacheConst.DELAY_TASK_RETRY_TIMES_PREFIX, taskId); } diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/DelaySlotUtil.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/DelaySlotUtil.java index 13768190..2e2f9c32 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/DelaySlotUtil.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/DelaySlotUtil.java @@ -10,7 +10,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/RedisUtil.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/RedisUtil.java index 24d44d40..fcd873fd 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/RedisUtil.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/RedisUtil.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class RedisUtil { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/WorkerUtil.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/WorkerUtil.java index 6c454d80..0f12a949 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/WorkerUtil.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/util/WorkerUtil.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class WorkerUtil { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/AbstractWheel.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/AbstractWheel.java index e52e4364..ee3a28cd 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/AbstractWheel.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/AbstractWheel.java @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicLong; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/SchedulerWheel.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/SchedulerWheel.java index 43b2aebb..abfd67e2 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/SchedulerWheel.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/SchedulerWheel.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/Wheel.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/Wheel.java index 45d05229..ec632471 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/Wheel.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/Wheel.java @@ -7,7 +7,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public interface Wheel { diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WheelManager.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WheelManager.java index e1987c10..4ad2f454 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WheelManager.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WheelManager.java @@ -7,7 +7,7 @@ import java.util.Set; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WorkflowWheel.java b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WorkflowWheel.java index 01a022ed..0415dab6 100644 --- a/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WorkflowWheel.java +++ b/openjob-server/openjob-server-scheduler/src/main/java/io/openjob/server/scheduler/wheel/WorkflowWheel.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Component diff --git a/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/SchedulerTest.java b/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/SchedulerTest.java index a41baa52..081d2ba6 100644 --- a/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/SchedulerTest.java +++ b/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/SchedulerTest.java @@ -7,7 +7,7 @@ import java.util.Date; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class SchedulerTest { diff --git a/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/util/DelaySlotUtilTest.java b/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/util/DelaySlotUtilTest.java index c9d59148..0baa3402 100644 --- a/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/util/DelaySlotUtilTest.java +++ b/openjob-server/openjob-server-scheduler/src/test/java/io/openjob/server/scheduler/timer/util/DelaySlotUtilTest.java @@ -10,7 +10,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class DelaySlotUtilTest { diff --git a/openjob-server/openjob-server-starter/pom.xml b/openjob-server/openjob-server-starter/pom.xml index ad405fd3..1cfc0224 100644 --- a/openjob-server/openjob-server-starter/pom.xml +++ b/openjob-server/openjob-server-starter/pom.xml @@ -11,9 +11,6 @@ 4.0.0 openjob-server-starter - - - org.springframework.boot @@ -87,12 +84,10 @@ org.apache.maven.plugins maven-resources-plugin + + 3.1.0 - UTF-8 - - xlsx - xls - + ${project.build.sourceEncoding} diff --git a/openjob-server/openjob-server-starter/release/assembly.xml b/openjob-server/openjob-server-starter/release/assembly.xml index e9d731ce..44100601 100644 --- a/openjob-server/openjob-server-starter/release/assembly.xml +++ b/openjob-server/openjob-server-starter/release/assembly.xml @@ -1,11 +1,14 @@ - release + ${project.version} + tar.gz + zip + ${basedir}/target target @@ -15,6 +18,7 @@ + ${basedir}/release/bin bin @@ -23,5 +27,25 @@ * + + + + ${basedir}/release/conf + conf + 0755 + + * + + + + + + ${basedir}/release/logs + logs + 0755 + + * + + diff --git a/openjob-server/openjob-server-starter/release/bin/startup.sh b/openjob-server/openjob-server-starter/release/bin/startup.sh index e69de29b..659c2275 100644 --- a/openjob-server/openjob-server-starter/release/bin/startup.sh +++ b/openjob-server/openjob-server-starter/release/bin/startup.sh @@ -0,0 +1,100 @@ +#!/bin/bash +#=========================================================================================== +# System Configuration +#=========================================================================================== +cygwin=false +darwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +esac +error_exit () +{ + echo "ERROR: $1 !!" + exit 1 +} +[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java +[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java +[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/taobao/java +[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME + +if [ -z "$JAVA_HOME" ]; then + if $darwin; then + + if [ -x '/usr/libexec/java_home' ] ; then + export JAVA_HOME=`/usr/libexec/java_home` + + elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then + export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" + fi + else + JAVA_PATH=`dirname $(readlink -f $(which javac))` + if [ "x$JAVA_PATH" != "x" ]; then + export JAVA_HOME=`dirname $JAVA_PATH 2>/dev/null` + fi + fi + if [ -z "$JAVA_HOME" ]; then + error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!" + fi +fi +#=========================================================================================== +# JVM Configuration +#=========================================================================================== +export SERVER="openjob-server" +export JAVA_HOME +export JAVA="$JAVA_HOME/bin/java" +export BASE_DIR=`cd $(dirname $0)/..; pwd` +export CUSTOM_ADDITIONAL_LOCATION=${OPENJOB_CONFIG_PATH:="file:${BASE_DIR}/conf/"} + +JVM_XMX=$JVM_XMX +JVM_XMS=$JVM_XMS +JVM_XMN=$JVM_XMN +JVM_XSS=$JVM_XSS +JVM_MetaspaceSize=$JVM_MetaspaceSize +JVM_MaxMetaspaceSize=$JVM_MaxMetaspaceSize +JVM_MaxDirectMemorySize=$JVM_MaxDirectMemorySize + +JAVA_OPT="${JAVA_OPT} -server -Xmx${JVM_XMX:="2048m"} -Xms${JVM_XMS:="2048m"} -Xmn${JVM_XMN:="1024m"} -Xss${JVM_XSS:="512k"} -XX:MetaspaceSize=${JVM_MetaspaceSize:="128m"} -XX:MaxMetaspaceSize=${JVM_MaxMetaspaceSize:="256m"} -XX:MaxDirectMemorySize=${JVM_MaxDirectMemorySize:=1024m} -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy" +JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof" +JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages" + +JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p') +if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then + JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${BASE_DIR}/logs/openjob_gc.log:time,tags:filecount=10,filesize=100m" +else + JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC" + JAVA_OPT_EXT_FIX="-Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext" + JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/openjob_gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M" +fi + +JAVA_OPT="${JAVA_OPT} -Dopenjob.home=${BASE_DIR}" +JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar" +JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}" +JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CUSTOM_ADDITIONAL_LOCATION}" +JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/logback.xml" +JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288" + +# check logs path +if [ ! -d "${BASE_DIR}/logs" ]; then + mkdir ${BASE_DIR}/logs +fi + +echo "$JAVA $JAVA_OPT_EXT_FIX ${JAVA_OPT}" +echo "openjob is starting" + +# check the start.out log output file +if [ ! -f "${BASE_DIR}/logs/start.out" ]; then + touch "${BASE_DIR}/logs/start.out" +fi + +# start +echo "$JAVA $JAVA_OPT_EXT_FIX ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 & +if [[ "$JAVA_OPT_EXT_FIX" == "" ]]; then + nohup "$JAVA" ${JAVA_OPT} openjob.openjob >> ${BASE_DIR}/logs/start.out 2>&1 & +else + nohup "$JAVA" "$JAVA_OPT_EXT_FIX" ${JAVA_OPT} openjob.openjob >> ${BASE_DIR}/logs/start.out 2>&1 & +fi + +echo "openjob is starting，you can check the ${BASE_DIR}/logs/start.out" \ No newline at end of file diff --git a/openjob-server/openjob-server-starter/release/conf/application.properties b/openjob-server/openjob-server-starter/release/conf/application.properties new file mode 100644 index 00000000..ca1a3780 --- /dev/null +++ b/openjob-server/openjob-server-starter/release/conf/application.properties @@ -0,0 +1,43 @@ +server.port=${SERVER_PORT:8080} +### admin config +# user passwd hash salt +openjob.admin.user.passwd-salt=${OJ_ADMIN_USER_PWD_SALT:3TJPjpUanNqZ0N1} +### spring config +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false +spring.datasource.driver-class-name=${OJ_DS_DRIVER_CLASS:com.mysql.cj.jdbc.Driver} +spring.datasource.url=${OJ_DS_URL:jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +spring.datasource.username=${OJ_DS_USERNAME:root} +spring.datasource.password=${OJ_DS_PASSWORD:123456} +spring.datasource.type=com.zaxxer.hikari.HikariDataSource +spring.datasource.hikari.minimum-idle=${OJ_DS_HK_MINI_IDLE:1} +spring.datasource.hikari.maximum-pool-size=${OJ_DS_HK_MAX_POOL_SIZE:10} +spring.datasource.hikari.idle-timeout=${OJ_DS_HK_IDLE_TIMEOUT:60000} +spring.datasource.hikari.pool-name=${OJ_DS_HK_POOL_NAME:openjob} +# fixed warn for "spring.jpa.open-in-view is enabled by default" +spring.jpa.open-in-view=false +spring.flyway.enabled=true +spring.flyway.clean-disabled=true +spring.flyway.locations=${OJ_FW_LOCATIONS:classpath:db/migration/mysql} +spring.flyway.baseline-on-migrate=true +spring.flyway.table=${OJ_FW_TABLE:migration_version} +spring.flyway.baseline-version=0 +spring.flyway.encoding=UTF-8 +spring.flyway.validate-on-migrate=false +openjob.log.storage.selector=${OJ_LOG_STORAGE_SELECTOR:mysql} +openjob.log.storage.h2.properties.user=${OJ_LOG_STORAGE_H2_USER:root} +openjob.log.storage.h2.properties.password=${OJ_LOG_STORAGE_H2_PASSWORD:123456} +openjob.log.storage.h2.properties.url=${OJ_LOG_STORAGE_H2_URL:jdbc:h2:mem:openjob;AUTO_RECONNECT=TRUE;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;WRITE_DELAY=0;} +openjob.log.storage.mysql.properties.user=${OJ_LOG_STORAGE_MYSQL_USER:root} +openjob.log.storage.mysql.properties.password=${OJ_LOG_STORAGE_MYSQL_PASSWORD:123456} +openjob.log.storage.mysql.properties.url=${OJ_LOG_STORAGE_MYSQL_URL:jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +openjob.scheduler.delay.enable=${OJ_SCHEDULER_DELAY_ENABLE:true} +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration +spring.redis.host=${OJ_REDIS_HOST:127.0.0.1} +spring.redis.password=${OJ_REDIS_PASSWORD:} +spring.redis.database=${OJ_REDIS_DB:0} +spring.redis.client-type=lettuce +spring.redis.lettuce.pool.max-active=32 +spring.redis.lettuce.pool.max-idle=8 +spring.redis.lettuce.pool.max-wait=1000 +spring.redis.lettuce.pool.time-between-eviction-runs=60s +spring.jpa.show-sql=${SPRING_JPA_SHOW_SQL:false} \ No newline at end of file diff --git a/openjob-server/openjob-server-starter/release/conf/logback.xml b/openjob-server/openjob-server-starter/release/conf/logback.xml new file mode 100644 index 00000000..83254899 --- /dev/null +++ b/openjob-server/openjob-server-starter/release/conf/logback.xml @@ -0,0 +1,53 @@ + + + + + + + + + ${LOG_PATH}/notice.log + true + + + + ${LOG_PATH}/notice.log.%d{yyyy-MM-dd}.%i + 2GB + 7 + 7GB + true + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + UTF-8 + + + + + + + + WARN + + ${LOG_PATH}/error.log + true + + + + ${LOG_PATH}/error.log.%d{yyyy-MM-dd}.%i + 2GB + 7 + 7GB + true + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + UTF-8 + + + + + + + + \ No newline at end of file diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/ServerApplication.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/ServerApplication.java index 3c396230..e5d15c5b 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/ServerApplication.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/ServerApplication.java @@ -7,7 +7,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @SpringBootApplication() @@ -16,6 +16,6 @@ @EnableSwagger2 public class ServerApplication { public static void main(String[] args) { - SpringApplication.run(ServerApplication.class); + SpringApplication.run(ServerApplication.class, args); } } diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/AkkaProperties.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/AkkaProperties.java index 70e4f72c..c9db668f 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/AkkaProperties.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/AkkaProperties.java @@ -4,7 +4,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Data diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/ServerAutoConfiguration.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/ServerAutoConfiguration.java index e78c746d..f95d455e 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/ServerAutoConfiguration.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/ServerAutoConfiguration.java @@ -21,7 +21,7 @@ import java.util.Map; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/SwaggerAutoConfiguration.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/SwaggerAutoConfiguration.java index 4516d9fa..07f589e2 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/SwaggerAutoConfiguration.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/autoconfigure/SwaggerAutoConfiguration.java @@ -16,7 +16,7 @@ import static com.google.common.collect.Lists.newArrayList; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Configuration diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/event/ApplicationReadyEventListener.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/event/ApplicationReadyEventListener.java index b66f0757..f59da3c9 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/event/ApplicationReadyEventListener.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/event/ApplicationReadyEventListener.java @@ -7,7 +7,7 @@ import org.springframework.context.ApplicationListener; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ public class ApplicationReadyEventListener implements ApplicationListener { diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/filter/NoticeFilter.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/filter/NoticeFilter.java new file mode 100644 index 00000000..fbf41073 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/filter/NoticeFilter.java @@ -0,0 +1,20 @@ +package io.openjob.server.filter; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.filter.Filter; +import ch.qos.logback.core.spi.FilterReply; + +/** + * @author stelin swoft@qq.com + * @since 1.0.0 + */ +public class NoticeFilter extends Filter { + @Override + public FilterReply decide(ILoggingEvent event) { + if (Level.TRACE.equals(event.getLevel()) || Level.INFO.equals(event.getLevel())) { + return FilterReply.ACCEPT; + } + return FilterReply.DENY; + } +} diff --git a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/handler/ServerExceptionHandler.java b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/handler/ServerExceptionHandler.java index b5920dc6..e25401f7 100644 --- a/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/handler/ServerExceptionHandler.java +++ b/openjob-server/openjob-server-starter/src/main/java/io/openjob/server/handler/ServerExceptionHandler.java @@ -20,7 +20,7 @@ import java.util.List; /** - * @author stelin + * @author stelin swoft@qq.com * @since 1.0.0 */ @Slf4j diff --git a/openjob-server/openjob-server-starter/src/main/resources/application.properties b/openjob-server/openjob-server-starter/src/main/resources/application.properties index 2df1a0b6..ca1a3780 100644 --- a/openjob-server/openjob-server-starter/src/main/resources/application.properties +++ b/openjob-server/openjob-server-starter/src/main/resources/application.properties @@ -1,45 +1,43 @@ -server.port=8080 +server.port=${SERVER_PORT:8080} ### admin config # user passwd hash salt -openjob.admin.user.passwd-salt=3TJPjpUanNqZ0N1 -openjob.admin.user.cache-init-size=10 -openjob.admin.user.cache-max-size=100 +openjob.admin.user.passwd-salt=${OJ_ADMIN_USER_PWD_SALT:3TJPjpUanNqZ0N1} ### spring config spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.driver-class-name=${OJ_DS_DRIVER_CLASS:com.mysql.cj.jdbc.Driver} +spring.datasource.url=${OJ_DS_URL:jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +spring.datasource.username=${OJ_DS_USERNAME:root} +spring.datasource.password=${OJ_DS_PASSWORD:123456} spring.datasource.type=com.zaxxer.hikari.HikariDataSource -spring.datasource.hikari.minimum-idle=1 -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.idle-timeout=60000 -spring.datasource.hikari.pool-name=openjob +spring.datasource.hikari.minimum-idle=${OJ_DS_HK_MINI_IDLE:1} +spring.datasource.hikari.maximum-pool-size=${OJ_DS_HK_MAX_POOL_SIZE:10} +spring.datasource.hikari.idle-timeout=${OJ_DS_HK_IDLE_TIMEOUT:60000} +spring.datasource.hikari.pool-name=${OJ_DS_HK_POOL_NAME:openjob} # fixed warn for "spring.jpa.open-in-view is enabled by default" spring.jpa.open-in-view=false spring.flyway.enabled=true spring.flyway.clean-disabled=true -spring.flyway.locations=classpath:db/migration +spring.flyway.locations=${OJ_FW_LOCATIONS:classpath:db/migration/mysql} spring.flyway.baseline-on-migrate=true -spring.flyway.table=migration_version +spring.flyway.table=${OJ_FW_TABLE:migration_version} spring.flyway.baseline-version=0 spring.flyway.encoding=UTF-8 spring.flyway.validate-on-migrate=false -openjob.log.storage.selector=mysql -openjob.log.storage.h2.properties.user=root -openjob.log.storage.h2.properties.password=123456 -openjob.log.storage.h2.properties.url=jdbc:h2:mem:openjob;AUTO_RECONNECT=TRUE;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;WRITE_DELAY=0; -openjob.log.storage.mysql.properties.user=root -openjob.log.storage.mysql.properties.password=123456 -openjob.log.storage.mysql.properties.url=jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -openjob.scheduler.delay.enable=true +openjob.log.storage.selector=${OJ_LOG_STORAGE_SELECTOR:mysql} +openjob.log.storage.h2.properties.user=${OJ_LOG_STORAGE_H2_USER:root} +openjob.log.storage.h2.properties.password=${OJ_LOG_STORAGE_H2_PASSWORD:123456} +openjob.log.storage.h2.properties.url=${OJ_LOG_STORAGE_H2_URL:jdbc:h2:mem:openjob;AUTO_RECONNECT=TRUE;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;WRITE_DELAY=0;} +openjob.log.storage.mysql.properties.user=${OJ_LOG_STORAGE_MYSQL_USER:root} +openjob.log.storage.mysql.properties.password=${OJ_LOG_STORAGE_MYSQL_PASSWORD:123456} +openjob.log.storage.mysql.properties.url=${OJ_LOG_STORAGE_MYSQL_URL:jdbc:mysql://127.0.0.1:3306/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +openjob.scheduler.delay.enable=${OJ_SCHEDULER_DELAY_ENABLE:true} #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration -spring.redis.host=127.0.0.1 -spring.redis.password= -spring.redis.database=0 +spring.redis.host=${OJ_REDIS_HOST:127.0.0.1} +spring.redis.password=${OJ_REDIS_PASSWORD:} +spring.redis.database=${OJ_REDIS_DB:0} spring.redis.client-type=lettuce spring.redis.lettuce.pool.max-active=32 spring.redis.lettuce.pool.max-idle=8 spring.redis.lettuce.pool.max-wait=1000 spring.redis.lettuce.pool.time-between-eviction-runs=60s -spring.jpa.show-sql=false \ No newline at end of file +spring.jpa.show-sql=${SPRING_JPA_SHOW_SQL:false} \ No newline at end of file diff --git a/openjob-server/openjob-server-starter/src/main/resources/db/migration/V1__v1.0.0_release.sql b/openjob-server/openjob-server-starter/src/main/resources/db/migration/V1__v1.0.0_release.sql deleted file mode 100644 index 75f9f4cd..00000000 --- a/openjob-server/openjob-server-starter/src/main/resources/db/migration/V1__v1.0.0_release.sql +++ /dev/null @@ -1,833 +0,0 @@ -# Dump of table app -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `app`; - -CREATE TABLE `app` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `namespace_id` bigint(20) NOT NULL, - `name` varchar(256) NOT NULL DEFAULT '', - `desc` varchar(256) NOT NULL DEFAULT '', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `udx_app_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -/*!40000 ALTER TABLE `app` DISABLE KEYS */; - -INSERT INTO `app` (`id`, `namespace_id`, `name`, `desc`, `create_time`, `update_time`) -VALUES - (1,1,'openjob','openjob', 1658473199,1658473199); - -/*!40000 ALTER TABLE `app` ENABLE KEYS */; - - - -# Dump of table delay -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `delay`; - -CREATE TABLE `delay` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `pid` bigint(20) NOT NULL DEFAULT '0', - `namespace_id` bigint(20) NOT NULL, - `app_id` bigint(20) NOT NULL, - `name` varchar(128) NOT NULL DEFAULT '', - `description` varchar(256) NOT NULL DEFAULT '', - `processor_info` varchar(256) NOT NULL DEFAULT '', - `fail_retry_times` int(11) unsigned NOT NULL DEFAULT '0', - `fail_retry_interval` int(11) unsigned NOT NULL DEFAULT '1000', - `execute_timeout` int(11) unsigned NOT NULL DEFAULT '0', - `concurrency` int(11) unsigned NOT NULL DEFAULT '2', - `blocking_size` int(11) unsigned NOT NULL DEFAULT '20', - `topic` varchar(128) NOT NULL DEFAULT '', - `fail_topic_enable` tinyint(2) NOT NULL DEFAULT '1', - `fail_topic_concurrency` int(11) NOT NULL DEFAULT '1', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) NOT NULL, - `update_time` bigint(12) NOT NULL, - PRIMARY KEY (`id`), - KEY `udx_topic` (`topic`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -INSERT INTO `delay` (`id`, `namespace_id`, `app_id`, `name`, `description`, `processor_info`, `fail_retry_times`, `fail_retry_interval`, `execute_timeout`, `concurrency`, `blocking_size`, `topic`, `deleted`, `delete_time`, `create_time`, `update_time`) -VALUES - (1,1,1,'delay_test','','io.openjob.worker.samples.processor.DelayProcessorSample',0,1000,30,2,20,'openjob.delay.test',2,0,0,0); - - -# Dump of table delay_instance -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `delay_instance`; - -CREATE TABLE `delay_instance` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `app_id` bigint(20) unsigned NOT NULL, - `namespace_id` bigint(20) unsigned NOT NULL, - `task_id` varchar(64) NOT NULL DEFAULT '', - `topic` varchar(128) NOT NULL DEFAULT '', - `delay_id` bigint(20) unsigned NOT NULL, - `delay_params` longtext NOT NULL, - `delay_extra` text NOT NULL, - `status` tinyint(2) NOT NULL, - `execute_time` bigint(12) NOT NULL, - `worker_address` varchar(32) NOT NULL DEFAULT '', - `complete_time` bigint(12) NOT NULL DEFAULT '0', - `deleted` tinyint(12) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) NOT NULL, - `update_time` bigint(12) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `udx_task_id` (`task_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - -# Dump of table delay_worker -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `delay_worker`; - -CREATE TABLE `delay_worker` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `topic` varchar(128) NOT NULL DEFAULT '', - `pull_size` int(11) unsigned NOT NULL DEFAULT '0', - `pull_time` bigint(16) unsigned NOT NULL DEFAULT '0', - `create_time` bigint(12) NOT NULL, - `update_time` bigint(12) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - - -# Dump of table job -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `job`; - -CREATE TABLE `job` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `namespace_id` bigint(20) unsigned NOT NULL, - `app_id` bigint(20) unsigned NOT NULL, - `workflow_id` bigint(20) unsigned NOT NULL DEFAULT '0', - `name` varchar(32) NOT NULL DEFAULT '', - `description` varchar(128) NOT NULL DEFAULT '', - `processor_type` varchar(16) NOT NULL DEFAULT 'java' COMMENT 'java /shell/python', - `processor_info` text NOT NULL, - `execute_type` varchar(16) NOT NULL DEFAULT 'standalone' COMMENT 'execute type 1=standalone 2=broadcast 3=MR', - `params` varchar(3096) NOT NULL DEFAULT '', - `params_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Params type text/json/yaml', - `extend_params_type` varchar(16) DEFAULT NULL COMMENT 'Extend params type text/json/yaml', - `extend_params` varchar(3096) NOT NULL DEFAULT '', - `fail_retry_times` int(11) unsigned NOT NULL, - `fail_retry_interval` int(11) unsigned NOT NULL, - `concurrency` int(11) unsigned NOT NULL DEFAULT '1', - `time_expression_type` varchar(16) NOT NULL DEFAULT 'cron' COMMENT 'cron/second/delay', - `time_expression` varchar(32) NOT NULL DEFAULT '' COMMENT 'Cron express type', - `execute_strategy` tinyint(2) NOT NULL DEFAULT '1' COMMENT 'Execute strategy. 1=Discard after task 2=Overlay before task 3=Concurrency', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT '1=running 2=stop', - `next_execute_time` bigint(12) unsigned NOT NULL, - `slots_id` int(11) unsigned NOT NULL, - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -/*!40000 ALTER TABLE `job` DISABLE KEYS */; - -INSERT INTO `job` (`id`, `namespace_id`, `app_id`, `workflow_id`, `name`, `description`, `processor_type`, `processor_info`, `execute_type`, `params`, `params_type`, `extend_params_type`, `extend_params`,`fail_retry_times`, `fail_retry_interval`, `concurrency`, `time_expression_type`, `time_expression`, `status`, `next_execute_time`, `slots_id`, `create_time`, `update_time`) -VALUES - (10,1,1,0,'测试任务','测试任务','java','io.openjob.worker.samples.processor.JavaProcessorSample','standalone','','text','text','',0,0,1,'cron','30 * * * * ?',2,1663590330,233,1657528102,1663590220), - (13,1,1,0,'测试任务2','测试任务2','java','io.openjob.worker.samples.processorJavaProcessorSample','standalone','','text','text','',0,0,1,'cron','10 * * * * ?',2,1660288630,1,1657528102,1660288512), - (14,1,1,0,'测试任务','测试任务','java','io.openjob.worker.samples.processor.JavaProcessorSample','standalone','','text','text','',0,0,1,'cron','59 * * * * ?',2,1660288619,126,1657528102,1660288512), - (15,1,1,0,'测试任务','测试任务','java','io.openjob.worker.samples.processor.JavaProcessorSample','standalone','','text','text','',0,0,1,'cron','0 */3 * * * ?',2,1660288680,12,1657528102,1660288452), - (16,1,1,0,'MR任务测试','测试MR','java','io.openjob.worker.samples.processor.MapReduceProcessorSample','mapReduce','','text','text','',0,0,1,'cron','15 * * * * ?',2,1666100115,126,1657528102,1666099995); - -/*!40000 ALTER TABLE `job` ENABLE KEYS */; - - -# Dump of table job_instance -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `job_instance`; - -CREATE TABLE `job_instance` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `job_id` bigint(20) unsigned NOT NULL, - `params` varchar(3096) NOT NULL, - `params_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Params type text/json/yaml', - `extend_params_type` varchar(16) DEFAULT NULL COMMENT 'Extend params type text/json/yaml', - `extend_params` varchar(3096) NOT NULL DEFAULT '', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1', - `slots_id` bigint(20) unsigned NOT NULL, - `workflow_id` bigint(20) unsigned NOT NULL DEFAULT '0', - `namespace_id` bigint(20) unsigned NOT NULL, - `app_id` bigint(20) unsigned NOT NULL, - `execute_time` bigint(12) unsigned NOT NULL, - `complete_time` bigint(12) unsigned NOT NULL DEFAULT '0', - `last_report_time` bigint(12) unsigned NOT NULL DEFAULT '0', - `processor_type` varchar(16) NOT NULL DEFAULT '', - `processor_info` text NOT NULL, - `execute_type` varchar(16) NOT NULL DEFAULT '', - `fail_retry_times` int(11) unsigned NOT NULL, - `fail_retry_interval` int(11) unsigned NOT NULL, - `time_expression_type` varchar(16) NOT NULL DEFAULT '', - `time_expression` varchar(32) NOT NULL DEFAULT '', - `concurrency` int(11) unsigned NOT NULL DEFAULT '1', - `worker_address` varchar(32) NOT NULL DEFAULT '', - `execute_strategy` tinyint(2) NOT NULL DEFAULT '1' COMMENT 'Execute strategy. 1=Discard after task 2=Overlay before task 3=Concurrency', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL, - `create_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `idx_execute_time_slots_id` (`execute_time`,`slots_id`), - KEY `idx_last_report_time_slots_id` (`last_report_time`,`slots_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - - -# Dump of table job_instance_log -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `job_instance_log`; - -CREATE TABLE `job_instance_log` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `job_id` bigint(20) unsigned NOT NULL, - `job_instance_id` bigint(20) unsigned NOT NULL, - `message` longtext, - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -# Dump of table job_instance_task -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `job_instance_task`; - -CREATE TABLE `job_instance_task` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `job_id` bigint(20) unsigned NOT NULL, - `job_instance_id` bigint(20) unsigned NOT NULL, - `circle_id` bigint(20) unsigned NOT NULL, - `task_id` varchar(64) NOT NULL DEFAULT '', - `parent_task_id` varchar(64) NOT NULL DEFAULT '0', - `task_name` varchar(128) NOT NULL DEFAULT '', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1', - `result` longtext, - `worker_address` varchar(128) NOT NULL DEFAULT '', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned DEFAULT NULL, - `update_time` bigint(12) unsigned DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `udx_task_id` (`task_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - - -# Dump of table processor_log -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `processor_log`; - -CREATE TABLE `processor_log` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `task_id` varchar(128) NOT NULL DEFAULT '', - `worker_address` varchar(128) NOT NULL DEFAULT '', - `content` longtext NOT NULL, - `time` bigint(16) unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `idx_task_unique_id_time` (`time`), - KEY `idx_task_id` (`task_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -# Dump of table job_slots -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `job_slots`; - -CREATE TABLE `job_slots` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `server_id` bigint(20) unsigned NOT NULL, - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `idx_server_id` (`server_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -/*!40000 ALTER TABLE `job_slots` DISABLE KEYS */; - -INSERT INTO `job_slots` (`id`, `server_id`, `create_time`, `update_time`) -VALUES - (1,0,1655781998,1666100014), - (2,0,1655781999,1666100014), - (3,0,1655781999,1666100014), - (4,0,1655781999,1666100014), - (5,0,1655781999,1666100014), - (6,0,1655781999,1666100014), - (7,0,1655781999,1666100014), - (8,0,1655781999,1666100014), - (9,0,1655781999,1666100014), - (10,0,1655781999,1666100014), - (11,0,1655781999,1666100014), - (12,0,1655781999,1666100014), - (13,0,1655781999,1666100014), - (14,0,1655781999,1666100014), - (15,0,1655781999,1666100014), - (16,0,1655781999,1666100014), - (17,0,1655781999,1666100014), - (18,0,1655781999,1666100014), - (19,0,1655781999,1666100014), - (20,0,1655781999,1666100014), - (21,0,1655781999,1666100014), - (22,0,1655781999,1666100014), - (23,0,1655781999,1666100014), - (24,0,1655781999,1666100014), - (25,0,1655781999,1666100014), - (26,0,1655781999,1666100014), - (27,0,1655781999,1666100014), - (28,0,1655781999,1666100014), - (29,0,1655781999,1666100014), - (30,0,1655781999,1666100014), - (31,0,1655781999,1666100014), - (32,0,1655781999,1666100014), - (33,0,1655781999,1666100014), - (34,0,1655781999,1666100014), - (35,0,1655781999,1666100014), - (36,0,1655781999,1666100014), - (37,0,1655781999,1666100014), - (38,0,1655781999,1666100014), - (39,0,1655781999,1666100014), - (40,0,1655781999,1666100014), - (41,0,1655781999,1666100014), - (42,0,1655781999,1666100014), - (43,0,1655781999,1666100014), - (44,0,1655781999,1666100014), - (45,0,1655781999,1666100014), - (46,0,1655781999,1666100014), - (47,0,1655781999,1666100014), - (48,0,1655781999,1666100014), - (49,0,1655781999,1666100014), - (50,0,1655781999,1666100014), - (51,0,1655781999,1666100014), - (52,0,1655781999,1666100014), - (53,0,1655781999,1666100014), - (54,0,1655781999,1666100014), - (55,0,1655781999,1666100014), - (56,0,1655781999,1666100014), - (57,0,1655781999,1666100014), - (58,0,1655781999,1666100014), - (59,0,1655781999,1666100014), - (60,0,1655781999,1666100014), - (61,0,1655781999,1666100014), - (62,0,1655781999,1666100014), - (63,0,1655781999,1666100014), - (64,0,1655781999,1666100014), - (65,0,1655781999,1666100014), - (66,0,1655781999,1666100014), - (67,0,1655781999,1666100014), - (68,0,1655781999,1666100014), - (69,0,1655781999,1666100014), - (70,0,1655781999,1666100014), - (71,0,1655781999,1666100014), - (72,0,1655781999,1666100014), - (73,0,1655781999,1666100014), - (74,0,1655781999,1666100014), - (75,0,1655781999,1666100014), - (76,0,1655781999,1666100014), - (77,0,1655781999,1666100014), - (78,0,1655781999,1666100014), - (79,0,1655781999,1666100014), - (80,0,1655781999,1666100014), - (81,0,1655781999,1666100014), - (82,0,1655781999,1666100014), - (83,0,1655781999,1666100014), - (84,0,1655781999,1666100014), - (85,0,1655781999,1666100014), - (86,0,1655781999,1666100014), - (87,0,1655781999,1666100014), - (88,0,1655781999,1666100014), - (89,0,1655781999,1666100014), - (90,0,1655781999,1666100014), - (91,0,1655781999,1666100014), - (92,0,1655781999,1666100014), - (93,0,1655781999,1666100014), - (94,0,1655781999,1666100014), - (95,0,1655781999,1666100014), - (96,0,1655781999,1666100014), - (97,0,1655781999,1666100014), - (98,0,1655781999,1666100014), - (99,0,1655781999,1666100014), - (100,0,1655781999,1666100014), - (101,0,1655781999,1666100014), - (102,0,1655781999,1666100014), - (103,0,1655781999,1666100014), - (104,0,1655781999,1666100014), - (105,0,1655781999,1666100014), - (106,0,1655781999,1666100014), - (107,0,1655781999,1666100014), - (108,0,1655781999,1666100014), - (109,0,1655781999,1666100014), - (110,0,1655781999,1666100014), - (111,0,1655781999,1666100014), - (112,0,1655781999,1666100014), - (113,0,1655781999,1666100014), - (114,0,1655781999,1666100014), - (115,0,1655781999,1666100014), - (116,0,1655781999,1666100014), - (117,0,1655781999,1666100014), - (118,0,1655781999,1666100014), - (119,0,1655781999,1666100014), - (120,0,1655781999,1666100014), - (121,0,1655781999,1666100014), - (122,0,1655781999,1666100014), - (123,0,1655781999,1666100014), - (124,0,1655781999,1666100014), - (125,0,1655781999,1666100014), - (126,0,1655781999,1666100014), - (127,0,1655781999,1666100014), - (128,0,1655781999,1666100014), - (129,0,1655781999,1666100014), - (130,0,1655781999,1666100014), - (131,0,1655781999,1666100014), - (132,0,1655781999,1666100014), - (133,0,1655781999,1666100014), - (134,0,1655781999,1666100014), - (135,0,1655781999,1666100014), - (136,0,1655782000,1666100014), - (137,0,1655782000,1666100014), - (138,0,1655782000,1666100014), - (139,0,1655782000,1666100014), - (140,0,1655782000,1666100014), - (141,0,1655782000,1666100014), - (142,0,1655782000,1666100014), - (143,0,1655782000,1666100014), - (144,0,1655782000,1666100014), - (145,0,1655782000,1666100014), - (146,0,1655782000,1666100014), - (147,0,1655782000,1666100014), - (148,0,1655782000,1666100014), - (149,0,1655782000,1666100014), - (150,0,1655782000,1666100014), - (151,0,1655782000,1666100014), - (152,0,1655782000,1666100014), - (153,0,1655782000,1666100014), - (154,0,1655782000,1666100014), - (155,0,1655782000,1666100014), - (156,0,1655782000,1666100014), - (157,0,1655782000,1666100014), - (158,0,1655782000,1666100014), - (159,0,1655782000,1666100014), - (160,0,1655782000,1666100014), - (161,0,1655782000,1666100014), - (162,0,1655782000,1666100014), - (163,0,1655782000,1666100014), - (164,0,1655782000,1666100014), - (165,0,1655782000,1666100014), - (166,0,1655782000,1666100014), - (167,0,1655782000,1666100014), - (168,0,1655782000,1666100014), - (169,0,1655782000,1666100014), - (170,0,1655782000,1666100014), - (171,0,1655782000,1666100014), - (172,0,1655782000,1666100014), - (173,0,1655782000,1666100014), - (174,0,1655782000,1666100014), - (175,0,1655782000,1666100014), - (176,0,1655782000,1666100014), - (177,0,1655782000,1666100014), - (178,0,1655782000,1666100014), - (179,0,1655782000,1666100014), - (180,0,1655782000,1666100014), - (181,0,1655782000,1666100014), - (182,0,1655782000,1666100014), - (183,0,1655782000,1666100014), - (184,0,1655782000,1666100014), - (185,0,1655782000,1666100014), - (186,0,1655782000,1666100014), - (187,0,1655782000,1666100014), - (188,0,1655782000,1666100014), - (189,0,1655782000,1666100014), - (190,0,1655782000,1666100014), - (191,0,1655782000,1666100014), - (192,0,1655782000,1666100014), - (193,0,1655782000,1666100014), - (194,0,1655782000,1666100014), - (195,0,1655782000,1666100014), - (196,0,1655782000,1666100014), - (197,0,1655782000,1666100014), - (198,0,1655782000,1666100014), - (199,0,1655782000,1666100014), - (200,0,1655782000,1666100014), - (201,0,1655782000,1666100014), - (202,0,1655782000,1666100014), - (203,0,1655782000,1666100014), - (204,0,1655782000,1666100014), - (205,0,1655782000,1666100014), - (206,0,1655782000,1666100014), - (207,0,1655782000,1666100014), - (208,0,1655782000,1666100014), - (209,0,1655782000,1666100014), - (210,0,1655782000,1666100014), - (211,0,1655782000,1666100014), - (212,0,1655782000,1666100014), - (213,0,1655782000,1666100014), - (214,0,1655782000,1666100014), - (215,0,1655782000,1666100014), - (216,0,1655782000,1666100014), - (217,0,1655782000,1666100014), - (218,0,1655782000,1666100014), - (219,0,1655782000,1666100014), - (220,0,1655782000,1666100014), - (221,0,1655782000,1666100014), - (222,0,1655782000,1666100014), - (223,0,1655782000,1666100014), - (224,0,1655782000,1666100014), - (225,0,1655782000,1666100014), - (226,0,1655782000,1666100014), - (227,0,1655782000,1666100014), - (228,0,1655782000,1666100014), - (229,0,1655782000,1666100014), - (230,0,1655782000,1666100014), - (231,0,1655782000,1666100014), - (232,0,1655782000,1666100014), - (233,0,1655782000,1666100014), - (234,0,1655782000,1666100014), - (235,0,1655782000,1666100014), - (236,0,1655782000,1666100014), - (237,0,1655782000,1666100014), - (238,0,1655782000,1666100014), - (239,0,1655782000,1666100014), - (240,0,1655782000,1666100014), - (241,0,1655782000,1666100014), - (242,0,1655782000,1666100014), - (243,0,1655782000,1666100014), - (244,0,1655782000,1666100014), - (245,0,1655782000,1666100014), - (246,0,1655782000,1666100014), - (247,0,1655782000,1666100014), - (248,0,1655782000,1666100014), - (249,0,1655782000,1666100014), - (250,0,1655782000,1666100014), - (251,0,1655782000,1666100014), - (252,0,1655782000,1666100014), - (253,0,1655782000,1666100014), - (254,0,1655782000,1666100014), - (255,0,1655782000,1666100014), - (256,0,1655782000,1666100014); - -/*!40000 ALTER TABLE `job_slots` ENABLE KEYS */; - -# Dump of table namespace -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `namespace`; - -CREATE TABLE `namespace` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(64) NOT NULL DEFAULT '', - `uuid` varchar(64) NOT NULL DEFAULT '', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `idx_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -insert into namespace (id, `name`, deleted, delete_time, create_time, update_time) -values (1, 'default', 'a65d3fe5-258d-43e3-a5e6-dc12c4879ed6', 2, 0, 1657528102, 1657528102); - - - -# Dump of table server -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `server`; - -CREATE TABLE `server` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', - `ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'Server ip', - `akka_address` varchar(32) NOT NULL DEFAULT '' COMMENT 'Akka address like `127.0.0.1:25520`', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Server status 1=ok 2=fail', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', - `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', - PRIMARY KEY (`id`), - KEY `udx_akka_address` (`akka_address`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - - -# Dump of table server_reports -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `server_reports`; - -CREATE TABLE `server_reports` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `server_id` bigint(20) unsigned NOT NULL, - `report_server_id` bigint(20) unsigned NOT NULL, - `status` tinyint(2) unsigned NOT NULL DEFAULT '1', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', - PRIMARY KEY (`id`), - KEY `idx_create_time` (`create_time`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - - -# Dump of table task -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `task`; - -CREATE TABLE `task` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `job_id` bigint(20) unsigned NOT NULL, - `instance_id` bigint(20) unsigned NOT NULL, - `circle_id` bigint(20) unsigned NOT NULL DEFAULT '0', - `task_id` varchar(64) NOT NULL DEFAULT '', - `task_name` varchar(128) NOT NULL, - `task_parent_id` varchar(64) NOT NULL DEFAULT '0', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1', - `worker_address` varchar(64) NOT NULL DEFAULT '', - `result` longtext, - `task_body` blob, - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `udx_task_id` (`task_id`), - KEY `idx_instance_id_circle_id` (`instance_id`,`circle_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - -# Dump of table worker -# ------------------------------------------------------------ - -DROP TABLE IF EXISTS `worker`; - -CREATE TABLE `worker` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `app_id` bigint(20) unsigned NOT NULL, - `namespace_id` bigint(20) unsigned NOT NULL, - `app_name` varchar(128) NOT NULL DEFAULT '', - `worker_key` varchar(64) NOT NULL DEFAULT '', - `slots_id` bigint(20) unsigned NOT NULL, - `address` varchar(32) NOT NULL DEFAULT '', - `protocol_type` varchar(8) NOT NULL DEFAULT '', - `version` varchar(32) NOT NULL DEFAULT '', - `last_heartbeat_time` bigint(12) unsigned NOT NULL, - `status` tinyint(2) unsigned NOT NULL DEFAULT '1', - `metric` varchar(1024) NOT NULL DEFAULT '', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `udx_address` (`address`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - -# Dump of table system -# ------------------------------------------------------------ -DROP TABLE IF EXISTS `system`; - -CREATE TABLE `system` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `version` varchar(16) NOT NULL DEFAULT '0', - `cluster_version` bigint(20) unsigned NOT NULL DEFAULT '1', - `cluster_delay_version` bigint(20) unsigned NOT NULL DEFAULT '1', - `worker_supervisor_slot` int(11) unsigned NOT NULL DEFAULT '16', - `delay_zset_slot` int(11) unsigned NOT NULL DEFAULT '4', - `delay_fail_zset_slot` int(11) NOT NULL DEFAULT '2', - `delay_add_list_slot` int(11) unsigned NOT NULL DEFAULT '2', - `delay_status_list_slot` int(10) unsigned NOT NULL DEFAULT '2', - `delay_delete_list_slot` int(10) unsigned NOT NULL DEFAULT '1', - `max_slot` int(11) unsigned NOT NULL DEFAULT '256', - `job_keep_days` int(11) NOT NULL DEFAULT '30', - `delay_keep_days` int(11) NOT NULL DEFAULT '30', - `server_keep_days` int(11) NOT NULL DEFAULT '30', - `worker_keep_days` int(11) NOT NULL DEFAULT '30', - `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `create_time` bigint(12) unsigned NOT NULL, - `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -/*!40000 ALTER TABLE `system` DISABLE KEYS */; - -INSERT INTO `system` (`id`, `version`, `cluster_version`, `cluster_delay_version`, `worker_supervisor_slot`, `delay_zset_slot`, `delay_add_list_slot`, `delay_status_list_slot`, `delay_delete_list_slot`, `max_slot`, `create_time`, `update_time`) -VALUES - (1,'1.0.0',1,1,256,2,2,2,1,256,1663590330,1663590330); - - -DROP TABLE IF EXISTS `admin_session`; -CREATE TABLE `admin_session` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'User Id', - `username` varchar(48) NOT NULL DEFAULT '' COMMENT 'User name', - `token` varchar(64) NOT NULL DEFAULT '' COMMENT 'Session token', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - INDEX `idx_user_id` (`user_id`), - UNIQUE `uni_token` (`token`), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Admin user session caches'; - -DROP TABLE IF EXISTS `admin_user`; -CREATE TABLE `admin_user` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `username` varchar(48) NOT NULL DEFAULT '' COMMENT 'User name', - `nickname` varchar(64) NOT NULL DEFAULT '' COMMENT 'Nickname', - `passwd` varchar(128) NOT NULL DEFAULT '' COMMENT 'Password', - `session_key` varchar(128) NOT NULL DEFAULT '' COMMENT 'Session key', - `session_expire_at` bigint(12) NOT NULL COMMENT 'Session expire at', - `token` varchar(64) NOT NULL DEFAULT '' COMMENT 'Api auth token', - `role_ids` JSON COMMENT 'role IDs. JSON: [1,2]', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - INDEX `idx_name` (`username`), - UNIQUE `uni_token` (`token`), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job admin users'; - -INSERT INTO `admin_user` (`username`, `nickname`, `passwd`, `session_key`, `session_expire_at`, `token`, `role_ids`, `deleted`, `delete_time`, `update_time`, `create_time`) -VALUES - ('admin', 'Administrator', 'c881f5068a2d066023dfd404d9a75e4f1708a9df6dc9c451900fc72d986f7ba9', '79f74383e2c92ae01e172ced4c9267d5', 0, '79f74383e2c92ae01e172ced4c9267d5', '[1]', 2, 0, 1670255999, 1670255999), - ('openjob', 'OpenJob User', 'c0d4247cd38f62f975ba32c9f1e58926f6a99c223f642524c53917810c95d39b', '2cebdf15d414b6713672475a21f995a0', 0, '2cebdf15d414b6713672475a21f995a0', '[2]', 2, 0, 1670255999, 1670255999); - -DROP TABLE IF EXISTS `admin_role`; -CREATE TABLE `admin_role` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `name` varchar(48) NOT NULL DEFAULT '' COMMENT 'role name', - `desc` varchar(128) NOT NULL DEFAULT '' COMMENT 'Description', - `admin` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Is supper admin. 1=yes 2=no', - `menu_ids` JSON COMMENT 'Menu ids for role. JSON array', - `perm_ids` JSON COMMENT 'Permission ids for role. JSON array', - `namespace_ids` JSON COMMENT 'namespaces Ids. JSON array', - `app_ids` JSON COMMENT 'app ids. JSON array', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - INDEX `idx_name` (`name`), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Admin roles with perms'; - -INSERT INTO `admin_role` (`name`, `desc`, `menu_ids`, `perm_ids`, `namespace_ids`, `app_ids`, `admin`, `deleted`, `delete_time`, `update_time`, `create_time`) -VALUES - ('Admin', 'Administrator role', '[1, 5]', '[11, 12, 13, 14, 15]', '[]', '[]', 1, 2, 0, 1670255999, 1670255999), - ('Developer', 'Developer role', '[1, 5]', '[11, 12, 13, 14, 15]', '[]', '[]', 2, 2, 0, 1670255999, 1670255999); - -DROP TABLE IF EXISTS `admin_permission`; -CREATE TABLE `admin_permission` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `pid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Parent ID', - `type` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Type. 1=menu 2=perm', - `name` varchar(48) NOT NULL DEFAULT '' COMMENT 'Menu name', - `path` varchar(86) NOT NULL DEFAULT '' COMMENT 'Route path or API path', - `meta` JSON COMMENT 'Extra meta data. JSON object: {icon:xx,title:some.name}', - `hidden` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Hidden status. 1=yes 2=no', - `sort` int(10) NOT NULL DEFAULT '0' COMMENT 'Sort value', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - PRIMARY KEY (`id`), - INDEX `idx_pid` (`pid`), - INDEX `idx_path` (`path`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Admin user permissions'; - -insert into admin_permission (id, pid, `type`, `name`, `path`, meta, hidden, sort, deleted, delete_time, update_time, create_time) -values (1, 0, 1, 'dashboard', '/dashboard', '{"icon": "iconfont icon-shouye", "roles": ["admin"], "title": "message.router.dashboard", "isLink": "", "isAffix": false, "isIframe": false, "component": "/home/index.vue", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (20, 0, 1, 'namespace', '/admin/namespace/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.namespace", "isLink": "", "isAffix": false, "isIframe": false, "component": "/namespace/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (40, 0, 1, 'application', '/admin/app/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.application", "isLink": "", "isAffix": false, "isIframe": false, "component": "/app/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (60, 0, 1, 'cronJob', '/a', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.cronJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (61, 60, 1, 'cronJobJob', '/admin/job/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.cronJobJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/job/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (62, 60, 1, 'cronJobInstance', '/admin/job-instance/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.cronJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/instance/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (63, 60, 1, 'cronJobPage', '/admin/job/page', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.cronJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/job/page", "isKeepAlive": true}', 1, 0, 2, 0, 1669972320, 1669972320), - (80, 0, 1, 'delayJob', '/b', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.delayJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (81, 80, 1, 'delayJobDelay', '/admin/delay/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.delayJobJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "/delay/job/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (82, 80, 1, 'delayJobInstance', '/admin/delay-instance/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.delayJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/delay/instance/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (200, 0, 1, 'cluster', '/c', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.clusterManager", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (201, 200, 1, 'ClusterNode', '/admin/cluster-node/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.clusterNode", "isLink": "", "isAffix": false, "isIframe": false, "component": "/cluster/node/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (202, 200, 1, 'ClusterWorker', '/admin/cluster-worker/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.clusterWorker", "isLink": "", "isAffix": false, "isIframe": false, "component": "/cluster/worker/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (300, 0, 1, 'system', '/d', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.systemManager", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (301, 300, 1, 'SystemConfiguration', '/admin/system-config/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.systemConfiguration", "isLink": "", "isAffix": false, "isIframe": false, "component": "/system/config/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (302, 300, 1, 'SystemSlots', '/admin/system-slots/list', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.systemSlots", "isLink": "", "isAffix": false, "isIframe": false, "component": "/system/slots/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), - (1000, 0, 2, 'namespace.add', '/admin/namespace/add', '{}', 2, 0, 2, 0, 1669972320, 1669972320), - (1001, 0, 2, 'namespace.delete', '/admin/namespace/delete', '{}', 2, 0, 2, 0, 1669972320, 1669972320), - (1002, 0, 2, 'namespace.update', '/admin/namespace/update', '{}', 2, 0, 2, 0, 1669972320, 1669972320), - (1003, 0, 2, 'namespace.update.status', '/admin/namespace/update-status', '{}', 2, 0, 2, 0, 1669972320, 1669972320); - -DROP TABLE IF EXISTS `notify_template`; -CREATE TABLE `notify_template` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Template name. eg: Wechat, DingTalk, Wecom, Feishu', - `type` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'notify type. 1 webhook 2 email 3 sms', - `level` varchar(16) NOT NULL DEFAULT 'error' COMMENT 'Level. 1 notice 2 warning 3 error', - `events` JSON COMMENT 'notify events list. JSON: [task_fail, task_suc, task_cancel, task_skip]', - `contact_ids` JSON COMMENT 'related contact ids. JSON [12, 34]', - `group_ids` JSON COMMENT 'related group ids. JSON [12, 34]', - `webhook` varchar(128) NOT NULL DEFAULT '' COMMENT 'Webhook URL', - `content` varchar(2048) NOT NULL DEFAULT '' COMMENT 'Template contents', - `extra` JSON COMMENT 'Extra info. eg: third platform token', - `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Creator user ID', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - INDEX `idx_name` (`name`), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job notify template table'; - -DROP TABLE IF EXISTS `notify_contact`; -CREATE TABLE `notify_contact` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `name` varchar(128) NOT NULL DEFAULT '' COMMENT 'User name', - `phone` varchar(24) NOT NULL DEFAULT '' COMMENT 'Phone', - `email` varchar(64) NOT NULL DEFAULT '' COMMENT 'Email address', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Status. 1=OK 2=disabled', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - INDEX `idx_name` (`name`), - INDEX `idx_phone` (`phone`), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job notify contact'; - -DROP TABLE IF EXISTS `notify_group`; -CREATE TABLE `notify_group` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', - `name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group name', - `contact_ids` varchar(2048) NOT NULL DEFAULT '' COMMENT '[12, 34]', - `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Status. 1=OK 2=disabled', - `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', - `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', - `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', - `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Notify contact group'; diff --git a/openjob-server/openjob-server-starter/src/main/resources/db/migration/mysql/V1__v1.0.0_release.sql b/openjob-server/openjob-server-starter/src/main/resources/db/migration/mysql/V1__v1.0.0_release.sql new file mode 100644 index 00000000..420d9775 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/db/migration/mysql/V1__v1.0.0_release.sql @@ -0,0 +1,786 @@ +# ************************************************************ +# Openjob SQL dump +# Version 1.0.0 +# +# http://www.openjob.io/ +# https://github.com/open-job/openjob +# +# Host: 127.0.0.1 (MySQL) +# Database: openjob +# Generation Time: 2023-05-05 12:51:40 +0000 +# ************************************************************ + +# Dump of table admin_permission +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `admin_permission`; + +CREATE TABLE `admin_permission` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `pid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Parent ID', + `type` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Type. 1=menu 2=perm', + `name` varchar(48) NOT NULL DEFAULT '' COMMENT 'Menu name', + `path` varchar(86) NOT NULL DEFAULT '' COMMENT 'Route path or API path', + `meta` json DEFAULT NULL COMMENT 'Extra meta data. JSON object: {icon:xx,title:some.name}', + `hidden` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Hidden status. 1=yes 2=no', + `sort` int(10) NOT NULL DEFAULT '0' COMMENT 'Sort value', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', + `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', + PRIMARY KEY (`id`), + KEY `idx_pid` (`pid`), + KEY `idx_path` (`path`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Admin user permissions'; + +INSERT INTO `admin_permission` (`id`, `pid`, `type`, `name`, `path`, `meta`, `hidden`, `sort`, `deleted`, `delete_time`, `update_time`, `create_time`) +VALUES (1, 0, 1, 'dashboard', '/dashboard', '{"icon": "iconfont icon-shouye", "roles": ["admin"], "title": "message.router.dashboard", "isLink": "", "isAffix": false, "isIframe": false, "component": "/home/index.vue", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (20, 0, 1, 'namespace', '/admin/namespace/list', '{"icon": "ele-Edit", "roles": ["admin"], "title": "message.router.namespace", "isLink": "", "isAffix": false, "isIframe": false, "component": "/namespace/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (40, 0, 1, 'application', '/admin/app/list', '{"icon": "ele-Operation", "roles": ["admin"], "title": "message.router.application", "isLink": "", "isAffix": false, "isIframe": false, "component": "/app/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (60, 0, 1, 'cronJob', '/a', '{"icon": "ele-AlarmClock", "roles": ["admin"], "title": "message.router.cronJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (61, 60, 1, 'cronJobJob', '/admin/job/list', '{"icon": "ele-Suitcase", "roles": ["admin"], "title": "message.router.cronJobJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/job/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (62, 60, 1, 'cronJobInstance', '/admin/job-instance/list', '{"icon": "ele-Document", "roles": ["admin"], "title": "message.router.cronJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/instance/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (63, 60, 1, 'cronJobPage', '/admin/job/page', '{"icon": "ele-ColdDrink", "roles": ["admin"], "title": "message.router.cronJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/job/job/page", "isKeepAlive": true}', 1, 0, 2, 0, 1669972320, 1669972320), + (80, 0, 1, 'delayJob', '/b', '{"icon": "ele-Clock", "roles": ["admin"], "title": "message.router.delayJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (81, 80, 1, 'delayJobDelay', '/admin/delay/list', '{"icon": "ele-SetUp", "roles": ["admin"], "title": "message.router.delayJobJob", "isLink": "", "isAffix": false, "isIframe": false, "component": "/delay/job/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (82, 80, 1, 'delayJobInstance', '/admin/delay-instance/list', '{"icon": "ele-DocumentChecked", "roles": ["admin"], "title": "message.router.delayJobInstance", "isLink": "", "isAffix": false, "isIframe": false, "component": "/delay/instance/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (200, 0, 1, 'cluster', '/c', '{"icon": "ele-SuitcaseLine", "roles": ["admin"], "title": "message.router.clusterManager", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (201, 200, 1, 'ClusterNode', '/admin/cluster-node/list', '{"icon": "ele-Notification", "roles": ["admin"], "title": "message.router.clusterNode", "isLink": "", "isAffix": false, "isIframe": false, "component": "/cluster/node/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (202, 200, 1, 'ClusterWorker', '/admin/cluster-worker/list', '{"icon": "ele-Monitor", "roles": ["admin"], "title": "message.router.clusterWorker", "isLink": "", "isAffix": false, "isIframe": false, "component": "/cluster/worker/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (300, 0, 1, 'system', '/d', '{"icon": "ele-Setting", "roles": ["admin"], "title": "message.router.systemManager", "isLink": "", "isAffix": false, "isIframe": false, "component": "", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (301, 300, 1, 'SystemConfiguration', '/admin/system-config/list', '{"icon": "ele-CreditCard", "roles": ["admin"], "title": "message.router.systemConfiguration", "isLink": "", "isAffix": false, "isIframe": false, "component": "/system/config/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (302, 300, 1, 'SystemSlots', '/admin/system-slots/list', '{"icon": "ele-Connection", "roles": ["admin"], "title": "message.router.systemSlots", "isLink": "", "isAffix": false, "isIframe": false, "component": "/system/slots/index", "isKeepAlive": true}', 2, 0, 2, 0, 1669972320, 1669972320), + (1000, 0, 2, 'namespace.add', '/admin/namespace/add', '{}', 2, 0, 2, 0, 1669972320, 1669972320), + (1001, 0, 2, 'namespace.delete', '/admin/namespace/delete', '{}', 2, 0, 2, 0, 1669972320, 1669972320), + (1002, 0, 2, 'namespace.update', '/admin/namespace/update', '{}', 2, 0, 2, 0, 1669972320, 1669972320), + (1003, 0, 2, 'namespace.update.status', '/admin/namespace/update-status', '{}', 2, 0, 2, 0, 1669972320, 1669972320); + +# Dump of table admin_role +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `admin_role`; + +CREATE TABLE `admin_role` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `name` varchar(48) NOT NULL DEFAULT '' COMMENT 'role name', + `desc` varchar(128) NOT NULL DEFAULT '' COMMENT 'Description', + `admin` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Is supper admin. 1=yes 2=no', + `menu_ids` json DEFAULT NULL COMMENT 'Menu ids for role. JSON array', + `perm_ids` json DEFAULT NULL COMMENT 'Permission ids for role. JSON array', + `namespace_ids` json DEFAULT NULL COMMENT 'namespaces Ids. JSON array', + `app_ids` json DEFAULT NULL COMMENT 'app ids. JSON array', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', + `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', + PRIMARY KEY (`id`), + KEY `idx_name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Admin roles with perms'; + +INSERT INTO `admin_role` (`id`, `name`, `desc`, `admin`, `menu_ids`, `perm_ids`, `namespace_ids`, `app_ids`, `deleted`, `delete_time`, `update_time`, `create_time`) +VALUES (1, 'Admin', 'Administrator role', 1, '[]', '[]', '[]', '[]', 2, 0, 1670255999, 1670255999); + +# Dump of table admin_user +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `admin_user`; + +CREATE TABLE `admin_user` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `username` varchar(48) NOT NULL DEFAULT '' COMMENT 'User name', + `nickname` varchar(64) NOT NULL DEFAULT '' COMMENT 'Nickname', + `passwd` varchar(128) NOT NULL DEFAULT '' COMMENT 'Password', + `session_key` varchar(128) NOT NULL DEFAULT '' COMMENT 'Session key', + `session_expire_at` bigint(12) NOT NULL COMMENT 'Session expire at', + `token` varchar(64) NOT NULL DEFAULT '' COMMENT 'Api auth token', + `role_ids` json DEFAULT NULL COMMENT 'role IDs. JSON: [1,2]', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', + `create_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Create time', + PRIMARY KEY (`id`), + UNIQUE KEY `uni_token` (`token`), + KEY `idx_name` (`username`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job admin users'; + +INSERT INTO `admin_user` (`id`, `username`, `nickname`, `passwd`, `session_key`, `session_expire_at`, `token`, `role_ids`, `deleted`, `delete_time`, `update_time`, `create_time`) +VALUES (1, 'openjob', 'Administrator', '144f039395e24903a08926b978340a1554660c4da724d0700e3dceac9573675f', '79f74383e2c92ae01e172ced4c9267d5', 0, '79f74383e2c92ae01e172ced4c9267d5', '[1]', 2, 0, 1670255999, 1670255999); + +# Dump of table app +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `app`; + +CREATE TABLE `app` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `namespace_id` bigint(20) NOT NULL COMMENT 'Namespace id', + `name` varchar(64) DEFAULT NULL COMMENT 'Name', + `desc` varchar(256) NOT NULL DEFAULT '' COMMENT 'Description', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + UNIQUE KEY `udx_name` (`name`), + KEY `idx_namespace_id_name` (`namespace_id`,`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `app` (`id`, `namespace_id`, `name`, `desc`, `deleted`, `delete_time`, `create_time`, `update_time`) +VALUES + (1,1,'openjob','openjob',2,0,1658473199,1678796017); + + +# Dump of table delay +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `delay`; + +CREATE TABLE `delay` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `pid` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Parent id', + `cid` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Child id', + `namespace_id` bigint(20) NOT NULL COMMENT 'Namespace', + `app_id` bigint(20) NOT NULL COMMENT 'Application', + `name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Name', + `description` varchar(256) NOT NULL DEFAULT '' COMMENT 'Description', + `processor_info` varchar(256) NOT NULL DEFAULT '' COMMENT 'Processor info', + `fail_retry_times` int(11) unsigned NOT NULL DEFAULT '3' COMMENT 'Fail retry times', + `fail_retry_interval` int(11) unsigned NOT NULL DEFAULT '3' COMMENT 'Fail retry interval(s)', + `execute_timeout` int(11) unsigned NOT NULL DEFAULT '60' COMMENT 'Execute timeout(s)', + `concurrency` int(11) unsigned NOT NULL DEFAULT '1' COMMENT 'Execute concurrency', + `blocking_size` int(11) unsigned NOT NULL DEFAULT '8' COMMENT 'Pull blocking size', + `topic` varchar(128) NOT NULL DEFAULT '' COMMENT 'Topic', + `fail_topic_enable` tinyint(2) NOT NULL DEFAULT '1' COMMENT 'Fail topic eanble status', + `fail_topic_concurrency` int(11) NOT NULL DEFAULT '1' COMMENT 'Fail topic execute concurrency', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) NOT NULL COMMENT 'Create time', + `update_time` bigint(12) NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + UNIQUE KEY `udx_topic` (`topic`), + KEY `idx_namespace_id_name` (`namespace_id`,`name`), + KEY `idx_namespace_id_topic` (`namespace_id`,`topic`), + KEY `idx_namespace_id_app_id` (`namespace_id`,`app_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table delay_instance +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `delay_instance`; + +CREATE TABLE `delay_instance` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `app_id` bigint(20) unsigned NOT NULL COMMENT 'Application', + `namespace_id` bigint(20) unsigned NOT NULL COMMENT 'Namespace', + `task_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'Task id', + `topic` varchar(128) NOT NULL DEFAULT '' COMMENT 'Topic', + `delay_id` bigint(20) unsigned NOT NULL COMMENT 'Delay id', + `delay_params` longtext NOT NULL COMMENT 'Delay params', + `delay_extra` text NOT NULL COMMENT 'Delay extra', + `status` tinyint(2) NOT NULL COMMENT 'Delay task status', + `execute_time` bigint(12) NOT NULL COMMENT 'Execute time', + `complete_time` bigint(12) NOT NULL DEFAULT '0' COMMENT 'Complete time', + `worker_address` varchar(32) NOT NULL DEFAULT '' COMMENT 'Worker address', + `deleted` tinyint(12) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) NOT NULL COMMENT 'Create time', + `update_time` bigint(12) NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + UNIQUE KEY `udx_task_id` (`task_id`), + KEY `idx_namespace_id_create_time` (`namespace_id`,`create_time`), + KEY `idx_namespace_id_app_id_delay_id_create_time` (`namespace_id`,`app_id`,`delay_id`,`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table delay_worker +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `delay_worker`; + +CREATE TABLE `delay_worker` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `topic` varchar(128) NOT NULL DEFAULT '' COMMENT 'Topic', + `pull_size` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'Pull size', + `pull_time` bigint(16) unsigned NOT NULL DEFAULT '0' COMMENT 'Pull time', + `create_time` bigint(12) NOT NULL COMMENT 'Create time', + `update_time` bigint(12) NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table job +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `job`; + +CREATE TABLE `job` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `namespace_id` bigint(20) unsigned NOT NULL COMMENT 'Namespace', + `app_id` bigint(20) unsigned NOT NULL COMMENT 'Application', + `workflow_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Workflow id', + `name` varchar(32) NOT NULL DEFAULT '' COMMENT 'Name', + `description` varchar(128) NOT NULL DEFAULT '' COMMENT 'Description', + `processor_type` varchar(16) NOT NULL DEFAULT 'java' COMMENT 'Processor type java /shell/python', + `processor_info` text NOT NULL COMMENT 'Processor info', + `execute_type` varchar(16) NOT NULL DEFAULT 'standalone' COMMENT 'Execute type 1=standalone 2=broadcast 3=MR', + `params` varchar(3096) NOT NULL DEFAULT '' COMMENT 'Params', + `params_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Params type text/json/yaml', + `extend_params_type` varchar(16) DEFAULT NULL COMMENT 'Extend params type text/json/yaml', + `extend_params` varchar(3096) NOT NULL DEFAULT '' COMMENT 'Extend params', + `fail_retry_times` int(11) unsigned NOT NULL COMMENT 'Fail retry times', + `fail_retry_interval` int(11) unsigned NOT NULL COMMENT 'Fail retry interval(s)', + `concurrency` int(11) unsigned NOT NULL DEFAULT '1' COMMENT 'Execute concurrency', + `time_expression_type` varchar(16) NOT NULL DEFAULT 'cron' COMMENT 'Time express time cron/second/delay', + `time_expression` varchar(32) NOT NULL DEFAULT '' COMMENT 'Cron express type', + `execute_strategy` tinyint(2) NOT NULL DEFAULT '1' COMMENT 'Execute strategy. 1=Discard after task 2=Overlay before task 3=Concurrency', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT '1=running 2=stop', + `next_execute_time` bigint(12) unsigned NOT NULL COMMENT 'Next execute time', + `slots_id` int(11) unsigned NOT NULL COMMENT 'Slots id', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_namespace_id_name` (`namespace_id`,`name`), + KEY `idx_namespace_id_app_id_name` (`namespace_id`,`app_id`,`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table job_instance +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `job_instance`; + +CREATE TABLE `job_instance` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `job_id` bigint(20) unsigned NOT NULL COMMENT 'Job id', + `params` varchar(3096) NOT NULL DEFAULT '' COMMENT 'Params', + `params_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Params type text/json/yaml', + `extend_params_type` varchar(16) DEFAULT NULL COMMENT 'Extend params type text/json/yaml', + `extend_params` varchar(3096) NOT NULL DEFAULT '' COMMENT 'Extend params', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Instance status', + `slots_id` bigint(20) unsigned NOT NULL COMMENT 'Slots id', + `workflow_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Workflow id', + `namespace_id` bigint(20) unsigned NOT NULL COMMENT 'Namespace', + `app_id` bigint(20) unsigned NOT NULL COMMENT 'Application', + `execute_time` bigint(12) unsigned NOT NULL COMMENT 'Execute time', + `complete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Complete time', + `last_report_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Last report time', + `processor_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Processor type', + `processor_info` text NOT NULL COMMENT 'Processor info', + `execute_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Execute time', + `fail_retry_times` int(11) unsigned NOT NULL COMMENT 'Fail retry times', + `fail_retry_interval` int(11) unsigned NOT NULL COMMENT 'Fail retry interval(s)', + `time_expression_type` varchar(16) NOT NULL DEFAULT '' COMMENT 'Time expression type', + `time_expression` varchar(32) NOT NULL DEFAULT '' COMMENT 'TIme expression', + `concurrency` int(11) unsigned NOT NULL DEFAULT '1' COMMENT 'Concurrency', + `worker_address` varchar(32) NOT NULL DEFAULT '' COMMENT 'Worker address', + `execute_strategy` tinyint(2) NOT NULL DEFAULT '1' COMMENT 'Execute strategy. 1=Discard after task 2=Overlay before task 3=Concurrency', + `deleted` tinyint(2) unsigned NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_execute_time_slots_id` (`execute_time`,`slots_id`), + KEY `idx_last_report_time_slots_id` (`last_report_time`,`slots_id`), + KEY `idx_job_id_status` (`job_id`,`status`), + KEY `idx_namespace_id_create_time` (`namespace_id`,`create_time`), + KEY `idx_namespace_id_app_id_job_id_create_time` (`namespace_id`,`app_id`,`job_id`,`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table job_instance_log +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `job_instance_log`; + +CREATE TABLE `job_instance_log` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `job_id` bigint(20) unsigned NOT NULL COMMENT 'Job id', + `job_instance_id` bigint(20) unsigned NOT NULL COMMENT 'Job instance id', + `message` longtext COMMENT 'Message', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_job_instance_id_create_time` (`job_instance_id`,`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table job_instance_task +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `job_instance_task`; + +CREATE TABLE `job_instance_task` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `job_id` bigint(20) unsigned NOT NULL COMMENT 'Job id', + `job_instance_id` bigint(20) unsigned NOT NULL COMMENT 'Instance id', + `circle_id` bigint(20) unsigned NOT NULL COMMENT 'Circle id', + `task_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'Task id', + `parent_task_id` varchar(64) NOT NULL DEFAULT '0' COMMENT 'Parent task id', + `task_name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Task name', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Instance task status', + `result` longtext COMMENT 'Task result', + `worker_address` varchar(128) NOT NULL DEFAULT '' COMMENT 'Worker address', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned DEFAULT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned DEFAULT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + UNIQUE KEY `udx_task_id` (`task_id`), + KEY `idx_job_instance_id_create_time` (`job_instance_id`,`create_time`), + KEY `idx_parent_task_id` (`parent_task_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table job_slots +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `job_slots`; + +CREATE TABLE `job_slots` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `server_id` bigint(20) unsigned NOT NULL COMMENT 'Server id', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_server_id` (`server_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `job_slots` (`id`, `server_id`, `deleted`, `delete_time`, `create_time`, `update_time`) +VALUES + (1,1,2,0,1655781998,1683287431), + (2,1,2,0,1655781999,1683287431), + (3,1,2,0,1655781999,1683287431), + (4,1,2,0,1655781999,1683287431), + (5,1,2,0,1655781999,1683287431), + (6,1,2,0,1655781999,1683287431), + (7,1,2,0,1655781999,1683287431), + (8,1,2,0,1655781999,1683287431), + (9,1,2,0,1655781999,1683287431), + (10,1,2,0,1655781999,1683287431), + (11,1,2,0,1655781999,1683287431), + (12,1,2,0,1655781999,1683287431), + (13,1,2,0,1655781999,1683287431), + (14,1,2,0,1655781999,1683287431), + (15,1,2,0,1655781999,1683287431), + (16,1,2,0,1655781999,1683287431), + (17,1,2,0,1655781999,1683287431), + (18,1,2,0,1655781999,1683287431), + (19,1,2,0,1655781999,1683287431), + (20,1,2,0,1655781999,1683287431), + (21,1,2,0,1655781999,1683287431), + (22,1,2,0,1655781999,1683287431), + (23,1,2,0,1655781999,1683287431), + (24,1,2,0,1655781999,1683287431), + (25,1,2,0,1655781999,1683287431), + (26,1,2,0,1655781999,1683287431), + (27,1,2,0,1655781999,1683287431), + (28,1,2,0,1655781999,1683287431), + (29,1,2,0,1655781999,1683287431), + (30,1,2,0,1655781999,1683287431), + (31,1,2,0,1655781999,1683287431), + (32,1,2,0,1655781999,1683287431), + (33,1,2,0,1655781999,1683287431), + (34,1,2,0,1655781999,1683287431), + (35,1,2,0,1655781999,1683287431), + (36,1,2,0,1655781999,1683287431), + (37,1,2,0,1655781999,1683287431), + (38,1,2,0,1655781999,1683287431), + (39,1,2,0,1655781999,1683287431), + (40,1,2,0,1655781999,1683287431), + (41,1,2,0,1655781999,1683287431), + (42,1,2,0,1655781999,1683287431), + (43,1,2,0,1655781999,1683287431), + (44,1,2,0,1655781999,1683287431), + (45,1,2,0,1655781999,1683287431), + (46,1,2,0,1655781999,1683287431), + (47,1,2,0,1655781999,1683287431), + (48,1,2,0,1655781999,1683287431), + (49,1,2,0,1655781999,1683287431), + (50,1,2,0,1655781999,1683287431), + (51,1,2,0,1655781999,1683287431), + (52,1,2,0,1655781999,1683287431), + (53,1,2,0,1655781999,1683287431), + (54,1,2,0,1655781999,1683287431), + (55,1,2,0,1655781999,1683287431), + (56,1,2,0,1655781999,1683287431), + (57,1,2,0,1655781999,1683287431), + (58,1,2,0,1655781999,1683287431), + (59,1,2,0,1655781999,1683287431), + (60,1,2,0,1655781999,1683287431), + (61,1,2,0,1655781999,1683287431), + (62,1,2,0,1655781999,1683287431), + (63,1,2,0,1655781999,1683287431), + (64,1,2,0,1655781999,1683287431), + (65,1,2,0,1655781999,1683287431), + (66,1,2,0,1655781999,1683287431), + (67,1,2,0,1655781999,1683287431), + (68,1,2,0,1655781999,1683287431), + (69,1,2,0,1655781999,1683287431), + (70,1,2,0,1655781999,1683287431), + (71,1,2,0,1655781999,1683287431), + (72,1,2,0,1655781999,1683287431), + (73,1,2,0,1655781999,1683287431), + (74,1,2,0,1655781999,1683287431), + (75,1,2,0,1655781999,1683287431), + (76,1,2,0,1655781999,1683287431), + (77,1,2,0,1655781999,1683287431), + (78,1,2,0,1655781999,1683287431), + (79,1,2,0,1655781999,1683287431), + (80,1,2,0,1655781999,1683287431), + (81,1,2,0,1655781999,1683287431), + (82,1,2,0,1655781999,1683287431), + (83,1,2,0,1655781999,1683287431), + (84,1,2,0,1655781999,1683287431), + (85,1,2,0,1655781999,1683287431), + (86,1,2,0,1655781999,1683287431), + (87,1,2,0,1655781999,1683287431), + (88,1,2,0,1655781999,1683287431), + (89,1,2,0,1655781999,1683287431), + (90,1,2,0,1655781999,1683287431), + (91,1,2,0,1655781999,1683287431), + (92,1,2,0,1655781999,1683287431), + (93,1,2,0,1655781999,1683287431), + (94,1,2,0,1655781999,1683287431), + (95,1,2,0,1655781999,1683287431), + (96,1,2,0,1655781999,1683287431), + (97,1,2,0,1655781999,1683287431), + (98,1,2,0,1655781999,1683287431), + (99,1,2,0,1655781999,1683287431), + (100,1,2,0,1655781999,1683287431), + (101,1,2,0,1655781999,1683287431), + (102,1,2,0,1655781999,1683287431), + (103,1,2,0,1655781999,1683287431), + (104,1,2,0,1655781999,1683287431), + (105,1,2,0,1655781999,1683287431), + (106,1,2,0,1655781999,1683287431), + (107,1,2,0,1655781999,1683287431), + (108,1,2,0,1655781999,1683287431), + (109,1,2,0,1655781999,1683287431), + (110,1,2,0,1655781999,1683287431), + (111,1,2,0,1655781999,1683287431), + (112,1,2,0,1655781999,1683287431), + (113,1,2,0,1655781999,1683287431), + (114,1,2,0,1655781999,1683287431), + (115,1,2,0,1655781999,1683287431), + (116,1,2,0,1655781999,1683287431), + (117,1,2,0,1655781999,1683287431), + (118,1,2,0,1655781999,1683287431), + (119,1,2,0,1655781999,1683287431), + (120,1,2,0,1655781999,1683287431), + (121,1,2,0,1655781999,1683287431), + (122,1,2,0,1655781999,1683287431), + (123,1,2,0,1655781999,1683287431), + (124,1,2,0,1655781999,1683287431), + (125,1,2,0,1655781999,1683287431), + (126,1,2,0,1655781999,1683287431), + (127,1,2,0,1655781999,1683287431), + (128,1,2,0,1655781999,1683287431), + (129,1,2,0,1655781999,1683287431), + (130,1,2,0,1655781999,1683287431), + (131,1,2,0,1655781999,1683287431), + (132,1,2,0,1655781999,1683287431), + (133,1,2,0,1655781999,1683287431), + (134,1,2,0,1655781999,1683287431), + (135,1,2,0,1655781999,1683287431), + (136,1,2,0,1655782000,1683287431), + (137,1,2,0,1655782000,1683287431), + (138,1,2,0,1655782000,1683287431), + (139,1,2,0,1655782000,1683287431), + (140,1,2,0,1655782000,1683287431), + (141,1,2,0,1655782000,1683287431), + (142,1,2,0,1655782000,1683287431), + (143,1,2,0,1655782000,1683287431), + (144,1,2,0,1655782000,1683287431), + (145,1,2,0,1655782000,1683287431), + (146,1,2,0,1655782000,1683287431), + (147,1,2,0,1655782000,1683287431), + (148,1,2,0,1655782000,1683287431), + (149,1,2,0,1655782000,1683287431), + (150,1,2,0,1655782000,1683287431), + (151,1,2,0,1655782000,1683287431), + (152,1,2,0,1655782000,1683287431), + (153,1,2,0,1655782000,1683287431), + (154,1,2,0,1655782000,1683287431), + (155,1,2,0,1655782000,1683287431), + (156,1,2,0,1655782000,1683287431), + (157,1,2,0,1655782000,1683287431), + (158,1,2,0,1655782000,1683287431), + (159,1,2,0,1655782000,1683287431), + (160,1,2,0,1655782000,1683287431), + (161,1,2,0,1655782000,1683287431), + (162,1,2,0,1655782000,1683287431), + (163,1,2,0,1655782000,1683287431), + (164,1,2,0,1655782000,1683287431), + (165,1,2,0,1655782000,1683287431), + (166,1,2,0,1655782000,1683287431), + (167,1,2,0,1655782000,1683287431), + (168,1,2,0,1655782000,1683287431), + (169,1,2,0,1655782000,1683287431), + (170,1,2,0,1655782000,1683287431), + (171,1,2,0,1655782000,1683287431), + (172,1,2,0,1655782000,1683287431), + (173,1,2,0,1655782000,1683287431), + (174,1,2,0,1655782000,1683287431), + (175,1,2,0,1655782000,1683287431), + (176,1,2,0,1655782000,1683287431), + (177,1,2,0,1655782000,1683287431), + (178,1,2,0,1655782000,1683287431), + (179,1,2,0,1655782000,1683287431), + (180,1,2,0,1655782000,1683287431), + (181,1,2,0,1655782000,1683287431), + (182,1,2,0,1655782000,1683287431), + (183,1,2,0,1655782000,1683287431), + (184,1,2,0,1655782000,1683287431), + (185,1,2,0,1655782000,1683287431), + (186,1,2,0,1655782000,1683287431), + (187,1,2,0,1655782000,1683287431), + (188,1,2,0,1655782000,1683287431), + (189,1,2,0,1655782000,1683287431), + (190,1,2,0,1655782000,1683287431), + (191,1,2,0,1655782000,1683287431), + (192,1,2,0,1655782000,1683287431), + (193,1,2,0,1655782000,1683287431), + (194,1,2,0,1655782000,1683287431), + (195,1,2,0,1655782000,1683287431), + (196,1,2,0,1655782000,1683287431), + (197,1,2,0,1655782000,1683287431), + (198,1,2,0,1655782000,1683287431), + (199,1,2,0,1655782000,1683287431), + (200,1,2,0,1655782000,1683287431), + (201,1,2,0,1655782000,1683287431), + (202,1,2,0,1655782000,1683287431), + (203,1,2,0,1655782000,1683287431), + (204,1,2,0,1655782000,1683287431), + (205,1,2,0,1655782000,1683287431), + (206,1,2,0,1655782000,1683287431), + (207,1,2,0,1655782000,1683287431), + (208,1,2,0,1655782000,1683287431), + (209,1,2,0,1655782000,1683287431), + (210,1,2,0,1655782000,1683287431), + (211,1,2,0,1655782000,1683287431), + (212,1,2,0,1655782000,1683287431), + (213,1,2,0,1655782000,1683287431), + (214,1,2,0,1655782000,1683287431), + (215,1,2,0,1655782000,1683287431), + (216,1,2,0,1655782000,1683287431), + (217,1,2,0,1655782000,1683287431), + (218,1,2,0,1655782000,1683287431), + (219,1,2,0,1655782000,1683287431), + (220,1,2,0,1655782000,1683287431), + (221,1,2,0,1655782000,1683287431), + (222,1,2,0,1655782000,1683287431), + (223,1,2,0,1655782000,1683287431), + (224,1,2,0,1655782000,1683287431), + (225,1,2,0,1655782000,1683287431), + (226,1,2,0,1655782000,1683287431), + (227,1,2,0,1655782000,1683287431), + (228,1,2,0,1655782000,1683287431), + (229,1,2,0,1655782000,1683287431), + (230,1,2,0,1655782000,1683287431), + (231,1,2,0,1655782000,1683287431), + (232,1,2,0,1655782000,1683287431), + (233,1,2,0,1655782000,1683287431), + (234,1,2,0,1655782000,1683287431), + (235,1,2,0,1655782000,1683287431), + (236,1,2,0,1655782000,1683287431), + (237,1,2,0,1655782000,1683287431), + (238,1,2,0,1655782000,1683287431), + (239,1,2,0,1655782000,1683287431), + (240,1,2,0,1655782000,1683287431), + (241,1,2,0,1655782000,1683287431), + (242,1,2,0,1655782000,1683287431), + (243,1,2,0,1655782000,1683287431), + (244,1,2,0,1655782000,1683287431), + (245,1,2,0,1655782000,1683287431), + (246,1,2,0,1655782000,1683287431), + (247,1,2,0,1655782000,1683287431), + (248,1,2,0,1655782000,1683287431), + (249,1,2,0,1655782000,1683287431), + (250,1,2,0,1655782000,1683287431), + (251,1,2,0,1655782000,1683287431), + (252,1,2,0,1655782000,1683287431), + (253,1,2,0,1655782000,1683287431), + (254,1,2,0,1655782000,1683287431), + (255,1,2,0,1655782000,1683287431), + (256,1,2,0,1655782000,1683287431); + + +# Dump of table namespace +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `namespace`; + +CREATE TABLE `namespace` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `name` varchar(64) NOT NULL DEFAULT '' COMMENT 'Name', + `uuid` varchar(64) NOT NULL DEFAULT '' COMMENT 'Unique id', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `namespace` (`id`, `name`, `uuid`, `deleted`, `delete_time`, `create_time`, `update_time`) +VALUES + (1,'default','a65d3fe5-258d-43e3-a5e6-dc12c4879ed6',2,0,1657528102,1683203496); + + +# Dump of table processor_log +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `processor_log`; + +CREATE TABLE `processor_log` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `task_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Task id', + `worker_address` varchar(128) NOT NULL DEFAULT '' COMMENT 'Worker address', + `content` longtext NOT NULL COMMENT 'Content', + `time` bigint(16) unsigned NOT NULL COMMENT 'TIme', + PRIMARY KEY (`id`), + KEY `idx_task_unique_id_time` (`time`), + KEY `idx_task_id` (`task_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table server +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `server`; + +CREATE TABLE `server` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'Server ip', + `akka_address` varchar(32) NOT NULL DEFAULT '' COMMENT 'Akka address like `127.0.0.1:25520`', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Server status 1=ok 2=fail', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `udx_akka_address` (`akka_address`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table server_reports +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `server_reports`; + +CREATE TABLE `server_reports` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `server_id` bigint(20) unsigned NOT NULL COMMENT 'Server id', + `report_server_id` bigint(20) unsigned NOT NULL COMMENT 'Report server id', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Report status', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `idx_create_time_server_id` (`create_time`,`server_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table system +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `system`; + +CREATE TABLE `system` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `version` varchar(16) NOT NULL DEFAULT '0' COMMENT 'Version', + `cluster_version` bigint(20) unsigned NOT NULL DEFAULT '1' COMMENT 'Cluster version', + `cluster_delay_version` bigint(20) unsigned NOT NULL DEFAULT '1' COMMENT 'Cluster delay version', + `worker_supervisor_slot` int(11) unsigned NOT NULL DEFAULT '16' COMMENT 'Worker supervisor slot', + `delay_zset_slot` int(11) unsigned NOT NULL DEFAULT '4' COMMENT 'Delay zset slot', + `delay_fail_zset_slot` int(11) NOT NULL DEFAULT '2' COMMENT 'Delay fail zset slot', + `delay_add_list_slot` int(11) unsigned NOT NULL DEFAULT '2' COMMENT 'Delay add list slot', + `delay_status_list_slot` int(10) unsigned NOT NULL DEFAULT '2' COMMENT 'Delay status list slot', + `delay_delete_list_slot` int(10) unsigned NOT NULL DEFAULT '1' COMMENT 'Delay delete list slot', + `max_slot` int(11) unsigned NOT NULL DEFAULT '256' COMMENT 'System max slot', + `job_keep_days` int(11) NOT NULL DEFAULT '30' COMMENT 'Job keep days', + `delay_keep_days` int(11) NOT NULL DEFAULT '30' COMMENT 'Delay keep days', + `server_keep_days` int(11) NOT NULL DEFAULT '30' COMMENT 'Server keep days', + `worker_keep_days` int(11) NOT NULL DEFAULT '30' COMMENT 'Worker keep days', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `system` (`id`, `version`, `cluster_version`, `cluster_delay_version`, `worker_supervisor_slot`, `delay_zset_slot`, `delay_fail_zset_slot`, `delay_add_list_slot`, `delay_status_list_slot`, `delay_delete_list_slot`, `max_slot`, `job_keep_days`, `delay_keep_days`, `server_keep_days`, `worker_keep_days`, `deleted`, `delete_time`, `create_time`, `update_time`) +VALUES + (1,'1.0.0',437,8,32,2,2,2,2,1,256,1,7,90,180,2,0,1663590330,1663590330); + + +# Dump of table task +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `task`; + +CREATE TABLE `task` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `job_id` bigint(20) unsigned NOT NULL COMMENT 'Job id', + `instance_id` bigint(20) unsigned NOT NULL COMMENT 'Instance id', + `circle_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Circle id', + `task_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'Task id', + `task_name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Task name', + `task_parent_id` varchar(64) NOT NULL DEFAULT '0' COMMENT 'Task parent id', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Status', + `worker_address` varchar(64) NOT NULL DEFAULT '' COMMENT 'Worker address', + `result` longtext COMMENT 'Task result', + `task_body` blob COMMENT 'Task body', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + UNIQUE KEY `udx_task_id` (`task_id`), + KEY `idx_instance_id_circle_id` (`instance_id`,`circle_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + +# Dump of table worker +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `worker`; + +CREATE TABLE `worker` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'PK', + `app_id` bigint(20) unsigned NOT NULL COMMENT 'Application id', + `namespace_id` bigint(20) unsigned NOT NULL COMMENT 'Namepspace', + `app_name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Application name', + `worker_key` varchar(64) NOT NULL DEFAULT '' COMMENT 'Worker unique key', + `slots_id` bigint(20) unsigned NOT NULL COMMENT 'Slots id', + `address` varchar(32) NOT NULL DEFAULT '' COMMENT 'Address', + `protocol_type` varchar(8) NOT NULL DEFAULT '' COMMENT 'Protocol type', + `version` varchar(32) NOT NULL DEFAULT '' COMMENT 'Version', + `last_heartbeat_time` bigint(12) unsigned NOT NULL COMMENT 'Last heartbeat time', + `status` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT 'Worker status', + `metric` varchar(1024) NOT NULL DEFAULT '' COMMENT 'Metric', + `deleted` tinyint(2) NOT NULL DEFAULT '2' COMMENT 'Delete status. 1=yes 2=no', + `delete_time` bigint(12) unsigned NOT NULL DEFAULT '0' COMMENT 'Delete time', + `create_time` bigint(12) unsigned NOT NULL COMMENT 'Create time', + `update_time` bigint(12) unsigned NOT NULL COMMENT 'Update time', + PRIMARY KEY (`id`), + KEY `udx_address` (`address`), + KEY `idx_namespace_id_app_id` (`namespace_id`,`app_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/openjob-worker/openjob-worker-agent/src/main/java/.keep b/openjob-server/openjob-server-starter/src/main/resources/db/migration/oracle/.keep similarity index 100% rename from openjob-worker/openjob-worker-agent/src/main/java/.keep rename to openjob-server/openjob-server-starter/src/main/resources/db/migration/oracle/.keep diff --git a/openjob-worker/openjob-worker-agent/src/main/resources/.keep b/openjob-server/openjob-server-starter/src/main/resources/db/migration/postgresql/.keep similarity index 100% rename from openjob-worker/openjob-worker-agent/src/main/resources/.keep rename to openjob-server/openjob-server-starter/src/main/resources/db/migration/postgresql/.keep diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.5cb360b5.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.5cb360b5.js new file mode 100644 index 00000000..5b12a49b --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.5cb360b5.js @@ -0,0 +1 @@ +import{S as _}from"./storage.b628b270.js";import{h as a,a9 as l,j as d,k as m,l as e,C as o,D as r,x as p,B as f,aE as h,aF as u}from"./vue.543fafcc.js";import{_ as g}from"./_plugin-vue_export-helper.c27b6911.js";const i=t=>(h("data-v-789f1e91"),t=t(),u(),t),v={class:"error layout-padding"},y={class:"layout-padding-auto layout-padding-view"},w={class:"error-flex"},x={class:"left"},F={class:"left-item"},b=i(()=>e("div",{class:"left-item-animation left-item-num"},"401",-1)),S={class:"left-item-animation left-item-title"},A={class:"left-item-animation left-item-msg"},B={class:"left-item-animation left-item-btn"},k=i(()=>e("div",{class:"right"},[e("img",{src:"https://img-blog.csdnimg.cn/3333f265772a4fa89287993500ecbf96.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"})],-1)),C=a({name:"noPower"}),I=a({...C,setup(t){const c=()=>{_.clear(),window.location.reload()};return(s,N)=>{const n=l("el-button");return d(),m("div",v,[e("div",y,[e("div",w,[e("div",x,[e("div",F,[b,e("div",S,o(s.$t("message.noAccess.accessTitle")),1),e("div",A,o(s.$t("message.noAccess.accessMsg")),1),e("div",B,[r(n,{type:"primary",size:"default",round:"",onClick:c},{default:p(()=>[f(o(s.$t("message.noAccess.accessBtn")),1)]),_:1})])])]),k])])])}}});const $=g(I,[["__scopeId","data-v-789f1e91"]]);export{$ as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.97b0819c.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.97b0819c.css new file mode 100644 index 00000000..ef2503a7 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/401.97b0819c.css @@ -0,0 +1 @@ +.error[data-v-789f1e91]{height:100%}.error .error-flex[data-v-789f1e91]{margin:auto;display:flex;height:350px;width:900px}.error .error-flex .left[data-v-789f1e91]{flex:1;height:100%;align-items:center;display:flex}.error .error-flex .left .left-item .left-item-animation[data-v-789f1e91]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards}.error .error-flex .left .left-item .left-item-num[data-v-789f1e91]{color:var(--el-color-info);font-size:55px}.error .error-flex .left .left-item .left-item-title[data-v-789f1e91]{font-size:20px;color:var(--el-text-color-primary);margin:15px 0 5px;animation-delay:.1s}.error .error-flex .left .left-item .left-item-msg[data-v-789f1e91]{color:var(--el-text-color-secondary);font-size:12px;margin-bottom:30px;animation-delay:.2s}.error .error-flex .left .left-item .left-item-btn[data-v-789f1e91]{animation-delay:.2s}.error .error-flex .right[data-v-789f1e91]{flex:1;opacity:0;animation-name:error-img;animation-duration:2s;animation-fill-mode:forwards}.error .error-flex .right img[data-v-789f1e91]{width:100%;height:100%} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.3c72d64d.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.3c72d64d.css new file mode 100644 index 00000000..3202ce6d --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.3c72d64d.css @@ -0,0 +1 @@ +.error[data-v-7a76f84d]{height:100%}.error .error-flex[data-v-7a76f84d]{margin:auto;display:flex;height:350px;width:900px}.error .error-flex .left[data-v-7a76f84d]{flex:1;height:100%;align-items:center;display:flex}.error .error-flex .left .left-item .left-item-animation[data-v-7a76f84d]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards}.error .error-flex .left .left-item .left-item-num[data-v-7a76f84d]{color:var(--el-color-info);font-size:55px}.error .error-flex .left .left-item .left-item-title[data-v-7a76f84d]{font-size:20px;color:var(--el-text-color-primary);margin:15px 0 5px;animation-delay:.1s}.error .error-flex .left .left-item .left-item-msg[data-v-7a76f84d]{color:var(--el-text-color-secondary);font-size:12px;margin-bottom:30px;animation-delay:.2s}.error .error-flex .left .left-item .left-item-btn[data-v-7a76f84d]{animation-delay:.2s}.error .error-flex .right[data-v-7a76f84d]{flex:1;opacity:0;animation-name:error-img;animation-duration:2s;animation-fill-mode:forwards}.error .error-flex .right img[data-v-7a76f84d]{width:100%;height:100%} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.9418289f.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.9418289f.js new file mode 100644 index 00000000..6c55c646 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/404.9418289f.js @@ -0,0 +1 @@ +import{h as a,aH as c,a9 as l,j as m,k as r,l as t,C as o,D as p,x as u,B as f,aE as h,aF as g}from"./vue.543fafcc.js";import{_ as v}from"./_plugin-vue_export-helper.c27b6911.js";const n=e=>(h("data-v-7a76f84d"),e=e(),g(),e),F={class:"error layout-padding"},y={class:"layout-padding-auto layout-padding-view"},b={class:"error-flex"},x={class:"left"},B={class:"left-item"},k=n(()=>t("div",{class:"left-item-animation left-item-num"},"404",-1)),w={class:"left-item-animation left-item-title"},C={class:"left-item-animation left-item-msg"},I={class:"left-item-animation left-item-btn"},N=n(()=>t("div",{class:"right"},[t("img",{src:"https://img-blog.csdnimg.cn/9eb1d85a417f4ed1ba7107f149ce3da1.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"})],-1)),S=a({name:"notFound"}),E=a({...S,setup(e){const i=c(),d=()=>{i.push("/")};return(s,H)=>{const _=l("el-button");return m(),r("div",F,[t("div",y,[t("div",b,[t("div",x,[t("div",B,[k,t("div",w,o(s.$t("message.notFound.foundTitle")),1),t("div",C,o(s.$t("message.notFound.foundMsg")),1),t("div",I,[p(_,{type:"primary",size:"default",round:"",onClick:d},{default:u(()=>[f(o(s.$t("message.notFound.foundBtn")),1)]),_:1})])])]),N])])])}}});const $=v(E,[["__scopeId","data-v-7a76f84d"]]);export{$ as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/_commonjsHelpers.35101cd5.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/_commonjsHelpers.35101cd5.js new file mode 100644 index 00000000..109b04c4 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/_commonjsHelpers.35101cd5.js @@ -0,0 +1 @@ +var f=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function l(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function a(e){var r=e.default;if(typeof r=="function"){var n=function o(){if(this instanceof o){var t=[null];t.push.apply(t,arguments);var u=Function.bind.apply(r,t);return new u}return r.apply(this,arguments)};n.prototype=r.prototype}else n={};return Object.defineProperty(n,"__esModule",{value:!0}),Object.keys(e).forEach(function(o){var t=Object.getOwnPropertyDescriptor(e,o);Object.defineProperty(n,o,t.get?t:{enumerable:!0,get:function(){return e[o]}})}),n}export{a,f as c,l as g}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/_plugin-vue_export-helper.c27b6911.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/_plugin-vue_export-helper.c27b6911.js new file mode 100644 index 00000000..718edd33 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/_plugin-vue_export-helper.c27b6911.js @@ -0,0 +1 @@ +const s=(t,r)=>{const o=t.__vccOpts||t;for(const[c,e]of r)o[c]=e;return o};export{s as _}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/abap.ffbe9c82.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/abap.ffbe9c82.js new file mode 100644 index 00000000..1a53ef6c --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/abap.ffbe9c82.js @@ -0,0 +1 @@ +var e={comments:{lineComment:"*"},brackets:[["[","]"],["(",")"]]},t={defaultToken:"invalid",ignoreCase:!0,tokenPostfix:".abap",keywords:["abap-source","abbreviated","abstract","accept","accepting","according","activation","actual","add","add-corresponding","adjacent","after","alias","aliases","align","all","allocate","alpha","analysis","analyzer","and","append","appendage","appending","application","archive","area","arithmetic","as","ascending","aspect","assert","assign","assigned","assigning","association","asynchronous","at","attributes","authority","authority-check","avg","back","background","backup","backward","badi","base","before","begin","between","big","binary","bintohex","bit","black","blank","blanks","blob","block","blocks","blue","bound","boundaries","bounds","boxed","break-point","buffer","by","bypassing","byte","byte-order","call","calling","case","cast","casting","catch","center","centered","chain","chain-input","chain-request","change","changing","channels","character","char-to-hex","check","checkbox","ci_","circular","class","class-coding","class-data","class-events","class-methods","class-pool","cleanup","clear","client","clob","clock","close","coalesce","code","coding","col_background","col_group","col_heading","col_key","col_negative","col_normal","col_positive","col_total","collect","color","column","columns","comment","comments","commit","common","communication","comparing","component","components","compression","compute","concat","concat_with_space","concatenate","cond","condense","condition","connect","connection","constants","context","contexts","continue","control","controls","conv","conversion","convert","copies","copy","corresponding","country","cover","cpi","create","creating","critical","currency","currency_conversion","current","cursor","cursor-selection","customer","customer-function","dangerous","data","database","datainfo","dataset","date","dats_add_days","dats_add_months","dats_days_between","dats_is_valid","daylight","dd/mm/yy","dd/mm/yyyy","ddmmyy","deallocate","decimal_shift","decimals","declarations","deep","default","deferred","define","defining","definition","delete","deleting","demand","department","descending","describe","destination","detail","dialog","directory","disconnect","display","display-mode","distinct","divide","divide-corresponding","division","do","dummy","duplicate","duplicates","duration","during","dynamic","dynpro","edit","editor-call","else","elseif","empty","enabled","enabling","encoding","end","endat","endcase","endcatch","endchain","endclass","enddo","endenhancement","end-enhancement-section","endexec","endform","endfunction","endian","endif","ending","endinterface","end-lines","endloop","endmethod","endmodule","end-of-definition","end-of-editing","end-of-file","end-of-page","end-of-selection","endon","endprovide","endselect","end-test-injection","end-test-seam","endtry","endwhile","endwith","engineering","enhancement","enhancement-point","enhancements","enhancement-section","entries","entry","enum","environment","equiv","errormessage","errors","escaping","event","events","exact","except","exception","exceptions","exception-table","exclude","excluding","exec","execute","exists","exit","exit-command","expand","expanding","expiration","explicit","exponent","export","exporting","extend","extended","extension","extract","fail","fetch","field","field-groups","fields","field-symbol","field-symbols","file","filter","filters","filter-table","final","find","first","first-line","fixed-point","fkeq","fkge","flush","font","for","form","format","forward","found","frame","frames","free","friends","from","function","functionality","function-pool","further","gaps","generate","get","giving","gkeq","gkge","global","grant","green","group","groups","handle","handler","harmless","hashed","having","hdb","header","headers","heading","head-lines","help-id","help-request","hextobin","hide","high","hint","hold","hotspot","icon","id","identification","identifier","ids","if","ignore","ignoring","immediately","implementation","implementations","implemented","implicit","import","importing","in","inactive","incl","include","includes","including","increment","index","index-line","infotypes","inheriting","init","initial","initialization","inner","inout","input","insert","instance","instances","instr","intensified","interface","interface-pool","interfaces","internal","intervals","into","inverse","inverted-date","is","iso","job","join","keep","keeping","kernel","key","keys","keywords","kind","language","last","late","layout","leading","leave","left","left-justified","leftplus","leftspace","legacy","length","let","level","levels","like","line","lines","line-count","linefeed","line-selection","line-size","list","listbox","list-processing","little","llang","load","load-of-program","lob","local","locale","locator","logfile","logical","log-point","long","loop","low","lower","lpad","lpi","ltrim","mail","main","major-id","mapping","margin","mark","mask","match","matchcode","max","maximum","medium","members","memory","mesh","message","message-id","messages","messaging","method","methods","min","minimum","minor-id","mm/dd/yy","mm/dd/yyyy","mmddyy","mode","modif","modifier","modify","module","move","move-corresponding","multiply","multiply-corresponding","name","nametab","native","nested","nesting","new","new-line","new-page","new-section","next","no","no-display","no-extension","no-gap","no-gaps","no-grouping","no-heading","no-scrolling","no-sign","no-title","no-topofpage","no-zero","node","nodes","non-unicode","non-unique","not","null","number","object","objects","obligatory","occurrence","occurrences","occurs","of","off","offset","ole","on","only","open","option","optional","options","or","order","other","others","out","outer","output","output-length","overflow","overlay","pack","package","pad","padding","page","pages","parameter","parameters","parameter-table","part","partially","pattern","percentage","perform","performing","person","pf1","pf10","pf11","pf12","pf13","pf14","pf15","pf2","pf3","pf4","pf5","pf6","pf7","pf8","pf9","pf-status","pink","places","pool","pos_high","pos_low","position","pragmas","precompiled","preferred","preserving","primary","print","print-control","priority","private","procedure","process","program","property","protected","provide","public","push","pushbutton","put","queue-only","quickinfo","radiobutton","raise","raising","range","ranges","read","reader","read-only","receive","received","receiver","receiving","red","redefinition","reduce","reduced","ref","reference","refresh","regex","reject","remote","renaming","replace","replacement","replacing","report","request","requested","reserve","reset","resolution","respecting","responsible","result","results","resumable","resume","retry","return","returncode","returning","returns","right","right-justified","rightplus","rightspace","risk","rmc_communication_failure","rmc_invalid_status","rmc_system_failure","role","rollback","rows","rpad","rtrim","run","sap","sap-spool","saving","scale_preserving","scale_preserving_scientific","scan","scientific","scientific_with_leading_zero","scroll","scroll-boundary","scrolling","search","secondary","seconds","section","select","selection","selections","selection-screen","selection-set","selection-sets","selection-table","select-options","send","separate","separated","set","shared","shift","short","shortdump-id","sign_as_postfix","single","size","skip","skipping","smart","some","sort","sortable","sorted","source","specified","split","spool","spots","sql","sqlscript","stable","stamp","standard","starting","start-of-editing","start-of-selection","state","statement","statements","static","statics","statusinfo","step-loop","stop","structure","structures","style","subkey","submatches","submit","subroutine","subscreen","subtract","subtract-corresponding","suffix","sum","summary","summing","supplied","supply","suppress","switch","switchstates","symbol","syncpoints","syntax","syntax-check","syntax-trace","system-call","system-exceptions","system-exit","tab","tabbed","table","tables","tableview","tabstrip","target","task","tasks","test","testing","test-injection","test-seam","text","textpool","then","throw","time","times","timestamp","timezone","tims_is_valid","title","titlebar","title-lines","to","tokenization","tokens","top-lines","top-of-page","trace-file","trace-table","trailing","transaction","transfer","transformation","translate","transporting","trmac","truncate","truncation","try","tstmp_add_seconds","tstmp_current_utctimestamp","tstmp_is_valid","tstmp_seconds_between","type","type-pool","type-pools","types","uline","unassign","under","unicode","union","unique","unit_conversion","unix","unpack","until","unwind","up","update","upper","user","user-command","using","utf-8","valid","value","value-request","values","vary","varying","verification-message","version","via","view","visible","wait","warning","when","whenever","where","while","width","window","windows","with","with-heading","without","with-title","word","work","write","writer","xml","xsd","yellow","yes","yymmdd","zero","zone","abap_system_timezone","abap_user_timezone","access","action","adabas","adjust_numbers","allow_precision_loss","allowed","amdp","applicationuser","as_geo_json","as400","associations","balance","behavior","breakup","bulk","cds","cds_client","check_before_save","child","clients","corr","corr_spearman","cross","cycles","datn_add_days","datn_add_months","datn_days_between","dats_from_datn","dats_tims_to_tstmp","dats_to_datn","db2","db6","ddl","dense_rank","depth","deterministic","discarding","entities","entity","error","failed","finalize","first_value","fltp_to_dec","following","fractional","full","graph","grouping","hierarchy","hierarchy_ancestors","hierarchy_ancestors_aggregate","hierarchy_descendants","hierarchy_descendants_aggregate","hierarchy_siblings","incremental","indicators","lag","last_value","lead","leaves","like_regexpr","link","locale_sap","lock","locks","many","mapped","matched","measures","median","mssqlnt","multiple","nodetype","ntile","nulls","occurrences_regexpr","one","operations","oracle","orphans","over","parent","parents","partition","pcre","period","pfcg_mapping","preceding","privileged","product","projection","rank","redirected","replace_regexpr","reported","response","responses","root","row","row_number","sap_system_date","save","schema","session","sets","shortdump","siblings","spantree","start","stddev","string_agg","subtotal","sybase","tims_from_timn","tims_to_timn","to_blob","to_clob","total","trace-entry","tstmp_to_dats","tstmp_to_dst","tstmp_to_tims","tstmpl_from_utcl","tstmpl_to_utcl","unbounded","utcl_add_seconds","utcl_current","utcl_seconds_between","uuid","var","verbatim"],builtinFunctions:["abs","acos","asin","atan","bit-set","boolc","boolx","ceil","char_off","charlen","cmax","cmin","concat_lines_of","contains","contains_any_not_of","contains_any_of","cos","cosh","count","count_any_not_of","count_any_of","dbmaxlen","distance","escape","exp","find_any_not_of","find_any_of","find_end","floor","frac","from_mixed","ipow","line_exists","line_index","log","log10","matches","nmax","nmin","numofchar","repeat","rescale","reverse","round","segment","shift_left","shift_right","sign","sin","sinh","sqrt","strlen","substring","substring_after","substring_before","substring_from","substring_to","tan","tanh","to_lower","to_mixed","to_upper","trunc","utclong_add","utclong_current","utclong_diff","xsdbool","xstrlen"],typeKeywords:["b","c","d","decfloat16","decfloat34","f","i","int8","n","p","s","string","t","utclong","x","xstring","any","clike","csequence","decfloat","numeric","simple","xsequence","accp","char","clnt","cuky","curr","datn","dats","d16d","d16n","d16r","d34d","d34n","d34r","dec","df16_dec","df16_raw","df34_dec","df34_raw","fltp","geom_ewkb","int1","int2","int4","lang","lchr","lraw","numc","quan","raw","rawstring","sstring","timn","tims","unit","utcl","df16_scl","df34_scl","prec","varc","abap_bool","abap_false","abap_true","abap_undefined","me","screen","space","super","sy","syst","table_line","*sys*"],builtinMethods:["class_constructor","constructor"],derivedTypes:["%CID","%CID_REF","%CONTROL","%DATA","%ELEMENT","%FAIL","%KEY","%MSG","%PARAM","%PID","%PID_ASSOC","%PID_PARENT","%_HINTS"],cdsLanguage:["@AbapAnnotation","@AbapCatalog","@AccessControl","@API","@ClientDependent","@ClientHandling","@CompatibilityContract","@DataAging","@EndUserText","@Environment","@LanguageDependency","@MappingRole","@Metadata","@MetadataExtension","@ObjectModel","@Scope","@Semantics","$EXTENSION","$SELF"],selectors:["->","->*","=>","~","~*"],operators:[" +"," -","/","*","**","div","mod","=","#","@","+=","-=","*=","/=","**=","&&=","?=","&","&&","bit-and","bit-not","bit-or","bit-xor","m","o","z","<"," >","<=",">=","<>","><","=<","=>","bt","byte-ca","byte-cn","byte-co","byte-cs","byte-na","byte-ns","ca","cn","co","cp","cs","eq","ge","gt","le","lt","na","nb","ne","np","ns","*/","*:","--","/*","//"],symbols:/[=>))*/,{cases:{"@typeKeywords":"type","@keywords":"keyword","@cdsLanguage":"annotation","@derivedTypes":"type","@builtinFunctions":"type","@builtinMethods":"type","@operators":"key","@default":"identifier"}}],[/<[\w]+>/,"identifier"],[/##[\w|_]+/,"comment"],{include:"@whitespace"},[/[:,.]/,"delimiter"],[/[{}()\[\]]/,"@brackets"],[/@symbols/,{cases:{"@selectors":"tag","@operators":"key","@default":""}}],[/'/,{token:"string",bracket:"@open",next:"@stringquote"}],[/`/,{token:"string",bracket:"@open",next:"@stringping"}],[/\|/,{token:"string",bracket:"@open",next:"@stringtemplate"}],[/\d+/,"number"]],stringtemplate:[[/[^\\\|]+/,"string"],[/\\\|/,"string"],[/\|/,{token:"string",bracket:"@close",next:"@pop"}]],stringping:[[/[^\\`]+/,"string"],[/`/,{token:"string",bracket:"@close",next:"@pop"}]],stringquote:[[/[^\\']+/,"string"],[/'/,{token:"string",bracket:"@close",next:"@pop"}]],whitespace:[[/[ \t\r\n]+/,""],[/^\*.*$/,"comment"],[/\".*$/,"comment"]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.bdfb30a6.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.bdfb30a6.css new file mode 100644 index 00000000..c82733b7 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.bdfb30a6.css @@ -0,0 +1 @@ +.login-content-form[data-v-0cd136ae]{margin-top:20px}.login-content-form .login-animation1[data-v-0cd136ae]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards;animation-delay:.1s}.login-content-form .login-animation2[data-v-0cd136ae]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards;animation-delay:.2s}.login-content-form .login-animation3[data-v-0cd136ae]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards;animation-delay:.3s}.login-content-form .login-animation4[data-v-0cd136ae]{opacity:0;animation-name:error-num;animation-duration:.5s;animation-fill-mode:forwards;animation-delay:.4s}.login-content-form .login-content-password[data-v-0cd136ae]{display:inline-block;width:20px;cursor:pointer}.login-content-form .login-content-password[data-v-0cd136ae]:hover{color:#909399}.login-content-form .login-content-code[data-v-0cd136ae]{width:100%;padding:0;font-weight:700;letter-spacing:5px}.login-content-form .login-content-submit[data-v-0cd136ae]{width:100%;letter-spacing:2px;font-weight:300;margin-top:15px} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.d0442d41.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.d0442d41.js new file mode 100644 index 00000000..ba9c750b --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/account.d0442d41.js @@ -0,0 +1 @@ +import{h as P,ar as U,aq as q,aH as B,K as R,a as $,a9 as n,ac as A,j as _,v as f,x as o,D as s,l as v,n as D,y as x,B as E,C as L}from"./vue.543fafcc.js";import{u as j}from"./vue-i18n.cjs.f888bd5c.js";import{u as z}from"./themeConfig.084d7f79.js";import{i as J,b as K}from"./index.b8b1b364.js";import{S as O}from"./storage.b628b270.js";import{a as G}from"./formatTime.057ac5b9.js";import{N as H}from"./loading.7efee3a8.js";import{u as M}from"./index.5df4e03c.js";import{u as Q}from"./userInfo.2fef1b52.js";import{ay as I}from"./index.070d5527.js";import{_ as W}from"./_plugin-vue_export-helper.c27b6911.js";import"./_commonjsHelpers.35101cd5.js";import"./index.18e5bded.js";import"./keepAliveNames.cf66da55.js";import"./routesList.76e57b72.js";import"./preload-helper.101896b7.js";import"./tagsViewRoutes.92636029.js";import"./request.b1530b7c.js";import"./index.4ac74e37.js";import"./index.3b68140d.js";const X=P({name:"loginAccount"}),Y=P({...X,setup(Z){const C=M(),{t:S}=j(),V=z(),{themeConfig:N}=U(V),m=q(),g=B(),t=R({isShowPassword:!1,ruleForm:{username:"",password:"",keeplive:!0,code:"1234"},loading:{signIn:!1}}),T=$(()=>G(new Date)),k=async()=>{t.loading.signIn=!0;let a=t.ruleForm;try{const e=await C.login(a);console.log(e),Q().saveToSession(e.username,e.sessionKey,{userName:e.username,photo:"https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500",time:1800,roles:[],isAdmin:e.supperAdmin,authBtnList:[],perms:e.permNames})}catch(e){console.log(e),t.loading.signIn=!1;return}if(console.log("登录后 - 加载菜单路由列表"),N.value.isRequestRoutes){const e=await K();console.log("加载菜单路由列表",e),w(e)}else{const e=await J();w(e)}},w=a=>{var e,u,l,r;if(a)I.warning("抱歉，您没有登录权限"),O.clear();else{let i=T.value;(e=m.query)!=null&&e.redirect?g.push({path:(u=m.query)==null?void 0:u.redirect,query:Object.keys((l=m.query)==null?void 0:l.params).length>0?JSON.parse((r=m.query)==null?void 0:r.params):""}):g.push("/");const p=S("message.signInText");I.success(`${i}，${p}`),H.start()}t.loading.signIn=!1};return(a,e)=>{const u=n("ele-User"),l=n("el-icon"),r=n("el-input"),i=n("el-form-item"),p=n("ele-Unlock"),F=n("ele-Position"),d=n("el-col"),h=n("el-button"),b=n("el-form"),y=A("waves");return _(),f(b,{size:"large",class:"login-content-form"},{default:o(()=>[s(i,{class:"login-animation1"},{default:o(()=>[s(r,{text:"",placeholder:a.$t("message.account.accountPlaceholder1"),modelValue:t.ruleForm.username,"onUpdate:modelValue":e[0]||(e[0]=c=>t.ruleForm.username=c),clearable:"",autocomplete:"off"},{prefix:o(()=>[s(l,{class:"el-input__icon"},{default:o(()=>[s(u)]),_:1})]),_:1},8,["placeholder","modelValue"])]),_:1}),s(i,{class:"login-animation2"},{default:o(()=>[s(r,{type:t.isShowPassword?"text":"password",placeholder:a.$t("message.account.accountPlaceholder2"),modelValue:t.ruleForm.password,"onUpdate:modelValue":e[2]||(e[2]=c=>t.ruleForm.password=c),autocomplete:"off"},{prefix:o(()=>[s(l,{class:"el-input__icon"},{default:o(()=>[s(p)]),_:1})]),suffix:o(()=>[v("i",{class:D(["iconfont el-input__icon login-content-password",t.isShowPassword?"icon-yincangmima":"icon-xianshimima"]),onClick:e[1]||(e[1]=c=>t.isShowPassword=!t.isShowPassword)},null,2)]),_:1},8,["type","placeholder","modelValue"])]),_:1}),s(i,{class:"login-animation3"},{default:o(()=>[s(d,{span:15},{default:o(()=>[s(r,{text:"",maxlength:"4",placeholder:a.$t("message.account.accountPlaceholder3"),modelValue:t.ruleForm.code,"onUpdate:modelValue":e[3]||(e[3]=c=>t.ruleForm.code=c),clearable:"",autocomplete:"off"},{prefix:o(()=>[s(l,{class:"el-input__icon"},{default:o(()=>[s(F)]),_:1})]),_:1},8,["placeholder","modelValue"])]),_:1}),s(d,{span:1}),s(d,{span:8},{default:o(()=>[x((_(),f(h,{class:"login-content-code"},{default:o(()=>[E("1234")]),_:1})),[[y]])]),_:1})]),_:1}),s(i,{class:"login-animation4"},{default:o(()=>[x((_(),f(h,{type:"primary",class:"login-content-submit",round:"",onClick:k,loading:t.loading.signIn},{default:o(()=>[v("span",null,L(a.$t("message.account.accountBtnText")),1)]),_:1},8,["loading"])),[[y]])]),_:1})]),_:1})}}});const ve=W(Y,[["__scopeId","data-v-0cd136ae"]]);export{ve as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/apex.38989e74.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/apex.38989e74.js new file mode 100644 index 00000000..1125d158 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/apex.38989e74.js @@ -0,0 +1 @@ +var n={wordPattern:/(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"},{open:"<",close:">"}],folding:{markers:{start:new RegExp("^\\s*//\\s*(?:(?:#?region\\b)|(?:))")}}},s=["abstract","activate","and","any","array","as","asc","assert","autonomous","begin","bigdecimal","blob","boolean","break","bulk","by","case","cast","catch","char","class","collect","commit","const","continue","convertcurrency","decimal","default","delete","desc","do","double","else","end","enum","exception","exit","export","extends","false","final","finally","float","for","from","future","get","global","goto","group","having","hint","if","implements","import","in","inner","insert","instanceof","int","interface","into","join","last_90_days","last_month","last_n_days","last_week","like","limit","list","long","loop","map","merge","native","new","next_90_days","next_month","next_n_days","next_week","not","null","nulls","number","object","of","on","or","outer","override","package","parallel","pragma","private","protected","public","retrieve","return","returning","rollback","savepoint","search","select","set","short","sort","stat","static","strictfp","super","switch","synchronized","system","testmethod","then","this","this_month","this_week","throw","throws","today","tolabel","tomorrow","transaction","transient","trigger","true","try","type","undelete","update","upsert","using","virtual","void","volatile","webservice","when","where","while","yesterday"],o=e=>e.charAt(0).toUpperCase()+e.substr(1),t=[];s.forEach(e=>{t.push(e),t.push(e.toUpperCase()),t.push(o(e))});var i={defaultToken:"",tokenPostfix:".apex",keywords:t,operators:["=",">","<","!","~","?",":","==","<=",">=","!=","&&","||","++","--","+","-","*","/","&","|","^","%","<<",">>",">>>","+=","-=","*=","/=","&=","|=","^=","%=","<<=",">>=",">>>="],symbols:/[=>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/@\s*[a-zA-Z_\$][\w\$]*/,"annotation"],[/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/,"number.float"],[/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/,"number.float"],[/(@digits)[fFdD]/,"number.float"],[/(@digits)[lL]?/,"number"],[/[;,.]/,"delimiter"],[/"([^"\\]|\\.)*$/,"string.invalid"],[/'([^'\\]|\\.)*$/,"string.invalid"],[/"/,"string",'@string."'],[/'/,"string","@string.'"],[/'[^\\']'/,"string"],[/(')(@escapes)(')/,["string","string.escape","string"]],[/'/,"string.invalid"]],whitespace:[[/[ \t\r\n]+/,""],[/\/\*\*(?!\/)/,"comment.doc","@apexdoc"],[/\/\*/,"comment","@comment"],[/\/\/.*$/,"comment"]],comment:[[/[^\/*]+/,"comment"],[/\*\//,"comment","@pop"],[/[\/*]/,"comment"]],apexdoc:[[/[^\/*]+/,"comment.doc"],[/\*\//,"comment.doc","@pop"],[/[\/*]/,"comment.doc"]],string:[[/[^\\"']+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/["']/,{cases:{"$#==$S2":{token:"string",next:"@pop"},"@default":"string"}}]]}};export{n as conf,i as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/arrayOperation.b573dead.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/arrayOperation.b573dead.js new file mode 100644 index 00000000..0e045c13 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/arrayOperation.b573dead.js @@ -0,0 +1 @@ +function c(n,e){const r=u(n),l=u(e);let t=0;const s=r.length;for(let o in l)for(let f in r)l[o]===r[f]&&t++;return t===s}function i(n,e){if(!n||!e)return!1;let r=Object.getOwnPropertyNames(n),l=Object.getOwnPropertyNames(e);if(r.length!=l.length)return!1;for(let t=0;t(r[t[e]]||(r[t[e]]=t[e]&&l.push(t)),l),[])}else return[...new Set(n)];else return n}export{i,c as j}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/aside.8d4db85d.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/aside.8d4db85d.js new file mode 100644 index 00000000..bc30b705 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/aside.8d4db85d.js @@ -0,0 +1 @@ +import{_ as C}from"./preload-helper.101896b7.js";import{h as A,ap as b,r as D,ar as m,K as I,a as L,b as N,w as g,a9 as S,y as O,E as P,u as a,j as F,k as j,D as f,x as w,v as q,A as z,n as H}from"./vue.543fafcc.js";import{p as $}from"./index.18e5bded.js";import{u as K}from"./routesList.76e57b72.js";import{u as G}from"./themeConfig.084d7f79.js";import{u as J}from"./tagsViewRoutes.92636029.js";import{e as l}from"./mitt.7f99bbc0.js";import"./storage.b628b270.js";const Q={class:"h100"},U=A({name:"layoutAside"}),ae=A({...U,setup(X){const R=b(()=>C(()=>import("./index.9f9e529f.js"),["assets/index.9f9e529f.js","assets/vue.543fafcc.js","assets/themeConfig.084d7f79.js","assets/logo-mini.323e783b.js","assets/_plugin-vue_export-helper.c27b6911.js","assets/index.880bac10.css"])),T=b(()=>C(()=>import("./vertical.751950be.js"),["assets/vertical.751950be.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/themeConfig.084d7f79.js","assets/other.eb37633a.js","assets/index.3b68140d.js","assets/index.b8b1b364.js","assets/_commonjsHelpers.35101cd5.js","assets/index.18e5bded.js","assets/keepAliveNames.cf66da55.js","assets/routesList.76e57b72.js","assets/storage.b628b270.js","assets/userInfo.2fef1b52.js","assets/loading.7efee3a8.js","assets/loading.70fbfd85.css","assets/tagsViewRoutes.92636029.js","assets/request.b1530b7c.js","assets/index.4ac74e37.js","assets/index.070d5527.js","assets/index.8b89e2e0.css","assets/index.05309dac.js","assets/vue-i18n.cjs.f888bd5c.js","assets/toolsValidate.7cb139e2.js"])),r=D(),p=K(),E=G(),M=J(),{routesList:B}=m(p),{themeConfig:i}=m(E),{isTagsViewCurrenFull:V}=m(M),n=I({menuList:[],clientWidth:0}),W=L(()=>{const{layout:e,isCollapse:t,menuBar:s}=i.value,o=["#FFFFFF","#FFF","#fff","#ffffff"].includes(s)?"layout-el-aside-br-color":"";if(n.clientWidth<=1e3)if(t){document.body.setAttribute("class","el-popup-parent--hidden");const x=document.querySelector(".layout-container"),d=document.createElement("div");return d.setAttribute("class","layout-aside-mobile-mode"),x.appendChild(d),d.addEventListener("click",u),[o,"layout-aside-mobile","layout-aside-mobile-open"]}else return u(),[o,"layout-aside-mobile","layout-aside-mobile-close"];else return e==="columns"?t?[o,"layout-aside-pc-1"]:[o,"layout-aside-pc-220"]:t?[o,"layout-aside-pc-64"]:[o,"layout-aside-pc-220"]}),k=L(()=>{let{layout:e,isShowLogo:t}=i.value;return t&&e==="defaults"||t&&e==="columns"}),u=()=>{const e=document.querySelector(".layout-aside-mobile-mode");e==null||e.setAttribute("style","animation: error-img-two 0.3s"),setTimeout(()=>{var s;(s=e==null?void 0:e.parentNode)==null||s.removeChild(e)},300),document.body.clientWidth<1e3&&(i.value.isCollapse=!1),document.body.setAttribute("class","")},c=()=>{if(i.value.layout==="columns")return!1;n.menuList=y(B.value)},y=e=>e.filter(t=>{var s;return!((s=t.meta)!=null&&s.isHide)}).map(t=>(t=Object.assign({},t),t.children&&(t.children=y(t.children)),t)),h=e=>{n.clientWidth=e},_=e=>{let{layout:t}=i.value;if(t!=="columns")return!1;e||l.emit("restoreDefault"),p.setColumnsMenuHover(e)};return N(()=>{h(document.body.clientWidth),c(),l.on("setSendColumnsChildren",e=>{n.menuList=e.children}),l.on("setSendClassicChildren",e=>{let{layout:t,isClassicSplitMenu:s}=i.value;t==="classic"&&s&&(n.menuList=[],n.menuList=e.children)}),l.on("getBreadcrumbIndexSetFilterRoutes",()=>{c()}),l.on("layoutMobileResize",e=>{h(e.clientWidth),u()})}),g(i.value,e=>{e.isShowLogoChange!==e.isShowLogo&&r.value&&r.value.update()}),g($.state,e=>{let{layout:t,isClassicSplitMenu:s}=e.themeConfig.themeConfig;if(t==="classic"&&s)return!1;c()},{deep:!0}),(e,t)=>{const s=S("el-scrollbar"),v=S("el-aside");return O((F(),j("div",Q,[f(v,{class:H(["layout-aside",a(W)])},{default:w(()=>[a(k)?(F(),q(a(R),{key:0})):z("",!0),f(s,{class:"flex-auto",ref_key:"layoutAsideScrollbarRef",ref:r,onMouseenter:t[0]||(t[0]=o=>_(!0)),onMouseleave:t[1]||(t[1]=o=>_(!1))},{default:w(()=>[f(a(T),{menuList:n.menuList},null,8,["menuList"])]),_:1},512)]),_:1},8,["class"])],512)),[[P,!a(V)]])}}});export{ae as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/auth.9f634aa7.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/auth.9f634aa7.js new file mode 100644 index 00000000..a4e5d7eb --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/auth.9f634aa7.js @@ -0,0 +1 @@ +import{h as t,ar as u,a as m,u as f,m as p,A as c}from"./vue.543fafcc.js";import{u as l}from"./userInfo.2fef1b52.js";import"./storage.b628b270.js";const d=t({name:"auth"}),g=t({...d,props:{value:{type:String,default:()=>""}},setup(s){const o=s,r=l(),{userInfos:a}=u(r),n=m(()=>a.value.authBtnList.some(e=>e===o.value));return(e,i)=>f(n)?p(e.$slots,"default",{key:0}):c("",!0)}});export{g as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/authAll.13da74cb.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/authAll.13da74cb.js new file mode 100644 index 00000000..95f871ab --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/authAll.13da74cb.js @@ -0,0 +1 @@ +import{h as e,ar as u,a as m,u as f,m as p,A as c}from"./vue.543fafcc.js";import{u as l}from"./userInfo.2fef1b52.js";import{j as d}from"./arrayOperation.b573dead.js";import"./storage.b628b270.js";const i=e({name:"authAll"}),j=e({...i,props:{value:{type:Array,default:()=>[]}},setup(t){const s=t,r=l(),{userInfos:o}=u(r),a=m(()=>d(s.value,o.value.authBtnList));return(n,_)=>f(a)?p(n.$slots,"default",{key:0}):c("",!0)}});export{j as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/auths.d8e07afa.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/auths.d8e07afa.js new file mode 100644 index 00000000..2f74b849 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/auths.d8e07afa.js @@ -0,0 +1 @@ +import{h as s,ar as m,a as p,u as l,m as c,A as d}from"./vue.543fafcc.js";import{u as i}from"./userInfo.2fef1b52.js";import"./storage.b628b270.js";const _=s({name:"auths"}),A=s({..._,props:{value:{type:Array,default:()=>[]}},setup(a){const r=a,o=i(),{userInfos:u}=m(o),n=p(()=>{let e=!1;return u.value.authBtnList.map(t=>{r.value.map(f=>{t===f&&(e=!0)})}),e});return(e,t)=>l(n)?c(e.$slots,"default",{key:0}):d("",!0)}});export{A as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/azcli.714c239b.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/azcli.714c239b.js new file mode 100644 index 00000000..dd4f4987 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/azcli.714c239b.js @@ -0,0 +1 @@ +var e={comments:{lineComment:"#"}},t={defaultToken:"keyword",ignoreCase:!0,tokenPostfix:".azcli",str:/[^#\s]/,tokenizer:{root:[{include:"@comment"},[/\s-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}],[/^-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":{token:"key.identifier",next:"@type"}}}]],type:[{include:"@comment"},[/-+@str*\s*/,{cases:{"@eos":{token:"key.identifier",next:"@popall"},"@default":"key.identifier"}}],[/@str+\s*/,{cases:{"@eos":{token:"string",next:"@popall"},"@default":"string"}}]],comment:[[/#.*$/,{cases:{"@eos":{token:"comment",next:"@popall"}}}]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/bat.7eb152e5.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/bat.7eb152e5.js new file mode 100644 index 00000000..0869f492 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/bat.7eb152e5.js @@ -0,0 +1 @@ +var e={comments:{lineComment:"REM"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],surroundingPairs:[{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'}],folding:{markers:{start:new RegExp("^\\s*(::\\s*|REM\\s+)#region"),end:new RegExp("^\\s*(::\\s*|REM\\s+)#endregion")}}},s={defaultToken:"",ignoreCase:!0,tokenPostfix:".bat",brackets:[{token:"delimiter.bracket",open:"{",close:"}"},{token:"delimiter.parenthesis",open:"(",close:")"},{token:"delimiter.square",open:"[",close:"]"}],keywords:/call|defined|echo|errorlevel|exist|for|goto|if|pause|set|shift|start|title|not|pushd|popd/,symbols:/[=>`\\b${e}\\b`,t="[_a-zA-Z]",o="[_a-zA-Z0-9]",r=n(`${t}${o}*`),i=["targetScope","resource","module","param","var","output","for","in","if","existing"],a=["true","false","null"],s="[ \\t\\r\\n]",c="[0-9]+",g={comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"'",close:"'"},{open:"'''",close:"'''"}],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"'",close:"'",notIn:["string","comment"]},{open:"'''",close:"'''",notIn:["string","comment"]}],autoCloseBefore:`:.,=}])' + `,indentationRules:{increaseIndentPattern:new RegExp("^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$"),decreaseIndentPattern:new RegExp("^((?!.*?\\/\\*).*\\*/)?\\s*[\\}\\]].*$")}},l={defaultToken:"",tokenPostfix:".bicep",brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"}],symbols:/[=>"u")throw new Error("BMap api is not loaded");if(_=_||H(),e)throw new Error("Only one bmap component can exist");var i;if(!o.__bmap){var p=a.querySelector(".ec-extension-bmap");p&&(l.style.left="0px",l.style.top="0px",a.removeChild(p)),p=document.createElement("div"),p.className="ec-extension-bmap",p.style.cssText="position:absolute;width:100%;height:100%",a.appendChild(p);var s=o.get("mapOptions");s&&(s=S(s),delete s.mapType),i=o.__bmap=new BMap.Map(p,s);var g=new _(l);i.addOverlay(g),f.getViewportRootOffset=function(){return{offsetLeft:0,offsetTop:0}}}i=o.__bmap;var m=o.get("center"),c=o.get("zoom");if(m&&c){var y=i.getCenter(),v=i.getZoom(),u=o.centerOrZoomChanged([y.lng,y.lat],v);if(u){var w=new BMap.Point(m[0],m[1]);i.centerAndZoom(w,c)}}e=new r(i,n),e.setMapOffset(o.__mapOffset||[0,0]),e.setZoom(c),e.setCenter(m),o.coordinateSystem=e}),t.eachSeries(function(o){o.get("coordinateSystem")==="bmap"&&(o.coordinateSystem=e)}),e&&[e]};function R(t,n){return t&&n&&t[0]===n[0]&&t[1]===n[1]}z({type:"bmap",getBMap:function(){return this.__bmap},setCenterAndZoom:function(t,n){this.option.center=t,this.option.zoom=n},centerOrZoomChanged:function(t,n){var e=this.option;return!(R(t,e.center)&&n===e.zoom)},defaultOption:{center:[104.114129,37.550339],zoom:5,mapStyle:{},mapStyleV2:{},mapOptions:{},roam:!1}});function Z(t){for(var n in t)if(t.hasOwnProperty(n))return!1;return!0}x({type:"bmap",render:function(t,n,e){var a=!0,o=t.getBMap(),f=e.getZr().painter.getViewportRoot(),l=t.coordinateSystem,i=function(w,D){if(!a){var O=f.parentNode.parentNode.parentNode,h=[-parseInt(O.style.left,10)||0,-parseInt(O.style.top,10)||0],d=f.style,C=h[0]+"px",P=h[1]+"px";d.left!==C&&(d.left=C),d.top!==P&&(d.top=P),l.setMapOffset(h),t.__mapOffset=h,e.dispatchAction({type:"bmapRoam",animation:{duration:0}})}};function p(){a||e.dispatchAction({type:"bmapRoam",animation:{duration:0}})}o.removeEventListener("moving",this._oldMoveHandler),o.removeEventListener("moveend",this._oldMoveHandler),o.removeEventListener("zoomend",this._oldZoomEndHandler),o.addEventListener("moving",i),o.addEventListener("moveend",i),o.addEventListener("zoomend",p),this._oldMoveHandler=i,this._oldZoomEndHandler=p;var s=t.get("roam");s&&s!=="scale"?o.enableDragging():o.disableDragging(),s&&s!=="move"?(o.enableScrollWheelZoom(),o.enableDoubleClickZoom(),o.enablePinchToZoom()):(o.disableScrollWheelZoom(),o.disableDoubleClickZoom(),o.disablePinchToZoom());var g=t.__mapStyle,m=t.get("mapStyle")||{},c=JSON.stringify(m);JSON.stringify(g)!==c&&(Z(m)||o.setMapStyle(S(m)),t.__mapStyle=JSON.parse(c));var y=t.__mapStyle2,v=t.get("mapStyleV2")||{},u=JSON.stringify(v);JSON.stringify(y)!==u&&(Z(v)||o.setMapStyleV2(S(v)),t.__mapStyle2=JSON.parse(u)),a=!1}});L("bmap",r);N({type:"bmapRoam",event:"bmapRoam",update:"updateLayout"},function(t,n){n.eachComponent("bmap",function(e){var a=e.getBMap(),o=a.getCenter();e.setCenterAndZoom([o.lng,o.lat],a.getZoom())})}); diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.9ac6d349.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.9ac6d349.css new file mode 100644 index 00000000..b6ad4980 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.9ac6d349.css @@ -0,0 +1 @@ +.layout-navbars-breadcrumb[data-v-cc3d7130]{flex:1;height:inherit;display:flex;align-items:center}.layout-navbars-breadcrumb .layout-navbars-breadcrumb-icon[data-v-cc3d7130]{cursor:pointer;font-size:18px;color:var(--next-bg-topBarColor);height:100%;width:40px;opacity:.8}.layout-navbars-breadcrumb .layout-navbars-breadcrumb-icon[data-v-cc3d7130]:hover{opacity:1}.layout-navbars-breadcrumb .layout-navbars-breadcrumb-span[data-v-cc3d7130]{display:flex;opacity:.7;color:var(--next-bg-topBarColor)}.layout-navbars-breadcrumb .layout-navbars-breadcrumb-iconfont[data-v-cc3d7130]{font-size:14px;margin-right:5px}.layout-navbars-breadcrumb[data-v-cc3d7130] .el-breadcrumb__separator{opacity:.7;color:var(--next-bg-topBarColor)}.layout-navbars-breadcrumb[data-v-cc3d7130] .el-breadcrumb__inner a{font-weight:unset!important;color:var(--next-bg-topBarColor)}.layout-navbars-breadcrumb[data-v-cc3d7130] .el-breadcrumb__inner a:hover{color:var(--el-color-primary)!important} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.c27a7b33.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.c27a7b33.js new file mode 100644 index 00000000..fd4afb30 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/breadcrumb.c27a7b33.js @@ -0,0 +1 @@ +import{h as L,ar as S,aq as T,aH as R,K as $,a as E,o as D,aJ as M,a9 as d,u,j as o,k as n,D as p,x as b,al as j,F as q,Z as z,v as _,A as f,C as h,$ as A,B as G}from"./vue.543fafcc.js";import{L as k}from"./storage.b628b270.js";import{o as H}from"./other.eb37633a.js";import{u as J}from"./themeConfig.084d7f79.js";import{u as K}from"./routesList.76e57b72.js";import{_ as U}from"./_plugin-vue_export-helper.c27b6911.js";import"./preload-helper.101896b7.js";import"./index.3b68140d.js";import"./index.b8b1b364.js";import"./_commonjsHelpers.35101cd5.js";import"./index.18e5bded.js";import"./keepAliveNames.cf66da55.js";import"./userInfo.2fef1b52.js";import"./loading.7efee3a8.js";import"./tagsViewRoutes.92636029.js";import"./request.b1530b7c.js";import"./index.4ac74e37.js";import"./index.070d5527.js";import"./index.05309dac.js";import"./vue-i18n.cjs.f888bd5c.js";import"./toolsValidate.7cb139e2.js";const Z={key:0,class:"layout-navbars-breadcrumb"},O={key:0,class:"layout-navbars-breadcrumb-span"},P={key:1},Q={key:2},W=["onClick"],X=L({name:"layoutBreadcrumb"}),Y=L({...X,setup(ee){const B=K(),x=J(),{themeConfig:s}=S(x),{routesList:g}=S(B),c=T(),v=R(),e=$({breadcrumbList:[],routeSplit:[],routeSplitFirst:"",routeSplitIndex:1}),I=E(()=>{m(c.path);const{layout:t,isBreadcrumb:a}=s.value;return t==="classic"||t==="transverse"?!1:!!a}),w=t=>{const{redirect:a,path:i}=t;a?v.push(a):v.push(i)},N=()=>{s.value.isCollapse=!s.value.isCollapse,V()},V=()=>{k.remove("themeConfig"),k.set("themeConfig",s.value)},C=t=>{t.forEach(a=>{e.routeSplit.forEach((i,y,l)=>{e.routeSplitFirst===a.path&&(e.routeSplitFirst+=`/${l[e.routeSplitIndex]}`,e.breadcrumbList.push(a),e.routeSplitIndex++,a.children&&C(a.children))})})},m=t=>{if(!s.value.isBreadcrumb)return!1;e.breadcrumbList=[g.value[0]],e.routeSplit=t.split("/"),e.routeSplit.shift(),e.routeSplitFirst=`/${e.routeSplit[0]}`,e.routeSplitIndex=1,C(g.value),(c.name==="home"||c.name==="notFound"&&e.breadcrumbList.length>1)&&e.breadcrumbList.shift(),e.breadcrumbList.length>0&&(e.breadcrumbList[e.breadcrumbList.length-1].meta.tagsViewName=H.setTagsViewNameI18n(c))};return D(()=>{m(c.path)}),M(t=>{m(t.path)}),(t,a)=>{const i=d("SvgIcon"),y=d("el-breadcrumb-item"),l=d("el-breadcrumb");return u(I)?(o(),n("div",Z,[p(i,{class:"layout-navbars-breadcrumb-icon",name:u(s).isCollapse?"ele-Expand":"ele-Fold",size:16,onClick:N},null,8,["name"]),p(l,{class:"layout-navbars-breadcrumb-hide"},{default:b(()=>[p(j,{name:"breadcrumb"},{default:b(()=>[(o(!0),n(q,null,z(e.breadcrumbList,(r,F)=>(o(),_(y,{key:r.meta.tagsViewName?r.meta.tagsViewName:r.meta.title},{default:b(()=>[F===e.breadcrumbList.length-1?(o(),n("span",O,[u(s).isBreadcrumbIcon?(o(),_(i,{key:0,name:r.meta.icon,class:"layout-navbars-breadcrumb-iconfont"},null,8,["name"])):f("",!0),r.meta.tagsViewName?(o(),n("div",Q,h(r.meta.tagsViewName),1)):(o(),n("div",P,h(t.$t(r.meta.title)),1))])):(o(),n("a",{key:1,onClick:A(te=>w(r),["prevent"])},[u(s).isBreadcrumbIcon?(o(),_(i,{key:0,name:r.meta.icon,class:"layout-navbars-breadcrumb-iconfont"},null,8,["name"])):f("",!0),G(h(t.$t(r.meta.title)),1)],8,W))]),_:2},1024))),128))]),_:1})]),_:1})])):f("",!0)}}});const ke=U(Y,[["__scopeId","data-v-cc3d7130"]]);export{ke as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/cameligo.91a865e0.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/cameligo.91a865e0.js new file mode 100644 index 00000000..06ec6426 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/cameligo.91a865e0.js @@ -0,0 +1 @@ +var e={comments:{lineComment:"//",blockComment:["(*","*)"]},brackets:[["{","}"],["[","]"],["(",")"],["<",">"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'},{open:"(*",close:"*)"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'},{open:"(*",close:"*)"}]},o={defaultToken:"",tokenPostfix:".cameligo",ignoreCase:!0,brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"},{open:"<",close:">",token:"delimiter.angle"}],keywords:["abs","assert","block","Bytes","case","Crypto","Current","else","failwith","false","for","fun","if","in","let","let%entry","let%init","List","list","Map","map","match","match%nat","mod","not","operation","Operation","of","record","Set","set","sender","skip","source","String","then","to","true","type","with"],typeKeywords:["int","unit","string","tz","nat","bool"],operators:["=",">","<","<=",">=","<>",":",":=","and","mod","or","+","-","*","/","@","&","^","%","->","<-","&&","||"],symbols:/[=><:@\^&|+\-*\/\^%]+/,tokenizer:{root:[[/[a-zA-Z_][\w]*/,{cases:{"@keywords":{token:"keyword.$0"},"@default":"identifier"}}],{include:"@whitespace"},[/[{}()\[\]]/,"@brackets"],[/[<>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/\d*\.\d+([eE][\-+]?\d+)?/,"number.float"],[/\$[0-9a-fA-F]{1,16}/,"number.hex"],[/\d+/,"number"],[/[;,.]/,"delimiter"],[/'([^'\\]|\\.)*$/,"string.invalid"],[/'/,"string","@string"],[/'[^\\']'/,"string"],[/'/,"string.invalid"],[/\#\d+/,"string"]],comment:[[/[^\(\*]+/,"comment"],[/\*\)/,"comment","@pop"],[/\(\*/,"comment"]],string:[[/[^\\']+/,"string"],[/\\./,"string.escape.invalid"],[/'/,{token:"string.quote",bracket:"@close",next:"@pop"}]],whitespace:[[/[ \t\r\n]+/,"white"],[/\(\*/,"comment","@comment"],[/\/\/.*$/,"comment"]]}};export{e as conf,o as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/classic.d7d3bd11.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/classic.d7d3bd11.js new file mode 100644 index 00000000..df263319 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/classic.d7d3bd11.js @@ -0,0 +1 @@ +import{_ as t}from"./preload-helper.101896b7.js";import{h as m,ap as o,r as g,aq as E,ar as L,a as V,o as w,w as _,a9 as x,j as l,v as f,x as p,D as a,u as e,l as A,A as k,J as M}from"./vue.543fafcc.js";import{u as D}from"./themeConfig.084d7f79.js";const P={class:"flex-center layout-backtop"},b=m({name:"layoutClassic"}),H=m({...b,setup(B){const d=o(()=>t(()=>import("./aside.8d4db85d.js"),["assets/aside.8d4db85d.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/index.18e5bded.js","assets/routesList.76e57b72.js","assets/themeConfig.084d7f79.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js","assets/mitt.7f99bbc0.js"])),y=o(()=>t(()=>import("./header.c0d0f269.js"),["assets/header.c0d0f269.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js"])),v=o(()=>t(()=>import("./main.d421fafb.js"),["assets/main.d421fafb.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js","assets/themeConfig.084d7f79.js","assets/loading.7efee3a8.js","assets/loading.70fbfd85.css"])),T=o(()=>t(()=>import("./tagsView.ac1ca70d.js"),["assets/tagsView.ac1ca70d.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/sortable.esm.1e7dbfeb.js","assets/index.18e5bded.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js","assets/themeConfig.084d7f79.js","assets/keepAliveNames.cf66da55.js","assets/arrayOperation.b573dead.js","assets/other.eb37633a.js","assets/index.3b68140d.js","assets/index.b8b1b364.js","assets/_commonjsHelpers.35101cd5.js","assets/routesList.76e57b72.js","assets/userInfo.2fef1b52.js","assets/loading.7efee3a8.js","assets/loading.70fbfd85.css","assets/request.b1530b7c.js","assets/index.4ac74e37.js","assets/index.070d5527.js","assets/index.8b89e2e0.css","assets/index.05309dac.js","assets/vue-i18n.cjs.f888bd5c.js","assets/toolsValidate.7cb139e2.js","assets/mitt.7f99bbc0.js","assets/_plugin-vue_export-helper.c27b6911.js","assets/tagsView.01e7bb28.css"])),s=g(),h=E(),R=D(),{themeConfig:r}=L(R),C=V(()=>r.value.isTagsview),c=()=>{var n;(n=s.value)==null||n.layoutMainScrollbarRef.update()},i=()=>{M(()=>{setTimeout(()=>{c(),s.value.layoutMainScrollbarRef.wrapRef.scrollTop=0},500)})};return w(()=>{i()}),_(()=>h.path,()=>{i()}),_(r,()=>{c()},{deep:!0}),(n,I)=>{const u=x("el-container");return l(),f(u,{class:"layout-container flex-center"},{default:p(()=>[a(e(y)),a(u,{class:"layout-mian-height-50"},{default:p(()=>[a(e(d)),A("div",P,[e(C)?(l(),f(e(T),{key:0})):k("",!0),a(e(v),{ref_key:"layoutMainRef",ref:s},null,512)])]),_:1})]),_:1})}}});export{H as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/clojure.7e0f8eaa.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/clojure.7e0f8eaa.js new file mode 100644 index 00000000..4e57cae0 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/clojure.7e0f8eaa.js @@ -0,0 +1 @@ +var e={comments:{lineComment:";;"},brackets:[["[","]"],["(",")"],["{","}"]],autoClosingPairs:[{open:"[",close:"]"},{open:'"',close:'"'},{open:"(",close:")"},{open:"{",close:"}"}],surroundingPairs:[{open:"[",close:"]"},{open:'"',close:'"'},{open:"(",close:")"},{open:"{",close:"}"}]},t={defaultToken:"",ignoreCase:!0,tokenPostfix:".clj",brackets:[{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"},{open:"{",close:"}",token:"delimiter.curly"}],constants:["true","false","nil"],numbers:/^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/,characters:/^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/,escapes:/^\\(?:["'\\bfnrt]|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,qualifiedSymbols:/^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/,specialForms:[".","catch","def","do","if","monitor-enter","monitor-exit","new","quote","recur","set!","throw","try","var"],coreSymbols:["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","cast","cat","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"],tokenizer:{root:[{include:"@whitespace"},[/@numbers/,"number"],[/@characters/,"string"],{include:"@string"},[/[()\[\]{}]/,"@brackets"],[/\/#"(?:\.|(?:")|[^"\n])*"\/g/,"regexp"],[/[#'@^`~]/,"meta"],[/@qualifiedSymbols/,{cases:{"^:.+$":"constant","@specialForms":"keyword","@coreSymbols":"keyword","@constants":"constant","@default":"identifier"}}]],whitespace:[[/[\s,]+/,"white"],[/;.*$/,"comment"],[/\(comment\b/,"comment","@comment"]],comment:[[/\(/,"comment","@push"],[/\)/,"comment","@pop"],[/[^()]/,"comment"]],string:[[/"/,"string","@multiLineString"]],multiLineString:[[/"/,"string","@popall"],[/@escapes/,"string.escape"],[/./,"string"]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.5a2179a2.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.5a2179a2.css new file mode 100644 index 00000000..d00d3e2f --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.5a2179a2.css @@ -0,0 +1 @@ +.layout-navbars-close-full[data-v-c5e48991]{position:fixed;z-index:9999999999;right:-30px;top:-30px}.layout-navbars-close-full .layout-navbars-close-full-icon[data-v-c5e48991]{width:60px;height:60px;border-radius:100%;cursor:pointer;background:rgba(0,0,0,.1);transition:all .3s ease;position:relative}.layout-navbars-close-full .layout-navbars-close-full-icon[data-v-c5e48991] i{position:absolute;left:10px;top:35px;color:#333;transition:all .3s ease}.layout-navbars-close-full[data-v-c5e48991]:hover{transition:all .3s ease}.layout-navbars-close-full[data-v-c5e48991]:hover i{color:var(--el-color-primary);transition:all .3s ease} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.cd6cf403.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.cd6cf403.js new file mode 100644 index 00000000..05164296 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/closeFull.cd6cf403.js @@ -0,0 +1 @@ +import{h as s,ar as n,a9 as c,u as r,j as _,k as u,l as i,D as m,A as p}from"./vue.543fafcc.js";import{u as d}from"./tagsViewRoutes.92636029.js";import{_ as f}from"./_plugin-vue_export-helper.c27b6911.js";import"./storage.b628b270.js";const v={key:0,class:"layout-navbars-close-full"},C={class:"layout-navbars-close-full-icon"},g=s({name:"layoutCloseFull"}),F=s({...g,setup(y){const e=d(),{isTagsViewCurrenFull:o}=n(e),t=()=>{e.setCurrenFullscreen(!1)};return(l,V)=>{const a=c("SvgIcon");return r(o)?(_(),u("div",v,[i("div",C,[m(a,{name:"ele-Close",title:l.$t("message.tagsView.closeFullscreen"),onClick:t},null,8,["title"])])])):p("",!0)}}});const B=f(F,[["__scopeId","data-v-c5e48991"]]);export{B as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/codicon.bff90e92.ttf b/openjob-server/openjob-server-starter/src/main/resources/static/assets/codicon.bff90e92.ttf new file mode 100644 index 00000000..cc4c7aea Binary files /dev/null and b/openjob-server/openjob-server-starter/src/main/resources/static/assets/codicon.bff90e92.ttf differ diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/coffee.af1c6ca9.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/coffee.af1c6ca9.js new file mode 100644 index 00000000..6b1eeaa4 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/coffee.af1c6ca9.js @@ -0,0 +1 @@ +var e={wordPattern:/(-?\d*\.\d\w*)|([^\`\~\!\@\#%\^\&\*\(\)\=\$\-\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,comments:{blockComment:["###","###"],lineComment:"#"},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],folding:{markers:{start:new RegExp("^\\s*#region\\b"),end:new RegExp("^\\s*#endregion\\b")}}},r={defaultToken:"",ignoreCase:!0,tokenPostfix:".coffee",brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"}],regEx:/\/(?!\/\/)(?:[^\/\\]|\\.)*\/[igm]*/,keywords:["and","or","is","isnt","not","on","yes","@","no","off","true","false","null","this","new","delete","typeof","in","instanceof","return","throw","break","continue","debugger","if","else","switch","for","while","do","try","catch","finally","class","extends","super","undefined","then","unless","until","loop","of","by","when"],symbols:/[=>e(()=>import("./aside.8d4db85d.js"),["assets/aside.8d4db85d.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/index.18e5bded.js","assets/routesList.76e57b72.js","assets/themeConfig.084d7f79.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js","assets/mitt.7f99bbc0.js"])),d=t(()=>e(()=>import("./header.c0d0f269.js"),["assets/header.c0d0f269.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js"])),y=t(()=>e(()=>import("./main.d421fafb.js"),["assets/main.d421fafb.js","assets/preload-helper.101896b7.js","assets/vue.543fafcc.js","assets/tagsViewRoutes.92636029.js","assets/storage.b628b270.js","assets/themeConfig.084d7f79.js","assets/loading.7efee3a8.js","assets/loading.70fbfd85.css"])),R=t(()=>e(()=>import("./columnsAside.6d782816.js"),["assets/columnsAside.6d782816.js","assets/vue.543fafcc.js","assets/index.18e5bded.js","assets/routesList.76e57b72.js","assets/themeConfig.084d7f79.js","assets/mitt.7f99bbc0.js","assets/_plugin-vue_export-helper.c27b6911.js","assets/columnsAside.8d96fc45.css"])),r=_(""),s=_(),v=b(),T=M(),{themeConfig:h}=E(T),l=()=>{r.value.update(),s.value.layoutMainScrollbarRef.update()},c=()=>{k(()=>{setTimeout(()=>{l(),r.value.wrapRef.scrollTop=0,s.value.layoutMainScrollbarRef.wrapRef.scrollTop=0},500)})};return w(()=>{c()}),i(()=>v.path,()=>{c()}),i(h,()=>{l()},{deep:!0}),(D,P)=>{const C=f("el-scrollbar"),u=f("el-container");return A(),L(u,{class:"layout-container"},{default:n(()=>[o(a(R)),o(u,{class:"layout-columns-warp layout-container-view h100"},{default:n(()=>[o(a(m)),o(C,{ref_key:"layoutScrollbarRef",ref:r,class:"layout-backtop"},{default:n(()=>[o(a(d)),o(a(y),{ref_key:"layoutMainRef",ref:s},null,512)]),_:1},512)]),_:1})]),_:1})}}});export{O as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.6d782816.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.6d782816.js new file mode 100644 index 00000000..6ffd8441 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.6d782816.js @@ -0,0 +1 @@ +import{h as O,r as I,ar as M,aq as B,aH as j,K as J,o as U,a4 as V,aJ as q,w as z,a9 as $,j as c,k as m,D as _,x as E,l as d,F as K,Z,n as C,u as f,C as k,J as G}from"./vue.543fafcc.js";import{p as Q}from"./index.18e5bded.js";import{u as W}from"./routesList.76e57b72.js";import{u as X}from"./themeConfig.084d7f79.js";import{e as i}from"./mitt.7f99bbc0.js";import{_ as Y}from"./_plugin-vue_export-helper.c27b6911.js";const ee={class:"layout-columns-aside"},te=["onClick","onMouseenter","title"],se={class:"columns-vertical-title font12"},ne=["href"],oe={class:"columns-vertical-title font12"},le=O({name:"layoutColumnsAside"}),ie=O({...le,setup(ae){const v=I([]),A=I(),h=W(),R=X(),{routesList:x,isColumnsMenuHover:D,isColumnsNavHover:T}=M(h),{themeConfig:a}=M(R),y=B(),g=j(),t=J({columnsAsideList:[],liIndex:0,liOldIndex:null,liHoverIndex:null,liOldPath:null,difference:0,routeSplit:[]}),L=e=>{t.liIndex=e,A.value.style.top=`${v.value[e].offsetTop+t.difference}px`},b=(e,s)=>{L(s);let{path:o,redirect:l}=e;l?g.push(l):g.push(o)},P=(e,s)=>{if(!a.value.isColumnsMenuHoverPreload)return!1;let{path:o}=e;t.liOldPath=o,t.liOldIndex=s,t.liHoverIndex=s,i.emit("setSendColumnsChildren",u(o)),h.setColumnsMenuHover(!1),h.setColumnsNavHover(!0)},N=async()=>{await h.setColumnsNavHover(!1),setTimeout(()=>{!D&&!T&&i.emit("restoreDefault")},100)},S=e=>{G(()=>{L(e)})},w=()=>{var s;t.columnsAsideList=H(x.value);const e=u(y.path);if(Object.keys(e).length<=0)return!1;S((s=e.item)==null?void 0:s.k),i.emit("setSendColumnsChildren",e)},u=e=>{const s=e.split("/");let o={children:[]};return t.columnsAsideList.map((l,n)=>{l.path===`/${s[1]}`&&(l.k=n,o.item={...l},o.children=[{...l}],l.children&&(o.children=l.children))}),o},H=e=>e.filter(s=>{var o;return!((o=s.meta)!=null&&o.isHide)}).map(s=>(s=Object.assign({},s),s.children&&(s.children=H(s.children)),s)),F=e=>{t.routeSplit=e.split("/"),t.routeSplit.shift();const s=`/${t.routeSplit[0]}`,o=t.columnsAsideList.find(l=>l.path===s);if(!o)return!1;setTimeout(()=>{S(o.k)},0)};return U(()=>{w(),i.on("restoreDefault",()=>{t.liOldIndex=null,t.liOldPath=null})}),V(()=>{i.off("restoreDefault",()=>{})}),q(e=>{F(e.path),i.emit("setSendColumnsChildren",u(e.path))}),z(Q.state,e=>{if(e.themeConfig.themeConfig.columnsAsideStyle==="columnsRound"?t.difference=3:t.difference=0,!e.routesList.isColumnsMenuHover&&!e.routesList.isColumnsNavHover)t.liHoverIndex=null,i.emit("setSendColumnsChildren",u(y.path));else{if(t.liHoverIndex=t.liOldIndex,!t.liOldPath)return!1;i.emit("setSendColumnsChildren",u(t.liOldPath))}},{deep:!0}),(e,s)=>{const o=$("SvgIcon"),l=$("el-scrollbar");return c(),m("div",ee,[_(l,null,{default:E(()=>[d("ul",{onMouseleave:s[0]||(s[0]=n=>N())},[(c(!0),m(K,null,Z(t.columnsAsideList,(n,r)=>(c(),m("li",{key:r,onClick:p=>b(n,r),onMouseenter:p=>P(n,r),ref_for:!0,ref:p=>{p&&(v.value[r]=p)},class:C({"layout-columns-active":t.liIndex===r,"layout-columns-hover":t.liHoverIndex===r}),title:e.$t(n.meta.title)},[!n.meta.isLink||n.meta.isLink&&n.meta.isIframe?(c(),m("div",{key:0,class:C(f(a).columnsAsideLayout)},[_(o,{name:n.meta.icon},null,8,["name"]),d("div",se,k(e.$t(n.meta.title)&&e.$t(n.meta.title).length>=4?e.$t(n.meta.title).substr(0,f(a).columnsAsideLayout==="columns-vertical"?4:3):e.$t(n.meta.title)),1)],2)):(c(),m("div",{key:1,class:C(f(a).columnsAsideLayout)},[d("a",{href:n.meta.isLink,target:"_blank"},[_(o,{name:n.meta.icon},null,8,["name"]),d("div",oe,k(e.$t(n.meta.title)&&e.$t(n.meta.title).length>=4?e.$t(n.meta.title).substr(0,f(a).columnsAsideLayout==="columns-vertical"?4:3):e.$t(n.meta.title)),1)],8,ne)],2))],42,te))),128)),d("div",{ref_key:"columnsAsideActiveRef",ref:A,class:C(f(a).columnsAsideStyle)},null,2)],32)]),_:1})])}}});const he=Y(ie,[["__scopeId","data-v-e9a1a406"]]);export{he as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.8d96fc45.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.8d96fc45.css new file mode 100644 index 00000000..550d78a7 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/columnsAside.8d96fc45.css @@ -0,0 +1 @@ +.layout-columns-aside[data-v-e9a1a406]{width:70px;height:100%;background:var(--next-bg-columnsMenuBar)}.layout-columns-aside ul[data-v-e9a1a406]{position:relative}.layout-columns-aside ul .layout-columns-active[data-v-e9a1a406]{color:var(--next-bg-columnsMenuBarColor)!important;transition:.3s ease-in-out}.layout-columns-aside ul .layout-columns-hover[data-v-e9a1a406],.layout-columns-aside ul li[data-v-e9a1a406]:hover,.layout-columns-aside ul .layout-columns-hover a[data-v-e9a1a406],.layout-columns-aside ul li:hover a[data-v-e9a1a406]{color:var(--el-color-primary)}.layout-columns-aside ul li[data-v-e9a1a406]{color:var(--next-bg-columnsMenuBarColor);width:100%;height:50px;text-align:center;display:flex;cursor:pointer;position:relative;z-index:1}.layout-columns-aside ul li .columns-vertical[data-v-e9a1a406]{margin:auto}.layout-columns-aside ul li .columns-vertical .columns-vertical-title[data-v-e9a1a406]{padding-top:1px}.layout-columns-aside ul li .columns-horizontal[data-v-e9a1a406]{display:flex;height:50px;width:100%;align-items:center;padding:0 5px}.layout-columns-aside ul li .columns-horizontal i[data-v-e9a1a406]{margin-right:3px}.layout-columns-aside ul li .columns-horizontal a[data-v-e9a1a406]{display:flex}.layout-columns-aside ul li .columns-horizontal a .columns-horizontal-title[data-v-e9a1a406]{padding-top:1px}.layout-columns-aside ul li a[data-v-e9a1a406]{text-decoration:none;color:var(--next-bg-columnsMenuBarColor)}.layout-columns-aside ul .columns-round[data-v-e9a1a406],.layout-columns-aside ul .columns-card[data-v-e9a1a406]{background:var(--el-color-primary);color:var(--el-color-white);position:absolute;left:50%;top:2px;height:44px;width:65px;transform:translate(-50%);z-index:0;transition:.3s ease-in-out;border-radius:5px}.layout-columns-aside ul .columns-card[data-v-e9a1a406]{top:0;height:50px;width:100%;border-radius:0} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/commonFunction.eaef175c.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/commonFunction.eaef175c.js new file mode 100644 index 00000000..31bc4b73 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/commonFunction.eaef175c.js @@ -0,0 +1 @@ +import{g as Q,c as W}from"./_commonjsHelpers.35101cd5.js";import{f as k}from"./formatTime.057ac5b9.js";import{u as Z}from"./vue-i18n.cjs.f888bd5c.js";import{ay as N}from"./index.070d5527.js";var R={exports:{}};(function(E,T){(function(x,h){E.exports=h()})(W,function(){return function(){var _={686:function(d,a,t){t.d(a,{default:function(){return K}});var c=t(279),r=t.n(c),f=t(370),s=t.n(f),p=t(817),g=t.n(p);function y(u){try{return document.execCommand(u)}catch{return!1}}var v=function(n){var e=g()(n);return y("cut"),e},m=v;function S(u){var n=document.documentElement.getAttribute("dir")==="rtl",e=document.createElement("textarea");e.style.fontSize="12pt",e.style.border="0",e.style.padding="0",e.style.margin="0",e.style.position="absolute",e.style[n?"right":"left"]="-9999px";var o=window.pageYOffset||document.documentElement.scrollTop;return e.style.top="".concat(o,"px"),e.setAttribute("readonly",""),e.value=u,e}var P=function(n,e){var o=S(n);e.container.appendChild(o);var i=g()(o);return y("copy"),o.remove(),i},Y=function(n){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{container:document.body},o="";return typeof n=="string"?o=P(n,e):n instanceof HTMLInputElement&&!["text","search","url","tel","password"].includes(n==null?void 0:n.type)?o=P(n.value,e):(o=g()(n),y("copy")),o},O=Y;function C(u){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?C=function(e){return typeof e}:C=function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},C(u)}var H=function(){var n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},e=n.action,o=e===void 0?"copy":e,i=n.container,l=n.target,b=n.text;if(o!=="copy"&&o!=="cut")throw new Error('Invalid "action" value, use either "copy" or "cut"');if(l!==void 0)if(l&&C(l)==="object"&&l.nodeType===1){if(o==="copy"&&l.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if(o==="cut"&&(l.hasAttribute("readonly")||l.hasAttribute("disabled")))throw new Error(`Invalid "target" attribute. You can't cut text from elements with "readonly" or "disabled" attributes`)}else throw new Error('Invalid "target" value, use a valid Element');if(b)return O(b,{container:i});if(l)return o==="cut"?m(l):O(l,{container:i})},j=H;function w(u){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?w=function(e){return typeof e}:w=function(e){return e&&typeof Symbol=="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},w(u)}function I(u,n){if(!(u instanceof n))throw new TypeError("Cannot call a class as a function")}function D(u,n){for(var e=0;e"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch{return!1}}function A(u){return A=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)},A(u)}function L(u,n){var e="data-clipboard-".concat(u);if(!!n.hasAttribute(e))return n.getAttribute(e)}var J=function(u){B(e,u);var n=U(e);function e(o,i){var l;return I(this,e),l=n.call(this),l.resolveOptions(i),l.listenClick(o),l}return z(e,[{key:"resolveOptions",value:function(){var i=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};this.action=typeof i.action=="function"?i.action:this.defaultAction,this.target=typeof i.target=="function"?i.target:this.defaultTarget,this.text=typeof i.text=="function"?i.text:this.defaultText,this.container=w(i.container)==="object"?i.container:document.body}},{key:"listenClick",value:function(i){var l=this;this.listener=s()(i,"click",function(b){return l.onClick(b)})}},{key:"onClick",value:function(i){var l=i.delegateTarget||i.currentTarget,b=this.action(l)||"copy",M=j({action:b,container:this.container,target:this.target(l),text:this.text(l)});this.emit(M?"success":"error",{action:b,text:M,trigger:l,clearSelection:function(){l&&l.focus(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(i){return L("action",i)}},{key:"defaultTarget",value:function(i){var l=L("target",i);if(l)return document.querySelector(l)}},{key:"defaultText",value:function(i){return L("text",i)}},{key:"destroy",value:function(){this.listener.destroy()}}],[{key:"copy",value:function(i){var l=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{container:document.body};return O(i,l)}},{key:"cut",value:function(i){return m(i)}},{key:"isSupported",value:function(){var i=arguments.length>0&&arguments[0]!==void 0?arguments[0]:["copy","cut"],l=typeof i=="string"?[i]:i,b=!!document.queryCommandSupported;return l.forEach(function(M){b=b&&!!document.queryCommandSupported(M)}),b}}]),e}(r()),K=J},828:function(d){var a=9;if(typeof Element<"u"&&!Element.prototype.matches){var t=Element.prototype;t.matches=t.matchesSelector||t.mozMatchesSelector||t.msMatchesSelector||t.oMatchesSelector||t.webkitMatchesSelector}function c(r,f){for(;r&&r.nodeType!==a;){if(typeof r.matches=="function"&&r.matches(f))return r;r=r.parentNode}}d.exports=c},438:function(d,a,t){var c=t(828);function r(p,g,y,v,m){var S=s.apply(this,arguments);return p.addEventListener(y,S,m),{destroy:function(){p.removeEventListener(y,S,m)}}}function f(p,g,y,v,m){return typeof p.addEventListener=="function"?r.apply(null,arguments):typeof y=="function"?r.bind(null,document).apply(null,arguments):(typeof p=="string"&&(p=document.querySelectorAll(p)),Array.prototype.map.call(p,function(S){return r(S,g,y,v,m)}))}function s(p,g,y,v){return function(m){m.delegateTarget=c(m.target,g),m.delegateTarget&&v.call(p,m)}}d.exports=f},879:function(d,a){a.node=function(t){return t!==void 0&&t instanceof HTMLElement&&t.nodeType===1},a.nodeList=function(t){var c=Object.prototype.toString.call(t);return t!==void 0&&(c==="[object NodeList]"||c==="[object HTMLCollection]")&&"length"in t&&(t.length===0||a.node(t[0]))},a.string=function(t){return typeof t=="string"||t instanceof String},a.fn=function(t){var c=Object.prototype.toString.call(t);return c==="[object Function]"}},370:function(d,a,t){var c=t(879),r=t(438);function f(y,v,m){if(!y&&!v&&!m)throw new Error("Missing required arguments");if(!c.string(v))throw new TypeError("Second argument must be a String");if(!c.fn(m))throw new TypeError("Third argument must be a Function");if(c.node(y))return s(y,v,m);if(c.nodeList(y))return p(y,v,m);if(c.string(y))return g(y,v,m);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function s(y,v,m){return y.addEventListener(v,m),{destroy:function(){y.removeEventListener(v,m)}}}function p(y,v,m){return Array.prototype.forEach.call(y,function(S){S.addEventListener(v,m)}),{destroy:function(){Array.prototype.forEach.call(y,function(S){S.removeEventListener(v,m)})}}}function g(y,v,m){return r(document.body,y,v,m)}d.exports=f},817:function(d){function a(t){var c;if(t.nodeName==="SELECT")t.focus(),c=t.value;else if(t.nodeName==="INPUT"||t.nodeName==="TEXTAREA"){var r=t.hasAttribute("readonly");r||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),r||t.removeAttribute("readonly"),c=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var f=window.getSelection(),s=document.createRange();s.selectNodeContents(t),f.removeAllRanges(),f.addRange(s),c=f.toString()}return c}d.exports=a},279:function(d){function a(){}a.prototype={on:function(t,c,r){var f=this.e||(this.e={});return(f[t]||(f[t]=[])).push({fn:c,ctx:r}),this},once:function(t,c,r){var f=this;function s(){f.off(t,s),c.apply(r,arguments)}return s._=c,this.on(t,s,r)},emit:function(t){var c=[].slice.call(arguments,1),r=((this.e||(this.e={}))[t]||[]).slice(),f=0,s=r.length;for(f;f{const T=(E==null?void 0:E.appendToBody)===void 0?!0:E.appendToBody;return{toClipboard(_,x){return new Promise((h,d)=>{const a=document.createElement("button"),t=new q(a,{text:()=>_,action:()=>"copy",container:x!==void 0?x:document.body});t.on("success",c=>{t.destroy(),h(c)}),t.on("error",c=>{t.destroy(),d(c)}),T&&document.body.appendChild(a),a.click(),T&&document.body.removeChild(a)})}}};function it(){const{t:E}=Z(),{toClipboard:T}=V();return{percentFormat:(r,f,s)=>s?`${s}%`:"-",dateFormatYMD:(r,f,s)=>s?k(new Date(s),"YYYY-mm-dd"):"-",dateFormatYMDHMS:(r,f,s)=>s?k(new Date(s),"YYYY-mm-dd HH:MM:SS"):"-",dateFormatHMS:(r,f,s)=>{if(!s)return"-";let p=0;return typeof r=="number"&&(p=r),typeof s=="number"&&(p=s),k(new Date(p*1e3),"HH:MM:SS")},scaleFormat:(r="0",f=4)=>Number.parseFloat(r).toFixed(f),scale2Format:(r="0")=>Number.parseFloat(r).toFixed(2),copyText:r=>new Promise((f,s)=>{try{T(r),N.success(E("message.layout.copyTextSuccess")),f(r)}catch(p){N.error(E("message.layout.copyTextError")),s(p)}})}}export{it as c}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.02ff486a.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.02ff486a.js new file mode 100644 index 00000000..e44e48e5 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.02ff486a.js @@ -0,0 +1 @@ +import{h as p,K as k,a as y,o as v,a4 as b,w as L,a9 as I,j as o,v as S,x as V,y as E,k as a,q as d,u,l as i,F as m,Z as M,D as $,C as B,A as D,E as T,T as W}from"./vue.543fafcc.js";import{_ as j}from"./_plugin-vue_export-helper.c27b6911.js";const A={class:"el-dropdown-menu"},F=["onClick"],N=p({name:"layoutTagsViewContextmenu"}),O=p({...N,props:{dropdown:{type:Object,default:()=>({x:0,y:0})}},emits:["currentContextmenuClick"],setup(f,{expose:x,emit:_}){const n=f,e=k({isShow:!1,dropdownList:[{contextMenuClickId:0,txt:"message.tagsView.refresh",affix:!1,icon:"ele-RefreshRight"},{contextMenuClickId:1,txt:"message.tagsView.close",affix:!1,icon:"ele-Close"},{contextMenuClickId:2,txt:"message.tagsView.closeOther",affix:!1,icon:"ele-CircleClose"},{contextMenuClickId:3,txt:"message.tagsView.closeAll",affix:!1,icon:"ele-FolderDelete"},{contextMenuClickId:4,txt:"message.tagsView.fullscreen",affix:!1,icon:"iconfont icon-fullscreen"}],item:{},arrowLeft:10}),r=y(()=>n.dropdown.x+117>document.documentElement.clientWidth?{x:document.documentElement.clientWidth-117-5,y:n.dropdown.y}:n.dropdown),w=t=>{_("currentContextmenuClick",Object.assign({},{contextMenuClickId:t},e.item))},C=t=>{var l;e.item=t,(l=t.meta)!=null&&l.isAffix?e.dropdownList[1].affix=!0:e.dropdownList[1].affix=!1,c(),setTimeout(()=>{e.isShow=!0},10)},c=()=>{e.isShow=!1};return v(()=>{document.body.addEventListener("click",c)}),b(()=>{document.body.removeEventListener("click",c)}),L(()=>n.dropdown,({x:t})=>{t+117>document.documentElement.clientWidth?e.arrowLeft=117-(document.documentElement.clientWidth-t):e.arrowLeft=10},{deep:!0}),x({openContextmenu:C}),(t,l)=>{const h=I("SvgIcon");return o(),S(W,{name:"el-zoom-in-center"},{default:V(()=>[E((o(),a("div",{"aria-hidden":"true",class:"el-dropdown__popper el-popper is-light is-pure custom-contextmenu",role:"tooltip","data-popper-placement":"bottom",style:d(`top: ${u(r).y+5}px;left: ${u(r).x}px;`),key:Math.random()},[i("ul",A,[(o(!0),a(m,null,M(e.dropdownList,(s,g)=>(o(),a(m,null,[s.affix?D("",!0):(o(),a("li",{class:"el-dropdown-menu__item","aria-disabled":"false",tabindex:"-1",key:g,onClick:z=>w(s.contextMenuClickId)},[$(h,{name:s.icon},null,8,["name"]),i("span",null,B(t.$t(s.txt)),1)],8,F))],64))),256))]),i("div",{class:"el-popper__arrow",style:d({left:`${e.arrowLeft}px`})},null,4)],4)),[[T,e.isShow]])]),_:1})}}});const K=j(O,[["__scopeId","data-v-b988030b"]]);export{K as default}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.e68deed5.css b/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.e68deed5.css new file mode 100644 index 00000000..51f49506 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/contextmenu.e68deed5.css @@ -0,0 +1 @@ +.custom-contextmenu[data-v-b988030b]{transform-origin:center top;z-index:2190;position:fixed}.custom-contextmenu .el-dropdown-menu__item[data-v-b988030b]{font-size:12px!important;white-space:nowrap}.custom-contextmenu .el-dropdown-menu__item i[data-v-b988030b]{font-size:12px!important} diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/cpp.2a429e6c.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/cpp.2a429e6c.js new file mode 100644 index 00000000..7bb402e4 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/cpp.2a429e6c.js @@ -0,0 +1 @@ +var e={comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"[",close:"]"},{open:"{",close:"}"},{open:"(",close:")"},{open:"'",close:"'",notIn:["string","comment"]},{open:'"',close:'"',notIn:["string"]}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:'"',close:'"'},{open:"'",close:"'"}],folding:{markers:{start:new RegExp("^\\s*#pragma\\s+region\\b"),end:new RegExp("^\\s*#pragma\\s+endregion\\b")}}},t={defaultToken:"",tokenPostfix:".cpp",brackets:[{token:"delimiter.curly",open:"{",close:"}"},{token:"delimiter.parenthesis",open:"(",close:")"},{token:"delimiter.square",open:"[",close:"]"},{token:"delimiter.angle",open:"<",close:">"}],keywords:["abstract","amp","array","auto","bool","break","case","catch","char","class","const","constexpr","const_cast","continue","cpu","decltype","default","delegate","delete","do","double","dynamic_cast","each","else","enum","event","explicit","export","extern","false","final","finally","float","for","friend","gcnew","generic","goto","if","in","initonly","inline","int","interface","interior_ptr","internal","literal","long","mutable","namespace","new","noexcept","nullptr","__nullptr","operator","override","partial","pascal","pin_ptr","private","property","protected","public","ref","register","reinterpret_cast","restrict","return","safe_cast","sealed","short","signed","sizeof","static","static_assert","static_cast","struct","switch","template","this","thread_local","throw","tile_static","true","try","typedef","typeid","typename","union","unsigned","using","virtual","void","volatile","wchar_t","where","while","_asm","_based","_cdecl","_declspec","_fastcall","_if_exists","_if_not_exists","_inline","_multiple_inheritance","_pascal","_single_inheritance","_stdcall","_virtual_inheritance","_w64","__abstract","__alignof","__asm","__assume","__based","__box","__builtin_alignof","__cdecl","__clrcall","__declspec","__delegate","__event","__except","__fastcall","__finally","__forceinline","__gc","__hook","__identifier","__if_exists","__if_not_exists","__inline","__int128","__int16","__int32","__int64","__int8","__interface","__leave","__m128","__m128d","__m128i","__m256","__m256d","__m256i","__m512","__m512d","__m512i","__m64","__multiple_inheritance","__newslot","__nogc","__noop","__nounwind","__novtordisp","__pascal","__pin","__pragma","__property","__ptr32","__ptr64","__raise","__restrict","__resume","__sealed","__single_inheritance","__stdcall","__super","__thiscall","__try","__try_cast","__typeof","__unaligned","__unhook","__uuidof","__value","__virtual_inheritance","__w64","__wchar_t"],operators:["=",">","<","!","~","?",":","==","<=",">=","!=","&&","||","++","--","+","-","*","/","&","|","^","%","<<",">>",">>>","+=","-=","*=","/=","&=","|=","^=","%=","<<=",">>=",">>>="],symbols:/[=>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/\d*\d+[eE]([\-+]?\d+)?(@floatsuffix)/,"number.float"],[/\d*\.\d+([eE][\-+]?\d+)?(@floatsuffix)/,"number.float"],[/0[xX][0-9a-fA-F']*[0-9a-fA-F](@integersuffix)/,"number.hex"],[/0[0-7']*[0-7](@integersuffix)/,"number.octal"],[/0[bB][0-1']*[0-1](@integersuffix)/,"number.binary"],[/\d[\d']*\d(@integersuffix)/,"number"],[/\d(@integersuffix)/,"number"],[/[;,.]/,"delimiter"],[/"([^"\\]|\\.)*$/,"string.invalid"],[/"/,"string","@string"],[/'[^\\']'/,"string"],[/(')(@escapes)(')/,["string","string.escape","string"]],[/'/,"string.invalid"]],whitespace:[[/[ \t\r\n]+/,""],[/\/\*\*(?!\/)/,"comment.doc","@doccomment"],[/\/\*/,"comment","@comment"],[/\/\/.*\\$/,"comment","@linecomment"],[/\/\/.*$/,"comment"]],comment:[[/[^\/*]+/,"comment"],[/\*\//,"comment","@pop"],[/[\/*]/,"comment"]],linecomment:[[/.*[^\\]$/,"comment","@pop"],[/[^]+/,"comment"]],doccomment:[[/[^\/*]+/,"comment.doc"],[/\*\//,"comment.doc","@pop"],[/[\/*]/,"comment.doc"]],string:[[/[^\\"]+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/"/,"string","@pop"]],raw:[[/(.*)(\))(?:([^ ()\\\t"]*))(\")/,{cases:{"$3==$S2":["string.raw","string.raw.end","string.raw.end",{token:"string.raw.end",next:"@pop"}],"@default":["string.raw","string.raw","string.raw","string.raw"]}}],[/.*/,"string.raw"]],annotation:[{include:"@whitespace"},[/using|alignas/,"keyword"],[/[a-zA-Z0-9_]+/,"annotation"],[/[,:]/,"delimiter"],[/[()]/,"@brackets"],[/\]\s*\]/,{token:"annotation",next:"@pop"}]],include:[[/(\s*)(<)([^<>]*)(>)/,["","keyword.directive.include.begin","string.include.identifier",{token:"keyword.directive.include.end",next:"@pop"}]],[/(\s*)(")([^"]*)(")/,["","keyword.directive.include.begin","string.include.identifier",{token:"keyword.directive.include.end",next:"@pop"}]]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/csharp.d087d64c.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/csharp.d087d64c.js new file mode 100644 index 00000000..651aca86 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/csharp.d087d64c.js @@ -0,0 +1 @@ +var e={wordPattern:/(-?\d*\.\d\w*)|([^\`\~\!\#\$\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,comments:{lineComment:"//",blockComment:["/*","*/"]},brackets:[["{","}"],["[","]"],["(",")"]],autoClosingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"'",close:"'",notIn:["string","comment"]},{open:'"',close:'"',notIn:["string","comment"]}],surroundingPairs:[{open:"{",close:"}"},{open:"[",close:"]"},{open:"(",close:")"},{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'}],folding:{markers:{start:new RegExp("^\\s*#region\\b"),end:new RegExp("^\\s*#endregion\\b")}}},t={defaultToken:"",tokenPostfix:".cs",brackets:[{open:"{",close:"}",token:"delimiter.curly"},{open:"[",close:"]",token:"delimiter.square"},{open:"(",close:")",token:"delimiter.parenthesis"},{open:"<",close:">",token:"delimiter.angle"}],keywords:["extern","alias","using","bool","decimal","sbyte","byte","short","ushort","int","uint","long","ulong","char","float","double","object","dynamic","string","assembly","is","as","ref","out","this","base","new","typeof","void","checked","unchecked","default","delegate","var","const","if","else","switch","case","while","do","for","foreach","in","break","continue","goto","return","throw","try","catch","finally","lock","yield","from","let","where","join","on","equals","into","orderby","ascending","descending","select","group","by","namespace","partial","class","field","event","method","param","public","protected","internal","private","abstract","sealed","static","struct","readonly","volatile","virtual","override","params","get","set","add","remove","operator","true","false","implicit","explicit","interface","enum","null","async","await","fixed","sizeof","stackalloc","unsafe","nameof","when"],namespaceFollows:["namespace","using"],parenFollows:["if","for","while","switch","foreach","using","catch","when"],operators:["=","??","||","&&","|","^","&","==","!=","<=",">=","<<","+","-","*","/","%","!","~","++","--","+=","-=","*=","/=","%=","&=","|=","^=","<<=",">>=",">>","=>"],symbols:/[=>](?!@symbols)/,"@brackets"],[/@symbols/,{cases:{"@operators":"delimiter","@default":""}}],[/[0-9_]*\.[0-9_]+([eE][\-+]?\d+)?[fFdD]?/,"number.float"],[/0[xX][0-9a-fA-F_]+/,"number.hex"],[/0[bB][01_]+/,"number.hex"],[/[0-9_]+/,"number"],[/[;,.]/,"delimiter"],[/"([^"\\]|\\.)*$/,"string.invalid"],[/"/,{token:"string.quote",next:"@string"}],[/\$\@"/,{token:"string.quote",next:"@litinterpstring"}],[/\@"/,{token:"string.quote",next:"@litstring"}],[/\$"/,{token:"string.quote",next:"@interpolatedstring"}],[/'[^\\']'/,"string"],[/(')(@escapes)(')/,["string","string.escape","string"]],[/'/,"string.invalid"]],qualified:[[/[a-zA-Z_][\w]*/,{cases:{"@keywords":{token:"keyword.$0"},"@default":"identifier"}}],[/\./,"delimiter"],["","","@pop"]],namespace:[{include:"@whitespace"},[/[A-Z]\w*/,"namespace"],[/[\.=]/,"delimiter"],["","","@pop"]],comment:[[/[^\/*]+/,"comment"],["\\*/","comment","@pop"],[/[\/*]/,"comment"]],string:[[/[^\\"]+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/"/,{token:"string.quote",next:"@pop"}]],litstring:[[/[^"]+/,"string"],[/""/,"string.escape"],[/"/,{token:"string.quote",next:"@pop"}]],litinterpstring:[[/[^"{]+/,"string"],[/""/,"string.escape"],[/{{/,"string.escape"],[/}}/,"string.escape"],[/{/,{token:"string.quote",next:"root.litinterpstring"}],[/"/,{token:"string.quote",next:"@pop"}]],interpolatedstring:[[/[^\\"{]+/,"string"],[/@escapes/,"string.escape"],[/\\./,"string.escape.invalid"],[/{{/,"string.escape"],[/}}/,"string.escape"],[/{/,{token:"string.quote",next:"root.interpolatedstring"}],[/"/,{token:"string.quote",next:"@pop"}]],whitespace:[[/^[ \t\v\f]*#((r)|(load))(?=\s)/,"directive.csx"],[/^[ \t\v\f]*#\w.*$/,"namespace.cpp"],[/[ \t\v\f\r\n]+/,""],[/\/\*/,"comment","@comment"],[/\/\/.*$/,"comment"]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/csp.13ea92a6.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/csp.13ea92a6.js new file mode 100644 index 00000000..dd0bbef2 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/csp.13ea92a6.js @@ -0,0 +1 @@ +var t={brackets:[],autoClosingPairs:[],surroundingPairs:[]},r={keywords:[],typeKeywords:[],tokenPostfix:".csp",operators:[],symbols:/[=>",token:"delimiter.angle"}],tokenizer:{root:[{include:"@selector"}],selector:[{include:"@comments"},{include:"@import"},{include:"@strings"},["[@](keyframes|-webkit-keyframes|-moz-keyframes|-o-keyframes)",{token:"keyword",next:"@keyframedeclaration"}],["[@](page|content|font-face|-moz-document)",{token:"keyword"}],["[@](charset|namespace)",{token:"keyword",next:"@declarationbody"}],["(url-prefix)(\\()",["attribute.value",{token:"delimiter.parenthesis",next:"@urldeclaration"}]],["(url)(\\()",["attribute.value",{token:"delimiter.parenthesis",next:"@urldeclaration"}]],{include:"@selectorname"},["[\\*]","tag"],["[>\\+,]","delimiter"],["\\[",{token:"delimiter.bracket",next:"@selectorattribute"}],["{",{token:"delimiter.bracket",next:"@selectorbody"}]],selectorbody:[{include:"@comments"},["[*_]?@identifier@ws:(?=(\\s|\\d|[^{;}]*[;}]))","attribute.name","@rulevalue"],["}",{token:"delimiter.bracket",next:"@pop"}]],selectorname:[["(\\.|#(?=[^{])|%|(@identifier)|:)+","tag"]],selectorattribute:[{include:"@term"},["]",{token:"delimiter.bracket",next:"@pop"}]],term:[{include:"@comments"},["(url-prefix)(\\()",["attribute.value",{token:"delimiter.parenthesis",next:"@urldeclaration"}]],["(url)(\\()",["attribute.value",{token:"delimiter.parenthesis",next:"@urldeclaration"}]],{include:"@functioninvocation"},{include:"@numbers"},{include:"@name"},{include:"@strings"},["([<>=\\+\\-\\*\\/\\^\\|\\~,])","delimiter"],[",","delimiter"]],rulevalue:[{include:"@comments"},{include:"@strings"},{include:"@term"},["!important","keyword"],[";","delimiter","@pop"],["(?=})",{token:"",next:"@pop"}]],warndebug:[["[@](warn|debug)",{token:"keyword",next:"@declarationbody"}]],import:[["[@](import)",{token:"keyword",next:"@declarationbody"}]],urldeclaration:[{include:"@strings"},[`[^)\r +]+`,"string"],["\\)",{token:"delimiter.parenthesis",next:"@pop"}]],parenthizedterm:[{include:"@term"},["\\)",{token:"delimiter.parenthesis",next:"@pop"}]],declarationbody:[{include:"@term"},[";","delimiter","@pop"],["(?=})",{token:"",next:"@pop"}]],comments:[["\\/\\*","comment","@comment"],["\\/\\/+.*","comment"]],comment:[["\\*\\/","comment","@pop"],[/[^*/]+/,"comment"],[/./,"comment"]],name:[["@identifier","attribute.value"]],numbers:[["-?(\\d*\\.)?\\d+([eE][\\-+]?\\d+)?",{token:"attribute.value.number",next:"@units"}],["#[0-9a-fA-F_]+(?!\\w)","attribute.value.hex"]],units:[["(em|ex|ch|rem|fr|vmin|vmax|vw|vh|vm|cm|mm|in|px|pt|pc|deg|grad|rad|turn|s|ms|Hz|kHz|%)?","attribute.value.unit","@pop"]],keyframedeclaration:[["@identifier","attribute.value"],["{",{token:"delimiter.bracket",switchTo:"@keyframebody"}]],keyframebody:[{include:"@term"},["{",{token:"delimiter.bracket",next:"@selectorbody"}],["}",{token:"delimiter.bracket",next:"@pop"}]],functioninvocation:[["@identifier\\(",{token:"attribute.value",next:"@functionarguments"}]],functionarguments:[["\\$@identifier@ws:","attribute.name"],["[,]","delimiter"],{include:"@term"},["\\)",{token:"attribute.value",next:"@pop"}]],strings:[['~?"',{token:"string",next:"@stringenddoublequote"}],["~?'",{token:"string",next:"@stringendquote"}]],stringenddoublequote:[["\\\\.","string"],['"',{token:"string",next:"@pop"}],[/[^\\"]+/,"string"],[".","string"]],stringendquote:[["\\\\.","string"],["'",{token:"string",next:"@pop"}],[/[^\\']+/,"string"],[".","string"]]}};export{e as conf,t as language}; diff --git a/openjob-server/openjob-server-starter/src/main/resources/static/assets/css.worker-e5436562.js b/openjob-server/openjob-server-starter/src/main/resources/static/assets/css.worker-e5436562.js new file mode 100644 index 00000000..44bbd0d1 --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/static/assets/css.worker-e5436562.js @@ -0,0 +1,80 @@ +var op=Object.defineProperty;var lp=(ut,Ge,tt)=>Ge in ut?op(ut,Ge,{enumerable:!0,configurable:!0,writable:!0,value:tt}):ut[Ge]=tt;var bn=(ut,Ge,tt)=>(lp(ut,typeof Ge!="symbol"?Ge+"":Ge,tt),tt);(function(){"use strict";class ut{constructor(){this.listeners=[],this.unexpectedErrorHandler=function(t){setTimeout(()=>{throw t.stack?St.isErrorNoTelemetry(t)?new St(t.message+` + +`+t.stack):new Error(t.message+` + +`+t.stack):t},0)}}emit(t){this.listeners.forEach(n=>{n(t)})}onUnexpectedError(t){this.unexpectedErrorHandler(t),this.emit(t)}onUnexpectedExternalError(t){this.unexpectedErrorHandler(t)}}const Ge=new ut;function tt(e){vl(e)||Ge.onUnexpectedError(e)}function Pi(e){if(e instanceof Error){const{name:t,message:n}=e,r=e.stacktrace||e.stack;return{$isError:!0,name:t,message:n,stack:r,noTelemetry:St.isErrorNoTelemetry(e)}}return e}const nr="Canceled";function vl(e){return e instanceof yl?!0:e instanceof Error&&e.name===nr&&e.message===nr}class yl extends Error{constructor(){super(nr),this.name=this.message}}class St extends Error{constructor(t){super(t),this.name="CodeExpectedError"}static fromError(t){if(t instanceof St)return t;const n=new St;return n.message=t.message,n.stack=t.stack,n}static isErrorNoTelemetry(t){return t.name==="CodeExpectedError"}}class rr extends Error{constructor(t){super(t||"An unexpected bug occurred."),Object.setPrototypeOf(this,rr.prototype);debugger}}function wl(e){const t=this;let n=!1,r;return function(){return n||(n=!0,r=e.apply(t,arguments)),r}}var vn;(function(e){function t(w){return w&&typeof w=="object"&&typeof w[Symbol.iterator]=="function"}e.is=t;const n=Object.freeze([]);function r(){return n}e.empty=r;function*i(w){yield w}e.single=i;function s(w){return t(w)?w:i(w)}e.wrap=s;function a(w){return w||n}e.from=a;function o(w){return!w||w[Symbol.iterator]().next().done===!0}e.isEmpty=o;function l(w){return w[Symbol.iterator]().next().value}e.first=l;function c(w,C){for(const _ of w)if(C(_))return!0;return!1}e.some=c;function h(w,C){for(const _ of w)if(C(_))return _}e.find=h;function*u(w,C){for(const _ of w)C(_)&&(yield _)}e.filter=u;function*f(w,C){let _=0;for(const I of w)yield C(I,_++)}e.map=f;function*m(...w){for(const C of w)for(const _ of C)yield _}e.concat=m;function b(w,C,_){let I=_;for(const L of w)I=C(I,L);return I}e.reduce=b;function*y(w,C,_=w.length){for(C<0&&(C+=w.length),_<0?_+=w.length:_>w.length&&(_=w.length);C<_;C++)yield w[C]}e.slice=y;function v(w,C=Number.POSITIVE_INFINITY){const _=[];if(C===0)return[_,w];const I=w[Symbol.iterator]();for(let L=0;L1)throw new AggregateError(t,"Encountered errors while disposing of store");return Array.isArray(e)?[]:e}else if(e)return e.dispose(),e}function xl(...e){return yn(()=>Ii(e))}function yn(e){return{dispose:wl(()=>{e()})}}class pt{constructor(){this._toDispose=new Set,this._isDisposed=!1}dispose(){this._isDisposed||(this._isDisposed=!0,this.clear())}get isDisposed(){return this._isDisposed}clear(){if(this._toDispose.size!==0)try{Ii(this._toDispose)}finally{this._toDispose.clear()}}add(t){if(!t)return t;if(t===this)throw new Error("Cannot register a disposable on itself!");return this._isDisposed?pt.DISABLE_DISPOSED_WARNING||console.warn(new Error("Trying to add a disposable to a DisposableStore that has already been disposed of. The added object will be leaked!").stack):this._toDispose.add(t),t}}pt.DISABLE_DISPOSED_WARNING=!1;class wn{constructor(){this._store=new pt,this._store}dispose(){this._store.dispose()}_register(t){if(t===this)throw new Error("Cannot register a disposable on itself!");return this._store.add(t)}}wn.None=Object.freeze({dispose(){}});class Sl{constructor(){this.dispose=()=>{},this.unset=()=>{},this.isset=()=>!1}set(t){let n=t;return this.unset=()=>n=void 0,this.isset=()=>n!==void 0,this.dispose=()=>{n&&(n(),n=void 0)},this}}let re=class{constructor(t){this.element=t,this.next=re.Undefined,this.prev=re.Undefined}};re.Undefined=new re(void 0);class xn{constructor(){this._first=re.Undefined,this._last=re.Undefined,this._size=0}get size(){return this._size}isEmpty(){return this._first===re.Undefined}clear(){let t=this._first;for(;t!==re.Undefined;){const n=t.next;t.prev=re.Undefined,t.next=re.Undefined,t=n}this._first=re.Undefined,this._last=re.Undefined,this._size=0}unshift(t){return this._insert(t,!1)}push(t){return this._insert(t,!0)}_insert(t,n){const r=new re(t);if(this._first===re.Undefined)this._first=r,this._last=r;else if(n){const s=this._last;this._last=r,r.prev=s,s.next=r}else{const s=this._first;this._first=r,r.next=s,s.prev=r}this._size+=1;let i=!1;return()=>{i||(i=!0,this._remove(r))}}shift(){if(this._first!==re.Undefined){const t=this._first.element;return this._remove(this._first),t}}pop(){if(this._last!==re.Undefined){const t=this._last.element;return this._remove(this._last),t}}_remove(t){if(t.prev!==re.Undefined&&t.next!==re.Undefined){const n=t.prev;n.next=t.next,t.next.prev=n}else t.prev===re.Undefined&&t.next===re.Undefined?(this._first=re.Undefined,this._last=re.Undefined):t.next===re.Undefined?(this._last=this._last.prev,this._last.next=re.Undefined):t.prev===re.Undefined&&(this._first=this._first.next,this._first.prev=re.Undefined);this._size-=1}*[Symbol.iterator](){let t=this._first;for(;t!==re.Undefined;)yield t.element,t=t.next}}let Cl=typeof document<"u"&&document.location&&document.location.hash.indexOf("pseudo=true")>=0;function kl(e,t){let n;return t.length===0?n=e:n=e.replace(/\{(\d+)\}/g,(r,i)=>{const s=i[0],a=t[s];let o=r;return typeof a=="string"?o=a:(typeof a=="number"||typeof a=="boolean"||a===void 0||a===null)&&(o=String(a)),o}),Cl&&(n="［"+n.replace(/[aouei]/g,"$&$&")+"］"),n}function _l(e,t,...n){return kl(t,n)}function dp(e){}var ir;const Bt="en";let sr=!1,ar=!1,or=!1,Li=!1,Sn,lr=Bt,Fl,Le;const me=typeof self=="object"?self:typeof global=="object"?global:{};let ge;typeof me.vscode<"u"&&typeof me.vscode.process<"u"?ge=me.vscode.process:typeof process<"u"&&(ge=process);const Rl=typeof((ir=ge==null?void 0:ge.versions)===null||ir===void 0?void 0:ir.electron)=="string"&&(ge==null?void 0:ge.type)==="renderer";if(typeof navigator=="object"&&!Rl)Le=navigator.userAgent,sr=Le.indexOf("Windows")>=0,ar=Le.indexOf("Macintosh")>=0,(Le.indexOf("Macintosh")>=0||Le.indexOf("iPad")>=0||Le.indexOf("iPhone")>=0)&&!!navigator.maxTouchPoints&&navigator.maxTouchPoints>0,or=Le.indexOf("Linux")>=0,(Le==null?void 0:Le.indexOf("Mobi"))>=0,Li=!0,_l({key:"ensureLoaderPluginIsLoaded",comment:["{Locked}"]},"_"),Sn=Bt,lr=Sn;else if(typeof ge=="object"){sr=ge.platform==="win32",ar=ge.platform==="darwin",or=ge.platform==="linux",or&&!!ge.env.SNAP&&ge.env.SNAP_REVISION,ge.env.CI||ge.env.BUILD_ARTIFACTSTAGINGDIRECTORY,Sn=Bt,lr=Bt;const e=ge.env.VSCODE_NLS_CONFIG;if(e)try{const t=JSON.parse(e),n=t.availableLanguages["*"];Sn=t.locale,lr=n||Bt,Fl=t._translationsConfigFile}catch{}}else console.error("Unable to resolve platform.");const jt=sr,El=ar;Li&&me.importScripts;const Ue=Le,Dl=typeof me.postMessage=="function"&&!me.importScripts;(()=>{if(Dl){const e=[];me.addEventListener("message",n=>{if(n.data&&n.data.vscodeScheduleAsyncWork)for(let r=0,i=e.length;r{const r=++t;e.push({id:r,callback:n}),me.postMessage({vscodeScheduleAsyncWork:r},"*")}}return e=>setTimeout(e)})();const Al=!!(Ue&&Ue.indexOf("Chrome")>=0);Ue&&Ue.indexOf("Firefox")>=0,!Al&&Ue&&Ue.indexOf("Safari")>=0,Ue&&Ue.indexOf("Edg/")>=0,Ue&&Ue.indexOf("Android")>=0;const zl=me.performance&&typeof me.performance.now=="function";class Cn{static create(t=!0){return new Cn(t)}constructor(t){this._highResolution=zl&&t,this._startTime=this._now(),this._stopTime=-1}stop(){this._stopTime=this._now()}elapsed(){return this._stopTime!==-1?this._stopTime-this._startTime:this._now()-this._startTime}_now(){return this._highResolution?me.performance.now():Date.now()}}var cr;(function(e){e.None=()=>wn.None;function t(D,R){return h(D,()=>{},0,void 0,!0,void 0,R)}e.defer=t;function n(D){return(R,N=null,M)=>{let z=!1,V;return V=D(j=>{if(!z)return V?V.dispose():z=!0,R.call(N,j)},null,M),z&&V.dispose(),V}}e.once=n;function r(D,R,N){return c((M,z=null,V)=>D(j=>M.call(z,R(j)),null,V),N)}e.map=r;function i(D,R,N){return c((M,z=null,V)=>D(j=>{R(j),M.call(z,j)},null,V),N)}e.forEach=i;function s(D,R,N){return c((M,z=null,V)=>D(j=>R(j)&&M.call(z,j),null,V),N)}e.filter=s;function a(D){return D}e.signal=a;function o(...D){return(R,N=null,M)=>xl(...D.map(z=>z(V=>R.call(N,V),null,M)))}e.any=o;function l(D,R,N,M){let z=N;return r(D,V=>(z=R(z,V),z),M)}e.reduce=l;function c(D,R){let N;const M={onWillAddFirstListener(){N=D(z.fire,z)},onDidRemoveLastListener(){N==null||N.dispose()}},z=new Ve(M);return R==null||R.add(z),z.event}function h(D,R,N=100,M=!1,z=!1,V,j){let ae,ue,E,S=0,F;const P={leakWarningThreshold:V,onWillAddFirstListener(){ae=D(G=>{S++,ue=R(ue,G),M&&!E&&($.fire(ue),ue=void 0),F=()=>{const Z=ue;ue=void 0,E=void 0,(!M||S>1)&&$.fire(Z),S=0},typeof N=="number"?(clearTimeout(E),E=setTimeout(F,N)):E===void 0&&(E=0,queueMicrotask(F))})},onWillRemoveListener(){z&&S>0&&(F==null||F())},onDidRemoveLastListener(){F=void 0,ae.dispose()}},$=new Ve(P);return j==null||j.add($),$.event}e.debounce=h;function u(D,R=0,N){return e.debounce(D,(M,z)=>M?(M.push(z),M):[z],R,void 0,!0,void 0,N)}e.accumulate=u;function f(D,R=(M,z)=>M===z,N){let M=!0,z;return s(D,V=>{const j=M||!R(V,z);return M=!1,z=V,j},N)}e.latch=f;function m(D,R,N){return[e.filter(D,R,N),e.filter(D,M=>!R(M),N)]}e.split=m;function b(D,R=!1,N=[]){let M=N.slice(),z=D(ae=>{M?M.push(ae):j.fire(ae)});const V=()=>{M==null||M.forEach(ae=>j.fire(ae)),M=null},j=new Ve({onWillAddFirstListener(){z||(z=D(ae=>j.fire(ae)))},onDidAddFirstListener(){M&&(R?setTimeout(V):V())},onDidRemoveLastListener(){z&&z.dispose(),z=null}});return j.event}e.buffer=b;class y{constructor(R){this.event=R,this.disposables=new pt}map(R){return new y(r(this.event,R,this.disposables))}forEach(R){return new y(i(this.event,R,this.disposables))}filter(R){return new y(s(this.event,R,this.disposables))}reduce(R,N){return new y(l(this.event,R,N,this.disposables))}latch(){return new y(f(this.event,void 0,this.disposables))}debounce(R,N=100,M=!1,z=!1,V){return new y(h(this.event,R,N,M,z,V,this.disposables))}on(R,N,M){return this.event(R,N,M)}once(R,N,M){return n(this.event)(R,N,M)}dispose(){this.disposables.dispose()}}function v(D){return new y(D)}e.chain=v;function w(D,R,N=M=>M){const M=(...ae)=>j.fire(N(...ae)),z=()=>D.on(R,M),V=()=>D.removeListener(R,M),j=new Ve({onWillAddFirstListener:z,onDidRemoveLastListener:V});return j.event}e.fromNodeEventEmitter=w;function C(D,R,N=M=>M){const M=(...ae)=>j.fire(N(...ae)),z=()=>D.addEventListener(R,M),V=()=>D.removeEventListener(R,M),j=new Ve({onWillAddFirstListener:z,onDidRemoveLastListener:V});return j.event}e.fromDOMEventEmitter=C;function _(D){return new Promise(R=>n(D)(R))}e.toPromise=_;function I(D,R){return R(void 0),D(N=>R(N))}e.runAndSubscribe=I;function L(D,R){let N=null;function M(V){N==null||N.dispose(),N=new pt,R(V,N)}M(void 0);const z=D(V=>M(V));return yn(()=>{z.dispose(),N==null||N.dispose()})}e.runAndSubscribeWithStore=L;class X{constructor(R,N){this.obs=R,this._counter=0,this._hasChanged=!1;const M={onWillAddFirstListener:()=>{R.addObserver(this)},onDidRemoveLastListener:()=>{R.removeObserver(this)}};this.emitter=new Ve(M),N&&N.add(this.emitter)}beginUpdate(R){this._counter++}handleChange(R,N){this._hasChanged=!0}endUpdate(R){--this._counter===0&&this._hasChanged&&(this._hasChanged=!1,this.emitter.fire(this.obs.get()))}}function Q(D,R){return new X(D,R).emitter.event}e.fromObservable=Q})(cr||(cr={}));class Ct{constructor(t){this.listenerCount=0,this.invocationCount=0,this.elapsedOverall=0,this.durations=[],this.name=`${t}_${Ct._idPool++}`,Ct.all.add(this)}start(t){this._stopWatch=new Cn(!0),this.listenerCount=t}stop(){if(this._stopWatch){const t=this._stopWatch.elapsed();this.durations.push(t),this.elapsedOverall+=t,this.invocationCount+=1,this._stopWatch=void 0}}}Ct.all=new Set,Ct._idPool=0;let Ml=-1;class Nl{constructor(t,n=Math.random().toString(18).slice(2,5)){this.threshold=t,this.name=n,this._warnCountdown=0}dispose(){var t;(t=this._stacks)===null||t===void 0||t.clear()}check(t,n){const r=this.threshold;if(r<=0||n{const s=this._stacks.get(t.value)||0;this._stacks.set(t.value,s-1)}}}class hr{static create(){var t;return new hr((t=new Error().stack)!==null&&t!==void 0?t:"")}constructor(t){this.value=t}print(){console.warn(this.value.split(` +`).slice(2).join(` +`))}}class Pl{constructor(t,n,r){this.callback=t,this.callbackThis=n,this.stack=r,this.subscription=new Sl}invoke(t){this.callback.call(this.callbackThis,t)}}class Ve{constructor(t){var n,r,i,s,a;this._disposed=!1,this._options=t,this._leakageMon=!((n=this._options)===null||n===void 0)&&n.leakWarningThreshold?new Nl((i=(r=this._options)===null||r===void 0?void 0:r.leakWarningThreshold)!==null&&i!==void 0?i:Ml):void 0,this._perfMon=!((s=this._options)===null||s===void 0)&&s._profName?new Ct(this._options._profName):void 0,this._deliveryQueue=(a=this._options)===null||a===void 0?void 0:a.deliveryQueue}dispose(){var t,n,r,i;this._disposed||(this._disposed=!0,this._listeners&&this._listeners.clear(),(t=this._deliveryQueue)===null||t===void 0||t.clear(this),(r=(n=this._options)===null||n===void 0?void 0:n.onDidRemoveLastListener)===null||r===void 0||r.call(n),(i=this._leakageMon)===null||i===void 0||i.dispose())}get event(){return this._event||(this._event=(t,n,r)=>{var i,s,a;if(this._listeners||(this._listeners=new xn),this._leakageMon&&this._listeners.size>this._leakageMon.threshold*3)return console.warn(`[${this._leakageMon.name}] REFUSES to accept new listeners because it exceeded its threshold by far`),wn.None;const o=this._listeners.isEmpty();o&&((i=this._options)===null||i===void 0?void 0:i.onWillAddFirstListener)&&this._options.onWillAddFirstListener(this);let l,c;this._leakageMon&&this._listeners.size>=Math.ceil(this._leakageMon.threshold*.2)&&(c=hr.create(),l=this._leakageMon.check(c,this._listeners.size+1));const h=new Pl(t,n,c),u=this._listeners.push(h);o&&((s=this._options)===null||s===void 0?void 0:s.onDidAddFirstListener)&&this._options.onDidAddFirstListener(this),!((a=this._options)===null||a===void 0)&&a.onDidAddListener&&this._options.onDidAddListener(this,t,n);const f=h.subscription.set(()=>{var m,b;l==null||l(),this._disposed||((b=(m=this._options)===null||m===void 0?void 0:m.onWillRemoveListener)===null||b===void 0||b.call(m,this),u(),this._options&&this._options.onDidRemoveLastListener&&(this._listeners&&!this._listeners.isEmpty()||this._options.onDidRemoveLastListener(this)))});return r instanceof pt?r.add(f):Array.isArray(r)&&r.push(f),f}),this._event}fire(t){var n,r;if(this._listeners){this._deliveryQueue||(this._deliveryQueue=new Ll);for(const i of this._listeners)this._deliveryQueue.push(this,i,t);(n=this._perfMon)===null||n===void 0||n.start(this._deliveryQueue.size),this._deliveryQueue.deliver(),(r=this._perfMon)===null||r===void 0||r.stop()}}hasListeners(){return this._listeners?!this._listeners.isEmpty():!1}}class Il{constructor(){this._queue=new xn}get size(){return this._queue.size}push(t,n,r){this._queue.push(new Tl(t,n,r))}clear(t){const n=new xn;for(const r of this._queue)r.emitter!==t&&n.push(r);this._queue=n}deliver(){for(;this._queue.size>0;){const t=this._queue.shift();try{t.listener.invoke(t.event)}catch(n){tt(n)}}}}class Ll extends Il{clear(t){this._queue.clear()}}class Tl{constructor(t,n,r){this.emitter=t,this.listener=n,this.event=r}}function Wl(e){return typeof e=="string"}function Ol(e){let t=[],n=Object.getPrototypeOf(e);for(;Object.prototype!==n;)t=t.concat(Object.getOwnPropertyNames(n)),n=Object.getPrototypeOf(n);return t}function dr(e){const t=[];for(const n of Ol(e))typeof e[n]=="function"&&t.push(n);return t}function Ul(e,t){const n=i=>function(){const s=Array.prototype.slice.call(arguments,0);return t(i,s)},r={};for(const i of e)r[i]=n(i);return r}class Vl{constructor(t){this.fn=t,this.lastCache=void 0,this.lastArgKey=void 0}get(t){const n=JSON.stringify(t);return this.lastArgKey!==n&&(this.lastArgKey=n,this.lastCache=this.fn(t)),this.lastCache}}class Ti{constructor(t){this.executor=t,this._didRun=!1}get value(){if(!this._didRun)try{this._value=this.executor()}catch(t){this._error=t}finally{this._didRun=!0}if(this._error)throw this._error;return this._value}get rawValue(){return this._value}}var Wi;function Bl(e){return e.replace(/[\\\{\}\*\+\?\|\^\$\.\[\]\(\)]/g,"\\$&")}function jl(e){return e.split(/\r\n|\r|\n/)}function ql(e){for(let t=0,n=e.length;t=0;n--){const r=e.charCodeAt(n);if(r!==32&&r!==9)return n}return-1}function Oi(e){return e>=65&&e<=90}function ur(e){return 55296<=e&&e<=56319}function Hl(e){return 56320<=e&&e<=57343}function Gl(e,t){return(e-55296<<10)+(t-56320)+65536}function Jl(e,t,n){const r=e.charCodeAt(n);if(ur(r)&&n+1JSON.parse('{"_common":[8232,32,8233,32,5760,32,8192,32,8193,32,8194,32,8195,32,8196,32,8197,32,8198,32,8200,32,8201,32,8202,32,8287,32,8199,32,8239,32,2042,95,65101,95,65102,95,65103,95,8208,45,8209,45,8210,45,65112,45,1748,45,8259,45,727,45,8722,45,10134,45,11450,45,1549,44,1643,44,8218,44,184,44,42233,44,894,59,2307,58,2691,58,1417,58,1795,58,1796,58,5868,58,65072,58,6147,58,6153,58,8282,58,1475,58,760,58,42889,58,8758,58,720,58,42237,58,451,33,11601,33,660,63,577,63,2429,63,5038,63,42731,63,119149,46,8228,46,1793,46,1794,46,42510,46,68176,46,1632,46,1776,46,42232,46,1373,96,65287,96,8219,96,8242,96,1370,96,1523,96,8175,96,65344,96,900,96,8189,96,8125,96,8127,96,8190,96,697,96,884,96,712,96,714,96,715,96,756,96,699,96,701,96,700,96,702,96,42892,96,1497,96,2036,96,2037,96,5194,96,5836,96,94033,96,94034,96,65339,91,10088,40,10098,40,12308,40,64830,40,65341,93,10089,41,10099,41,12309,41,64831,41,10100,123,119060,123,10101,125,65342,94,8270,42,1645,42,8727,42,66335,42,5941,47,8257,47,8725,47,8260,47,9585,47,10187,47,10744,47,119354,47,12755,47,12339,47,11462,47,20031,47,12035,47,65340,92,65128,92,8726,92,10189,92,10741,92,10745,92,119311,92,119355,92,12756,92,20022,92,12034,92,42872,38,708,94,710,94,5869,43,10133,43,66203,43,8249,60,10094,60,706,60,119350,60,5176,60,5810,60,5120,61,11840,61,12448,61,42239,61,8250,62,10095,62,707,62,119351,62,5171,62,94015,62,8275,126,732,126,8128,126,8764,126,65372,124,65293,45,120784,50,120794,50,120804,50,120814,50,120824,50,130034,50,42842,50,423,50,1000,50,42564,50,5311,50,42735,50,119302,51,120785,51,120795,51,120805,51,120815,51,120825,51,130035,51,42923,51,540,51,439,51,42858,51,11468,51,1248,51,94011,51,71882,51,120786,52,120796,52,120806,52,120816,52,120826,52,130036,52,5070,52,71855,52,120787,53,120797,53,120807,53,120817,53,120827,53,130037,53,444,53,71867,53,120788,54,120798,54,120808,54,120818,54,120828,54,130038,54,11474,54,5102,54,71893,54,119314,55,120789,55,120799,55,120809,55,120819,55,120829,55,130039,55,66770,55,71878,55,2819,56,2538,56,2666,56,125131,56,120790,56,120800,56,120810,56,120820,56,120830,56,130040,56,547,56,546,56,66330,56,2663,57,2920,57,2541,57,3437,57,120791,57,120801,57,120811,57,120821,57,120831,57,130041,57,42862,57,11466,57,71884,57,71852,57,71894,57,9082,97,65345,97,119834,97,119886,97,119938,97,119990,97,120042,97,120094,97,120146,97,120198,97,120250,97,120302,97,120354,97,120406,97,120458,97,593,97,945,97,120514,97,120572,97,120630,97,120688,97,120746,97,65313,65,119808,65,119860,65,119912,65,119964,65,120016,65,120068,65,120120,65,120172,65,120224,65,120276,65,120328,65,120380,65,120432,65,913,65,120488,65,120546,65,120604,65,120662,65,120720,65,5034,65,5573,65,42222,65,94016,65,66208,65,119835,98,119887,98,119939,98,119991,98,120043,98,120095,98,120147,98,120199,98,120251,98,120303,98,120355,98,120407,98,120459,98,388,98,5071,98,5234,98,5551,98,65314,66,8492,66,119809,66,119861,66,119913,66,120017,66,120069,66,120121,66,120173,66,120225,66,120277,66,120329,66,120381,66,120433,66,42932,66,914,66,120489,66,120547,66,120605,66,120663,66,120721,66,5108,66,5623,66,42192,66,66178,66,66209,66,66305,66,65347,99,8573,99,119836,99,119888,99,119940,99,119992,99,120044,99,120096,99,120148,99,120200,99,120252,99,120304,99,120356,99,120408,99,120460,99,7428,99,1010,99,11429,99,43951,99,66621,99,128844,67,71922,67,71913,67,65315,67,8557,67,8450,67,8493,67,119810,67,119862,67,119914,67,119966,67,120018,67,120174,67,120226,67,120278,67,120330,67,120382,67,120434,67,1017,67,11428,67,5087,67,42202,67,66210,67,66306,67,66581,67,66844,67,8574,100,8518,100,119837,100,119889,100,119941,100,119993,100,120045,100,120097,100,120149,100,120201,100,120253,100,120305,100,120357,100,120409,100,120461,100,1281,100,5095,100,5231,100,42194,100,8558,68,8517,68,119811,68,119863,68,119915,68,119967,68,120019,68,120071,68,120123,68,120175,68,120227,68,120279,68,120331,68,120383,68,120435,68,5024,68,5598,68,5610,68,42195,68,8494,101,65349,101,8495,101,8519,101,119838,101,119890,101,119942,101,120046,101,120098,101,120150,101,120202,101,120254,101,120306,101,120358,101,120410,101,120462,101,43826,101,1213,101,8959,69,65317,69,8496,69,119812,69,119864,69,119916,69,120020,69,120072,69,120124,69,120176,69,120228,69,120280,69,120332,69,120384,69,120436,69,917,69,120492,69,120550,69,120608,69,120666,69,120724,69,11577,69,5036,69,42224,69,71846,69,71854,69,66182,69,119839,102,119891,102,119943,102,119995,102,120047,102,120099,102,120151,102,120203,102,120255,102,120307,102,120359,102,120411,102,120463,102,43829,102,42905,102,383,102,7837,102,1412,102,119315,70,8497,70,119813,70,119865,70,119917,70,120021,70,120073,70,120125,70,120177,70,120229,70,120281,70,120333,70,120385,70,120437,70,42904,70,988,70,120778,70,5556,70,42205,70,71874,70,71842,70,66183,70,66213,70,66853,70,65351,103,8458,103,119840,103,119892,103,119944,103,120048,103,120100,103,120152,103,120204,103,120256,103,120308,103,120360,103,120412,103,120464,103,609,103,7555,103,397,103,1409,103,119814,71,119866,71,119918,71,119970,71,120022,71,120074,71,120126,71,120178,71,120230,71,120282,71,120334,71,120386,71,120438,71,1292,71,5056,71,5107,71,42198,71,65352,104,8462,104,119841,104,119945,104,119997,104,120049,104,120101,104,120153,104,120205,104,120257,104,120309,104,120361,104,120413,104,120465,104,1211,104,1392,104,5058,104,65320,72,8459,72,8460,72,8461,72,119815,72,119867,72,119919,72,120023,72,120179,72,120231,72,120283,72,120335,72,120387,72,120439,72,919,72,120494,72,120552,72,120610,72,120668,72,120726,72,11406,72,5051,72,5500,72,42215,72,66255,72,731,105,9075,105,65353,105,8560,105,8505,105,8520,105,119842,105,119894,105,119946,105,119998,105,120050,105,120102,105,120154,105,120206,105,120258,105,120310,105,120362,105,120414,105,120466,105,120484,105,618,105,617,105,953,105,8126,105,890,105,120522,105,120580,105,120638,105,120696,105,120754,105,1110,105,42567,105,1231,105,43893,105,5029,105,71875,105,65354,106,8521,106,119843,106,119895,106,119947,106,119999,106,120051,106,120103,106,120155,106,120207,106,120259,106,120311,106,120363,106,120415,106,120467,106,1011,106,1112,106,65322,74,119817,74,119869,74,119921,74,119973,74,120025,74,120077,74,120129,74,120181,74,120233,74,120285,74,120337,74,120389,74,120441,74,42930,74,895,74,1032,74,5035,74,5261,74,42201,74,119844,107,119896,107,119948,107,120000,107,120052,107,120104,107,120156,107,120208,107,120260,107,120312,107,120364,107,120416,107,120468,107,8490,75,65323,75,119818,75,119870,75,119922,75,119974,75,120026,75,120078,75,120130,75,120182,75,120234,75,120286,75,120338,75,120390,75,120442,75,922,75,120497,75,120555,75,120613,75,120671,75,120729,75,11412,75,5094,75,5845,75,42199,75,66840,75,1472,108,8739,73,9213,73,65512,73,1633,108,1777,73,66336,108,125127,108,120783,73,120793,73,120803,73,120813,73,120823,73,130033,73,65321,73,8544,73,8464,73,8465,73,119816,73,119868,73,119920,73,120024,73,120128,73,120180,73,120232,73,120284,73,120336,73,120388,73,120440,73,65356,108,8572,73,8467,108,119845,108,119897,108,119949,108,120001,108,120053,108,120105,73,120157,73,120209,73,120261,73,120313,73,120365,73,120417,73,120469,73,448,73,120496,73,120554,73,120612,73,120670,73,120728,73,11410,73,1030,73,1216,73,1493,108,1503,108,1575,108,126464,108,126592,108,65166,108,65165,108,1994,108,11599,73,5825,73,42226,73,93992,73,66186,124,66313,124,119338,76,8556,76,8466,76,119819,76,119871,76,119923,76,120027,76,120079,76,120131,76,120183,76,120235,76,120287,76,120339,76,120391,76,120443,76,11472,76,5086,76,5290,76,42209,76,93974,76,71843,76,71858,76,66587,76,66854,76,65325,77,8559,77,8499,77,119820,77,119872,77,119924,77,120028,77,120080,77,120132,77,120184,77,120236,77,120288,77,120340,77,120392,77,120444,77,924,77,120499,77,120557,77,120615,77,120673,77,120731,77,1018,77,11416,77,5047,77,5616,77,5846,77,42207,77,66224,77,66321,77,119847,110,119899,110,119951,110,120003,110,120055,110,120107,110,120159,110,120211,110,120263,110,120315,110,120367,110,120419,110,120471,110,1400,110,1404,110,65326,78,8469,78,119821,78,119873,78,119925,78,119977,78,120029,78,120081,78,120185,78,120237,78,120289,78,120341,78,120393,78,120445,78,925,78,120500,78,120558,78,120616,78,120674,78,120732,78,11418,78,42208,78,66835,78,3074,111,3202,111,3330,111,3458,111,2406,111,2662,111,2790,111,3046,111,3174,111,3302,111,3430,111,3664,111,3792,111,4160,111,1637,111,1781,111,65359,111,8500,111,119848,111,119900,111,119952,111,120056,111,120108,111,120160,111,120212,111,120264,111,120316,111,120368,111,120420,111,120472,111,7439,111,7441,111,43837,111,959,111,120528,111,120586,111,120644,111,120702,111,120760,111,963,111,120532,111,120590,111,120648,111,120706,111,120764,111,11423,111,4351,111,1413,111,1505,111,1607,111,126500,111,126564,111,126596,111,65259,111,65260,111,65258,111,65257,111,1726,111,64428,111,64429,111,64427,111,64426,111,1729,111,64424,111,64425,111,64423,111,64422,111,1749,111,3360,111,4125,111,66794,111,71880,111,71895,111,66604,111,1984,79,2534,79,2918,79,12295,79,70864,79,71904,79,120782,79,120792,79,120802,79,120812,79,120822,79,130032,79,65327,79,119822,79,119874,79,119926,79,119978,79,120030,79,120082,79,120134,79,120186,79,120238,79,120290,79,120342,79,120394,79,120446,79,927,79,120502,79,120560,79,120618,79,120676,79,120734,79,11422,79,1365,79,11604,79,4816,79,2848,79,66754,79,42227,79,71861,79,66194,79,66219,79,66564,79,66838,79,9076,112,65360,112,119849,112,119901,112,119953,112,120005,112,120057,112,120109,112,120161,112,120213,112,120265,112,120317,112,120369,112,120421,112,120473,112,961,112,120530,112,120544,112,120588,112,120602,112,120646,112,120660,112,120704,112,120718,112,120762,112,120776,112,11427,112,65328,80,8473,80,119823,80,119875,80,119927,80,119979,80,120031,80,120083,80,120187,80,120239,80,120291,80,120343,80,120395,80,120447,80,929,80,120504,80,120562,80,120620,80,120678,80,120736,80,11426,80,5090,80,5229,80,42193,80,66197,80,119850,113,119902,113,119954,113,120006,113,120058,113,120110,113,120162,113,120214,113,120266,113,120318,113,120370,113,120422,113,120474,113,1307,113,1379,113,1382,113,8474,81,119824,81,119876,81,119928,81,119980,81,120032,81,120084,81,120188,81,120240,81,120292,81,120344,81,120396,81,120448,81,11605,81,119851,114,119903,114,119955,114,120007,114,120059,114,120111,114,120163,114,120215,114,120267,114,120319,114,120371,114,120423,114,120475,114,43847,114,43848,114,7462,114,11397,114,43905,114,119318,82,8475,82,8476,82,8477,82,119825,82,119877,82,119929,82,120033,82,120189,82,120241,82,120293,82,120345,82,120397,82,120449,82,422,82,5025,82,5074,82,66740,82,5511,82,42211,82,94005,82,65363,115,119852,115,119904,115,119956,115,120008,115,120060,115,120112,115,120164,115,120216,115,120268,115,120320,115,120372,115,120424,115,120476,115,42801,115,445,115,1109,115,43946,115,71873,115,66632,115,65331,83,119826,83,119878,83,119930,83,119982,83,120034,83,120086,83,120138,83,120190,83,120242,83,120294,83,120346,83,120398,83,120450,83,1029,83,1359,83,5077,83,5082,83,42210,83,94010,83,66198,83,66592,83,119853,116,119905,116,119957,116,120009,116,120061,116,120113,116,120165,116,120217,116,120269,116,120321,116,120373,116,120425,116,120477,116,8868,84,10201,84,128872,84,65332,84,119827,84,119879,84,119931,84,119983,84,120035,84,120087,84,120139,84,120191,84,120243,84,120295,84,120347,84,120399,84,120451,84,932,84,120507,84,120565,84,120623,84,120681,84,120739,84,11430,84,5026,84,42196,84,93962,84,71868,84,66199,84,66225,84,66325,84,119854,117,119906,117,119958,117,120010,117,120062,117,120114,117,120166,117,120218,117,120270,117,120322,117,120374,117,120426,117,120478,117,42911,117,7452,117,43854,117,43858,117,651,117,965,117,120534,117,120592,117,120650,117,120708,117,120766,117,1405,117,66806,117,71896,117,8746,85,8899,85,119828,85,119880,85,119932,85,119984,85,120036,85,120088,85,120140,85,120192,85,120244,85,120296,85,120348,85,120400,85,120452,85,1357,85,4608,85,66766,85,5196,85,42228,85,94018,85,71864,85,8744,118,8897,118,65366,118,8564,118,119855,118,119907,118,119959,118,120011,118,120063,118,120115,118,120167,118,120219,118,120271,118,120323,118,120375,118,120427,118,120479,118,7456,118,957,118,120526,118,120584,118,120642,118,120700,118,120758,118,1141,118,1496,118,71430,118,43945,118,71872,118,119309,86,1639,86,1783,86,8548,86,119829,86,119881,86,119933,86,119985,86,120037,86,120089,86,120141,86,120193,86,120245,86,120297,86,120349,86,120401,86,120453,86,1140,86,11576,86,5081,86,5167,86,42719,86,42214,86,93960,86,71840,86,66845,86,623,119,119856,119,119908,119,119960,119,120012,119,120064,119,120116,119,120168,119,120220,119,120272,119,120324,119,120376,119,120428,119,120480,119,7457,119,1121,119,1309,119,1377,119,71434,119,71438,119,71439,119,43907,119,71919,87,71910,87,119830,87,119882,87,119934,87,119986,87,120038,87,120090,87,120142,87,120194,87,120246,87,120298,87,120350,87,120402,87,120454,87,1308,87,5043,87,5076,87,42218,87,5742,120,10539,120,10540,120,10799,120,65368,120,8569,120,119857,120,119909,120,119961,120,120013,120,120065,120,120117,120,120169,120,120221,120,120273,120,120325,120,120377,120,120429,120,120481,120,5441,120,5501,120,5741,88,9587,88,66338,88,71916,88,65336,88,8553,88,119831,88,119883,88,119935,88,119987,88,120039,88,120091,88,120143,88,120195,88,120247,88,120299,88,120351,88,120403,88,120455,88,42931,88,935,88,120510,88,120568,88,120626,88,120684,88,120742,88,11436,88,11613,88,5815,88,42219,88,66192,88,66228,88,66327,88,66855,88,611,121,7564,121,65369,121,119858,121,119910,121,119962,121,120014,121,120066,121,120118,121,120170,121,120222,121,120274,121,120326,121,120378,121,120430,121,120482,121,655,121,7935,121,43866,121,947,121,8509,121,120516,121,120574,121,120632,121,120690,121,120748,121,1199,121,4327,121,71900,121,65337,89,119832,89,119884,89,119936,89,119988,89,120040,89,120092,89,120144,89,120196,89,120248,89,120300,89,120352,89,120404,89,120456,89,933,89,978,89,120508,89,120566,89,120624,89,120682,89,120740,89,11432,89,1198,89,5033,89,5053,89,42220,89,94019,89,71844,89,66226,89,119859,122,119911,122,119963,122,120015,122,120067,122,120119,122,120171,122,120223,122,120275,122,120327,122,120379,122,120431,122,120483,122,7458,122,43923,122,71876,122,66293,90,71909,90,65338,90,8484,90,8488,90,119833,90,119885,90,119937,90,119989,90,120041,90,120197,90,120249,90,120301,90,120353,90,120405,90,120457,90,918,90,120493,90,120551,90,120609,90,120667,90,120725,90,5059,90,42204,90,71849,90,65282,34,65284,36,65285,37,65286,38,65290,42,65291,43,65294,46,65295,47,65296,48,65297,49,65298,50,65299,51,65300,52,65301,53,65302,54,65303,55,65304,56,65305,57,65308,60,65309,61,65310,62,65312,64,65316,68,65318,70,65319,71,65324,76,65329,81,65330,82,65333,85,65334,86,65335,87,65343,95,65346,98,65348,100,65350,102,65355,107,65357,109,65358,110,65361,113,65362,114,65364,116,65365,117,65367,119,65370,122,65371,123,65373,125],"_default":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"cs":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"de":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"es":[8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"fr":[65374,126,65306,58,65281,33,8216,96,8245,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"it":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"ja":[8211,45,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65292,44,65307,59],"ko":[8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"pl":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"pt-BR":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"qps-ploc":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"ru":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,305,105,921,73,1009,112,215,120,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"tr":[160,32,8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],"zh-hans":[65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41],"zh-hant":[8211,45,65374,126,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65307,59]}')),ze.cache=new Vl(e=>{function t(c){const h=new Map;for(let u=0;u!c.startsWith("_")&&c in i);s.length===0&&(s=["_default"]);let a;for(const c of s){const h=t(i[c]);a=r(a,h)}const o=t(i._common),l=n(o,a);return new ze(l)}),ze._locales=new Ti(()=>Object.keys(ze.ambiguousCharacterData.value).filter(e=>!e.startsWith("_")));class nt{static getRawData(){return JSON.parse("[9,10,11,12,13,32,127,160,173,847,1564,4447,4448,6068,6069,6155,6156,6157,6158,7355,7356,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8234,8235,8236,8237,8238,8239,8287,8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,10240,12288,12644,65024,65025,65026,65027,65028,65029,65030,65031,65032,65033,65034,65035,65036,65037,65038,65039,65279,65440,65520,65521,65522,65523,65524,65525,65526,65527,65528,65532,78844,119155,119156,119157,119158,119159,119160,119161,119162,917504,917505,917506,917507,917508,917509,917510,917511,917512,917513,917514,917515,917516,917517,917518,917519,917520,917521,917522,917523,917524,917525,917526,917527,917528,917529,917530,917531,917532,917533,917534,917535,917536,917537,917538,917539,917540,917541,917542,917543,917544,917545,917546,917547,917548,917549,917550,917551,917552,917553,917554,917555,917556,917557,917558,917559,917560,917561,917562,917563,917564,917565,917566,917567,917568,917569,917570,917571,917572,917573,917574,917575,917576,917577,917578,917579,917580,917581,917582,917583,917584,917585,917586,917587,917588,917589,917590,917591,917592,917593,917594,917595,917596,917597,917598,917599,917600,917601,917602,917603,917604,917605,917606,917607,917608,917609,917610,917611,917612,917613,917614,917615,917616,917617,917618,917619,917620,917621,917622,917623,917624,917625,917626,917627,917628,917629,917630,917631,917760,917761,917762,917763,917764,917765,917766,917767,917768,917769,917770,917771,917772,917773,917774,917775,917776,917777,917778,917779,917780,917781,917782,917783,917784,917785,917786,917787,917788,917789,917790,917791,917792,917793,917794,917795,917796,917797,917798,917799,917800,917801,917802,917803,917804,917805,917806,917807,917808,917809,917810,917811,917812,917813,917814,917815,917816,917817,917818,917819,917820,917821,917822,917823,917824,917825,917826,917827,917828,917829,917830,917831,917832,917833,917834,917835,917836,917837,917838,917839,917840,917841,917842,917843,917844,917845,917846,917847,917848,917849,917850,917851,917852,917853,917854,917855,917856,917857,917858,917859,917860,917861,917862,917863,917864,917865,917866,917867,917868,917869,917870,917871,917872,917873,917874,917875,917876,917877,917878,917879,917880,917881,917882,917883,917884,917885,917886,917887,917888,917889,917890,917891,917892,917893,917894,917895,917896,917897,917898,917899,917900,917901,917902,917903,917904,917905,917906,917907,917908,917909,917910,917911,917912,917913,917914,917915,917916,917917,917918,917919,917920,917921,917922,917923,917924,917925,917926,917927,917928,917929,917930,917931,917932,917933,917934,917935,917936,917937,917938,917939,917940,917941,917942,917943,917944,917945,917946,917947,917948,917949,917950,917951,917952,917953,917954,917955,917956,917957,917958,917959,917960,917961,917962,917963,917964,917965,917966,917967,917968,917969,917970,917971,917972,917973,917974,917975,917976,917977,917978,917979,917980,917981,917982,917983,917984,917985,917986,917987,917988,917989,917990,917991,917992,917993,917994,917995,917996,917997,917998,917999]")}static getData(){return this._data||(this._data=new Set(nt.getRawData())),this._data}static isInvisibleCharacter(t){return nt.getData().has(t)}static get codePoints(){return nt.getData()}}nt._data=void 0;const Kl="$initialize";class Ql{constructor(t,n,r,i){this.vsWorker=t,this.req=n,this.method=r,this.args=i,this.type=0}}class Ui{constructor(t,n,r,i){this.vsWorker=t,this.seq=n,this.res=r,this.err=i,this.type=1}}class Zl{constructor(t,n,r,i){this.vsWorker=t,this.req=n,this.eventName=r,this.arg=i,this.type=2}}class ec{constructor(t,n,r){this.vsWorker=t,this.req=n,this.event=r,this.type=3}}class tc{constructor(t,n){this.vsWorker=t,this.req=n,this.type=4}}class nc{constructor(t){this._workerId=-1,this._handler=t,this._lastSentReq=0,this._pendingReplies=Object.create(null),this._pendingEmitters=new Map,this._pendingEvents=new Map}setWorkerId(t){this._workerId=t}sendMessage(t,n){const r=String(++this._lastSentReq);return new Promise((i,s)=>{this._pendingReplies[r]={resolve:i,reject:s},this._send(new Ql(this._workerId,r,t,n))})}listen(t,n){let r=null;const i=new Ve({onWillAddFirstListener:()=>{r=String(++this._lastSentReq),this._pendingEmitters.set(r,i),this._send(new Zl(this._workerId,r,t,n))},onDidRemoveLastListener:()=>{this._pendingEmitters.delete(r),this._send(new tc(this._workerId,r)),r=null}});return i.event}handleMessage(t){!t||!t.vsWorker||this._workerId!==-1&&t.vsWorker!==this._workerId||this._handleMessage(t)}_handleMessage(t){switch(t.type){case 1:return this._handleReplyMessage(t);case 0:return this._handleRequestMessage(t);case 2:return this._handleSubscribeEventMessage(t);case 3:return this._handleEventMessage(t);case 4:return this._handleUnsubscribeEventMessage(t)}}_handleReplyMessage(t){if(!this._pendingReplies[t.seq]){console.warn("Got reply to unknown seq");return}const n=this._pendingReplies[t.seq];if(delete this._pendingReplies[t.seq],t.err){let r=t.err;t.err.$isError&&(r=new Error,r.name=t.err.name,r.message=t.err.message,r.stack=t.err.stack),n.reject(r);return}n.resolve(t.res)}_handleRequestMessage(t){const n=t.req;this._handler.handleMessage(t.method,t.args).then(i=>{this._send(new Ui(this._workerId,n,i,void 0))},i=>{i.detail instanceof Error&&(i.detail=Pi(i.detail)),this._send(new Ui(this._workerId,n,void 0,Pi(i)))})}_handleSubscribeEventMessage(t){const n=t.req,r=this._handler.handleEvent(t.eventName,t.arg)(i=>{this._send(new ec(this._workerId,n,i))});this._pendingEvents.set(n,r)}_handleEventMessage(t){if(!this._pendingEmitters.has(t.req)){console.warn("Got event for unknown req");return}this._pendingEmitters.get(t.req).fire(t.event)}_handleUnsubscribeEventMessage(t){if(!this._pendingEvents.has(t.req)){console.warn("Got unsubscribe for unknown req");return}this._pendingEvents.get(t.req).dispose(),this._pendingEvents.delete(t.req)}_send(t){const n=[];if(t.type===0)for(let r=0;rfunction(){const o=Array.prototype.slice.call(arguments,0);return t(a,o)},i=a=>function(o){return n(a,o)},s={};for(const a of e){if(Bi(a)){s[a]=i(a);continue}if(Vi(a)){s[a]=n(a,void 0);continue}s[a]=r(a)}return s}class ic{constructor(t,n){this._requestHandlerFactory=n,this._requestHandler=null,this._protocol=new nc({sendMessage:(r,i)=>{t(r,i)},handleMessage:(r,i)=>this._handleMessage(r,i),handleEvent:(r,i)=>this._handleEvent(r,i)})}onmessage(t){this._protocol.handleMessage(t)}_handleMessage(t,n){if(t===Kl)return this.initialize(n[0],n[1],n[2],n[3]);if(!this._requestHandler||typeof this._requestHandler[t]!="function")return Promise.reject(new Error("Missing requestHandler or method: "+t));try{return Promise.resolve(this._requestHandler[t].apply(this._requestHandler,n))}catch(r){return Promise.reject(r)}}_handleEvent(t,n){if(!this._requestHandler)throw new Error("Missing requestHandler");if(Bi(t)){const r=this._requestHandler[t].call(this._requestHandler,n);if(typeof r!="function")throw new Error(`Missing dynamic event ${t} on request handler.`);return r}if(Vi(t)){const r=this._requestHandler[t];if(typeof r!="function")throw new Error(`Missing event ${t} on request handler.`);return r}throw new Error(`Malformed event name ${t}`)}initialize(t,n,r,i){this._protocol.setWorkerId(t);const o=rc(i,(l,c)=>this._protocol.sendMessage(l,c),(l,c)=>this._protocol.listen(l,c));return this._requestHandlerFactory?(this._requestHandler=this._requestHandlerFactory(o),Promise.resolve(dr(this._requestHandler))):(n&&(typeof n.baseUrl<"u"&&delete n.baseUrl,typeof n.paths<"u"&&typeof n.paths.vs<"u"&&delete n.paths.vs,typeof n.trustedTypesPolicy!==void 0&&delete n.trustedTypesPolicy,n.catchError=!0,me.require.config(n)),new Promise((l,c)=>{const h=me.require;h([r],u=>{if(this._requestHandler=u.create(o),!this._requestHandler){c(new Error("No RequestHandler!"));return}l(dr(this._requestHandler))},c)}))}}class rt{constructor(t,n,r,i){this.originalStart=t,this.originalLength=n,this.modifiedStart=r,this.modifiedLength=i}getOriginalEnd(){return this.originalStart+this.originalLength}getModifiedEnd(){return this.modifiedStart+this.modifiedLength}}function ji(e,t){return(t<<5)-t+e|0}function sc(e,t){t=ji(149417,t);for(let n=0,r=e.length;n0||this.m_modifiedCount>0)&&this.m_changes.push(new rt(this.m_originalStart,this.m_originalCount,this.m_modifiedStart,this.m_modifiedCount)),this.m_originalCount=0,this.m_modifiedCount=0,this.m_originalStart=1073741824,this.m_modifiedStart=1073741824}AddOriginalElement(t,n){this.m_originalStart=Math.min(this.m_originalStart,t),this.m_modifiedStart=Math.min(this.m_modifiedStart,n),this.m_originalCount++}AddModifiedElement(t,n){this.m_originalStart=Math.min(this.m_originalStart,t),this.m_modifiedStart=Math.min(this.m_modifiedStart,n),this.m_modifiedCount++}getChanges(){return(this.m_originalCount>0||this.m_modifiedCount>0)&&this.MarkNextChange(),this.m_changes}getReverseChanges(){return(this.m_originalCount>0||this.m_modifiedCount>0)&&this.MarkNextChange(),this.m_changes.reverse(),this.m_changes}}class it{constructor(t,n,r=null){this.ContinueProcessingPredicate=r,this._originalSequence=t,this._modifiedSequence=n;const[i,s,a]=it._getElements(t),[o,l,c]=it._getElements(n);this._hasStrings=a&&c,this._originalStringElements=i,this._originalElementsOrHash=s,this._modifiedStringElements=o,this._modifiedElementsOrHash=l,this.m_forwardHistory=[],this.m_reverseHistory=[]}static _isStringArray(t){return t.length>0&&typeof t[0]=="string"}static _getElements(t){const n=t.getElements();if(it._isStringArray(n)){const r=new Int32Array(n.length);for(let i=0,s=n.length;i=t&&i>=r&&this.ElementsAreEqual(n,i);)n--,i--;if(t>n||r>i){let u;return r<=i?(kt.Assert(t===n+1,"originalStart should only be one more than originalEnd"),u=[new rt(t,0,r,i-r+1)]):t<=n?(kt.Assert(r===i+1,"modifiedStart should only be one more than modifiedEnd"),u=[new rt(t,n-t+1,r,0)]):(kt.Assert(t===n+1,"originalStart should only be one more than originalEnd"),kt.Assert(r===i+1,"modifiedStart should only be one more than modifiedEnd"),u=[]),u}const a=[0],o=[0],l=this.ComputeRecursionPoint(t,n,r,i,a,o,s),c=a[0],h=o[0];if(l!==null)return l;if(!s[0]){const u=this.ComputeDiffRecursive(t,c,r,h,s);let f=[];return s[0]?f=[new rt(c+1,n-(c+1)+1,h+1,i-(h+1)+1)]:f=this.ComputeDiffRecursive(c+1,n,h+1,i,s),this.ConcatenateChanges(u,f)}return[new rt(t,n-t+1,r,i-r+1)]}WALKTRACE(t,n,r,i,s,a,o,l,c,h,u,f,m,b,y,v,w,C){let _=null,I=null,L=new $i,X=n,Q=r,D=m[0]-v[0]-i,R=-1073741824,N=this.m_forwardHistory.length-1;do{const M=D+t;M===X||M=0&&(c=this.m_forwardHistory[N],t=c[0],X=1,Q=c.length-1)}while(--N>=-1);if(_=L.getReverseChanges(),C[0]){let M=m[0]+1,z=v[0]+1;if(_!==null&&_.length>0){const V=_[_.length-1];M=Math.max(M,V.getOriginalEnd()),z=Math.max(z,V.getModifiedEnd())}I=[new rt(M,f-M+1,z,y-z+1)]}else{L=new $i,X=a,Q=o,D=m[0]-v[0]-l,R=1073741824,N=w?this.m_reverseHistory.length-1:this.m_reverseHistory.length-2;do{const M=D+s;M===X||M=h[M+1]?(u=h[M+1]-1,b=u-D-l,u>R&&L.MarkNextChange(),R=u+1,L.AddOriginalElement(u+1,b+1),D=M+1-s):(u=h[M-1],b=u-D-l,u>R&&L.MarkNextChange(),R=u,L.AddModifiedElement(u+1,b+1),D=M-1-s),N>=0&&(h=this.m_reverseHistory[N],s=h[0],X=1,Q=h.length-1)}while(--N>=-1);I=L.getChanges()}return this.ConcatenateChanges(_,I)}ComputeRecursionPoint(t,n,r,i,s,a,o){let l=0,c=0,h=0,u=0,f=0,m=0;t--,r--,s[0]=0,a[0]=0,this.m_forwardHistory=[],this.m_reverseHistory=[];const b=n-t+(i-r),y=b+1,v=new Int32Array(y),w=new Int32Array(y),C=i-r,_=n-t,I=t-r,L=n-i,Q=(_-C)%2===0;v[C]=t,w[_]=n,o[0]=!1;for(let D=1;D<=b/2+1;D++){let R=0,N=0;h=this.ClipDiagonalBound(C-D,D,C,y),u=this.ClipDiagonalBound(C+D,D,C,y);for(let z=h;z<=u;z+=2){z===h||zR+N&&(R=l,N=c),!Q&&Math.abs(z-_)<=D-1&&l>=w[z])return s[0]=l,a[0]=c,V<=w[z]&&1447>0&&D<=1447+1?this.WALKTRACE(C,h,u,I,_,f,m,L,v,w,l,n,s,c,i,a,Q,o):null}const M=(R-t+(N-r)-D)/2;if(this.ContinueProcessingPredicate!==null&&!this.ContinueProcessingPredicate(R,M))return o[0]=!0,s[0]=R,a[0]=N,M>0&&1447>0&&D<=1447+1?this.WALKTRACE(C,h,u,I,_,f,m,L,v,w,l,n,s,c,i,a,Q,o):(t++,r++,[new rt(t,n-t+1,r,i-r+1)]);f=this.ClipDiagonalBound(_-D,D,_,y),m=this.ClipDiagonalBound(_+D,D,_,y);for(let z=f;z<=m;z+=2){z===f||z=w[z+1]?l=w[z+1]-1:l=w[z-1],c=l-(z-_)-L;const V=l;for(;l>t&&c>r&&this.ElementsAreEqual(l,c);)l--,c--;if(w[z]=l,Q&&Math.abs(z-C)<=D&&l<=v[z])return s[0]=l,a[0]=c,V>=v[z]&&1447>0&&D<=1447+1?this.WALKTRACE(C,h,u,I,_,f,m,L,v,w,l,n,s,c,i,a,Q,o):null}if(D<=1447){let z=new Int32Array(u-h+2);z[0]=C-h+1,_t.Copy2(v,h,z,1,u-h+1),this.m_forwardHistory.push(z),z=new Int32Array(m-f+2),z[0]=_-f+1,_t.Copy2(w,f,z,1,m-f+1),this.m_reverseHistory.push(z)}}return this.WALKTRACE(C,h,u,I,_,f,m,L,v,w,l,n,s,c,i,a,Q,o)}PrettifyChanges(t){for(let n=0;n0,o=r.modifiedLength>0;for(;r.originalStart+r.originalLength=0;n--){const r=t[n];let i=0,s=0;if(n>0){const u=t[n-1];i=u.originalStart+u.originalLength,s=u.modifiedStart+u.modifiedLength}const a=r.originalLength>0,o=r.modifiedLength>0;let l=0,c=this._boundaryScore(r.originalStart,r.originalLength,r.modifiedStart,r.modifiedLength);for(let u=1;;u++){const f=r.originalStart-u,m=r.modifiedStart-u;if(fc&&(c=y,l=u)}r.originalStart-=l,r.modifiedStart-=l;const h=[null];if(n>0&&this.ChangesOverlap(t[n-1],t[n],h)){t[n-1]=h[0],t.splice(n,1),n++;continue}}if(this._hasStrings)for(let n=1,r=t.length;n0&&m>l&&(l=m,c=u,h=f)}return l>0?[c,h]:null}_contiguousSequenceScore(t,n,r){let i=0;for(let s=0;s=this._originalElementsOrHash.length-1?!0:this._hasStrings&&/^\s*$/.test(this._originalStringElements[t])}_OriginalRegionIsBoundary(t,n){if(this._OriginalIsBoundary(t)||this._OriginalIsBoundary(t-1))return!0;if(n>0){const r=t+n;if(this._OriginalIsBoundary(r-1)||this._OriginalIsBoundary(r))return!0}return!1}_ModifiedIsBoundary(t){return t<=0||t>=this._modifiedElementsOrHash.length-1?!0:this._hasStrings&&/^\s*$/.test(this._modifiedStringElements[t])}_ModifiedRegionIsBoundary(t,n){if(this._ModifiedIsBoundary(t)||this._ModifiedIsBoundary(t-1))return!0;if(n>0){const r=t+n;if(this._ModifiedIsBoundary(r-1)||this._ModifiedIsBoundary(r))return!0}return!1}_boundaryScore(t,n,r,i){const s=this._OriginalRegionIsBoundary(t,n)?1:0,a=this._ModifiedRegionIsBoundary(r,i)?1:0;return s+a}ConcatenateChanges(t,n){const r=[];if(t.length===0||n.length===0)return n.length>0?n:t;if(this.ChangesOverlap(t[t.length-1],n[0],r)){const i=new Array(t.length+n.length-1);return _t.Copy(t,0,i,0,t.length-1),i[t.length-1]=r[0],_t.Copy(n,1,i,t.length,n.length-1),i}else{const i=new Array(t.length+n.length);return _t.Copy(t,0,i,0,t.length),_t.Copy(n,0,i,t.length,n.length),i}}ChangesOverlap(t,n,r){if(kt.Assert(t.originalStart<=n.originalStart,"Left change is not less than or equal to right change"),kt.Assert(t.modifiedStart<=n.modifiedStart,"Left change is not less than or equal to right change"),t.originalStart+t.originalLength>=n.originalStart||t.modifiedStart+t.modifiedLength>=n.modifiedStart){const i=t.originalStart;let s=t.originalLength;const a=t.modifiedStart;let o=t.modifiedLength;return t.originalStart+t.originalLength>=n.originalStart&&(s=n.originalStart+n.originalLength-t.originalStart),t.modifiedStart+t.modifiedLength>=n.modifiedStart&&(o=n.modifiedStart+n.modifiedLength-t.modifiedStart),r[0]=new rt(i,s,a,o),!0}else return r[0]=null,!1}ClipDiagonalBound(t,n,r,i){if(t>=0&&t=cc&&e<=dc||e>=hc&&e<=uc}function _n(e,t,n,r){let i="",s=0,a=-1,o=0,l=0;for(let c=0;c<=e.length;++c){if(c2){const h=i.lastIndexOf(n);h===-1?(i="",s=0):(i=i.slice(0,h),s=i.length-1-i.lastIndexOf(n)),a=c,o=0;continue}else if(i.length!==0){i="",s=0,a=c,o=0;continue}}t&&(i+=i.length>0?`${n}..`:"..",s=2)}else i.length>0?i+=`${n}${e.slice(a+1,c)}`:i=e.slice(a+1,c),s=c-a-1;a=c,o=0}else l===st&&o!==-1?++o:o=-1}return i}function Gi(e,t){fc(t,"pathObject");const n=t.dir||t.root,r=t.base||`${t.name||""}${t.ext||""}`;return n?n===t.root?`${n}${r}`:`${n}${e}${r}`:r}const xe={resolve(...e){let t="",n="",r=!1;for(let i=e.length-1;i>=-1;i--){let s;if(i>=0){if(s=e[i],oe(s,"path"),s.length===0)continue}else t.length===0?s=kn():(s=oc[`=${t}`]||kn(),(s===void 0||s.slice(0,2).toLowerCase()!==t.toLowerCase()&&s.charCodeAt(2)===Ce)&&(s=`${t}\\`));const a=s.length;let o=0,l="",c=!1;const h=s.charCodeAt(0);if(a===1)H(h)&&(o=1,c=!0);else if(H(h))if(c=!0,H(s.charCodeAt(1))){let u=2,f=u;for(;u2&&H(s.charCodeAt(2))&&(c=!0,o=3));if(l.length>0)if(t.length>0){if(l.toLowerCase()!==t.toLowerCase())continue}else t=l;if(r){if(t.length>0)break}else if(n=`${s.slice(o)}\\${n}`,r=c,c&&t.length>0)break}return n=_n(n,!r,"\\",H),r?`${t}\\${n}`:`${t}${n}`||"."},normalize(e){oe(e,"path");const t=e.length;if(t===0)return".";let n=0,r,i=!1;const s=e.charCodeAt(0);if(t===1)return pr(s)?"\\":e;if(H(s))if(i=!0,H(e.charCodeAt(1))){let o=2,l=o;for(;o2&&H(e.charCodeAt(2))&&(i=!0,n=3));let a=n0&&H(e.charCodeAt(t-1))&&(a+="\\"),r===void 0?i?`\\${a}`:a:i?`${r}\\${a}`:`${r}${a}`},isAbsolute(e){oe(e,"path");const t=e.length;if(t===0)return!1;const n=e.charCodeAt(0);return H(n)||t>2&<(n)&&e.charCodeAt(1)===at&&H(e.charCodeAt(2))},join(...e){if(e.length===0)return".";let t,n;for(let s=0;s0&&(t===void 0?t=n=a:t+=`\\${a}`)}if(t===void 0)return".";let r=!0,i=0;if(typeof n=="string"&&H(n.charCodeAt(0))){++i;const s=n.length;s>1&&H(n.charCodeAt(1))&&(++i,s>2&&(H(n.charCodeAt(2))?++i:r=!1))}if(r){for(;i=2&&(t=`\\${t.slice(i)}`)}return xe.normalize(t)},relative(e,t){if(oe(e,"from"),oe(t,"to"),e===t)return"";const n=xe.resolve(e),r=xe.resolve(t);if(n===r||(e=n.toLowerCase(),t=r.toLowerCase(),e===t))return"";let i=0;for(;ii&&e.charCodeAt(s-1)===Ce;)s--;const a=s-i;let o=0;for(;oo&&t.charCodeAt(l-1)===Ce;)l--;const c=l-o,h=ah){if(t.charCodeAt(o+f)===Ce)return r.slice(o+f+1);if(f===2)return r.slice(o+f)}a>h&&(e.charCodeAt(i+f)===Ce?u=f:f===2&&(u=3)),u===-1&&(u=0)}let m="";for(f=i+u+1;f<=s;++f)(f===s||e.charCodeAt(f)===Ce)&&(m+=m.length===0?"..":"\\..");return o+=u,m.length>0?`${m}${r.slice(o,l)}`:(r.charCodeAt(o)===Ce&&++o,r.slice(o,l))},toNamespacedPath(e){if(typeof e!="string"||e.length===0)return e;const t=xe.resolve(e);if(t.length<=2)return e;if(t.charCodeAt(0)===Ce){if(t.charCodeAt(1)===Ce){const n=t.charCodeAt(2);if(n!==pc&&n!==st)return`\\\\?\\UNC\\${t.slice(2)}`}}else if(lt(t.charCodeAt(0))&&t.charCodeAt(1)===at&&t.charCodeAt(2)===Ce)return`\\\\?\\${t}`;return e},dirname(e){oe(e,"path");const t=e.length;if(t===0)return".";let n=-1,r=0;const i=e.charCodeAt(0);if(t===1)return H(i)?e:".";if(H(i)){if(n=r=1,H(e.charCodeAt(1))){let o=2,l=o;for(;o2&&H(e.charCodeAt(2))?3:2,r=n);let s=-1,a=!0;for(let o=t-1;o>=r;--o)if(H(e.charCodeAt(o))){if(!a){s=o;break}}else a=!1;if(s===-1){if(n===-1)return".";s=n}return e.slice(0,s)},basename(e,t){t!==void 0&&oe(t,"ext"),oe(e,"path");let n=0,r=-1,i=!0,s;if(e.length>=2&<(e.charCodeAt(0))&&e.charCodeAt(1)===at&&(n=2),t!==void 0&&t.length>0&&t.length<=e.length){if(t===e)return"";let a=t.length-1,o=-1;for(s=e.length-1;s>=n;--s){const l=e.charCodeAt(s);if(H(l)){if(!i){n=s+1;break}}else o===-1&&(i=!1,o=s+1),a>=0&&(l===t.charCodeAt(a)?--a===-1&&(r=s):(a=-1,r=o))}return n===r?r=o:r===-1&&(r=e.length),e.slice(n,r)}for(s=e.length-1;s>=n;--s)if(H(e.charCodeAt(s))){if(!i){n=s+1;break}}else r===-1&&(i=!1,r=s+1);return r===-1?"":e.slice(n,r)},extname(e){oe(e,"path");let t=0,n=-1,r=0,i=-1,s=!0,a=0;e.length>=2&&e.charCodeAt(1)===at&<(e.charCodeAt(0))&&(t=r=2);for(let o=e.length-1;o>=t;--o){const l=e.charCodeAt(o);if(H(l)){if(!s){r=o+1;break}continue}i===-1&&(s=!1,i=o+1),l===st?n===-1?n=o:a!==1&&(a=1):n!==-1&&(a=-1)}return n===-1||i===-1||a===0||a===1&&n===i-1&&n===r+1?"":e.slice(n,i)},format:Gi.bind(null,"\\"),parse(e){oe(e,"path");const t={root:"",dir:"",base:"",ext:"",name:""};if(e.length===0)return t;const n=e.length;let r=0,i=e.charCodeAt(0);if(n===1)return H(i)?(t.root=t.dir=e,t):(t.base=t.name=e,t);if(H(i)){if(r=1,H(e.charCodeAt(1))){let u=2,f=u;for(;u0&&(t.root=e.slice(0,r));let s=-1,a=r,o=-1,l=!0,c=e.length-1,h=0;for(;c>=r;--c){if(i=e.charCodeAt(c),H(i)){if(!l){a=c+1;break}continue}o===-1&&(l=!1,o=c+1),i===st?s===-1?s=c:h!==1&&(h=1):s!==-1&&(h=-1)}return o!==-1&&(s===-1||h===0||h===1&&s===o-1&&s===a+1?t.base=t.name=e.slice(a,o):(t.name=e.slice(a,s),t.base=e.slice(a,o),t.ext=e.slice(s,o))),a>0&&a!==r?t.dir=e.slice(0,a-1):t.dir=t.root,t},sep:"\\",delimiter:";",win32:null,posix:null},mc=(()=>{if(ot){const e=/\\/g;return()=>{const t=kn().replace(e,"/");return t.slice(t.indexOf("/"))}}return()=>kn()})(),ke={resolve(...e){let t="",n=!1;for(let r=e.length-1;r>=-1&&!n;r--){const i=r>=0?e[r]:mc();oe(i,"path"),i.length!==0&&(t=`${i}/${t}`,n=i.charCodeAt(0)===fe)}return t=_n(t,!n,"/",pr),n?`/${t}`:t.length>0?t:"."},normalize(e){if(oe(e,"path"),e.length===0)return".";const t=e.charCodeAt(0)===fe,n=e.charCodeAt(e.length-1)===fe;return e=_n(e,!t,"/",pr),e.length===0?t?"/":n?"./":".":(n&&(e+="/"),t?`/${e}`:e)},isAbsolute(e){return oe(e,"path"),e.length>0&&e.charCodeAt(0)===fe},join(...e){if(e.length===0)return".";let t;for(let n=0;n0&&(t===void 0?t=r:t+=`/${r}`)}return t===void 0?".":ke.normalize(t)},relative(e,t){if(oe(e,"from"),oe(t,"to"),e===t||(e=ke.resolve(e),t=ke.resolve(t),e===t))return"";const n=1,r=e.length,i=r-n,s=1,a=t.length-s,o=io){if(t.charCodeAt(s+c)===fe)return t.slice(s+c+1);if(c===0)return t.slice(s+c)}else i>o&&(e.charCodeAt(n+c)===fe?l=c:c===0&&(l=0));let h="";for(c=n+l+1;c<=r;++c)(c===r||e.charCodeAt(c)===fe)&&(h+=h.length===0?"..":"/..");return`${h}${t.slice(s+l)}`},toNamespacedPath(e){return e},dirname(e){if(oe(e,"path"),e.length===0)return".";const t=e.charCodeAt(0)===fe;let n=-1,r=!0;for(let i=e.length-1;i>=1;--i)if(e.charCodeAt(i)===fe){if(!r){n=i;break}}else r=!1;return n===-1?t?"/":".":t&&n===1?"//":e.slice(0,n)},basename(e,t){t!==void 0&&oe(t,"ext"),oe(e,"path");let n=0,r=-1,i=!0,s;if(t!==void 0&&t.length>0&&t.length<=e.length){if(t===e)return"";let a=t.length-1,o=-1;for(s=e.length-1;s>=0;--s){const l=e.charCodeAt(s);if(l===fe){if(!i){n=s+1;break}}else o===-1&&(i=!1,o=s+1),a>=0&&(l===t.charCodeAt(a)?--a===-1&&(r=s):(a=-1,r=o))}return n===r?r=o:r===-1&&(r=e.length),e.slice(n,r)}for(s=e.length-1;s>=0;--s)if(e.charCodeAt(s)===fe){if(!i){n=s+1;break}}else r===-1&&(i=!1,r=s+1);return r===-1?"":e.slice(n,r)},extname(e){oe(e,"path");let t=-1,n=0,r=-1,i=!0,s=0;for(let a=e.length-1;a>=0;--a){const o=e.charCodeAt(a);if(o===fe){if(!i){n=a+1;break}continue}r===-1&&(i=!1,r=a+1),o===st?t===-1?t=a:s!==1&&(s=1):t!==-1&&(s=-1)}return t===-1||r===-1||s===0||s===1&&t===r-1&&t===n+1?"":e.slice(t,r)},format:Gi.bind(null,"/"),parse(e){oe(e,"path");const t={root:"",dir:"",base:"",ext:"",name:""};if(e.length===0)return t;const n=e.charCodeAt(0)===fe;let r;n?(t.root="/",r=1):r=0;let i=-1,s=0,a=-1,o=!0,l=e.length-1,c=0;for(;l>=r;--l){const h=e.charCodeAt(l);if(h===fe){if(!o){s=l+1;break}continue}a===-1&&(o=!1,a=l+1),h===st?i===-1?i=l:c!==1&&(c=1):i!==-1&&(c=-1)}if(a!==-1){const h=s===0&&n?1:s;i===-1||c===0||c===1&&i===a-1&&i===s+1?t.base=t.name=e.slice(h,a):(t.name=e.slice(h,i),t.base=e.slice(h,a),t.ext=e.slice(i,a))}return s>0?t.dir=e.slice(0,s-1):n&&(t.dir="/"),t},sep:"/",delimiter:":",win32:null,posix:null};ke.win32=xe.win32=xe,ke.posix=xe.posix=ke,ot?xe.normalize:ke.normalize,ot?xe.resolve:ke.resolve,ot?xe.relative:ke.relative,ot?xe.dirname:ke.dirname,ot?xe.basename:ke.basename,ot?xe.extname:ke.extname,ot?xe.sep:ke.sep;const gc=/^\w[\w\d+.-]*$/,bc=/^\//,vc=/^\/\//;function Ji(e,t){if(!e.scheme&&t)throw new Error(`[UriError]: Scheme is missing: {scheme: "", authority: "${e.authority}", path: "${e.path}", query: "${e.query}", fragment: "${e.fragment}"}`);if(e.scheme&&!gc.test(e.scheme))throw new Error("[UriError]: Scheme contains illegal characters.");if(e.path){if(e.authority){if(!bc.test(e.path))throw new Error('[UriError]: If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character')}else if(vc.test(e.path))throw new Error('[UriError]: If a URI does not contain an authority component, then the path cannot begin with two slash characters ("//")')}}function yc(e,t){return!e&&!t?"file":e}function wc(e,t){switch(e){case"https":case"http":case"file":t?t[0]!==Te&&(t=Te+t):t=Te;break}return t}const ie="",Te="/",xc=/^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;let Rt=class{static isUri(t){return t instanceof Rt?!0:t?typeof t.authority=="string"&&typeof t.fragment=="string"&&typeof t.path=="string"&&typeof t.query=="string"&&typeof t.scheme=="string"&&typeof t.fsPath=="string"&&typeof t.with=="function"&&typeof t.toString=="function":!1}constructor(t,n,r,i,s,a=!1){typeof t=="object"?(this.scheme=t.scheme||ie,this.authority=t.authority||ie,this.path=t.path||ie,this.query=t.query||ie,this.fragment=t.fragment||ie):(this.scheme=yc(t,a),this.authority=n||ie,this.path=wc(this.scheme,r||ie),this.query=i||ie,this.fragment=s||ie,Ji(this,a))}get fsPath(){return fr(this,!1)}with(t){if(!t)return this;let{scheme:n,authority:r,path:i,query:s,fragment:a}=t;return n===void 0?n=this.scheme:n===null&&(n=ie),r===void 0?r=this.authority:r===null&&(r=ie),i===void 0?i=this.path:i===null&&(i=ie),s===void 0?s=this.query:s===null&&(s=ie),a===void 0?a=this.fragment:a===null&&(a=ie),n===this.scheme&&r===this.authority&&i===this.path&&s===this.query&&a===this.fragment?this:new Et(n,r,i,s,a)}static parse(t,n=!1){const r=xc.exec(t);return r?new Et(r[2]||ie,Fn(r[4]||ie),Fn(r[5]||ie),Fn(r[7]||ie),Fn(r[9]||ie),n):new Et(ie,ie,ie,ie,ie)}static file(t){let n=ie;if(jt&&(t=t.replace(/\\/g,Te)),t[0]===Te&&t[1]===Te){const r=t.indexOf(Te,2);r===-1?(n=t.substring(2),t=Te):(n=t.substring(2,r),t=t.substring(r)||Te)}return new Et("file",n,t,ie,ie)}static from(t){const n=new Et(t.scheme,t.authority,t.path,t.query,t.fragment);return Ji(n,!0),n}static joinPath(t,...n){if(!t.path)throw new Error("[UriError]: cannot call joinPath on URI without path");let r;return jt&&t.scheme==="file"?r=Rt.file(xe.join(fr(t,!0),...n)).path:r=ke.join(t.path,...n),t.with({path:r})}toString(t=!1){return mr(this,t)}toJSON(){return this}static revive(t){if(t){if(t instanceof Rt)return t;{const n=new Et(t);return n._formatted=t.external,n._fsPath=t._sep===Xi?t.fsPath:null,n}}else return t}};const Xi=jt?1:void 0;class Et extends Rt{constructor(){super(...arguments),this._formatted=null,this._fsPath=null}get fsPath(){return this._fsPath||(this._fsPath=fr(this,!1)),this._fsPath}toString(t=!1){return t?mr(this,!0):(this._formatted||(this._formatted=mr(this,!1)),this._formatted)}toJSON(){const t={$mid:1};return this._fsPath&&(t.fsPath=this._fsPath,t._sep=Xi),this._formatted&&(t.external=this._formatted),this.path&&(t.path=this.path),this.scheme&&(t.scheme=this.scheme),this.authority&&(t.authority=this.authority),this.query&&(t.query=this.query),this.fragment&&(t.fragment=this.fragment),t}}const Yi={[58]:"%3A",[47]:"%2F",[63]:"%3F",[35]:"%23",[91]:"%5B",[93]:"%5D",[64]:"%40",[33]:"%21",[36]:"%24",[38]:"%26",[39]:"%27",[40]:"%28",[41]:"%29",[42]:"%2A",[43]:"%2B",[44]:"%2C",[59]:"%3B",[61]:"%3D",[32]:"%20"};function Ki(e,t,n){let r,i=-1;for(let s=0;s=97&&a<=122||a>=65&&a<=90||a>=48&&a<=57||a===45||a===46||a===95||a===126||t&&a===47||n&&a===91||n&&a===93||n&&a===58)i!==-1&&(r+=encodeURIComponent(e.substring(i,s)),i=-1),r!==void 0&&(r+=e.charAt(s));else{r===void 0&&(r=e.substr(0,s));const o=Yi[a];o!==void 0?(i!==-1&&(r+=encodeURIComponent(e.substring(i,s)),i=-1),r+=o):i===-1&&(i=s)}}return i!==-1&&(r+=encodeURIComponent(e.substring(i))),r!==void 0?r:e}function Sc(e){let t;for(let n=0;n1&&e.scheme==="file"?n=`//${e.authority}${e.path}`:e.path.charCodeAt(0)===47&&(e.path.charCodeAt(1)>=65&&e.path.charCodeAt(1)<=90||e.path.charCodeAt(1)>=97&&e.path.charCodeAt(1)<=122)&&e.path.charCodeAt(2)===58?t?n=e.path.substr(1):n=e.path[1].toLowerCase()+e.path.substr(2):n=e.path,jt&&(n=n.replace(/\//g,"\\")),n}function mr(e,t){const n=t?Sc:Ki;let r="",{scheme:i,authority:s,path:a,query:o,fragment:l}=e;if(i&&(r+=i,r+=":"),(s||i==="file")&&(r+=Te,r+=Te),s){let c=s.indexOf("@");if(c!==-1){const h=s.substr(0,c);s=s.substr(c+1),c=h.lastIndexOf(":"),c===-1?r+=n(h,!1,!1):(r+=n(h.substr(0,c),!1,!1),r+=":",r+=n(h.substr(c+1),!1,!0)),r+="@"}s=s.toLowerCase(),c=s.lastIndexOf(":"),c===-1?r+=n(s,!1,!0):(r+=n(s.substr(0,c),!1,!0),r+=s.substr(c))}if(a){if(a.length>=3&&a.charCodeAt(0)===47&&a.charCodeAt(2)===58){const c=a.charCodeAt(1);c>=65&&c<=90&&(a=`/${String.fromCharCode(c+32)}:${a.substr(3)}`)}else if(a.length>=2&&a.charCodeAt(1)===58){const c=a.charCodeAt(0);c>=65&&c<=90&&(a=`${String.fromCharCode(c+32)}:${a.substr(2)}`)}r+=n(a,!0,!1)}return o&&(r+="?",r+=n(o,!1,!1)),l&&(r+="#",r+=t?l:Ki(l,!1,!1)),r}function Qi(e){try{return decodeURIComponent(e)}catch{return e.length>3?e.substr(0,3)+Qi(e.substr(3)):e}}const Zi=/(%[0-9A-Za-z][0-9A-Za-z])+/g;function Fn(e){return e.match(Zi)?e.replace(Zi,t=>Qi(t)):e}let _e=class{constructor(t,n){this.lineNumber=t,this.column=n}with(t=this.lineNumber,n=this.column){return t===this.lineNumber&&n===this.column?this:new _e(t,n)}delta(t=0,n=0){return this.with(this.lineNumber+t,this.column+n)}equals(t){return _e.equals(this,t)}static equals(t,n){return!t&&!n?!0:!!t&&!!n&&t.lineNumber===n.lineNumber&&t.column===n.column}isBefore(t){return _e.isBefore(this,t)}static isBefore(t,n){return t.lineNumberr||t===r&&n>i?(this.startLineNumber=r,this.startColumn=i,this.endLineNumber=t,this.endColumn=n):(this.startLineNumber=t,this.startColumn=n,this.endLineNumber=r,this.endColumn=i)}isEmpty(){return ee.isEmpty(this)}static isEmpty(t){return t.startLineNumber===t.endLineNumber&&t.startColumn===t.endColumn}containsPosition(t){return ee.containsPosition(this,t)}static containsPosition(t,n){return!(n.lineNumbert.endLineNumber||n.lineNumber===t.startLineNumber&&n.columnt.endColumn)}static strictContainsPosition(t,n){return!(n.lineNumbert.endLineNumber||n.lineNumber===t.startLineNumber&&n.column<=t.startColumn||n.lineNumber===t.endLineNumber&&n.column>=t.endColumn)}containsRange(t){return ee.containsRange(this,t)}static containsRange(t,n){return!(n.startLineNumbert.endLineNumber||n.endLineNumber>t.endLineNumber||n.startLineNumber===t.startLineNumber&&n.startColumnt.endColumn)}strictContainsRange(t){return ee.strictContainsRange(this,t)}static strictContainsRange(t,n){return!(n.startLineNumbert.endLineNumber||n.endLineNumber>t.endLineNumber||n.startLineNumber===t.startLineNumber&&n.startColumn<=t.startColumn||n.endLineNumber===t.endLineNumber&&n.endColumn>=t.endColumn)}plusRange(t){return ee.plusRange(this,t)}static plusRange(t,n){let r,i,s,a;return n.startLineNumbert.endLineNumber?(s=n.endLineNumber,a=n.endColumn):n.endLineNumber===t.endLineNumber?(s=n.endLineNumber,a=Math.max(n.endColumn,t.endColumn)):(s=t.endLineNumber,a=t.endColumn),new ee(r,i,s,a)}intersectRanges(t){return ee.intersectRanges(this,t)}static intersectRanges(t,n){let r=t.startLineNumber,i=t.startColumn,s=t.endLineNumber,a=t.endColumn;const o=n.startLineNumber,l=n.startColumn,c=n.endLineNumber,h=n.endColumn;return rc?(s=c,a=h):s===c&&(a=Math.min(a,h)),r>s||r===s&&i>a?null:new ee(r,i,s,a)}equalsRange(t){return ee.equalsRange(this,t)}static equalsRange(t,n){return!t&&!n?!0:!!t&&!!n&&t.startLineNumber===n.startLineNumber&&t.startColumn===n.startColumn&&t.endLineNumber===n.endLineNumber&&t.endColumn===n.endColumn}getEndPosition(){return ee.getEndPosition(this)}static getEndPosition(t){return new _e(t.endLineNumber,t.endColumn)}getStartPosition(){return ee.getStartPosition(this)}static getStartPosition(t){return new _e(t.startLineNumber,t.startColumn)}toString(){return"["+this.startLineNumber+","+this.startColumn+" -> "+this.endLineNumber+","+this.endColumn+"]"}setEndPosition(t,n){return new ee(this.startLineNumber,this.startColumn,t,n)}setStartPosition(t,n){return new ee(t,n,this.endLineNumber,this.endColumn)}collapseToStart(){return ee.collapseToStart(this)}static collapseToStart(t){return new ee(t.startLineNumber,t.startColumn,t.startLineNumber,t.startColumn)}collapseToEnd(){return ee.collapseToEnd(this)}static collapseToEnd(t){return new ee(t.endLineNumber,t.endColumn,t.endLineNumber,t.endColumn)}delta(t){return new ee(this.startLineNumber+t,this.startColumn,this.endLineNumber+t,this.endColumn)}static fromPositions(t,n=t){return new ee(t.lineNumber,t.column,n.lineNumber,n.column)}static lift(t){return t?new ee(t.startLineNumber,t.startColumn,t.endLineNumber,t.endColumn):null}static isIRange(t){return t&&typeof t.startLineNumber=="number"&&typeof t.startColumn=="number"&&typeof t.endLineNumber=="number"&&typeof t.endColumn=="number"}static areIntersectingOrTouching(t,n){return!(t.endLineNumbert.startLineNumber}toJSON(){return this}};var es;(function(e){function t(i){return i<0}e.isLessThan=t;function n(i){return i>0}e.isGreaterThan=n;function r(i){return i===0}e.isNeitherLessOrGreaterThan=r,e.greaterThan=1,e.lessThan=-1,e.neitherLessOrGreaterThan=0})(es||(es={}));function ts(e){return e<0?0:e>255?255:e|0}function Dt(e){return e<0?0:e>4294967295?4294967295:e|0}class Cc{constructor(t){this.values=t,this.prefixSum=new Uint32Array(t.length),this.prefixSumValidIndex=new Int32Array(1),this.prefixSumValidIndex[0]=-1}insertValues(t,n){t=Dt(t);const r=this.values,i=this.prefixSum,s=n.length;return s===0?!1:(this.values=new Uint32Array(r.length+s),this.values.set(r.subarray(0,t),0),this.values.set(r.subarray(t),t+s),this.values.set(n,t),t-1=0&&this.prefixSum.set(i.subarray(0,this.prefixSumValidIndex[0]+1)),!0)}setValue(t,n){return t=Dt(t),n=Dt(n),this.values[t]===n?!1:(this.values[t]=n,t-1=r.length)return!1;const s=r.length-t;return n>=s&&(n=s),n===0?!1:(this.values=new Uint32Array(r.length-n),this.values.set(r.subarray(0,t),0),this.values.set(r.subarray(t+n),t),this.prefixSum=new Uint32Array(this.values.length),t-1=0&&this.prefixSum.set(i.subarray(0,this.prefixSumValidIndex[0]+1)),!0)}getTotalSum(){return this.values.length===0?0:this._getPrefixSum(this.values.length-1)}getPrefixSum(t){return t<0?0:(t=Dt(t),this._getPrefixSum(t))}_getPrefixSum(t){if(t<=this.prefixSumValidIndex[0])return this.prefixSum[t];let n=this.prefixSumValidIndex[0]+1;n===0&&(this.prefixSum[0]=this.values[0],n++),t>=this.values.length&&(t=this.values.length-1);for(let r=n;r<=t;r++)this.prefixSum[r]=this.prefixSum[r-1]+this.values[r];return this.prefixSumValidIndex[0]=Math.max(this.prefixSumValidIndex[0],t),this.prefixSum[t]}getIndexOf(t){t=Math.floor(t),this.getTotalSum();let n=0,r=this.values.length-1,i=0,s=0,a=0;for(;n<=r;)if(i=n+(r-n)/2|0,s=this.prefixSum[i],a=s-this.values[i],t=s)n=i+1;else break;return new kc(i,t-a)}}class kc{constructor(t,n){this.index=t,this.remainder=n,this._prefixSumIndexOfResultBrand=void 0,this.index=t,this.remainder=n}}class _c{constructor(t,n,r,i){this._uri=t,this._lines=n,this._eol=r,this._versionId=i,this._lineStarts=null,this._cachedTextValue=null}dispose(){this._lines.length=0}get version(){return this._versionId}getText(){return this._cachedTextValue===null&&(this._cachedTextValue=this._lines.join(this._eol)),this._cachedTextValue}onEvents(t){t.eol&&t.eol!==this._eol&&(this._eol=t.eol,this._lineStarts=null);const n=t.changes;for(const r of n)this._acceptDeleteRange(r.range),this._acceptInsertText(new _e(r.range.startLineNumber,r.range.startColumn),r.text);this._versionId=t.versionId,this._cachedTextValue=null}_ensureLineStarts(){if(!this._lineStarts){const t=this._eol.length,n=this._lines.length,r=new Uint32Array(n);for(let i=0;i/?";function Rc(e=""){let t="(-?\\d*\\.\\d\\w*)|([^";for(const n of Fc)e.indexOf(n)>=0||(t+="\\"+n);return t+="\\s]+)",new RegExp(t,"g")}const ns=Rc();function Ec(e){let t=ns;if(e&&e instanceof RegExp)if(e.global)t=e;else{let n="g";e.ignoreCase&&(n+="i"),e.multiline&&(n+="m"),e.unicode&&(n+="u"),t=new RegExp(e.source,n)}return t.lastIndex=0,t}const rs=new xn;rs.unshift({maxLen:1e3,windowSize:15,timeBudget:150});function gr(e,t,n,r,i){if(i||(i=vn.first(rs)),n.length>i.maxLen){let c=e-i.maxLen/2;return c<0?c=0:r+=c,n=n.substring(c,e+i.maxLen/2),gr(e,t,n,r,i)}const s=Date.now(),a=e-1-r;let o=-1,l=null;for(let c=1;!(Date.now()-s>=i.timeBudget);c++){const h=a-i.windowSize*c;t.lastIndex=Math.max(0,h);const u=Dc(t,n,a,o);if(!u&&l||(l=u,h<=0))break;o=h}if(l){const c={word:l[0],startColumn:r+1+l.index,endColumn:r+1+l.index+l[0].length};return t.lastIndex=0,c}return null}function Dc(e,t,n,r){let i;for(;i=e.exec(t);){const s=i.index||0;if(s<=n&&e.lastIndex>=n)return i;if(r>0&&s>r)return null}return null}class br{constructor(t){const n=ts(t);this._defaultValue=n,this._asciiMap=br._createAsciiMap(n),this._map=new Map}static _createAsciiMap(t){const n=new Uint8Array(256);return n.fill(t),n}set(t,n){const r=ts(n);t>=0&&t<256?this._asciiMap[t]=r:this._map.set(t,r)}get(t){return t>=0&&t<256?this._asciiMap[t]:this._map.get(t)||this._defaultValue}clear(){this._asciiMap.fill(this._defaultValue),this._map.clear()}}class Ac{constructor(t,n,r){const i=new Uint8Array(t*n);for(let s=0,a=t*n;sn&&(n=l),o>r&&(r=o),c>r&&(r=c)}n++,r++;const i=new Ac(r,n,0);for(let s=0,a=t.length;s=this._maxCharCode?0:this._states.get(t,n)}}let vr=null;function Mc(){return vr===null&&(vr=new zc([[1,104,2],[1,72,2],[1,102,6],[1,70,6],[2,116,3],[2,84,3],[3,116,4],[3,84,4],[4,112,5],[4,80,5],[5,115,9],[5,83,9],[5,58,10],[6,105,7],[6,73,7],[7,108,8],[7,76,8],[8,101,9],[8,69,9],[9,58,10],[10,47,11],[11,47,12]])),vr}let qt=null;function Nc(){if(qt===null){qt=new br(0);const e=` <>'"、。｡､，．：；‘〈「『〔（［｛｢｣｝］）〕』」〉’｀～…`;for(let n=0;ni);if(i>0){const o=n.charCodeAt(i-1),l=n.charCodeAt(a);(o===40&&l===41||o===91&&l===93||o===123&&l===125)&&a--}return{range:{startLineNumber:r,startColumn:i+1,endLineNumber:r,endColumn:a+2},url:n.substring(i,a+1)}}static computeLinks(t,n=Mc()){const r=Nc(),i=[];for(let s=1,a=t.getLineCount();s<=a;s++){const o=t.getLineContent(s),l=o.length;let c=0,h=0,u=0,f=1,m=!1,b=!1,y=!1,v=!1;for(;c=0?(i+=r?1:-1,i<0?i=t.length-1:i%=t.length,t[i]):null}}yr.INSTANCE=new yr;const is=Object.freeze(function(e,t){const n=setTimeout(e.bind(t),0);return{dispose(){clearTimeout(n)}}});var En;(function(e){function t(n){return n===e.None||n===e.Cancelled||n instanceof Dn?!0:!n||typeof n!="object"?!1:typeof n.isCancellationRequested=="boolean"&&typeof n.onCancellationRequested=="function"}e.isCancellationToken=t,e.None=Object.freeze({isCancellationRequested:!1,onCancellationRequested:cr.None}),e.Cancelled=Object.freeze({isCancellationRequested:!0,onCancellationRequested:is})})(En||(En={}));class Dn{constructor(){this._isCancelled=!1,this._emitter=null}cancel(){this._isCancelled||(this._isCancelled=!0,this._emitter&&(this._emitter.fire(void 0),this.dispose()))}get isCancellationRequested(){return this._isCancelled}get onCancellationRequested(){return this._isCancelled?is:(this._emitter||(this._emitter=new Ve),this._emitter.event)}dispose(){this._emitter&&(this._emitter.dispose(),this._emitter=null)}}class Ic{constructor(t){this._token=void 0,this._parentListener=void 0,this._parentListener=t&&t.onCancellationRequested(this.cancel,this)}get token(){return this._token||(this._token=new Dn),this._token}cancel(){this._token?this._token instanceof Dn&&this._token.cancel():this._token=En.Cancelled}dispose(t=!1){var n;t&&this.cancel(),(n=this._parentListener)===null||n===void 0||n.dispose(),this._token?this._token instanceof Dn&&this._token.dispose():this._token=En.None}}class wr{constructor(){this._keyCodeToStr=[],this._strToKeyCode=Object.create(null)}define(t,n){this._keyCodeToStr[t]=n,this._strToKeyCode[n.toLowerCase()]=t}keyCodeToStr(t){return this._keyCodeToStr[t]}strToKeyCode(t){return this._strToKeyCode[t.toLowerCase()]||0}}const An=new wr,xr=new wr,Sr=new wr,Lc=new Array(230),Tc=Object.create(null),Wc=Object.create(null);(function(){const e="",t=[[0,1,0,"None",0,"unknown",0,"VK_UNKNOWN",e,e],[0,1,1,"Hyper",0,e,0,e,e,e],[0,1,2,"Super",0,e,0,e,e,e],[0,1,3,"Fn",0,e,0,e,e,e],[0,1,4,"FnLock",0,e,0,e,e,e],[0,1,5,"Suspend",0,e,0,e,e,e],[0,1,6,"Resume",0,e,0,e,e,e],[0,1,7,"Turbo",0,e,0,e,e,e],[0,1,8,"Sleep",0,e,0,"VK_SLEEP",e,e],[0,1,9,"WakeUp",0,e,0,e,e,e],[31,0,10,"KeyA",31,"A",65,"VK_A",e,e],[32,0,11,"KeyB",32,"B",66,"VK_B",e,e],[33,0,12,"KeyC",33,"C",67,"VK_C",e,e],[34,0,13,"KeyD",34,"D",68,"VK_D",e,e],[35,0,14,"KeyE",35,"E",69,"VK_E",e,e],[36,0,15,"KeyF",36,"F",70,"VK_F",e,e],[37,0,16,"KeyG",37,"G",71,"VK_G",e,e],[38,0,17,"KeyH",38,"H",72,"VK_H",e,e],[39,0,18,"KeyI",39,"I",73,"VK_I",e,e],[40,0,19,"KeyJ",40,"J",74,"VK_J",e,e],[41,0,20,"KeyK",41,"K",75,"VK_K",e,e],[42,0,21,"KeyL",42,"L",76,"VK_L",e,e],[43,0,22,"KeyM",43,"M",77,"VK_M",e,e],[44,0,23,"KeyN",44,"N",78,"VK_N",e,e],[45,0,24,"KeyO",45,"O",79,"VK_O",e,e],[46,0,25,"KeyP",46,"P",80,"VK_P",e,e],[47,0,26,"KeyQ",47,"Q",81,"VK_Q",e,e],[48,0,27,"KeyR",48,"R",82,"VK_R",e,e],[49,0,28,"KeyS",49,"S",83,"VK_S",e,e],[50,0,29,"KeyT",50,"T",84,"VK_T",e,e],[51,0,30,"KeyU",51,"U",85,"VK_U",e,e],[52,0,31,"KeyV",52,"V",86,"VK_V",e,e],[53,0,32,"KeyW",53,"W",87,"VK_W",e,e],[54,0,33,"KeyX",54,"X",88,"VK_X",e,e],[55,0,34,"KeyY",55,"Y",89,"VK_Y",e,e],[56,0,35,"KeyZ",56,"Z",90,"VK_Z",e,e],[22,0,36,"Digit1",22,"1",49,"VK_1",e,e],[23,0,37,"Digit2",23,"2",50,"VK_2",e,e],[24,0,38,"Digit3",24,"3",51,"VK_3",e,e],[25,0,39,"Digit4",25,"4",52,"VK_4",e,e],[26,0,40,"Digit5",26,"5",53,"VK_5",e,e],[27,0,41,"Digit6",27,"6",54,"VK_6",e,e],[28,0,42,"Digit7",28,"7",55,"VK_7",e,e],[29,0,43,"Digit8",29,"8",56,"VK_8",e,e],[30,0,44,"Digit9",30,"9",57,"VK_9",e,e],[21,0,45,"Digit0",21,"0",48,"VK_0",e,e],[3,1,46,"Enter",3,"Enter",13,"VK_RETURN",e,e],[9,1,47,"Escape",9,"Escape",27,"VK_ESCAPE",e,e],[1,1,48,"Backspace",1,"Backspace",8,"VK_BACK",e,e],[2,1,49,"Tab",2,"Tab",9,"VK_TAB",e,e],[10,1,50,"Space",10,"Space",32,"VK_SPACE",e,e],[83,0,51,"Minus",83,"-",189,"VK_OEM_MINUS","-","OEM_MINUS"],[81,0,52,"Equal",81,"=",187,"VK_OEM_PLUS","=","OEM_PLUS"],[87,0,53,"BracketLeft",87,"[",219,"VK_OEM_4","[","OEM_4"],[89,0,54,"BracketRight",89,"]",221,"VK_OEM_6","]","OEM_6"],[88,0,55,"Backslash",88,"\\",220,"VK_OEM_5","\\","OEM_5"],[0,0,56,"IntlHash",0,e,0,e,e,e],[80,0,57,"Semicolon",80,";",186,"VK_OEM_1",";","OEM_1"],[90,0,58,"Quote",90,"'",222,"VK_OEM_7","'","OEM_7"],[86,0,59,"Backquote",86,"`",192,"VK_OEM_3","`","OEM_3"],[82,0,60,"Comma",82,",",188,"VK_OEM_COMMA",",","OEM_COMMA"],[84,0,61,"Period",84,".",190,"VK_OEM_PERIOD",".","OEM_PERIOD"],[85,0,62,"Slash",85,"/",191,"VK_OEM_2","/","OEM_2"],[8,1,63,"CapsLock",8,"CapsLock",20,"VK_CAPITAL",e,e],[59,1,64,"F1",59,"F1",112,"VK_F1",e,e],[60,1,65,"F2",60,"F2",113,"VK_F2",e,e],[61,1,66,"F3",61,"F3",114,"VK_F3",e,e],[62,1,67,"F4",62,"F4",115,"VK_F4",e,e],[63,1,68,"F5",63,"F5",116,"VK_F5",e,e],[64,1,69,"F6",64,"F6",117,"VK_F6",e,e],[65,1,70,"F7",65,"F7",118,"VK_F7",e,e],[66,1,71,"F8",66,"F8",119,"VK_F8",e,e],[67,1,72,"F9",67,"F9",120,"VK_F9",e,e],[68,1,73,"F10",68,"F10",121,"VK_F10",e,e],[69,1,74,"F11",69,"F11",122,"VK_F11",e,e],[70,1,75,"F12",70,"F12",123,"VK_F12",e,e],[0,1,76,"PrintScreen",0,e,0,e,e,e],[79,1,77,"ScrollLock",79,"ScrollLock",145,"VK_SCROLL",e,e],[7,1,78,"Pause",7,"PauseBreak",19,"VK_PAUSE",e,e],[19,1,79,"Insert",19,"Insert",45,"VK_INSERT",e,e],[14,1,80,"Home",14,"Home",36,"VK_HOME",e,e],[11,1,81,"PageUp",11,"PageUp",33,"VK_PRIOR",e,e],[20,1,82,"Delete",20,"Delete",46,"VK_DELETE",e,e],[13,1,83,"End",13,"End",35,"VK_END",e,e],[12,1,84,"PageDown",12,"PageDown",34,"VK_NEXT",e,e],[17,1,85,"ArrowRight",17,"RightArrow",39,"VK_RIGHT","Right",e],[15,1,86,"ArrowLeft",15,"LeftArrow",37,"VK_LEFT","Left",e],[18,1,87,"ArrowDown",18,"DownArrow",40,"VK_DOWN","Down",e],[16,1,88,"ArrowUp",16,"UpArrow",38,"VK_UP","Up",e],[78,1,89,"NumLock",78,"NumLock",144,"VK_NUMLOCK",e,e],[108,1,90,"NumpadDivide",108,"NumPad_Divide",111,"VK_DIVIDE",e,e],[103,1,91,"NumpadMultiply",103,"NumPad_Multiply",106,"VK_MULTIPLY",e,e],[106,1,92,"NumpadSubtract",106,"NumPad_Subtract",109,"VK_SUBTRACT",e,e],[104,1,93,"NumpadAdd",104,"NumPad_Add",107,"VK_ADD",e,e],[3,1,94,"NumpadEnter",3,e,0,e,e,e],[94,1,95,"Numpad1",94,"NumPad1",97,"VK_NUMPAD1",e,e],[95,1,96,"Numpad2",95,"NumPad2",98,"VK_NUMPAD2",e,e],[96,1,97,"Numpad3",96,"NumPad3",99,"VK_NUMPAD3",e,e],[97,1,98,"Numpad4",97,"NumPad4",100,"VK_NUMPAD4",e,e],[98,1,99,"Numpad5",98,"NumPad5",101,"VK_NUMPAD5",e,e],[99,1,100,"Numpad6",99,"NumPad6",102,"VK_NUMPAD6",e,e],[100,1,101,"Numpad7",100,"NumPad7",103,"VK_NUMPAD7",e,e],[101,1,102,"Numpad8",101,"NumPad8",104,"VK_NUMPAD8",e,e],[102,1,103,"Numpad9",102,"NumPad9",105,"VK_NUMPAD9",e,e],[93,1,104,"Numpad0",93,"NumPad0",96,"VK_NUMPAD0",e,e],[107,1,105,"NumpadDecimal",107,"NumPad_Decimal",110,"VK_DECIMAL",e,e],[92,0,106,"IntlBackslash",92,"OEM_102",226,"VK_OEM_102",e,e],[58,1,107,"ContextMenu",58,"ContextMenu",93,e,e,e],[0,1,108,"Power",0,e,0,e,e,e],[0,1,109,"NumpadEqual",0,e,0,e,e,e],[71,1,110,"F13",71,"F13",124,"VK_F13",e,e],[72,1,111,"F14",72,"F14",125,"VK_F14",e,e],[73,1,112,"F15",73,"F15",126,"VK_F15",e,e],[74,1,113,"F16",74,"F16",127,"VK_F16",e,e],[75,1,114,"F17",75,"F17",128,"VK_F17",e,e],[76,1,115,"F18",76,"F18",129,"VK_F18",e,e],[77,1,116,"F19",77,"F19",130,"VK_F19",e,e],[0,1,117,"F20",0,e,0,"VK_F20",e,e],[0,1,118,"F21",0,e,0,"VK_F21",e,e],[0,1,119,"F22",0,e,0,"VK_F22",e,e],[0,1,120,"F23",0,e,0,"VK_F23",e,e],[0,1,121,"F24",0,e,0,"VK_F24",e,e],[0,1,122,"Open",0,e,0,e,e,e],[0,1,123,"Help",0,e,0,e,e,e],[0,1,124,"Select",0,e,0,e,e,e],[0,1,125,"Again",0,e,0,e,e,e],[0,1,126,"Undo",0,e,0,e,e,e],[0,1,127,"Cut",0,e,0,e,e,e],[0,1,128,"Copy",0,e,0,e,e,e],[0,1,129,"Paste",0,e,0,e,e,e],[0,1,130,"Find",0,e,0,e,e,e],[0,1,131,"AudioVolumeMute",112,"AudioVolumeMute",173,"VK_VOLUME_MUTE",e,e],[0,1,132,"AudioVolumeUp",113,"AudioVolumeUp",175,"VK_VOLUME_UP",e,e],[0,1,133,"AudioVolumeDown",114,"AudioVolumeDown",174,"VK_VOLUME_DOWN",e,e],[105,1,134,"NumpadComma",105,"NumPad_Separator",108,"VK_SEPARATOR",e,e],[110,0,135,"IntlRo",110,"ABNT_C1",193,"VK_ABNT_C1",e,e],[0,1,136,"KanaMode",0,e,0,e,e,e],[0,0,137,"IntlYen",0,e,0,e,e,e],[0,1,138,"Convert",0,e,0,e,e,e],[0,1,139,"NonConvert",0,e,0,e,e,e],[0,1,140,"Lang1",0,e,0,e,e,e],[0,1,141,"Lang2",0,e,0,e,e,e],[0,1,142,"Lang3",0,e,0,e,e,e],[0,1,143,"Lang4",0,e,0,e,e,e],[0,1,144,"Lang5",0,e,0,e,e,e],[0,1,145,"Abort",0,e,0,e,e,e],[0,1,146,"Props",0,e,0,e,e,e],[0,1,147,"NumpadParenLeft",0,e,0,e,e,e],[0,1,148,"NumpadParenRight",0,e,0,e,e,e],[0,1,149,"NumpadBackspace",0,e,0,e,e,e],[0,1,150,"NumpadMemoryStore",0,e,0,e,e,e],[0,1,151,"NumpadMemoryRecall",0,e,0,e,e,e],[0,1,152,"NumpadMemoryClear",0,e,0,e,e,e],[0,1,153,"NumpadMemoryAdd",0,e,0,e,e,e],[0,1,154,"NumpadMemorySubtract",0,e,0,e,e,e],[0,1,155,"NumpadClear",126,"Clear",12,"VK_CLEAR",e,e],[0,1,156,"NumpadClearEntry",0,e,0,e,e,e],[5,1,0,e,5,"Ctrl",17,"VK_CONTROL",e,e],[4,1,0,e,4,"Shift",16,"VK_SHIFT",e,e],[6,1,0,e,6,"Alt",18,"VK_MENU",e,e],[57,1,0,e,57,"Meta",0,"VK_COMMAND",e,e],[5,1,157,"ControlLeft",5,e,0,"VK_LCONTROL",e,e],[4,1,158,"ShiftLeft",4,e,0,"VK_LSHIFT",e,e],[6,1,159,"AltLeft",6,e,0,"VK_LMENU",e,e],[57,1,160,"MetaLeft",57,e,0,"VK_LWIN",e,e],[5,1,161,"ControlRight",5,e,0,"VK_RCONTROL",e,e],[4,1,162,"ShiftRight",4,e,0,"VK_RSHIFT",e,e],[6,1,163,"AltRight",6,e,0,"VK_RMENU",e,e],[57,1,164,"MetaRight",57,e,0,"VK_RWIN",e,e],[0,1,165,"BrightnessUp",0,e,0,e,e,e],[0,1,166,"BrightnessDown",0,e,0,e,e,e],[0,1,167,"MediaPlay",0,e,0,e,e,e],[0,1,168,"MediaRecord",0,e,0,e,e,e],[0,1,169,"MediaFastForward",0,e,0,e,e,e],[0,1,170,"MediaRewind",0,e,0,e,e,e],[114,1,171,"MediaTrackNext",119,"MediaTrackNext",176,"VK_MEDIA_NEXT_TRACK",e,e],[115,1,172,"MediaTrackPrevious",120,"MediaTrackPrevious",177,"VK_MEDIA_PREV_TRACK",e,e],[116,1,173,"MediaStop",121,"MediaStop",178,"VK_MEDIA_STOP",e,e],[0,1,174,"Eject",0,e,0,e,e,e],[117,1,175,"MediaPlayPause",122,"MediaPlayPause",179,"VK_MEDIA_PLAY_PAUSE",e,e],[0,1,176,"MediaSelect",123,"LaunchMediaPlayer",181,"VK_MEDIA_LAUNCH_MEDIA_SELECT",e,e],[0,1,177,"LaunchMail",124,"LaunchMail",180,"VK_MEDIA_LAUNCH_MAIL",e,e],[0,1,178,"LaunchApp2",125,"LaunchApp2",183,"VK_MEDIA_LAUNCH_APP2",e,e],[0,1,179,"LaunchApp1",0,e,0,"VK_MEDIA_LAUNCH_APP1",e,e],[0,1,180,"SelectTask",0,e,0,e,e,e],[0,1,181,"LaunchScreenSaver",0,e,0,e,e,e],[0,1,182,"BrowserSearch",115,"BrowserSearch",170,"VK_BROWSER_SEARCH",e,e],[0,1,183,"BrowserHome",116,"BrowserHome",172,"VK_BROWSER_HOME",e,e],[112,1,184,"BrowserBack",117,"BrowserBack",166,"VK_BROWSER_BACK",e,e],[113,1,185,"BrowserForward",118,"BrowserForward",167,"VK_BROWSER_FORWARD",e,e],[0,1,186,"BrowserStop",0,e,0,"VK_BROWSER_STOP",e,e],[0,1,187,"BrowserRefresh",0,e,0,"VK_BROWSER_REFRESH",e,e],[0,1,188,"BrowserFavorites",0,e,0,"VK_BROWSER_FAVORITES",e,e],[0,1,189,"ZoomToggle",0,e,0,e,e,e],[0,1,190,"MailReply",0,e,0,e,e,e],[0,1,191,"MailForward",0,e,0,e,e,e],[0,1,192,"MailSend",0,e,0,e,e,e],[109,1,0,e,109,"KeyInComposition",229,e,e,e],[111,1,0,e,111,"ABNT_C2",194,"VK_ABNT_C2",e,e],[91,1,0,e,91,"OEM_8",223,"VK_OEM_8",e,e],[0,1,0,e,0,e,0,"VK_KANA",e,e],[0,1,0,e,0,e,0,"VK_HANGUL",e,e],[0,1,0,e,0,e,0,"VK_JUNJA",e,e],[0,1,0,e,0,e,0,"VK_FINAL",e,e],[0,1,0,e,0,e,0,"VK_HANJA",e,e],[0,1,0,e,0,e,0,"VK_KANJI",e,e],[0,1,0,e,0,e,0,"VK_CONVERT",e,e],[0,1,0,e,0,e,0,"VK_NONCONVERT",e,e],[0,1,0,e,0,e,0,"VK_ACCEPT",e,e],[0,1,0,e,0,e,0,"VK_MODECHANGE",e,e],[0,1,0,e,0,e,0,"VK_SELECT",e,e],[0,1,0,e,0,e,0,"VK_PRINT",e,e],[0,1,0,e,0,e,0,"VK_EXECUTE",e,e],[0,1,0,e,0,e,0,"VK_SNAPSHOT",e,e],[0,1,0,e,0,e,0,"VK_HELP",e,e],[0,1,0,e,0,e,0,"VK_APPS",e,e],[0,1,0,e,0,e,0,"VK_PROCESSKEY",e,e],[0,1,0,e,0,e,0,"VK_PACKET",e,e],[0,1,0,e,0,e,0,"VK_DBE_SBCSCHAR",e,e],[0,1,0,e,0,e,0,"VK_DBE_DBCSCHAR",e,e],[0,1,0,e,0,e,0,"VK_ATTN",e,e],[0,1,0,e,0,e,0,"VK_CRSEL",e,e],[0,1,0,e,0,e,0,"VK_EXSEL",e,e],[0,1,0,e,0,e,0,"VK_EREOF",e,e],[0,1,0,e,0,e,0,"VK_PLAY",e,e],[0,1,0,e,0,e,0,"VK_ZOOM",e,e],[0,1,0,e,0,e,0,"VK_NONAME",e,e],[0,1,0,e,0,e,0,"VK_PA1",e,e],[0,1,0,e,0,e,0,"VK_OEM_CLEAR",e,e]],n=[],r=[];for(const i of t){const[s,a,o,l,c,h,u,f,m,b]=i;if(r[o]||(r[o]=!0,Tc[l]=o,Wc[l.toLowerCase()]=o),!n[c]){if(n[c]=!0,!h)throw new Error(`String representation missing for key code ${c} around scan code ${l}`);An.define(c,h),xr.define(c,m||h),Sr.define(c,b||m||h)}u&&(Lc[u]=c)}})();var ss;(function(e){function t(o){return An.keyCodeToStr(o)}e.toString=t;function n(o){return An.strToKeyCode(o)}e.fromString=n;function r(o){return xr.keyCodeToStr(o)}e.toUserSettingsUS=r;function i(o){return Sr.keyCodeToStr(o)}e.toUserSettingsGeneral=i;function s(o){return xr.strToKeyCode(o)||Sr.strToKeyCode(o)}e.fromUserSettings=s;function a(o){if(o>=93&&o<=108)return null;switch(o){case 16:return"Up";case 18:return"Down";case 15:return"Left";case 17:return"Right"}return An.keyCodeToStr(o)}e.toElectronAccelerator=a})(ss||(ss={}));function Oc(e,t){const n=(t&65535)<<16>>>0;return(e|n)>>>0}class Re extends ee{constructor(t,n,r,i){super(t,n,r,i),this.selectionStartLineNumber=t,this.selectionStartColumn=n,this.positionLineNumber=r,this.positionColumn=i}toString(){return"["+this.selectionStartLineNumber+","+this.selectionStartColumn+" -> "+this.positionLineNumber+","+this.positionColumn+"]"}equalsSelection(t){return Re.selectionsEqual(this,t)}static selectionsEqual(t,n){return t.selectionStartLineNumber===n.selectionStartLineNumber&&t.selectionStartColumn===n.selectionStartColumn&&t.positionLineNumber===n.positionLineNumber&&t.positionColumn===n.positionColumn}getDirection(){return this.selectionStartLineNumber===this.startLineNumber&&this.selectionStartColumn===this.startColumn?0:1}setEndPosition(t,n){return this.getDirection()===0?new Re(this.startLineNumber,this.startColumn,t,n):new Re(t,n,this.startLineNumber,this.startColumn)}getPosition(){return new _e(this.positionLineNumber,this.positionColumn)}getSelectionStart(){return new _e(this.selectionStartLineNumber,this.selectionStartColumn)}setStartPosition(t,n){return this.getDirection()===0?new Re(t,n,this.endLineNumber,this.endColumn):new Re(this.endLineNumber,this.endColumn,t,n)}static fromPositions(t,n=t){return new Re(t.lineNumber,t.column,n.lineNumber,n.column)}static fromRange(t,n){return n===0?new Re(t.startLineNumber,t.startColumn,t.endLineNumber,t.endColumn):new Re(t.endLineNumber,t.endColumn,t.startLineNumber,t.startColumn)}static liftSelection(t){return new Re(t.selectionStartLineNumber,t.selectionStartColumn,t.positionLineNumber,t.positionColumn)}static selectionsArrEqual(t,n){if(t&&!n||!t&&n)return!1;if(!t&&!n)return!0;if(t.length!==n.length)return!1;for(let r=0,i=t.length;r{this._map.get(t)===n&&(this._map.delete(t),this.fire([t]))})}registerFactory(t,n){var r;(r=this._factories.get(t))===null||r===void 0||r.dispose();const i=new Vc(this,t,n);return this._factories.set(t,i),yn(()=>{const s=this._factories.get(t);!s||s!==i||(this._factories.delete(t),s.dispose())})}getOrCreate(t){return Cr(this,void 0,void 0,function*(){const n=this.get(t);if(n)return n;const r=this._factories.get(t);return!r||r.isResolved?null:(yield r.resolve(),this.get(t))})}get(t){return this._map.get(t)||null}isResolved(t){if(this.get(t))return!0;const r=this._factories.get(t);return!!(!r||r.isResolved)}setColorMap(t){this._colorMap=t,this._onDidChange.fire({changedLanguages:Array.from(this._map.keys()),changedColorMap:!0})}getColorMap(){return this._colorMap}getDefaultBackground(){return this._colorMap&&this._colorMap.length>2?this._colorMap[2]:null}}class Vc extends wn{get isResolved(){return this._isResolved}constructor(t,n,r){super(),this._registry=t,this._languageId=n,this._factory=r,this._isDisposed=!1,this._resolvePromise=null,this._isResolved=!1}dispose(){this._isDisposed=!0,super.dispose()}resolve(){return Cr(this,void 0,void 0,function*(){return this._resolvePromise||(this._resolvePromise=this._create()),this._resolvePromise})}_create(){return Cr(this,void 0,void 0,function*(){const t=yield Promise.resolve(this._factory.createTokenizationSupport());this._isResolved=!0,t&&!this._isDisposed&&this._register(this._registry.register(this._languageId,t))})}}class Bc{constructor(t,n,r){this.offset=t,this.type=n,this.language=r,this._tokenBrand=void 0}toString(){return"("+this.offset+", "+this.type+")"}}var os;(function(e){const t=new Map;t.set(0,O.symbolMethod),t.set(1,O.symbolFunction),t.set(2,O.symbolConstructor),t.set(3,O.symbolField),t.set(4,O.symbolVariable),t.set(5,O.symbolClass),t.set(6,O.symbolStruct),t.set(7,O.symbolInterface),t.set(8,O.symbolModule),t.set(9,O.symbolProperty),t.set(10,O.symbolEvent),t.set(11,O.symbolOperator),t.set(12,O.symbolUnit),t.set(13,O.symbolValue),t.set(15,O.symbolEnum),t.set(14,O.symbolConstant),t.set(15,O.symbolEnum),t.set(16,O.symbolEnumMember),t.set(17,O.symbolKeyword),t.set(27,O.symbolSnippet),t.set(18,O.symbolText),t.set(19,O.symbolColor),t.set(20,O.symbolFile),t.set(21,O.symbolReference),t.set(22,O.symbolCustomColor),t.set(23,O.symbolFolder),t.set(24,O.symbolTypeParameter),t.set(25,O.account),t.set(26,O.issues);function n(s){let a=t.get(s);return a||(console.info("No codicon found for CompletionItemKind "+s),a=O.symbolProperty),a}e.toIcon=n;const r=new Map;r.set("method",0),r.set("function",1),r.set("constructor",2),r.set("field",3),r.set("variable",4),r.set("class",5),r.set("struct",6),r.set("interface",7),r.set("module",8),r.set("property",9),r.set("event",10),r.set("operator",11),r.set("unit",12),r.set("value",13),r.set("constant",14),r.set("enum",15),r.set("enum-member",16),r.set("enumMember",16),r.set("keyword",17),r.set("snippet",27),r.set("text",18),r.set("color",19),r.set("file",20),r.set("reference",21),r.set("customcolor",22),r.set("folder",23),r.set("type-parameter",24),r.set("typeParameter",24),r.set("account",25),r.set("issue",26);function i(s,a){let o=r.get(s);return typeof o>"u"&&!a&&(o=9),o}e.fromString=i})(os||(os={}));var ls;(function(e){e[e.Automatic=0]="Automatic",e[e.Explicit=1]="Explicit"})(ls||(ls={}));var cs;(function(e){e[e.Invoke=1]="Invoke",e[e.TriggerCharacter=2]="TriggerCharacter",e[e.ContentChange=3]="ContentChange"})(cs||(cs={}));var hs;(function(e){e[e.Text=0]="Text",e[e.Read=1]="Read",e[e.Write=2]="Write"})(hs||(hs={}));var ds;(function(e){const t=new Map;t.set(0,O.symbolFile),t.set(1,O.symbolModule),t.set(2,O.symbolNamespace),t.set(3,O.symbolPackage),t.set(4,O.symbolClass),t.set(5,O.symbolMethod),t.set(6,O.symbolProperty),t.set(7,O.symbolField),t.set(8,O.symbolConstructor),t.set(9,O.symbolEnum),t.set(10,O.symbolInterface),t.set(11,O.symbolFunction),t.set(12,O.symbolVariable),t.set(13,O.symbolConstant),t.set(14,O.symbolString),t.set(15,O.symbolNumber),t.set(16,O.symbolBoolean),t.set(17,O.symbolArray),t.set(18,O.symbolObject),t.set(19,O.symbolKey),t.set(20,O.symbolNull),t.set(21,O.symbolEnumMember),t.set(22,O.symbolStruct),t.set(23,O.symbolEvent),t.set(24,O.symbolOperator),t.set(25,O.symbolTypeParameter);function n(r){let i=t.get(r);return i||(console.info("No codicon found for SymbolKind "+r),i=O.symbolProperty),i}e.toIcon=n})(ds||(ds={}));var us;(function(e){function t(n){return!n||typeof n!="object"?!1:typeof n.id=="string"&&typeof n.title=="string"}e.is=t})(us||(us={}));var ps;(function(e){e[e.Type=1]="Type",e[e.Parameter=2]="Parameter"})(ps||(ps={})),new Uc;var fs;(function(e){e[e.Unknown=0]="Unknown",e[e.Disabled=1]="Disabled",e[e.Enabled=2]="Enabled"})(fs||(fs={}));var ms;(function(e){e[e.Invoke=1]="Invoke",e[e.Auto=2]="Auto"})(ms||(ms={}));var gs;(function(e){e[e.None=0]="None",e[e.KeepWhitespace=1]="KeepWhitespace",e[e.InsertAsSnippet=4]="InsertAsSnippet"})(gs||(gs={}));var bs;(function(e){e[e.Method=0]="Method",e[e.Function=1]="Function",e[e.Constructor=2]="Constructor",e[e.Field=3]="Field",e[e.Variable=4]="Variable",e[e.Class=5]="Class",e[e.Struct=6]="Struct",e[e.Interface=7]="Interface",e[e.Module=8]="Module",e[e.Property=9]="Property",e[e.Event=10]="Event",e[e.Operator=11]="Operator",e[e.Unit=12]="Unit",e[e.Value=13]="Value",e[e.Constant=14]="Constant",e[e.Enum=15]="Enum",e[e.EnumMember=16]="EnumMember",e[e.Keyword=17]="Keyword",e[e.Text=18]="Text",e[e.Color=19]="Color",e[e.File=20]="File",e[e.Reference=21]="Reference",e[e.Customcolor=22]="Customcolor",e[e.Folder=23]="Folder",e[e.TypeParameter=24]="TypeParameter",e[e.User=25]="User",e[e.Issue=26]="Issue",e[e.Snippet=27]="Snippet"})(bs||(bs={}));var vs;(function(e){e[e.Deprecated=1]="Deprecated"})(vs||(vs={}));var ys;(function(e){e[e.Invoke=0]="Invoke",e[e.TriggerCharacter=1]="TriggerCharacter",e[e.TriggerForIncompleteCompletions=2]="TriggerForIncompleteCompletions"})(ys||(ys={}));var ws;(function(e){e[e.EXACT=0]="EXACT",e[e.ABOVE=1]="ABOVE",e[e.BELOW=2]="BELOW"})(ws||(ws={}));var xs;(function(e){e[e.NotSet=0]="NotSet",e[e.ContentFlush=1]="ContentFlush",e[e.RecoverFromMarkers=2]="RecoverFromMarkers",e[e.Explicit=3]="Explicit",e[e.Paste=4]="Paste",e[e.Undo=5]="Undo",e[e.Redo=6]="Redo"})(xs||(xs={}));var Ss;(function(e){e[e.LF=1]="LF",e[e.CRLF=2]="CRLF"})(Ss||(Ss={}));var Cs;(function(e){e[e.Text=0]="Text",e[e.Read=1]="Read",e[e.Write=2]="Write"})(Cs||(Cs={}));var ks;(function(e){e[e.None=0]="None",e[e.Keep=1]="Keep",e[e.Brackets=2]="Brackets",e[e.Advanced=3]="Advanced",e[e.Full=4]="Full"})(ks||(ks={}));var _s;(function(e){e[e.acceptSuggestionOnCommitCharacter=0]="acceptSuggestionOnCommitCharacter",e[e.acceptSuggestionOnEnter=1]="acceptSuggestionOnEnter",e[e.accessibilitySupport=2]="accessibilitySupport",e[e.accessibilityPageSize=3]="accessibilityPageSize",e[e.ariaLabel=4]="ariaLabel",e[e.autoClosingBrackets=5]="autoClosingBrackets",e[e.autoClosingDelete=6]="autoClosingDelete",e[e.autoClosingOvertype=7]="autoClosingOvertype",e[e.autoClosingQuotes=8]="autoClosingQuotes",e[e.autoIndent=9]="autoIndent",e[e.automaticLayout=10]="automaticLayout",e[e.autoSurround=11]="autoSurround",e[e.bracketPairColorization=12]="bracketPairColorization",e[e.guides=13]="guides",e[e.codeLens=14]="codeLens",e[e.codeLensFontFamily=15]="codeLensFontFamily",e[e.codeLensFontSize=16]="codeLensFontSize",e[e.colorDecorators=17]="colorDecorators",e[e.colorDecoratorsLimit=18]="colorDecoratorsLimit",e[e.columnSelection=19]="columnSelection",e[e.comments=20]="comments",e[e.contextmenu=21]="contextmenu",e[e.copyWithSyntaxHighlighting=22]="copyWithSyntaxHighlighting",e[e.cursorBlinking=23]="cursorBlinking",e[e.cursorSmoothCaretAnimation=24]="cursorSmoothCaretAnimation",e[e.cursorStyle=25]="cursorStyle",e[e.cursorSurroundingLines=26]="cursorSurroundingLines",e[e.cursorSurroundingLinesStyle=27]="cursorSurroundingLinesStyle",e[e.cursorWidth=28]="cursorWidth",e[e.disableLayerHinting=29]="disableLayerHinting",e[e.disableMonospaceOptimizations=30]="disableMonospaceOptimizations",e[e.domReadOnly=31]="domReadOnly",e[e.dragAndDrop=32]="dragAndDrop",e[e.dropIntoEditor=33]="dropIntoEditor",e[e.emptySelectionClipboard=34]="emptySelectionClipboard",e[e.experimentalWhitespaceRendering=35]="experimentalWhitespaceRendering",e[e.extraEditorClassName=36]="extraEditorClassName",e[e.fastScrollSensitivity=37]="fastScrollSensitivity",e[e.find=38]="find",e[e.fixedOverflowWidgets=39]="fixedOverflowWidgets",e[e.folding=40]="folding",e[e.foldingStrategy=41]="foldingStrategy",e[e.foldingHighlight=42]="foldingHighlight",e[e.foldingImportsByDefault=43]="foldingImportsByDefault",e[e.foldingMaximumRegions=44]="foldingMaximumRegions",e[e.unfoldOnClickAfterEndOfLine=45]="unfoldOnClickAfterEndOfLine",e[e.fontFamily=46]="fontFamily",e[e.fontInfo=47]="fontInfo",e[e.fontLigatures=48]="fontLigatures",e[e.fontSize=49]="fontSize",e[e.fontWeight=50]="fontWeight",e[e.fontVariations=51]="fontVariations",e[e.formatOnPaste=52]="formatOnPaste",e[e.formatOnType=53]="formatOnType",e[e.glyphMargin=54]="glyphMargin",e[e.gotoLocation=55]="gotoLocation",e[e.hideCursorInOverviewRuler=56]="hideCursorInOverviewRuler",e[e.hover=57]="hover",e[e.inDiffEditor=58]="inDiffEditor",e[e.inlineSuggest=59]="inlineSuggest",e[e.letterSpacing=60]="letterSpacing",e[e.lightbulb=61]="lightbulb",e[e.lineDecorationsWidth=62]="lineDecorationsWidth",e[e.lineHeight=63]="lineHeight",e[e.lineNumbers=64]="lineNumbers",e[e.lineNumbersMinChars=65]="lineNumbersMinChars",e[e.linkedEditing=66]="linkedEditing",e[e.links=67]="links",e[e.matchBrackets=68]="matchBrackets",e[e.minimap=69]="minimap",e[e.mouseStyle=70]="mouseStyle",e[e.mouseWheelScrollSensitivity=71]="mouseWheelScrollSensitivity",e[e.mouseWheelZoom=72]="mouseWheelZoom",e[e.multiCursorMergeOverlapping=73]="multiCursorMergeOverlapping",e[e.multiCursorModifier=74]="multiCursorModifier",e[e.multiCursorPaste=75]="multiCursorPaste",e[e.multiCursorLimit=76]="multiCursorLimit",e[e.occurrencesHighlight=77]="occurrencesHighlight",e[e.overviewRulerBorder=78]="overviewRulerBorder",e[e.overviewRulerLanes=79]="overviewRulerLanes",e[e.padding=80]="padding",e[e.parameterHints=81]="parameterHints",e[e.peekWidgetDefaultFocus=82]="peekWidgetDefaultFocus",e[e.definitionLinkOpensInPeek=83]="definitionLinkOpensInPeek",e[e.quickSuggestions=84]="quickSuggestions",e[e.quickSuggestionsDelay=85]="quickSuggestionsDelay",e[e.readOnly=86]="readOnly",e[e.renameOnType=87]="renameOnType",e[e.renderControlCharacters=88]="renderControlCharacters",e[e.renderFinalNewline=89]="renderFinalNewline",e[e.renderLineHighlight=90]="renderLineHighlight",e[e.renderLineHighlightOnlyWhenFocus=91]="renderLineHighlightOnlyWhenFocus",e[e.renderValidationDecorations=92]="renderValidationDecorations",e[e.renderWhitespace=93]="renderWhitespace",e[e.revealHorizontalRightPadding=94]="revealHorizontalRightPadding",e[e.roundedSelection=95]="roundedSelection",e[e.rulers=96]="rulers",e[e.scrollbar=97]="scrollbar",e[e.scrollBeyondLastColumn=98]="scrollBeyondLastColumn",e[e.scrollBeyondLastLine=99]="scrollBeyondLastLine",e[e.scrollPredominantAxis=100]="scrollPredominantAxis",e[e.selectionClipboard=101]="selectionClipboard",e[e.selectionHighlight=102]="selectionHighlight",e[e.selectOnLineNumbers=103]="selectOnLineNumbers",e[e.showFoldingControls=104]="showFoldingControls",e[e.showUnused=105]="showUnused",e[e.snippetSuggestions=106]="snippetSuggestions",e[e.smartSelect=107]="smartSelect",e[e.smoothScrolling=108]="smoothScrolling",e[e.stickyScroll=109]="stickyScroll",e[e.stickyTabStops=110]="stickyTabStops",e[e.stopRenderingLineAfter=111]="stopRenderingLineAfter",e[e.suggest=112]="suggest",e[e.suggestFontSize=113]="suggestFontSize",e[e.suggestLineHeight=114]="suggestLineHeight",e[e.suggestOnTriggerCharacters=115]="suggestOnTriggerCharacters",e[e.suggestSelection=116]="suggestSelection",e[e.tabCompletion=117]="tabCompletion",e[e.tabIndex=118]="tabIndex",e[e.unicodeHighlighting=119]="unicodeHighlighting",e[e.unusualLineTerminators=120]="unusualLineTerminators",e[e.useShadowDOM=121]="useShadowDOM",e[e.useTabStops=122]="useTabStops",e[e.wordBreak=123]="wordBreak",e[e.wordSeparators=124]="wordSeparators",e[e.wordWrap=125]="wordWrap",e[e.wordWrapBreakAfterCharacters=126]="wordWrapBreakAfterCharacters",e[e.wordWrapBreakBeforeCharacters=127]="wordWrapBreakBeforeCharacters",e[e.wordWrapColumn=128]="wordWrapColumn",e[e.wordWrapOverride1=129]="wordWrapOverride1",e[e.wordWrapOverride2=130]="wordWrapOverride2",e[e.wrappingIndent=131]="wrappingIndent",e[e.wrappingStrategy=132]="wrappingStrategy",e[e.showDeprecated=133]="showDeprecated",e[e.inlayHints=134]="inlayHints",e[e.editorClassName=135]="editorClassName",e[e.pixelRatio=136]="pixelRatio",e[e.tabFocusMode=137]="tabFocusMode",e[e.layoutInfo=138]="layoutInfo",e[e.wrappingInfo=139]="wrappingInfo"})(_s||(_s={}));var Fs;(function(e){e[e.TextDefined=0]="TextDefined",e[e.LF=1]="LF",e[e.CRLF=2]="CRLF"})(Fs||(Fs={}));var Rs;(function(e){e[e.LF=0]="LF",e[e.CRLF=1]="CRLF"})(Rs||(Rs={}));var Es;(function(e){e[e.None=0]="None",e[e.Indent=1]="Indent",e[e.IndentOutdent=2]="IndentOutdent",e[e.Outdent=3]="Outdent"})(Es||(Es={}));var Ds;(function(e){e[e.Both=0]="Both",e[e.Right=1]="Right",e[e.Left=2]="Left",e[e.None=3]="None"})(Ds||(Ds={}));var As;(function(e){e[e.Type=1]="Type",e[e.Parameter=2]="Parameter"})(As||(As={}));var zs;(function(e){e[e.Automatic=0]="Automatic",e[e.Explicit=1]="Explicit"})(zs||(zs={}));var kr;(function(e){e[e.DependsOnKbLayout=-1]="DependsOnKbLayout",e[e.Unknown=0]="Unknown",e[e.Backspace=1]="Backspace",e[e.Tab=2]="Tab",e[e.Enter=3]="Enter",e[e.Shift=4]="Shift",e[e.Ctrl=5]="Ctrl",e[e.Alt=6]="Alt",e[e.PauseBreak=7]="PauseBreak",e[e.CapsLock=8]="CapsLock",e[e.Escape=9]="Escape",e[e.Space=10]="Space",e[e.PageUp=11]="PageUp",e[e.PageDown=12]="PageDown",e[e.End=13]="End",e[e.Home=14]="Home",e[e.LeftArrow=15]="LeftArrow",e[e.UpArrow=16]="UpArrow",e[e.RightArrow=17]="RightArrow",e[e.DownArrow=18]="DownArrow",e[e.Insert=19]="Insert",e[e.Delete=20]="Delete",e[e.Digit0=21]="Digit0",e[e.Digit1=22]="Digit1",e[e.Digit2=23]="Digit2",e[e.Digit3=24]="Digit3",e[e.Digit4=25]="Digit4",e[e.Digit5=26]="Digit5",e[e.Digit6=27]="Digit6",e[e.Digit7=28]="Digit7",e[e.Digit8=29]="Digit8",e[e.Digit9=30]="Digit9",e[e.KeyA=31]="KeyA",e[e.KeyB=32]="KeyB",e[e.KeyC=33]="KeyC",e[e.KeyD=34]="KeyD",e[e.KeyE=35]="KeyE",e[e.KeyF=36]="KeyF",e[e.KeyG=37]="KeyG",e[e.KeyH=38]="KeyH",e[e.KeyI=39]="KeyI",e[e.KeyJ=40]="KeyJ",e[e.KeyK=41]="KeyK",e[e.KeyL=42]="KeyL",e[e.KeyM=43]="KeyM",e[e.KeyN=44]="KeyN",e[e.KeyO=45]="KeyO",e[e.KeyP=46]="KeyP",e[e.KeyQ=47]="KeyQ",e[e.KeyR=48]="KeyR",e[e.KeyS=49]="KeyS",e[e.KeyT=50]="KeyT",e[e.KeyU=51]="KeyU",e[e.KeyV=52]="KeyV",e[e.KeyW=53]="KeyW",e[e.KeyX=54]="KeyX",e[e.KeyY=55]="KeyY",e[e.KeyZ=56]="KeyZ",e[e.Meta=57]="Meta",e[e.ContextMenu=58]="ContextMenu",e[e.F1=59]="F1",e[e.F2=60]="F2",e[e.F3=61]="F3",e[e.F4=62]="F4",e[e.F5=63]="F5",e[e.F6=64]="F6",e[e.F7=65]="F7",e[e.F8=66]="F8",e[e.F9=67]="F9",e[e.F10=68]="F10",e[e.F11=69]="F11",e[e.F12=70]="F12",e[e.F13=71]="F13",e[e.F14=72]="F14",e[e.F15=73]="F15",e[e.F16=74]="F16",e[e.F17=75]="F17",e[e.F18=76]="F18",e[e.F19=77]="F19",e[e.NumLock=78]="NumLock",e[e.ScrollLock=79]="ScrollLock",e[e.Semicolon=80]="Semicolon",e[e.Equal=81]="Equal",e[e.Comma=82]="Comma",e[e.Minus=83]="Minus",e[e.Period=84]="Period",e[e.Slash=85]="Slash",e[e.Backquote=86]="Backquote",e[e.BracketLeft=87]="BracketLeft",e[e.Backslash=88]="Backslash",e[e.BracketRight=89]="BracketRight",e[e.Quote=90]="Quote",e[e.OEM_8=91]="OEM_8",e[e.IntlBackslash=92]="IntlBackslash",e[e.Numpad0=93]="Numpad0",e[e.Numpad1=94]="Numpad1",e[e.Numpad2=95]="Numpad2",e[e.Numpad3=96]="Numpad3",e[e.Numpad4=97]="Numpad4",e[e.Numpad5=98]="Numpad5",e[e.Numpad6=99]="Numpad6",e[e.Numpad7=100]="Numpad7",e[e.Numpad8=101]="Numpad8",e[e.Numpad9=102]="Numpad9",e[e.NumpadMultiply=103]="NumpadMultiply",e[e.NumpadAdd=104]="NumpadAdd",e[e.NUMPAD_SEPARATOR=105]="NUMPAD_SEPARATOR",e[e.NumpadSubtract=106]="NumpadSubtract",e[e.NumpadDecimal=107]="NumpadDecimal",e[e.NumpadDivide=108]="NumpadDivide",e[e.KEY_IN_COMPOSITION=109]="KEY_IN_COMPOSITION",e[e.ABNT_C1=110]="ABNT_C1",e[e.ABNT_C2=111]="ABNT_C2",e[e.AudioVolumeMute=112]="AudioVolumeMute",e[e.AudioVolumeUp=113]="AudioVolumeUp",e[e.AudioVolumeDown=114]="AudioVolumeDown",e[e.BrowserSearch=115]="BrowserSearch",e[e.BrowserHome=116]="BrowserHome",e[e.BrowserBack=117]="BrowserBack",e[e.BrowserForward=118]="BrowserForward",e[e.MediaTrackNext=119]="MediaTrackNext",e[e.MediaTrackPrevious=120]="MediaTrackPrevious",e[e.MediaStop=121]="MediaStop",e[e.MediaPlayPause=122]="MediaPlayPause",e[e.LaunchMediaPlayer=123]="LaunchMediaPlayer",e[e.LaunchMail=124]="LaunchMail",e[e.LaunchApp2=125]="LaunchApp2",e[e.Clear=126]="Clear",e[e.MAX_VALUE=127]="MAX_VALUE"})(kr||(kr={}));var _r;(function(e){e[e.Hint=1]="Hint",e[e.Info=2]="Info",e[e.Warning=4]="Warning",e[e.Error=8]="Error"})(_r||(_r={}));var Fr;(function(e){e[e.Unnecessary=1]="Unnecessary",e[e.Deprecated=2]="Deprecated"})(Fr||(Fr={}));var Ms;(function(e){e[e.Inline=1]="Inline",e[e.Gutter=2]="Gutter"})(Ms||(Ms={}));var Ns;(function(e){e[e.UNKNOWN=0]="UNKNOWN",e[e.TEXTAREA=1]="TEXTAREA",e[e.GUTTER_GLYPH_MARGIN=2]="GUTTER_GLYPH_MARGIN",e[e.GUTTER_LINE_NUMBERS=3]="GUTTER_LINE_NUMBERS",e[e.GUTTER_LINE_DECORATIONS=4]="GUTTER_LINE_DECORATIONS",e[e.GUTTER_VIEW_ZONE=5]="GUTTER_VIEW_ZONE",e[e.CONTENT_TEXT=6]="CONTENT_TEXT",e[e.CONTENT_EMPTY=7]="CONTENT_EMPTY",e[e.CONTENT_VIEW_ZONE=8]="CONTENT_VIEW_ZONE",e[e.CONTENT_WIDGET=9]="CONTENT_WIDGET",e[e.OVERVIEW_RULER=10]="OVERVIEW_RULER",e[e.SCROLLBAR=11]="SCROLLBAR",e[e.OVERLAY_WIDGET=12]="OVERLAY_WIDGET",e[e.OUTSIDE_EDITOR=13]="OUTSIDE_EDITOR"})(Ns||(Ns={}));var Ps;(function(e){e[e.TOP_RIGHT_CORNER=0]="TOP_RIGHT_CORNER",e[e.BOTTOM_RIGHT_CORNER=1]="BOTTOM_RIGHT_CORNER",e[e.TOP_CENTER=2]="TOP_CENTER"})(Ps||(Ps={}));var Is;(function(e){e[e.Left=1]="Left",e[e.Center=2]="Center",e[e.Right=4]="Right",e[e.Full=7]="Full"})(Is||(Is={}));var Ls;(function(e){e[e.Left=0]="Left",e[e.Right=1]="Right",e[e.None=2]="None",e[e.LeftOfInjectedText=3]="LeftOfInjectedText",e[e.RightOfInjectedText=4]="RightOfInjectedText"})(Ls||(Ls={}));var Ts;(function(e){e[e.Off=0]="Off",e[e.On=1]="On",e[e.Relative=2]="Relative",e[e.Interval=3]="Interval",e[e.Custom=4]="Custom"})(Ts||(Ts={}));var Ws;(function(e){e[e.None=0]="None",e[e.Text=1]="Text",e[e.Blocks=2]="Blocks"})(Ws||(Ws={}));var Os;(function(e){e[e.Smooth=0]="Smooth",e[e.Immediate=1]="Immediate"})(Os||(Os={}));var Us;(function(e){e[e.Auto=1]="Auto",e[e.Hidden=2]="Hidden",e[e.Visible=3]="Visible"})(Us||(Us={}));var Rr;(function(e){e[e.LTR=0]="LTR",e[e.RTL=1]="RTL"})(Rr||(Rr={}));var Vs;(function(e){e[e.Invoke=1]="Invoke",e[e.TriggerCharacter=2]="TriggerCharacter",e[e.ContentChange=3]="ContentChange"})(Vs||(Vs={}));var Bs;(function(e){e[e.File=0]="File",e[e.Module=1]="Module",e[e.Namespace=2]="Namespace",e[e.Package=3]="Package",e[e.Class=4]="Class",e[e.Method=5]="Method",e[e.Property=6]="Property",e[e.Field=7]="Field",e[e.Constructor=8]="Constructor",e[e.Enum=9]="Enum",e[e.Interface=10]="Interface",e[e.Function=11]="Function",e[e.Variable=12]="Variable",e[e.Constant=13]="Constant",e[e.String=14]="String",e[e.Number=15]="Number",e[e.Boolean=16]="Boolean",e[e.Array=17]="Array",e[e.Object=18]="Object",e[e.Key=19]="Key",e[e.Null=20]="Null",e[e.EnumMember=21]="EnumMember",e[e.Struct=22]="Struct",e[e.Event=23]="Event",e[e.Operator=24]="Operator",e[e.TypeParameter=25]="TypeParameter"})(Bs||(Bs={}));var js;(function(e){e[e.Deprecated=1]="Deprecated"})(js||(js={}));var qs;(function(e){e[e.Hidden=0]="Hidden",e[e.Blink=1]="Blink",e[e.Smooth=2]="Smooth",e[e.Phase=3]="Phase",e[e.Expand=4]="Expand",e[e.Solid=5]="Solid"})(qs||(qs={}));var $s;(function(e){e[e.Line=1]="Line",e[e.Block=2]="Block",e[e.Underline=3]="Underline",e[e.LineThin=4]="LineThin",e[e.BlockOutline=5]="BlockOutline",e[e.UnderlineThin=6]="UnderlineThin"})($s||($s={}));var Hs;(function(e){e[e.AlwaysGrowsWhenTypingAtEdges=0]="AlwaysGrowsWhenTypingAtEdges",e[e.NeverGrowsWhenTypingAtEdges=1]="NeverGrowsWhenTypingAtEdges",e[e.GrowsOnlyWhenTypingBefore=2]="GrowsOnlyWhenTypingBefore",e[e.GrowsOnlyWhenTypingAfter=3]="GrowsOnlyWhenTypingAfter"})(Hs||(Hs={}));var Gs;(function(e){e[e.None=0]="None",e[e.Same=1]="Same",e[e.Indent=2]="Indent",e[e.DeepIndent=3]="DeepIndent"})(Gs||(Gs={}));class $t{static chord(t,n){return Oc(t,n)}}$t.CtrlCmd=2048,$t.Shift=1024,$t.Alt=512,$t.WinCtrl=256;function jc(){return{editor:void 0,languages:void 0,CancellationTokenSource:Ic,Emitter:Ve,KeyCode:kr,KeyMod:$t,Position:_e,Range:ee,Selection:Re,SelectionDirection:Rr,MarkerSeverity:_r,MarkerTag:Fr,Uri:Rt,Token:Bc}}var Js;(function(e){e[e.Left=1]="Left",e[e.Center=2]="Center",e[e.Right=4]="Right",e[e.Full=7]="Full"})(Js||(Js={}));var Xs;(function(e){e[e.Inline=1]="Inline",e[e.Gutter=2]="Gutter"})(Xs||(Xs={}));var Ys;(function(e){e[e.Both=0]="Both",e[e.Right=1]="Right",e[e.Left=2]="Left",e[e.None=3]="None"})(Ys||(Ys={}));function qc(e,t,n,r,i){if(r===0)return!0;const s=t.charCodeAt(r-1);if(e.get(s)!==0||s===13||s===10)return!0;if(i>0){const a=t.charCodeAt(r);if(e.get(a)!==0)return!0}return!1}function $c(e,t,n,r,i){if(r+i===n)return!0;const s=t.charCodeAt(r+i);if(e.get(s)!==0||s===13||s===10)return!0;if(i>0){const a=t.charCodeAt(r+i-1);if(e.get(a)!==0)return!0}return!1}function Hc(e,t,n,r,i){return qc(e,t,n,r,i)&&$c(e,t,n,r,i)}class Gc{constructor(t,n){this._wordSeparators=t,this._searchRegex=n,this._prevMatchStartIndex=-1,this._prevMatchLength=0}reset(t){this._searchRegex.lastIndex=t,this._prevMatchStartIndex=-1,this._prevMatchLength=0}next(t){const n=t.length;let r;do{if(this._prevMatchStartIndex+this._prevMatchLength===n||(r=this._searchRegex.exec(t),!r))return null;const i=r.index,s=r[0].length;if(i===this._prevMatchStartIndex&&s===this._prevMatchLength){if(s===0){Jl(t,n,this._searchRegex.lastIndex)>65535?this._searchRegex.lastIndex+=2:this._searchRegex.lastIndex+=1;continue}return null}if(this._prevMatchStartIndex=i,this._prevMatchLength=s,!this._wordSeparators||Hc(this._wordSeparators,t,n,i,s))return r}while(r);return null}}function Jc(e,t="Unreachable"){throw new Error(t)}function Er(e){if(!e()){debugger;e(),tt(new rr("Assertion Failed"))}}function Ks(e,t){let n=0;for(;n0){const R=C.charCodeAt(I-1);ur(R)&&I--}if(L+1<_){const R=C.charCodeAt(L-1);ur(R)&&L++}const X=C.substring(I,L);let Q=gr(I+1,ns,C,0);Q&&Q.endColumn<=I+1&&(Q=null);const D=a.shouldHighlightNonBasicASCII(X,Q?Q.word:null);if(D!==0){D===3?m++:D===2?b++:D===1?y++:Jc();const R=1e3;if(h.length>=R){u=!0;break e}h.push(new ee(v,I+1,v,L+1))}}while(f)}return{ranges:h,hasMore:u,ambiguousCharacterCount:m,invisibleCharacterCount:b,nonBasicAsciiCharacterCount:y}}static computeUnicodeHighlightReason(t,n){const r=new Qs(n);switch(r.shouldHighlightNonBasicASCII(t,null)){case 0:return null;case 2:return{kind:1};case 3:{const s=t.codePointAt(0),a=r.ambiguousCharacters.getPrimaryConfusable(s),o=ze.getLocales().filter(l=>!ze.getInstance(new Set([...n.allowedLocales,l])).isAmbiguous(s));return{kind:0,confusableWith:String.fromCodePoint(a),notAmbiguousInLocales:o}}case 1:return{kind:2}}}}function Yc(e,t){return`[${Bl(e.map(r=>String.fromCodePoint(r)).join(""))}]`}class Qs{constructor(t){this.options=t,this.allowedCodePoints=new Set(t.allowedCodePoints),this.ambiguousCharacters=ze.getInstance(new Set(t.allowedLocales))}getCandidateCodePoints(){if(this.options.nonBasicASCII)return"allNonBasicAscii";const t=new Set;if(this.options.invisibleCharacters)for(const n of nt.codePoints)Zs(String.fromCodePoint(n))||t.add(n);if(this.options.ambiguousCharacters)for(const n of this.ambiguousCharacters.getConfusableCodePoints())t.add(n);for(const n of this.allowedCodePoints)t.delete(n);return t}shouldHighlightNonBasicASCII(t,n){const r=t.codePointAt(0);if(this.allowedCodePoints.has(r))return 0;if(this.options.nonBasicASCII)return 1;let i=!1,s=!1;if(n)for(const a of n){const o=a.codePointAt(0),l=Yl(a);i=i||l,!l&&!this.ambiguousCharacters.isAmbiguous(o)&&!nt.isInvisibleCharacter(o)&&(s=!0)}return!i&&s?0:this.options.invisibleCharacters&&!Zs(t)&&nt.isInvisibleCharacter(r)?2:this.options.ambiguousCharacters&&this.ambiguousCharacters.isAmbiguous(r)?3:0}}function Zs(e){return e===" "||e===` +`||e===" "}class Dr{constructor(t,n,r){this.originalRange=t,this.modifiedRange=n,this.innerChanges=r}toString(){return`{${this.originalRange.toString()}->${this.modifiedRange.toString()}}`}}class ea{constructor(t,n){this.originalRange=t,this.modifiedRange=n}toString(){return`{${this.originalRange.toString()}->${this.modifiedRange.toString()}}`}}class Je{constructor(t,n){this.startLineNumber=t,this.endLineNumberExclusive=n}get isEmpty(){return this.startLineNumber===this.endLineNumberExclusive}delta(t){return new Je(this.startLineNumber+t,this.endLineNumberExclusive+t)}get length(){return this.endLineNumberExclusive-this.startLineNumber}join(t){return new Je(Math.min(this.startLineNumber,t.startLineNumber),Math.max(this.endLineNumberExclusive,t.endLineNumberExclusive))}toString(){return`[${this.startLineNumber},${this.endLineNumberExclusive})`}}const Kc=3;class Qc{computeDiff(t,n,r){var i;const a=new th(t,n,{maxComputationTime:r.maxComputationTimeMs,shouldIgnoreTrimWhitespace:r.ignoreTrimWhitespace,shouldComputeCharChanges:!0,shouldMakePrettyDiff:!0,shouldPostProcessCharChanges:!0}).computeDiff(),o=[];let l=null;for(const c of a.changes){let h;c.originalEndLineNumber===0?h=new Je(c.originalStartLineNumber+1,c.originalStartLineNumber+1):h=new Je(c.originalStartLineNumber,c.originalEndLineNumber+1);let u;c.modifiedEndLineNumber===0?u=new Je(c.modifiedStartLineNumber+1,c.modifiedStartLineNumber+1):u=new Je(c.modifiedStartLineNumber,c.modifiedEndLineNumber+1);let f=new Dr(h,u,(i=c.charChanges)===null||i===void 0?void 0:i.map(m=>new ea(new ee(m.originalStartLineNumber,m.originalStartColumn,m.originalEndLineNumber,m.originalEndColumn),new ee(m.modifiedStartLineNumber,m.modifiedStartColumn,m.modifiedEndLineNumber,m.modifiedEndColumn))));l&&(l.modifiedRange.endLineNumberExclusive===f.modifiedRange.startLineNumber||l.originalRange.endLineNumberExclusive===f.originalRange.startLineNumber)&&(f=new Dr(l.originalRange.join(f.originalRange),l.modifiedRange.join(f.modifiedRange),l.innerChanges&&f.innerChanges?l.innerChanges.concat(f.innerChanges):void 0),o.pop()),o.push(f),l=f}return Er(()=>Ks(o,(c,h)=>h.originalRange.startLineNumber-c.originalRange.endLineNumberExclusive===h.modifiedRange.startLineNumber-c.modifiedRange.endLineNumberExclusive&&c.originalRange.endLineNumberExclusive(t===10?"\\n":String.fromCharCode(t))+`-(${this._lineNumbers[n]},${this._columns[n]})`).join(", ")+"]"}_assertIndex(t,n){if(t<0||t>=n.length)throw new Error("Illegal index")}getElements(){return this._charCodes}getStartLineNumber(t){return t>0&&t===this._lineNumbers.length?this.getEndLineNumber(t-1):(this._assertIndex(t,this._lineNumbers),this._lineNumbers[t])}getEndLineNumber(t){return t===-1?this.getStartLineNumber(t+1):(this._assertIndex(t,this._lineNumbers),this._charCodes[t]===10?this._lineNumbers[t]+1:this._lineNumbers[t])}getStartColumn(t){return t>0&&t===this._columns.length?this.getEndColumn(t-1):(this._assertIndex(t,this._columns),this._columns[t])}getEndColumn(t){return t===-1?this.getStartColumn(t+1):(this._assertIndex(t,this._columns),this._charCodes[t]===10?1:this._columns[t]+1)}}class At{constructor(t,n,r,i,s,a,o,l){this.originalStartLineNumber=t,this.originalStartColumn=n,this.originalEndLineNumber=r,this.originalEndColumn=i,this.modifiedStartLineNumber=s,this.modifiedStartColumn=a,this.modifiedEndLineNumber=o,this.modifiedEndColumn=l}static createFromDiffChange(t,n,r){const i=n.getStartLineNumber(t.originalStart),s=n.getStartColumn(t.originalStart),a=n.getEndLineNumber(t.originalStart+t.originalLength-1),o=n.getEndColumn(t.originalStart+t.originalLength-1),l=r.getStartLineNumber(t.modifiedStart),c=r.getStartColumn(t.modifiedStart),h=r.getEndLineNumber(t.modifiedStart+t.modifiedLength-1),u=r.getEndColumn(t.modifiedStart+t.modifiedLength-1);return new At(i,s,a,o,l,c,h,u)}}function eh(e){if(e.length<=1)return e;const t=[e[0]];let n=t[0];for(let r=1,i=e.length;r0&&n.originalLength<20&&n.modifiedLength>0&&n.modifiedLength<20&&s()){const m=r.createCharSequence(t,n.originalStart,n.originalStart+n.originalLength-1),b=i.createCharSequence(t,n.modifiedStart,n.modifiedStart+n.modifiedLength-1);if(m.getElements().length>0&&b.getElements().length>0){let y=ta(m,b,s,!0).changes;o&&(y=eh(y)),f=[];for(let v=0,w=y.length;v1&&y>1;){const v=f.charCodeAt(b-2),w=m.charCodeAt(y-2);if(v!==w)break;b--,y--}(b>1||y>1)&&this._pushTrimWhitespaceCharChange(i,s+1,1,b,a+1,1,y)}{let b=zr(f,1),y=zr(m,1);const v=f.length+1,w=m.length+1;for(;b!0;const t=Date.now();return()=>Date.now()-t ${this.seq2Range}`}}class Fe{constructor(t,n){this.start=t,this.endExclusive=n}get isEmpty(){return this.start===this.endExclusive}delta(t){return new Fe(this.start+t,this.endExclusive+t)}get length(){return this.endExclusive-this.start}toString(){return`[${this.start}, ${this.endExclusive})`}join(t){return new Fe(Math.min(this.start,t.start),Math.max(this.endExclusive,t.endExclusive))}}class Mr{constructor(t,n){this.width=t,this.height=n,this.array=[],this.array=new Array(t*n)}get(t,n){return this.array[t+n*this.width]}set(t,n,r){this.array[t+n*this.width]=r}}class nh{compute(t,n,r){const i=new Mr(t.length,n.length),s=new Mr(t.length,n.length),a=new Mr(t.length,n.length);for(let m=0;m0&&b>0&&s.get(m-1,b-1)===3&&(w+=a.get(m-1,b-1)),w+=r?r(m,b):1):w=-1;const C=Math.max(y,v,w);if(C===w){const _=m>0&&b>0?a.get(m-1,b-1):0;a.set(m,b,_+1),s.set(m,b,3)}else C===y?(a.set(m,b,0),s.set(m,b,1)):C===v&&(a.set(m,b,0),s.set(m,b,2));i.set(m,b,C)}const o=[];let l=t.length,c=n.length;function h(m,b){(m+1!==l||b+1!==c)&&o.push(new Be(new Fe(m+1,l),new Fe(b+1,c))),l=m,c=b}let u=t.length-1,f=n.length-1;for(;u>=0&&f>=0;)s.get(u,f)===3?(h(u,f),u--,f--):s.get(u,f)===1?u--:f--;return h(-1,-1),o.reverse(),o}}function ia(e,t,n){let r=n;return r=ih(e,t,r),r=sh(e,t,r),r}function rh(e,t,n){const r=[];for(const i of n){const s=r[r.length-1];if(!s){r.push(i);continue}i.seq1Range.start-s.seq1Range.endExclusive<=2||i.seq2Range.start-s.seq2Range.endExclusive<=2?r[r.length-1]=new Be(s.seq1Range.join(i.seq1Range),s.seq2Range.join(i.seq2Range)):r.push(i)}return r}function ih(e,t,n){const r=[];n.length>0&&r.push(n[0]);for(let i=1;i0?n[r-1].seq2Range.endExclusive:-1,a=r+10?n[r-1].seq1Range.endExclusive:-1,a=r+1i&&n.getElement(e.seq2Range.start-a)===n.getElement(e.seq2Range.endExclusive-a)&&a<20;)a++;a--;let o=0;for(;e.seq2Range.start+oc&&(c=b,l=h)}return l!==0?new Be(e.seq1Range.delta(l),e.seq2Range.delta(l)):e}class ah{compute(t,n){if(t.length===0)return[new Be(new Fe(0,0),new Fe(0,n.length))];if(n.length===0)return[new Be(new Fe(0,t.length),new Fe(0,0))];function r(f,m){for(;f=this.negativeArr.length){const r=this.negativeArr;this.negativeArr=new Int32Array(r.length*2),this.negativeArr.set(r)}this.negativeArr[t]=n}else{if(t>=this.positiveArr.length){const r=this.positiveArr;this.positiveArr=new Int32Array(r.length*2),this.positiveArr.set(r)}this.positiveArr[t]=n}}}class lh{constructor(){this.positiveArr=[],this.negativeArr=[]}get(t){return t<0?(t=-t-1,this.negativeArr[t]):this.positiveArr[t]}set(t,n){t<0?(t=-t-1,this.negativeArr[t]=n):this.positiveArr[t]=n}}class ch{constructor(){this.dynamicProgrammingDiffing=new nh,this.myersDiffingAlgorithm=new ah}computeDiff(t,n,r){const i=new Map;function s(v){let w=i.get(v);return w===void 0&&(w=i.size,i.set(v,w)),w}const a=t.map(v=>s(v.trim())),o=n.map(v=>s(v.trim())),l=new oa(a,t),c=new oa(o,n);let h=(()=>l.length+c.length<1500?this.dynamicProgrammingDiffing.compute(l,c,(v,w)=>t[v]===n[w]?n[w].length===0?.1:1+Math.log(1+n[w].length):.99):this.myersDiffingAlgorithm.compute(l,c))();h=ia(l,c,h);const u=[],f=v=>{for(let w=0;wv.seq1Range.start-m===v.seq2Range.start-b);const w=v.seq1Range.start-m;f(w),m=v.seq1Range.endExclusive,b=v.seq2Range.endExclusive;const C=this.refineDiff(t,n,v);for(const _ of C)u.push(_)}return f(t.length-m),{quitEarly:!1,changes:hh(u)}}refineDiff(t,n,r){const i=new ca(t,r.seq1Range),s=new ca(n,r.seq2Range),a=i.length+s.length<500?this.dynamicProgrammingDiffing.compute(i,s):this.myersDiffingAlgorithm.compute(i,s);let o=ia(i,s,a);return o=rh(i,s,o),o.map(c=>new ea(i.translateRange(c.seq1Range).delta(r.seq1Range.start),s.translateRange(c.seq2Range).delta(r.seq2Range.start)))}}function hh(e){const t=[];for(const n of dh(e,(r,i)=>i.originalRange.startLineNumber-(r.originalRange.endLineNumber-(r.originalRange.endColumn>1?0:1))<=1||i.modifiedRange.startLineNumber-(r.modifiedRange.endLineNumber-(r.modifiedRange.endColumn>1?0:1))<=1)){const r=n[0],i=n[n.length-1];t.push(new Dr(new Je(r.originalRange.startLineNumber,i.originalRange.endLineNumber+(i.originalRange.endColumn>1||i.modifiedRange.endColumn>1?1:0)),new Je(r.modifiedRange.startLineNumber,i.modifiedRange.endLineNumber+(i.originalRange.endColumn>1||i.modifiedRange.endColumn>1?1:0)),n))}return Er(()=>Ks(t,(n,r)=>r.originalRange.startLineNumber-n.originalRange.endLineNumberExclusive===r.modifiedRange.startLineNumber-n.modifiedRange.endLineNumberExclusive&&n.originalRange.endLineNumberExclusive0?this.elements[t-1]:-1),r=da(tt?r=s:n=s+1}const i=n===0?0:this.firstCharOnLineOffsets[n-1];return new _e(n+1,t-i+1)}translateRange(t){return ee.fromPositions(this.translateOffset(t.start),this.translateOffset(t.endExclusive))}}const uh={[0]:0,[1]:0,[2]:0,[3]:10,[4]:2,[5]:3,[6]:10,[7]:10};function ha(e){return uh[e]}function da(e){return e===10?7:e===13?6:ph(e)?5:e>=97&&e<=122?0:e>=65&&e<=90?1:e>=48&&e<=57?2:e===-1?3:4}function ph(e){return e===32||e===9}const ua={smart:new Qc,experimental:new ch};var ft=function(e,t,n,r){function i(s){return s instanceof n?s:new n(function(a){a(s)})}return new(n||(n=Promise))(function(s,a){function o(h){try{c(r.next(h))}catch(u){a(u)}}function l(h){try{c(r.throw(h))}catch(u){a(u)}}function c(h){h.done?s(h.value):i(h.value).then(o,l)}c((r=r.apply(e,t||[])).next())})};class fh extends _c{get uri(){return this._uri}get eol(){return this._eol}getValue(){return this.getText()}getLinesContent(){return this._lines.slice(0)}getLineCount(){return this._lines.length}getLineContent(t){return this._lines[t-1]}getWordAtPosition(t,n){const r=gr(t.column,Ec(n),this._lines[t.lineNumber-1],0);return r?new ee(t.lineNumber,r.startColumn,t.lineNumber,r.endColumn):null}words(t){const n=this._lines,r=this._wordenize.bind(this);let i=0,s="",a=0,o=[];return{*[Symbol.iterator](){for(;;)if(athis._lines.length)n=this._lines.length,r=this._lines[n-1].length+1,i=!0;else{const s=this._lines[n-1].length+1;r<1?(r=1,i=!0):r>s&&(r=s,i=!0)}return i?{lineNumber:n,column:r}:t}}class mt{constructor(t,n){this._host=t,this._models=Object.create(null),this._foreignModuleFactory=n,this._foreignModule=null}dispose(){this._models=Object.create(null)}_getModel(t){return this._models[t]}_getModels(){const t=[];return Object.keys(this._models).forEach(n=>t.push(this._models[n])),t}acceptNewModel(t){this._models[t.url]=new fh(Rt.parse(t.url),t.lines,t.EOL,t.versionId)}acceptModelChanged(t,n){if(!this._models[t])return;this._models[t].onEvents(n)}acceptRemovedModel(t){!this._models[t]||delete this._models[t]}computeUnicodeHighlights(t,n,r){return ft(this,void 0,void 0,function*(){const i=this._getModel(t);return i?Xc.computeUnicodeHighlights(i,n,r):{ranges:[],hasMore:!1,ambiguousCharacterCount:0,invisibleCharacterCount:0,nonBasicAsciiCharacterCount:0}})}computeDiff(t,n,r,i){return ft(this,void 0,void 0,function*(){const s=this._getModel(t),a=this._getModel(n);return!s||!a?null:mt.computeDiff(s,a,r,i)})}static computeDiff(t,n,r,i){const s=i==="experimental"?ua.experimental:ua.smart,a=t.getLinesContent(),o=n.getLinesContent(),l=s.computeDiff(a,o,r);return{identical:l.changes.length>0?!1:this._modelsAreIdentical(t,n),quitEarly:l.quitEarly,changes:l.changes.map(h=>{var u;return[h.originalRange.startLineNumber,h.originalRange.endLineNumberExclusive,h.modifiedRange.startLineNumber,h.modifiedRange.endLineNumberExclusive,(u=h.innerChanges)===null||u===void 0?void 0:u.map(f=>[f.originalRange.startLineNumber,f.originalRange.startColumn,f.originalRange.endLineNumber,f.originalRange.endColumn,f.modifiedRange.startLineNumber,f.modifiedRange.startColumn,f.modifiedRange.endLineNumber,f.modifiedRange.endColumn])]})}}static _modelsAreIdentical(t,n){const r=t.getLineCount(),i=n.getLineCount();if(r!==i)return!1;for(let s=1;s<=r;s++){const a=t.getLineContent(s),o=n.getLineContent(s);if(a!==o)return!1}return!0}computeMoreMinimalEdits(t,n){return ft(this,void 0,void 0,function*(){const r=this._getModel(t);if(!r)return n;const i=[];let s;n=n.slice(0).sort((a,o)=>{if(a.range&&o.range)return ee.compareRangesUsingStarts(a.range,o.range);const l=a.range?0:1,c=o.range?0:1;return l-c});for(let{range:a,text:o,eol:l}of n){if(typeof l=="number"&&(s=l),ee.isEmpty(a)&&!o)continue;const c=r.getValueInRange(a);if(o=o.replace(/\r\n|\n|\r/g,r.eol),c===o)continue;if(Math.max(o.length,c.length)>mt._diffLimit){i.push({range:a,text:o});continue}const h=ac(c,o,!1),u=r.offsetAt(ee.lift(a).getStartPosition());for(const f of h){const m=r.positionAt(u+f.originalStart),b=r.positionAt(u+f.originalStart+f.originalLength),y={text:o.substr(f.modifiedStart,f.modifiedLength),range:{startLineNumber:m.lineNumber,startColumn:m.column,endLineNumber:b.lineNumber,endColumn:b.column}};r.getValueInRange(y.range)!==y.text&&i.push(y)}}return typeof s=="number"&&i.push({eol:s,text:"",range:{startLineNumber:0,startColumn:0,endLineNumber:0,endColumn:0}}),i})}computeLinks(t){return ft(this,void 0,void 0,function*(){const n=this._getModel(t);return n?Pc(n):null})}textualSuggest(t,n,r,i){return ft(this,void 0,void 0,function*(){const s=new Cn(!0),a=new RegExp(r,i),o=new Set;e:for(const l of t){const c=this._getModel(l);if(!!c){for(const h of c.words(a))if(!(h===n||!isNaN(Number(h)))&&(o.add(h),o.size>mt._suggestionsLimit))break e}}return{words:Array.from(o),duration:s.elapsed()}})}computeWordRanges(t,n,r,i){return ft(this,void 0,void 0,function*(){const s=this._getModel(t);if(!s)return Object.create(null);const a=new RegExp(r,i),o=Object.create(null);for(let l=n.startLineNumber;lthis._host.fhr(o,l)),getMirrorModels:()=>this._getModels()};return this._foreignModuleFactory?(this._foreignModule=this._foreignModuleFactory(a,n),Promise.resolve(dr(this._foreignModule))):Promise.reject(new Error("Unexpected usage"))}fmr(t,n){if(!this._foreignModule||typeof this._foreignModule[t]!="function")return Promise.reject(new Error("Missing requestHandler or method: "+t));try{return Promise.resolve(this._foreignModule[t].apply(this._foreignModule,n))}catch(r){return Promise.reject(r)}}}mt._diffLimit=1e5,mt._suggestionsLimit=1e4,typeof importScripts=="function"&&(me.monaco=jc());let Nr=!1;function pa(e){if(Nr)return;Nr=!0;const t=new ic(n=>{self.postMessage(n)},n=>new mt(n,e));self.onmessage=n=>{t.onmessage(n.data)}}self.onmessage=e=>{Nr||pa(null)};var p;(function(e){e[e.Ident=0]="Ident",e[e.AtKeyword=1]="AtKeyword",e[e.String=2]="String",e[e.BadString=3]="BadString",e[e.UnquotedString=4]="UnquotedString",e[e.Hash=5]="Hash",e[e.Num=6]="Num",e[e.Percentage=7]="Percentage",e[e.Dimension=8]="Dimension",e[e.UnicodeRange=9]="UnicodeRange",e[e.CDO=10]="CDO",e[e.CDC=11]="CDC",e[e.Colon=12]="Colon",e[e.SemiColon=13]="SemiColon",e[e.CurlyL=14]="CurlyL",e[e.CurlyR=15]="CurlyR",e[e.ParenthesisL=16]="ParenthesisL",e[e.ParenthesisR=17]="ParenthesisR",e[e.BracketL=18]="BracketL",e[e.BracketR=19]="BracketR",e[e.Whitespace=20]="Whitespace",e[e.Includes=21]="Includes",e[e.Dashmatch=22]="Dashmatch",e[e.SubstringOperator=23]="SubstringOperator",e[e.PrefixOperator=24]="PrefixOperator",e[e.SuffixOperator=25]="SuffixOperator",e[e.Delim=26]="Delim",e[e.EMS=27]="EMS",e[e.EXS=28]="EXS",e[e.Length=29]="Length",e[e.Angle=30]="Angle",e[e.Time=31]="Time",e[e.Freq=32]="Freq",e[e.Exclamation=33]="Exclamation",e[e.Resolution=34]="Resolution",e[e.Comma=35]="Comma",e[e.Charset=36]="Charset",e[e.EscapedJavaScript=37]="EscapedJavaScript",e[e.BadEscapedJavaScript=38]="BadEscapedJavaScript",e[e.Comment=39]="Comment",e[e.SingleLineComment=40]="SingleLineComment",e[e.EOF=41]="EOF",e[e.CustomToken=42]="CustomToken"})(p||(p={}));var fa=function(){function e(t){this.source=t,this.len=t.length,this.position=0}return e.prototype.substring=function(t,n){return n===void 0&&(n=this.position),this.source.substring(t,n)},e.prototype.eos=function(){return this.len<=this.position},e.prototype.pos=function(){return this.position},e.prototype.goBackTo=function(t){this.position=t},e.prototype.goBack=function(t){this.position-=t},e.prototype.advance=function(t){this.position+=t},e.prototype.nextChar=function(){return this.source.charCodeAt(this.position++)||0},e.prototype.peekChar=function(t){return t===void 0&&(t=0),this.source.charCodeAt(this.position+t)||0},e.prototype.lookbackChar=function(t){return t===void 0&&(t=0),this.source.charCodeAt(this.position-t)||0},e.prototype.advanceIfChar=function(t){return t===this.source.charCodeAt(this.position)?(this.position++,!0):!1},e.prototype.advanceIfChars=function(t){if(this.position+t.length>this.source.length)return!1;for(var n=0;n=Gt&&n<=Jt?(this.stream.advance(t+1),this.stream.advanceWhileChar(function(r){return r>=Gt&&r<=Jt||t===0&&r===_a}),!0):!1},e.prototype._newline=function(t){var n=this.stream.peekChar();switch(n){case Mt:case Yt:case zt:return this.stream.advance(1),t.push(String.fromCharCode(n)),n===Mt&&this.stream.advanceIfChar(zt)&&t.push(` +`),!0}return!1},e.prototype._escape=function(t,n){var r=this.stream.peekChar();if(r===Ir){this.stream.advance(1),r=this.stream.peekChar();for(var i=0;i<6&&(r>=Gt&&r<=Jt||r>=zn&&r<=ma||r>=Mn&&r<=ba);)this.stream.advance(1),r=this.stream.peekChar(),i++;if(i>0){try{var s=parseInt(this.stream.substring(this.stream.pos()-i),16);s&&t.push(String.fromCharCode(s))}catch{}return r===Lr||r===Tr?this.stream.advance(1):this._newline([]),!0}if(r!==Mt&&r!==Yt&&r!==zt)return this.stream.advance(1),t.push(String.fromCharCode(r)),!0;if(n)return this._newline(t)}return!1},e.prototype._stringChar=function(t,n){var r=this.stream.peekChar();return r!==0&&r!==t&&r!==Ir&&r!==Mt&&r!==Yt&&r!==zt?(this.stream.advance(1),n.push(String.fromCharCode(r)),!0):!1},e.prototype._string=function(t){if(this.stream.peekChar()===ka||this.stream.peekChar()===Ca){var n=this.stream.nextChar();for(t.push(String.fromCharCode(n));this._stringChar(n,t)||this._escape(t,!0););return this.stream.peekChar()===n?(this.stream.nextChar(),t.push(String.fromCharCode(n)),p.String):p.BadString}return null},e.prototype._unquotedChar=function(t){var n=this.stream.peekChar();return n!==0&&n!==Ir&&n!==ka&&n!==Ca&&n!==wa&&n!==xa&&n!==Lr&&n!==Tr&&n!==zt&&n!==Yt&&n!==Mt?(this.stream.advance(1),t.push(String.fromCharCode(n)),!0):!1},e.prototype._unquotedString=function(t){for(var n=!1;this._unquotedChar(t)||this._escape(t);)n=!0;return n},e.prototype._whitespace=function(){var t=this.stream.advanceWhileChar(function(n){return n===Lr||n===Tr||n===zt||n===Yt||n===Mt});return t>0},e.prototype._name=function(t){for(var n=!1;this._identChar(t)||this._escape(t);)n=!0;return n},e.prototype.ident=function(t){var n=this.stream.pos(),r=this._minus(t);if(r){if(this._minus(t)||this._identFirstChar(t)||this._escape(t)){for(;this._identChar(t)||this._escape(t););return!0}}else if(this._identFirstChar(t)||this._escape(t)){for(;this._identChar(t)||this._escape(t););return!0}return this.stream.goBackTo(n),!1},e.prototype._identFirstChar=function(t){var n=this.stream.peekChar();return n===ya||n>=zn&&n<=ga||n>=Mn&&n<=va||n>=128&&n<=65535?(this.stream.advance(1),t.push(String.fromCharCode(n)),!0):!1},e.prototype._minus=function(t){var n=this.stream.peekChar();return n===gt?(this.stream.advance(1),t.push(String.fromCharCode(n)),!0):!1},e.prototype._identChar=function(t){var n=this.stream.peekChar();return n===ya||n===gt||n>=zn&&n<=ga||n>=Mn&&n<=va||n>=Gt&&n<=Jt||n>=128&&n<=65535?(this.stream.advance(1),t.push(String.fromCharCode(n)),!0):!1},e.prototype._unicodeRange=function(){if(this.stream.advanceIfChar(Mh)){var t=function(i){return i>=Gt&&i<=Jt||i>=zn&&i<=ma||i>=Mn&&i<=ba},n=this.stream.advanceWhileChar(t)+this.stream.advanceWhileChar(function(i){return i===zh});if(n>=1&&n<=6)if(this.stream.advanceIfChar(gt)){var r=this.stream.advanceWhileChar(t);if(r>=1&&r<=6)return!0}else return!0}return!1},e}();function he(e,t){if(e.length0?e.lastIndexOf(t)===n:n===0?e===t:!1}function Nh(e,t,n){n===void 0&&(n=4);var r=Math.abs(e.length-t.length);if(r>n)return 0;var i=[],s=[],a,o;for(a=0;a0;)(t&1)===1&&(n+=e),e+=e,t=t>>>1;return n}var T=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),g;(function(e){e[e.Undefined=0]="Undefined",e[e.Identifier=1]="Identifier",e[e.Stylesheet=2]="Stylesheet",e[e.Ruleset=3]="Ruleset",e[e.Selector=4]="Selector",e[e.SimpleSelector=5]="SimpleSelector",e[e.SelectorInterpolation=6]="SelectorInterpolation",e[e.SelectorCombinator=7]="SelectorCombinator",e[e.SelectorCombinatorParent=8]="SelectorCombinatorParent",e[e.SelectorCombinatorSibling=9]="SelectorCombinatorSibling",e[e.SelectorCombinatorAllSiblings=10]="SelectorCombinatorAllSiblings",e[e.SelectorCombinatorShadowPiercingDescendant=11]="SelectorCombinatorShadowPiercingDescendant",e[e.Page=12]="Page",e[e.PageBoxMarginBox=13]="PageBoxMarginBox",e[e.ClassSelector=14]="ClassSelector",e[e.IdentifierSelector=15]="IdentifierSelector",e[e.ElementNameSelector=16]="ElementNameSelector",e[e.PseudoSelector=17]="PseudoSelector",e[e.AttributeSelector=18]="AttributeSelector",e[e.Declaration=19]="Declaration",e[e.Declarations=20]="Declarations",e[e.Property=21]="Property",e[e.Expression=22]="Expression",e[e.BinaryExpression=23]="BinaryExpression",e[e.Term=24]="Term",e[e.Operator=25]="Operator",e[e.Value=26]="Value",e[e.StringLiteral=27]="StringLiteral",e[e.URILiteral=28]="URILiteral",e[e.EscapedValue=29]="EscapedValue",e[e.Function=30]="Function",e[e.NumericValue=31]="NumericValue",e[e.HexColorValue=32]="HexColorValue",e[e.RatioValue=33]="RatioValue",e[e.MixinDeclaration=34]="MixinDeclaration",e[e.MixinReference=35]="MixinReference",e[e.VariableName=36]="VariableName",e[e.VariableDeclaration=37]="VariableDeclaration",e[e.Prio=38]="Prio",e[e.Interpolation=39]="Interpolation",e[e.NestedProperties=40]="NestedProperties",e[e.ExtendsReference=41]="ExtendsReference",e[e.SelectorPlaceholder=42]="SelectorPlaceholder",e[e.Debug=43]="Debug",e[e.If=44]="If",e[e.Else=45]="Else",e[e.For=46]="For",e[e.Each=47]="Each",e[e.While=48]="While",e[e.MixinContentReference=49]="MixinContentReference",e[e.MixinContentDeclaration=50]="MixinContentDeclaration",e[e.Media=51]="Media",e[e.Keyframe=52]="Keyframe",e[e.FontFace=53]="FontFace",e[e.Import=54]="Import",e[e.Namespace=55]="Namespace",e[e.Invocation=56]="Invocation",e[e.FunctionDeclaration=57]="FunctionDeclaration",e[e.ReturnStatement=58]="ReturnStatement",e[e.MediaQuery=59]="MediaQuery",e[e.MediaCondition=60]="MediaCondition",e[e.MediaFeature=61]="MediaFeature",e[e.FunctionParameter=62]="FunctionParameter",e[e.FunctionArgument=63]="FunctionArgument",e[e.KeyframeSelector=64]="KeyframeSelector",e[e.ViewPort=65]="ViewPort",e[e.Document=66]="Document",e[e.AtApplyRule=67]="AtApplyRule",e[e.CustomPropertyDeclaration=68]="CustomPropertyDeclaration",e[e.CustomPropertySet=69]="CustomPropertySet",e[e.ListEntry=70]="ListEntry",e[e.Supports=71]="Supports",e[e.SupportsCondition=72]="SupportsCondition",e[e.NamespacePrefix=73]="NamespacePrefix",e[e.GridLine=74]="GridLine",e[e.Plugin=75]="Plugin",e[e.UnknownAtRule=76]="UnknownAtRule",e[e.Use=77]="Use",e[e.ModuleConfiguration=78]="ModuleConfiguration",e[e.Forward=79]="Forward",e[e.ForwardVisibility=80]="ForwardVisibility",e[e.Module=81]="Module",e[e.UnicodeRange=82]="UnicodeRange"})(g||(g={}));var J;(function(e){e[e.Mixin=0]="Mixin",e[e.Rule=1]="Rule",e[e.Variable=2]="Variable",e[e.Function=3]="Function",e[e.Keyframe=4]="Keyframe",e[e.Unknown=5]="Unknown",e[e.Module=6]="Module",e[e.Forward=7]="Forward",e[e.ForwardVisibility=8]="ForwardVisibility"})(J||(J={}));function Wr(e,t){var n=null;return!e||te.end?null:(e.accept(function(r){return r.offset===-1&&r.length===-1?!0:r.offset<=t&&r.end>=t?(n?r.length<=n.length&&(n=r):n=r,!0):!1}),n)}function Or(e,t){for(var n=Wr(e,t),r=[];n;)r.unshift(n),n=n.parent;return r}function Ih(e){var t=e.findParent(g.Declaration),n=t&&t.getValue();return n&&n.encloses(e)?t:null}var W=function(){function e(t,n,r){t===void 0&&(t=-1),n===void 0&&(n=-1),this.parent=null,this.offset=t,this.length=n,r&&(this.nodeType=r)}return Object.defineProperty(e.prototype,"end",{get:function(){return this.offset+this.length},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"type",{get:function(){return this.nodeType||g.Undefined},set:function(t){this.nodeType=t},enumerable:!1,configurable:!0}),e.prototype.getTextProvider=function(){for(var t=this;t&&!t.textProvider;)t=t.parent;return t?t.textProvider:function(){return"unknown"}},e.prototype.getText=function(){return this.getTextProvider()(this.offset,this.length)},e.prototype.matches=function(t){return this.length===t.length&&this.getTextProvider()(this.offset,this.length)===t},e.prototype.startsWith=function(t){return this.length>=t.length&&this.getTextProvider()(this.offset,t.length)===t},e.prototype.endsWith=function(t){return this.length>=t.length&&this.getTextProvider()(this.end-t.length,t.length)===t},e.prototype.accept=function(t){if(t(this)&&this.children)for(var n=0,r=this.children;n=0&&t.parent.children.splice(r,1)}t.parent=this;var i=this.children;return i||(i=this.children=[]),n!==-1?i.splice(n,0,t):i.push(t),t},e.prototype.attachTo=function(t,n){return n===void 0&&(n=-1),t&&t.adoptChild(this,n),this},e.prototype.collectIssues=function(t){this.issues&&t.push.apply(t,this.issues)},e.prototype.addIssue=function(t){this.issues||(this.issues=[]),this.issues.push(t)},e.prototype.hasIssue=function(t){return Array.isArray(this.issues)&&this.issues.some(function(n){return n.getRule()===t})},e.prototype.isErroneous=function(t){return t===void 0&&(t=!1),this.issues&&this.issues.length>0?!0:t&&Array.isArray(this.children)&&this.children.some(function(n){return n.isErroneous(!0)})},e.prototype.setNode=function(t,n,r){return r===void 0&&(r=-1),n?(n.attachTo(this,r),this[t]=n,!0):!1},e.prototype.addChild=function(t){return t?(this.children||(this.children=[]),t.attachTo(this),this.updateOffsetAndLength(t),!0):!1},e.prototype.updateOffsetAndLength=function(t){(t.offsetthis.end||this.length===-1)&&(this.length=n-this.offset)},e.prototype.hasChildren=function(){return!!this.children&&this.children.length>0},e.prototype.getChildren=function(){return this.children?this.children.slice(0):[]},e.prototype.getChild=function(t){return this.children&&t=0;r--)if(n=this.children[r],n.offset<=t)return n}return null},e.prototype.findChildAtOffset=function(t,n){var r=this.findFirstChildBeforeOffset(t);return r&&r.end>=t?n&&r.findChildAtOffset(t,!0)||r:null},e.prototype.encloses=function(t){return this.offset<=t.offset&&this.offset+this.length>=t.offset+t.length},e.prototype.getParent=function(){for(var t=this.parent;t instanceof be;)t=t.parent;return t},e.prototype.findParent=function(t){for(var n=this;n&&n.type!==t;)n=n.parent;return n},e.prototype.findAParent=function(){for(var t=[],n=0;n{let s=i[0];return typeof t[s]<"u"?t[s]:r}),n}function gd(e,t,...n){return md(t,n)}function We(e){return gd}var Y=We(),K=function(){function e(t,n){this.id=t,this.message=n}return e}(),x={NumberExpected:new K("css-numberexpected",Y("expected.number","number expected")),ConditionExpected:new K("css-conditionexpected",Y("expected.condt","condition expected")),RuleOrSelectorExpected:new K("css-ruleorselectorexpected",Y("expected.ruleorselector","at-rule or selector expected")),DotExpected:new K("css-dotexpected",Y("expected.dot","dot expected")),ColonExpected:new K("css-colonexpected",Y("expected.colon","colon expected")),SemiColonExpected:new K("css-semicolonexpected",Y("expected.semicolon","semi-colon expected")),TermExpected:new K("css-termexpected",Y("expected.term","term expected")),ExpressionExpected:new K("css-expressionexpected",Y("expected.expression","expression expected")),OperatorExpected:new K("css-operatorexpected",Y("expected.operator","operator expected")),IdentifierExpected:new K("css-identifierexpected",Y("expected.ident","identifier expected")),PercentageExpected:new K("css-percentageexpected",Y("expected.percentage","percentage expected")),URIOrStringExpected:new K("css-uriorstringexpected",Y("expected.uriorstring","uri or string expected")),URIExpected:new K("css-uriexpected",Y("expected.uri","URI expected")),VariableNameExpected:new K("css-varnameexpected",Y("expected.varname","variable name expected")),VariableValueExpected:new K("css-varvalueexpected",Y("expected.varvalue","variable value expected")),PropertyValueExpected:new K("css-propertyvalueexpected",Y("expected.propvalue","property value expected")),LeftCurlyExpected:new K("css-lcurlyexpected",Y("expected.lcurly","{ expected")),RightCurlyExpected:new K("css-rcurlyexpected",Y("expected.rcurly","} expected")),LeftSquareBracketExpected:new K("css-rbracketexpected",Y("expected.lsquare","[ expected")),RightSquareBracketExpected:new K("css-lbracketexpected",Y("expected.rsquare","] expected")),LeftParenthesisExpected:new K("css-lparentexpected",Y("expected.lparen","( expected")),RightParenthesisExpected:new K("css-rparentexpected",Y("expected.rparent",") expected")),CommaExpected:new K("css-commaexpected",Y("expected.comma","comma expected")),PageDirectiveOrDeclarationExpected:new K("css-pagedirordeclexpected",Y("expected.pagedirordecl","page directive or declaraton expected")),UnknownAtRule:new K("css-unknownatrule",Y("unknown.atrule","at-rule unknown")),UnknownKeyword:new K("css-unknownkeyword",Y("unknown.keyword","unknown keyword")),SelectorExpected:new K("css-selectorexpected",Y("expected.selector","selector expected")),StringLiteralExpected:new K("css-stringliteralexpected",Y("expected.stringliteral","string literal expected")),WhitespaceExpected:new K("css-whitespaceexpected",Y("expected.whitespace","whitespace expected")),MediaQueryExpected:new K("css-mediaqueryexpected",Y("expected.mediaquery","media query expected")),IdentifierOrWildcardExpected:new K("css-idorwildcardexpected",Y("expected.idorwildcard","identifier or wildcard expected")),WildcardExpected:new K("css-wildcardexpected",Y("expected.wildcard","wildcard expected")),IdentifierOrVariableExpected:new K("css-idorvarexpected",Y("expected.idorvar","identifier or variable expected"))},Va;(function(e){e.MIN_VALUE=-2147483648,e.MAX_VALUE=2147483647})(Va||(Va={}));var Tn;(function(e){e.MIN_VALUE=0,e.MAX_VALUE=2147483647})(Tn||(Tn={}));var Se;(function(e){function t(r,i){return r===Number.MAX_VALUE&&(r=Tn.MAX_VALUE),i===Number.MAX_VALUE&&(i=Tn.MAX_VALUE),{line:r,character:i}}e.create=t;function n(r){var i=r;return k.objectLiteral(i)&&k.uinteger(i.line)&&k.uinteger(i.character)}e.is=n})(Se||(Se={}));var te;(function(e){function t(r,i,s,a){if(k.uinteger(r)&&k.uinteger(i)&&k.uinteger(s)&&k.uinteger(a))return{start:Se.create(r,i),end:Se.create(s,a)};if(Se.is(r)&&Se.is(i))return{start:r,end:i};throw new Error("Range#create called with invalid arguments["+r+", "+i+", "+s+", "+a+"]")}e.create=t;function n(r){var i=r;return k.objectLiteral(i)&&Se.is(i.start)&&Se.is(i.end)}e.is=n})(te||(te={}));var rn;(function(e){function t(r,i){return{uri:r,range:i}}e.create=t;function n(r){var i=r;return k.defined(i)&&te.is(i.range)&&(k.string(i.uri)||k.undefined(i.uri))}e.is=n})(rn||(rn={}));var Ba;(function(e){function t(r,i,s,a){return{targetUri:r,targetRange:i,targetSelectionRange:s,originSelectionRange:a}}e.create=t;function n(r){var i=r;return k.defined(i)&&te.is(i.targetRange)&&k.string(i.targetUri)&&(te.is(i.targetSelectionRange)||k.undefined(i.targetSelectionRange))&&(te.is(i.originSelectionRange)||k.undefined(i.originSelectionRange))}e.is=n})(Ba||(Ba={}));var Yr;(function(e){function t(r,i,s,a){return{red:r,green:i,blue:s,alpha:a}}e.create=t;function n(r){var i=r;return k.numberRange(i.red,0,1)&&k.numberRange(i.green,0,1)&&k.numberRange(i.blue,0,1)&&k.numberRange(i.alpha,0,1)}e.is=n})(Yr||(Yr={}));var ja;(function(e){function t(r,i){return{range:r,color:i}}e.create=t;function n(r){var i=r;return te.is(i.range)&&Yr.is(i.color)}e.is=n})(ja||(ja={}));var qa;(function(e){function t(r,i,s){return{label:r,textEdit:i,additionalTextEdits:s}}e.create=t;function n(r){var i=r;return k.string(i.label)&&(k.undefined(i.textEdit)||q.is(i))&&(k.undefined(i.additionalTextEdits)||k.typedArray(i.additionalTextEdits,q.is))}e.is=n})(qa||(qa={}));var $a;(function(e){e.Comment="comment",e.Imports="imports",e.Region="region"})($a||($a={}));var Ha;(function(e){function t(r,i,s,a,o){var l={startLine:r,endLine:i};return k.defined(s)&&(l.startCharacter=s),k.defined(a)&&(l.endCharacter=a),k.defined(o)&&(l.kind=o),l}e.create=t;function n(r){var i=r;return k.uinteger(i.startLine)&&k.uinteger(i.startLine)&&(k.undefined(i.startCharacter)||k.uinteger(i.startCharacter))&&(k.undefined(i.endCharacter)||k.uinteger(i.endCharacter))&&(k.undefined(i.kind)||k.string(i.kind))}e.is=n})(Ha||(Ha={}));var Kr;(function(e){function t(r,i){return{location:r,message:i}}e.create=t;function n(r){var i=r;return k.defined(i)&&rn.is(i.location)&&k.string(i.message)}e.is=n})(Kr||(Kr={}));var Wn;(function(e){e.Error=1,e.Warning=2,e.Information=3,e.Hint=4})(Wn||(Wn={}));var Ga;(function(e){e.Unnecessary=1,e.Deprecated=2})(Ga||(Ga={}));var Ja;(function(e){function t(n){var r=n;return r!=null&&k.string(r.href)}e.is=t})(Ja||(Ja={}));var On;(function(e){function t(r,i,s,a,o,l){var c={range:r,message:i};return k.defined(s)&&(c.severity=s),k.defined(a)&&(c.code=a),k.defined(o)&&(c.source=o),k.defined(l)&&(c.relatedInformation=l),c}e.create=t;function n(r){var i,s=r;return k.defined(s)&&te.is(s.range)&&k.string(s.message)&&(k.number(s.severity)||k.undefined(s.severity))&&(k.integer(s.code)||k.string(s.code)||k.undefined(s.code))&&(k.undefined(s.codeDescription)||k.string((i=s.codeDescription)===null||i===void 0?void 0:i.href))&&(k.string(s.source)||k.undefined(s.source))&&(k.undefined(s.relatedInformation)||k.typedArray(s.relatedInformation,Kr.is))}e.is=n})(On||(On={}));var Lt;(function(e){function t(r,i){for(var s=[],a=2;a0&&(o.arguments=s),o}e.create=t;function n(r){var i=r;return k.defined(i)&&k.string(i.title)&&k.string(i.command)}e.is=n})(Lt||(Lt={}));var q;(function(e){function t(s,a){return{range:s,newText:a}}e.replace=t;function n(s,a){return{range:{start:s,end:s},newText:a}}e.insert=n;function r(s){return{range:s,newText:""}}e.del=r;function i(s){var a=s;return k.objectLiteral(a)&&k.string(a.newText)&&te.is(a.range)}e.is=i})(q||(q={}));var Tt;(function(e){function t(r,i,s){var a={label:r};return i!==void 0&&(a.needsConfirmation=i),s!==void 0&&(a.description=s),a}e.create=t;function n(r){var i=r;return i!==void 0&&k.objectLiteral(i)&&k.string(i.label)&&(k.boolean(i.needsConfirmation)||i.needsConfirmation===void 0)&&(k.string(i.description)||i.description===void 0)}e.is=n})(Tt||(Tt={}));var ye;(function(e){function t(n){var r=n;return typeof r=="string"}e.is=t})(ye||(ye={}));var ct;(function(e){function t(s,a,o){return{range:s,newText:a,annotationId:o}}e.replace=t;function n(s,a,o){return{range:{start:s,end:s},newText:a,annotationId:o}}e.insert=n;function r(s,a){return{range:s,newText:"",annotationId:a}}e.del=r;function i(s){var a=s;return q.is(a)&&(Tt.is(a.annotationId)||ye.is(a.annotationId))}e.is=i})(ct||(ct={}));var sn;(function(e){function t(r,i){return{textDocument:r,edits:i}}e.create=t;function n(r){var i=r;return k.defined(i)&&Vn.is(i.textDocument)&&Array.isArray(i.edits)}e.is=n})(sn||(sn={}));var an;(function(e){function t(r,i,s){var a={kind:"create",uri:r};return i!==void 0&&(i.overwrite!==void 0||i.ignoreIfExists!==void 0)&&(a.options=i),s!==void 0&&(a.annotationId=s),a}e.create=t;function n(r){var i=r;return i&&i.kind==="create"&&k.string(i.uri)&&(i.options===void 0||(i.options.overwrite===void 0||k.boolean(i.options.overwrite))&&(i.options.ignoreIfExists===void 0||k.boolean(i.options.ignoreIfExists)))&&(i.annotationId===void 0||ye.is(i.annotationId))}e.is=n})(an||(an={}));var on;(function(e){function t(r,i,s,a){var o={kind:"rename",oldUri:r,newUri:i};return s!==void 0&&(s.overwrite!==void 0||s.ignoreIfExists!==void 0)&&(o.options=s),a!==void 0&&(o.annotationId=a),o}e.create=t;function n(r){var i=r;return i&&i.kind==="rename"&&k.string(i.oldUri)&&k.string(i.newUri)&&(i.options===void 0||(i.options.overwrite===void 0||k.boolean(i.options.overwrite))&&(i.options.ignoreIfExists===void 0||k.boolean(i.options.ignoreIfExists)))&&(i.annotationId===void 0||ye.is(i.annotationId))}e.is=n})(on||(on={}));var ln;(function(e){function t(r,i,s){var a={kind:"delete",uri:r};return i!==void 0&&(i.recursive!==void 0||i.ignoreIfNotExists!==void 0)&&(a.options=i),s!==void 0&&(a.annotationId=s),a}e.create=t;function n(r){var i=r;return i&&i.kind==="delete"&&k.string(i.uri)&&(i.options===void 0||(i.options.recursive===void 0||k.boolean(i.options.recursive))&&(i.options.ignoreIfNotExists===void 0||k.boolean(i.options.ignoreIfNotExists)))&&(i.annotationId===void 0||ye.is(i.annotationId))}e.is=n})(ln||(ln={}));var Qr;(function(e){function t(n){var r=n;return r&&(r.changes!==void 0||r.documentChanges!==void 0)&&(r.documentChanges===void 0||r.documentChanges.every(function(i){return k.string(i.kind)?an.is(i)||on.is(i)||ln.is(i):sn.is(i)}))}e.is=t})(Qr||(Qr={}));var Un=function(){function e(t,n){this.edits=t,this.changeAnnotations=n}return e.prototype.insert=function(t,n,r){var i,s;if(r===void 0?i=q.insert(t,n):ye.is(r)?(s=r,i=ct.insert(t,n,r)):(this.assertChangeAnnotations(this.changeAnnotations),s=this.changeAnnotations.manage(r),i=ct.insert(t,n,s)),this.edits.push(i),s!==void 0)return s},e.prototype.replace=function(t,n,r){var i,s;if(r===void 0?i=q.replace(t,n):ye.is(r)?(s=r,i=ct.replace(t,n,r)):(this.assertChangeAnnotations(this.changeAnnotations),s=this.changeAnnotations.manage(r),i=ct.replace(t,n,s)),this.edits.push(i),s!==void 0)return s},e.prototype.delete=function(t,n){var r,i;if(n===void 0?r=q.del(t):ye.is(n)?(i=n,r=ct.del(t,n)):(this.assertChangeAnnotations(this.changeAnnotations),i=this.changeAnnotations.manage(n),r=ct.del(t,i)),this.edits.push(r),i!==void 0)return i},e.prototype.add=function(t){this.edits.push(t)},e.prototype.all=function(){return this.edits},e.prototype.clear=function(){this.edits.splice(0,this.edits.length)},e.prototype.assertChangeAnnotations=function(t){if(t===void 0)throw new Error("Text edit change is not configured to manage change annotations.")},e}(),Xa=function(){function e(t){this._annotations=t===void 0?Object.create(null):t,this._counter=0,this._size=0}return e.prototype.all=function(){return this._annotations},Object.defineProperty(e.prototype,"size",{get:function(){return this._size},enumerable:!1,configurable:!0}),e.prototype.manage=function(t,n){var r;if(ye.is(t)?r=t:(r=this.nextId(),n=t),this._annotations[r]!==void 0)throw new Error("Id "+r+" is already in use.");if(n===void 0)throw new Error("No annotation provided for id "+r);return this._annotations[r]=n,this._size++,r},e.prototype.nextId=function(){return this._counter++,this._counter.toString()},e}();(function(){function e(t){var n=this;this._textEditChanges=Object.create(null),t!==void 0?(this._workspaceEdit=t,t.documentChanges?(this._changeAnnotations=new Xa(t.changeAnnotations),t.changeAnnotations=this._changeAnnotations.all(),t.documentChanges.forEach(function(r){if(sn.is(r)){var i=new Un(r.edits,n._changeAnnotations);n._textEditChanges[r.textDocument.uri]=i}})):t.changes&&Object.keys(t.changes).forEach(function(r){var i=new Un(t.changes[r]);n._textEditChanges[r]=i})):this._workspaceEdit={}}return Object.defineProperty(e.prototype,"edit",{get:function(){return this.initDocumentChanges(),this._changeAnnotations!==void 0&&(this._changeAnnotations.size===0?this._workspaceEdit.changeAnnotations=void 0:this._workspaceEdit.changeAnnotations=this._changeAnnotations.all()),this._workspaceEdit},enumerable:!1,configurable:!0}),e.prototype.getTextEditChange=function(t){if(Vn.is(t)){if(this.initDocumentChanges(),this._workspaceEdit.documentChanges===void 0)throw new Error("Workspace edit is not configured for document changes.");var n={uri:t.uri,version:t.version},r=this._textEditChanges[n.uri];if(!r){var i=[],s={textDocument:n,edits:i};this._workspaceEdit.documentChanges.push(s),r=new Un(i,this._changeAnnotations),this._textEditChanges[n.uri]=r}return r}else{if(this.initChanges(),this._workspaceEdit.changes===void 0)throw new Error("Workspace edit is not configured for normal text edit changes.");var r=this._textEditChanges[t];if(!r){var i=[];this._workspaceEdit.changes[t]=i,r=new Un(i),this._textEditChanges[t]=r}return r}},e.prototype.initDocumentChanges=function(){this._workspaceEdit.documentChanges===void 0&&this._workspaceEdit.changes===void 0&&(this._changeAnnotations=new Xa,this._workspaceEdit.documentChanges=[],this._workspaceEdit.changeAnnotations=this._changeAnnotations.all())},e.prototype.initChanges=function(){this._workspaceEdit.documentChanges===void 0&&this._workspaceEdit.changes===void 0&&(this._workspaceEdit.changes=Object.create(null))},e.prototype.createFile=function(t,n,r){if(this.initDocumentChanges(),this._workspaceEdit.documentChanges===void 0)throw new Error("Workspace edit is not configured for document changes.");var i;Tt.is(n)||ye.is(n)?i=n:r=n;var s,a;if(i===void 0?s=an.create(t,r):(a=ye.is(i)?i:this._changeAnnotations.manage(i),s=an.create(t,r,a)),this._workspaceEdit.documentChanges.push(s),a!==void 0)return a},e.prototype.renameFile=function(t,n,r,i){if(this.initDocumentChanges(),this._workspaceEdit.documentChanges===void 0)throw new Error("Workspace edit is not configured for document changes.");var s;Tt.is(r)||ye.is(r)?s=r:i=r;var a,o;if(s===void 0?a=on.create(t,n,i):(o=ye.is(s)?s:this._changeAnnotations.manage(s),a=on.create(t,n,i,o)),this._workspaceEdit.documentChanges.push(a),o!==void 0)return o},e.prototype.deleteFile=function(t,n,r){if(this.initDocumentChanges(),this._workspaceEdit.documentChanges===void 0)throw new Error("Workspace edit is not configured for document changes.");var i;Tt.is(n)||ye.is(n)?i=n:r=n;var s,a;if(i===void 0?s=ln.create(t,r):(a=ye.is(i)?i:this._changeAnnotations.manage(i),s=ln.create(t,r,a)),this._workspaceEdit.documentChanges.push(s),a!==void 0)return a},e})();var Ya;(function(e){function t(r){return{uri:r}}e.create=t;function n(r){var i=r;return k.defined(i)&&k.string(i.uri)}e.is=n})(Ya||(Ya={}));var Zr;(function(e){function t(r,i){return{uri:r,version:i}}e.create=t;function n(r){var i=r;return k.defined(i)&&k.string(i.uri)&&k.integer(i.version)}e.is=n})(Zr||(Zr={}));var Vn;(function(e){function t(r,i){return{uri:r,version:i}}e.create=t;function n(r){var i=r;return k.defined(i)&&k.string(i.uri)&&(i.version===null||k.integer(i.version))}e.is=n})(Vn||(Vn={}));var Ka;(function(e){function t(r,i,s,a){return{uri:r,languageId:i,version:s,text:a}}e.create=t;function n(r){var i=r;return k.defined(i)&&k.string(i.uri)&&k.string(i.languageId)&&k.integer(i.version)&&k.string(i.text)}e.is=n})(Ka||(Ka={}));var Ne;(function(e){e.PlainText="plaintext",e.Markdown="markdown"})(Ne||(Ne={})),function(e){function t(n){var r=n;return r===e.PlainText||r===e.Markdown}e.is=t}(Ne||(Ne={}));var ei;(function(e){function t(n){var r=n;return k.objectLiteral(n)&&Ne.is(r.kind)&&k.string(r.value)}e.is=t})(ei||(ei={}));var B;(function(e){e.Text=1,e.Method=2,e.Function=3,e.Constructor=4,e.Field=5,e.Variable=6,e.Class=7,e.Interface=8,e.Module=9,e.Property=10,e.Unit=11,e.Value=12,e.Enum=13,e.Keyword=14,e.Snippet=15,e.Color=16,e.File=17,e.Reference=18,e.Folder=19,e.EnumMember=20,e.Constant=21,e.Struct=22,e.Event=23,e.Operator=24,e.TypeParameter=25})(B||(B={}));var De;(function(e){e.PlainText=1,e.Snippet=2})(De||(De={}));var bt;(function(e){e.Deprecated=1})(bt||(bt={}));var Qa;(function(e){function t(r,i,s){return{newText:r,insert:i,replace:s}}e.create=t;function n(r){var i=r;return i&&k.string(i.newText)&&te.is(i.insert)&&te.is(i.replace)}e.is=n})(Qa||(Qa={}));var Za;(function(e){e.asIs=1,e.adjustIndentation=2})(Za||(Za={}));var eo;(function(e){function t(n){return{label:n}}e.create=t})(eo||(eo={}));var to;(function(e){function t(n,r){return{items:n||[],isIncomplete:!!r}}e.create=t})(to||(to={}));var Bn;(function(e){function t(r){return r.replace(/[\\`*_{}[\]()#+\-.!]/g,"\\$&")}e.fromPlainText=t;function n(r){var i=r;return k.string(i)||k.objectLiteral(i)&&k.string(i.language)&&k.string(i.value)}e.is=n})(Bn||(Bn={}));var no;(function(e){function t(n){var r=n;return!!r&&k.objectLiteral(r)&&(ei.is(r.contents)||Bn.is(r.contents)||k.typedArray(r.contents,Bn.is))&&(n.range===void 0||te.is(n.range))}e.is=t})(no||(no={}));var ro;(function(e){function t(n,r){return r?{label:n,documentation:r}:{label:n}}e.create=t})(ro||(ro={}));var io;(function(e){function t(n,r){for(var i=[],s=2;s=0;h--){var u=l[h],f=s.offsetAt(u.range.start),m=s.offsetAt(u.range.end);if(m<=c)o=o.substring(0,f)+u.newText+o.substring(m,o.length);else throw new Error("Overlapping edit");c=f}return o}e.applyEdits=r;function i(s,a){if(s.length<=1)return s;var o=s.length/2|0,l=s.slice(0,o),c=s.slice(o);i(l,a),i(c,a);for(var h=0,u=0,f=0;h0&&t.push(n.length),this._lineOffsets=t}return this._lineOffsets},e.prototype.positionAt=function(t){t=Math.max(Math.min(t,this._content.length),0);var n=this.getLineOffsets(),r=0,i=n.length;if(i===0)return Se.create(0,t);for(;rt?i=s:r=s+1}var a=r-1;return Se.create(a,t-n[a])},e.prototype.offsetAt=function(t){var n=this.getLineOffsets();if(t.line>=n.length)return this._content.length;if(t.line<0)return 0;var r=n[t.line],i=t.line+1"u"}e.undefined=r;function i(m){return m===!0||m===!1}e.boolean=i;function s(m){return t.call(m)==="[object String]"}e.string=s;function a(m){return t.call(m)==="[object Number]"}e.number=a;function o(m,b,y){return t.call(m)==="[object Number]"&&b<=m&&m<=y}e.numberRange=o;function l(m){return t.call(m)==="[object Number]"&&-2147483648<=m&&m<=2147483647}e.integer=l;function c(m){return t.call(m)==="[object Number]"&&0<=m&&m<=2147483647}e.uinteger=c;function h(m){return t.call(m)==="[object Function]"}e.func=h;function u(m){return m!==null&&typeof m=="object"}e.objectLiteral=u;function f(m,b){return Array.isArray(m)&&m.every(b)}e.typedArray=f})(k||(k={}));var qn=class{constructor(e,t,n,r){this._uri=e,this._languageId=t,this._version=n,this._content=r,this._lineOffsets=void 0}get uri(){return this._uri}get languageId(){return this._languageId}get version(){return this._version}getText(e){if(e){const t=this.offsetAt(e.start),n=this.offsetAt(e.end);return this._content.substring(t,n)}return this._content}update(e,t){for(let n of e)if(qn.isIncremental(n)){const r=go(n.range),i=this.offsetAt(r.start),s=this.offsetAt(r.end);this._content=this._content.substring(0,i)+n.text+this._content.substring(s,this._content.length);const a=Math.max(r.start.line,0),o=Math.max(r.end.line,0);let l=this._lineOffsets;const c=mo(n.text,!1,i);if(o-a===c.length)for(let u=0,f=c.length;ue?r=s:n=s+1}let i=n-1;return{line:i,character:e-t[i]}}offsetAt(e){let t=this.getLineOffsets();if(e.line>=t.length)return this._content.length;if(e.line<0)return 0;let n=t[e.line],r=e.line+1{let f=h.range.start.line-u.range.start.line;return f===0?h.range.start.character-u.range.start.character:f}),l=0;const c=[];for(const h of o){let u=i.offsetAt(h.range.start);if(ul&&c.push(a.substring(l,u)),h.newText.length&&c.push(h.newText),l=i.offsetAt(h.range.end)}return c.push(a.substr(l)),c.join("")}e.applyEdits=r})(ri||(ri={}));function ii(e,t){if(e.length<=1)return e;const n=e.length/2|0,r=e.slice(0,n),i=e.slice(n);ii(r,t),ii(i,t);let s=0,a=0,o=0;for(;sn.line||t.line===n.line&&t.character>n.character?{start:n,end:t}:e}function vd(e){const t=go(e.range);return t!==e.range?{newText:e.newText,range:t}:e}var bo;(function(e){e.LATEST={textDocument:{completion:{completionItem:{documentationFormat:[Ne.Markdown,Ne.PlainText]}},hover:{contentFormat:[Ne.Markdown,Ne.PlainText]}}}})(bo||(bo={}));var cn;(function(e){e[e.Unknown=0]="Unknown",e[e.File=1]="File",e[e.Directory=2]="Directory",e[e.SymbolicLink=64]="SymbolicLink"})(cn||(cn={}));var vo={E:"Edge",FF:"Firefox",S:"Safari",C:"Chrome",IE:"IE",O:"Opera"};function yo(e){switch(e){case"experimental":return`⚠️ Property is experimental. Be cautious when using it.️ + +`;case"nonstandard":return`🚨️ Property is nonstandard. Avoid using it. + +`;case"obsolete":return`🚨️️️ Property is obsolete. Avoid using it. + +`;default:return""}}function ht(e,t,n){var r;if(t?r={kind:"markdown",value:wd(e,n)}:r={kind:"plaintext",value:yd(e,n)},r.value!=="")return r}function $n(e){return e=e.replace(/[\\`*_{}[\]()#+\-.!]/g,"\\$&"),e.replace(//g,">")}function yd(e,t){if(!e.description||e.description==="")return"";if(typeof e.description!="string")return e.description.value;var n="";if((t==null?void 0:t.documentation)!==!1){e.status&&(n+=yo(e.status)),n+=e.description;var r=wo(e.browsers);r&&(n+=` +(`+r+")"),"syntax"in e&&(n+=` + +Syntax: `.concat(e.syntax))}return e.references&&e.references.length>0&&(t==null?void 0:t.references)!==!1&&(n.length>0&&(n+=` + +`),n+=e.references.map(function(i){return"".concat(i.name,": ").concat(i.url)}).join(" | ")),n}function wd(e,t){if(!e.description||e.description==="")return"";var n="";if((t==null?void 0:t.documentation)!==!1){e.status&&(n+=yo(e.status)),typeof e.description=="string"?n+=$n(e.description):n+=e.description.kind===Ne.Markdown?e.description.value:$n(e.description.value);var r=wo(e.browsers);r&&(n+=` + +(`+$n(r)+")"),"syntax"in e&&e.syntax&&(n+=` + +Syntax: `.concat($n(e.syntax)))}return e.references&&e.references.length>0&&(t==null?void 0:t.references)!==!1&&(n.length>0&&(n+=` + +`),n+=e.references.map(function(i){return"[".concat(i.name,"](").concat(i.url,")")}).join(" | ")),n}function wo(e){return e===void 0&&(e=[]),e.length===0?null:e.map(function(t){var n="",r=t.match(/([A-Z]+)(\d+)?/),i=r[1],s=r[2];return i in vo&&(n+=vo[i]),s&&(n+=" "+s),n}).join(", ")}var hn=We(),xd=[{func:"rgb($red, $green, $blue)",desc:hn("css.builtin.rgb","Creates a Color from red, green, and blue values.")},{func:"rgba($red, $green, $blue, $alpha)",desc:hn("css.builtin.rgba","Creates a Color from red, green, blue, and alpha values.")},{func:"hsl($hue, $saturation, $lightness)",desc:hn("css.builtin.hsl","Creates a Color from hue, saturation, and lightness values.")},{func:"hsla($hue, $saturation, $lightness, $alpha)",desc:hn("css.builtin.hsla","Creates a Color from hue, saturation, lightness, and alpha values.")},{func:"hwb($hue $white $black)",desc:hn("css.builtin.hwb","Creates a Color from hue, white and black.")}],Hn={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rebeccapurple:"#663399",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},xo={currentColor:"The value of the 'color' property. The computed value of the 'currentColor' keyword is the computed value of the 'color' property. If the 'currentColor' keyword is set on the 'color' property itself, it is treated as 'color:inherit' at parse time.",transparent:"Fully transparent. This keyword can be considered a shorthand for rgba(0,0,0,0) which is its computed value."};function dt(e,t){var n=e.getText(),r=n.match(/^([-+]?[0-9]*\.?[0-9]+)(%?)$/);if(r){r[2]&&(t=100);var i=parseFloat(r[1])/t;if(i>=0&&i<=1)return i}throw new Error}function So(e){var t=e.getText(),n=t.match(/^([-+]?[0-9]*\.?[0-9]+)(deg|rad|grad|turn)?$/);if(n)switch(n[2]){case"deg":return parseFloat(t)%360;case"rad":return parseFloat(t)*180/Math.PI%360;case"grad":return parseFloat(t)*.9%360;case"turn":return parseFloat(t)*360%360;default:if(typeof n[2]>"u")return parseFloat(t)%360}throw new Error}function Sd(e){var t=e.getName();return t?/^(rgb|rgba|hsl|hsla|hwb)$/gi.test(t):!1}var Co=48,Cd=57,kd=65,Gn=97,_d=102;function le(e){return e=Gn&&e<=_d?e-Gn+10:0)}function ko(e){if(e[0]!=="#")return null;switch(e.length){case 4:return{red:le(e.charCodeAt(1))*17/255,green:le(e.charCodeAt(2))*17/255,blue:le(e.charCodeAt(3))*17/255,alpha:1};case 5:return{red:le(e.charCodeAt(1))*17/255,green:le(e.charCodeAt(2))*17/255,blue:le(e.charCodeAt(3))*17/255,alpha:le(e.charCodeAt(4))*17/255};case 7:return{red:(le(e.charCodeAt(1))*16+le(e.charCodeAt(2)))/255,green:(le(e.charCodeAt(3))*16+le(e.charCodeAt(4)))/255,blue:(le(e.charCodeAt(5))*16+le(e.charCodeAt(6)))/255,alpha:1};case 9:return{red:(le(e.charCodeAt(1))*16+le(e.charCodeAt(2)))/255,green:(le(e.charCodeAt(3))*16+le(e.charCodeAt(4)))/255,blue:(le(e.charCodeAt(5))*16+le(e.charCodeAt(6)))/255,alpha:(le(e.charCodeAt(7))*16+le(e.charCodeAt(8)))/255}}return null}function _o(e,t,n,r){if(r===void 0&&(r=1),e=e/60,t===0)return{red:n,green:n,blue:n,alpha:r};var i=function(o,l,c){for(;c<0;)c+=6;for(;c>=6;)c-=6;return c<1?(l-o)*c+o:c<3?l:c<4?(l-o)*(4-c)+o:o},s=n<=.5?n*(t+1):n+t-n*t,a=n*2-s;return{red:i(a,s,e+2),green:i(a,s,e),blue:i(a,s,e-2),alpha:r}}function Fo(e){var t=e.red,n=e.green,r=e.blue,i=e.alpha,s=Math.max(t,n,r),a=Math.min(t,n,r),o=0,l=0,c=(a+s)/2,h=s-a;if(h>0){switch(l=Math.min(c<=.5?h/(2*c):h/(2-2*c),1),s){case t:o=(n-r)/h+(n=1){var i=t/(t+n);return{red:i,green:i,blue:i,alpha:r}}var s=_o(e,1,.5,r),a=s.red;a*=1-t-n,a+=t;var o=s.green;o*=1-t-n,o+=t;var l=s.blue;return l*=1-t-n,l+=t,{red:a,green:o,blue:l,alpha:r}}function Rd(e){var t=Fo(e),n=Math.min(e.red,e.green,e.blue),r=1-Math.max(e.red,e.green,e.blue);return{h:t.h,w:n,b:r,a:t.a}}function Ed(e){if(e.type===g.HexColorValue){var t=e.getText();return ko(t)}else if(e.type===g.Function){var n=e,r=n.getName(),i=n.getArguments().getChildren();if(i.length===1){var s=i[0].getChildren();if(s.length===1&&s[0].type===g.Expression&&(i=s[0].getChildren(),i.length===3)){var a=i[2];if(a instanceof $r){var o=a.getLeft(),l=a.getRight(),c=a.getOperator();o&&l&&c&&c.matches("/")&&(i=[i[0],i[1],o,l])}}}if(!r||i.length<3||i.length>4)return null;try{var h=i.length===4?dt(i[3],1):1;if(r==="rgb"||r==="rgba")return{red:dt(i[0],255),green:dt(i[1],255),blue:dt(i[2],255),alpha:h};if(r==="hsl"||r==="hsla"){var u=So(i[0]),f=dt(i[1],100),m=dt(i[2],100);return _o(u,f,m,h)}else if(r==="hwb"){var u=So(i[0]),b=dt(i[1],100),y=dt(i[2],100);return Fd(u,b,y,h)}}catch{return null}}else if(e.type===g.Identifier){if(e.parent&&e.parent.type!==g.Term)return null;var v=e.parent;if(v&&v.parent&&v.parent.type===g.BinaryExpression){var w=v.parent;if(w.parent&&w.parent.type===g.ListEntry&&w.parent.key===w)return null}var C=e.getText().toLowerCase();if(C==="none")return null;var _=Hn[C];if(_)return ko(_)}return null}var Ro={bottom:"Computes to ‘100%’ for the vertical position if one or two values are given, otherwise specifies the bottom edge as the origin for the next offset.",center:"Computes to ‘50%’ (‘left 50%’) for the horizontal position if the horizontal position is not otherwise specified, or ‘50%’ (‘top 50%’) for the vertical position if it is.",left:"Computes to ‘0%’ for the horizontal position if one or two values are given, otherwise specifies the left edge as the origin for the next offset.",right:"Computes to ‘100%’ for the horizontal position if one or two values are given, otherwise specifies the right edge as the origin for the next offset.",top:"Computes to ‘0%’ for the vertical position if one or two values are given, otherwise specifies the top edge as the origin for the next offset."},Eo={"no-repeat":"Placed once and not repeated in this direction.",repeat:"Repeated in this direction as often as needed to cover the background painting area.","repeat-x":"Computes to ‘repeat no-repeat’.","repeat-y":"Computes to ‘no-repeat repeat’.",round:"Repeated as often as will fit within the background positioning area. If it doesn’t fit a whole number of times, it is rescaled so that it does.",space:"Repeated as often as will fit within the background positioning area without being clipped and then the images are spaced out to fill the area."},Do={dashed:"A series of square-ended dashes.",dotted:"A series of round dots.",double:"Two parallel solid lines with some space between them.",groove:"Looks as if it were carved in the canvas.",hidden:"Same as ‘none’, but has different behavior in the border conflict resolution rules for border-collapsed tables.",inset:"Looks as if the content on the inside of the border is sunken into the canvas.",none:"No border. Color and width are ignored.",outset:"Looks as if the content on the inside of the border is coming out of the canvas.",ridge:"Looks as if it were coming out of the canvas.",solid:"A single line segment."},Dd=["medium","thick","thin"],Ao={"border-box":"The background is painted within (clipped to) the border box.","content-box":"The background is painted within (clipped to) the content box.","padding-box":"The background is painted within (clipped to) the padding box."},zo={"margin-box":"Uses the margin box as reference box.","fill-box":"Uses the object bounding box as reference box.","stroke-box":"Uses the stroke bounding box as reference box.","view-box":"Uses the nearest SVG viewport as reference box."},Mo={initial:"Represents the value specified as the property’s initial value.",inherit:"Represents the computed value of the property on the element’s parent.",unset:"Acts as either `inherit` or `initial`, depending on whether the property is inherited or not."},No={"var()":"Evaluates the value of a custom variable.","calc()":"Evaluates an mathematical expression. The following operators can be used: + - * /."},Po={"url()":"Reference an image file by URL","image()":"Provide image fallbacks and annotations.","-webkit-image-set()":"Provide multiple resolutions. Remember to use unprefixed image-set() in addition.","image-set()":"Provide multiple resolutions of an image and const the UA decide which is most appropriate in a given situation.","-moz-element()":"Use an element in the document as an image. Remember to use unprefixed element() in addition.","element()":"Use an element in the document as an image.","cross-fade()":"Indicates the two images to be combined and how far along in the transition the combination is.","-webkit-gradient()":"Deprecated. Use modern linear-gradient() or radial-gradient() instead.","-webkit-linear-gradient()":"Linear gradient. Remember to use unprefixed version in addition.","-moz-linear-gradient()":"Linear gradient. Remember to use unprefixed version in addition.","-o-linear-gradient()":"Linear gradient. Remember to use unprefixed version in addition.","linear-gradient()":"A linear gradient is created by specifying a straight gradient line, and then several colors placed along that line.","-webkit-repeating-linear-gradient()":"Repeating Linear gradient. Remember to use unprefixed version in addition.","-moz-repeating-linear-gradient()":"Repeating Linear gradient. Remember to use unprefixed version in addition.","-o-repeating-linear-gradient()":"Repeating Linear gradient. Remember to use unprefixed version in addition.","repeating-linear-gradient()":"Same as linear-gradient, except the color-stops are repeated infinitely in both directions, with their positions shifted by multiples of the difference between the last specified color-stop’s position and the first specified color-stop’s position.","-webkit-radial-gradient()":"Radial gradient. Remember to use unprefixed version in addition.","-moz-radial-gradient()":"Radial gradient. Remember to use unprefixed version in addition.","radial-gradient()":"Colors emerge from a single point and smoothly spread outward in a circular or elliptical shape.","-webkit-repeating-radial-gradient()":"Repeating radial gradient. Remember to use unprefixed version in addition.","-moz-repeating-radial-gradient()":"Repeating radial gradient. Remember to use unprefixed version in addition.","repeating-radial-gradient()":"Same as radial-gradient, except the color-stops are repeated infinitely in both directions, with their positions shifted by multiples of the difference between the last specified color-stop’s position and the first specified color-stop’s position."},Io={ease:"Equivalent to cubic-bezier(0.25, 0.1, 0.25, 1.0).","ease-in":"Equivalent to cubic-bezier(0.42, 0, 1.0, 1.0).","ease-in-out":"Equivalent to cubic-bezier(0.42, 0, 0.58, 1.0).","ease-out":"Equivalent to cubic-bezier(0, 0, 0.58, 1.0).",linear:"Equivalent to cubic-bezier(0.0, 0.0, 1.0, 1.0).","step-end":"Equivalent to steps(1, end).","step-start":"Equivalent to steps(1, start).","steps()":"The first parameter specifies the number of intervals in the function. The second parameter, which is optional, is either the value “start” or “end”.","cubic-bezier()":"Specifies a cubic-bezier curve. The four values specify points P1 and P2 of the curve as (x1, y1, x2, y2).","cubic-bezier(0.6, -0.28, 0.735, 0.045)":"Ease-in Back. Overshoots.","cubic-bezier(0.68, -0.55, 0.265, 1.55)":"Ease-in-out Back. Overshoots.","cubic-bezier(0.175, 0.885, 0.32, 1.275)":"Ease-out Back. Overshoots.","cubic-bezier(0.6, 0.04, 0.98, 0.335)":"Ease-in Circular. Based on half circle.","cubic-bezier(0.785, 0.135, 0.15, 0.86)":"Ease-in-out Circular. Based on half circle.","cubic-bezier(0.075, 0.82, 0.165, 1)":"Ease-out Circular. Based on half circle.","cubic-bezier(0.55, 0.055, 0.675, 0.19)":"Ease-in Cubic. Based on power of three.","cubic-bezier(0.645, 0.045, 0.355, 1)":"Ease-in-out Cubic. Based on power of three.","cubic-bezier(0.215, 0.610, 0.355, 1)":"Ease-out Cubic. Based on power of three.","cubic-bezier(0.95, 0.05, 0.795, 0.035)":"Ease-in Exponential. Based on two to the power ten.","cubic-bezier(1, 0, 0, 1)":"Ease-in-out Exponential. Based on two to the power ten.","cubic-bezier(0.19, 1, 0.22, 1)":"Ease-out Exponential. Based on two to the power ten.","cubic-bezier(0.47, 0, 0.745, 0.715)":"Ease-in Sine.","cubic-bezier(0.445, 0.05, 0.55, 0.95)":"Ease-in-out Sine.","cubic-bezier(0.39, 0.575, 0.565, 1)":"Ease-out Sine.","cubic-bezier(0.55, 0.085, 0.68, 0.53)":"Ease-in Quadratic. Based on power of two.","cubic-bezier(0.455, 0.03, 0.515, 0.955)":"Ease-in-out Quadratic. Based on power of two.","cubic-bezier(0.25, 0.46, 0.45, 0.94)":"Ease-out Quadratic. Based on power of two.","cubic-bezier(0.895, 0.03, 0.685, 0.22)":"Ease-in Quartic. Based on power of four.","cubic-bezier(0.77, 0, 0.175, 1)":"Ease-in-out Quartic. Based on power of four.","cubic-bezier(0.165, 0.84, 0.44, 1)":"Ease-out Quartic. Based on power of four.","cubic-bezier(0.755, 0.05, 0.855, 0.06)":"Ease-in Quintic. Based on power of five.","cubic-bezier(0.86, 0, 0.07, 1)":"Ease-in-out Quintic. Based on power of five.","cubic-bezier(0.23, 1, 0.320, 1)":"Ease-out Quintic. Based on power of five."},Lo={"circle()":"Defines a circle.","ellipse()":"Defines an ellipse.","inset()":"Defines an inset rectangle.","polygon()":"Defines a polygon."},To={length:["em","rem","ex","px","cm","mm","in","pt","pc","ch","vw","vh","vmin","vmax"],angle:["deg","rad","grad","turn"],time:["ms","s"],frequency:["Hz","kHz"],resolution:["dpi","dpcm","dppx"],percentage:["%","fr"]},Ad=["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","p","param","picture","pre","progress","q","rb","rp","rt","rtc","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","title","tr","track","u","ul","const","video","wbr"],zd=["circle","clipPath","cursor","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence","filter","foreignObject","g","hatch","hatchpath","image","line","linearGradient","marker","mask","mesh","meshpatch","meshrow","metadata","mpath","path","pattern","polygon","polyline","radialGradient","rect","set","solidcolor","stop","svg","switch","symbol","text","textPath","tspan","use","view"],Md=["@bottom-center","@bottom-left","@bottom-left-corner","@bottom-right","@bottom-right-corner","@left-bottom","@left-middle","@left-top","@right-bottom","@right-middle","@right-top","@top-center","@top-left","@top-left-corner","@top-right","@top-right-corner"];function Jn(e){return Object.keys(e).map(function(t){return e[t]})}function Pe(e){return typeof e<"u"}var Wo=function(e,t,n){if(n||arguments.length===2)for(var r=0,i=t.length,s;rt.offset?s-t.offset:0}return t},e.prototype.markError=function(t,n,r,i){this.token!==this.lastErrorToken&&(t.addIssue(new Ua(t,n,Ee.Error,void 0,this.token.offset,this.token.len)),this.lastErrorToken=this.token),(r||i)&&this.resync(r,i)},e.prototype.parseStylesheet=function(t){var n=t.version,r=t.getText(),i=function(s,a){if(t.version!==n)throw new Error("Underlying model has changed, AST is no longer valid");return r.substr(s,a)};return this.internalParse(r,this._parseStylesheet,i)},e.prototype.internalParse=function(t,n,r){this.scanner.setSource(t),this.token=this.scanner.scan();var i=n.bind(this)();return i&&(r?i.textProvider=r:i.textProvider=function(s,a){return t.substr(s,a)}),i},e.prototype._parseStylesheet=function(){for(var t=this.create(Th);t.addChild(this._parseStylesheetStart()););var n=!1;do{var r=!1;do{r=!1;var i=this._parseStylesheetStatement();for(i&&(t.addChild(i),r=!0,n=!1,!this.peek(p.EOF)&&this._needsSemicolonAfter(i)&&!this.accept(p.SemiColon)&&this.markError(t,x.SemiColonExpected));this.accept(p.SemiColon)||this.accept(p.CDO)||this.accept(p.CDC);)r=!0,n=!1}while(r);if(this.peek(p.EOF))break;n||(this.peek(p.AtKeyword)?this.markError(t,x.UnknownAtRule):this.markError(t,x.RuleOrSelectorExpected),n=!0),this.consumeToken()}while(!this.peek(p.EOF));return this.finish(t)},e.prototype._parseStylesheetStart=function(){return this._parseCharset()},e.prototype._parseStylesheetStatement=function(t){return t===void 0&&(t=!1),this.peek(p.AtKeyword)?this._parseStylesheetAtStatement(t):this._parseRuleset(t)},e.prototype._parseStylesheetAtStatement=function(t){return t===void 0&&(t=!1),this._parseImport()||this._parseMedia(t)||this._parsePage()||this._parseFontFace()||this._parseKeyframe()||this._parseSupports(t)||this._parseViewPort()||this._parseNamespace()||this._parseDocument()||this._parseUnknownAtRule()},e.prototype._tryParseRuleset=function(t){var n=this.mark();if(this._parseSelector(t)){for(;this.accept(p.Comma)&&this._parseSelector(t););if(this.accept(p.CurlyL))return this.restoreAtMark(n),this._parseRuleset(t)}return this.restoreAtMark(n),null},e.prototype._parseRuleset=function(t){t===void 0&&(t=!1);var n=this.create(Nt),r=n.getSelectors();if(!r.addChild(this._parseSelector(t)))return null;for(;this.accept(p.Comma);)if(!r.addChild(this._parseSelector(t)))return this.finish(n,x.SelectorExpected);return this._parseBody(n,this._parseRuleSetDeclaration.bind(this))},e.prototype._parseRuleSetDeclarationAtStatement=function(){return this._parseUnknownAtRule()},e.prototype._parseRuleSetDeclaration=function(){return this.peek(p.AtKeyword)?this._parseRuleSetDeclarationAtStatement():this._parseDeclaration()},e.prototype._needsSemicolonAfter=function(t){switch(t.type){case g.Keyframe:case g.ViewPort:case g.Media:case g.Ruleset:case g.Namespace:case g.If:case g.For:case g.Each:case g.While:case g.MixinDeclaration:case g.FunctionDeclaration:case g.MixinContentDeclaration:return!1;case g.ExtendsReference:case g.MixinContentReference:case g.ReturnStatement:case g.MediaQuery:case g.Debug:case g.Import:case g.AtApplyRule:case g.CustomPropertyDeclaration:return!0;case g.VariableDeclaration:return t.needsSemicolon;case g.MixinReference:return!t.getContent();case g.Declaration:return!t.getNestedProperties()}return!1},e.prototype._parseDeclarations=function(t){var n=this.create(Ur);if(!this.accept(p.CurlyL))return null;for(var r=t();n.addChild(r)&&!this.peek(p.CurlyR);){if(this._needsSemicolonAfter(r)&&!this.accept(p.SemiColon))return this.finish(n,x.SemiColonExpected,[p.SemiColon,p.CurlyR]);for(r&&this.prevToken&&this.prevToken.type===p.SemiColon&&(r.semicolonPosition=this.prevToken.offset);this.accept(p.SemiColon););r=t()}return this.accept(p.CurlyR)?this.finish(n):this.finish(n,x.RightCurlyExpected,[p.CurlyR,p.SemiColon])},e.prototype._parseBody=function(t,n){return t.setDeclarations(this._parseDeclarations(n))?this.finish(t):this.finish(t,x.LeftCurlyExpected,[p.CurlyR,p.SemiColon])},e.prototype._parseSelector=function(t){var n=this.create(Qt),r=!1;for(t&&(r=n.addChild(this._parseCombinator()));n.addChild(this._parseSimpleSelector());)r=!0,n.addChild(this._parseCombinator());return r?this.finish(n):null},e.prototype._parseDeclaration=function(t){var n=this._tryParseCustomPropertyDeclaration(t);if(n)return n;var r=this.create(qe);return r.setProperty(this._parseProperty())?this.accept(p.Colon)?(this.prevToken&&(r.colonPosition=this.prevToken.offset),r.setValue(this._parseExpr())?(r.addChild(this._parsePrio()),this.peek(p.SemiColon)&&(r.semicolonPosition=this.token.offset),this.finish(r)):this.finish(r,x.PropertyValueExpected)):this.finish(r,x.ColonExpected,[p.Colon],t||[p.SemiColon]):null},e.prototype._tryParseCustomPropertyDeclaration=function(t){if(!this.peekRegExp(p.Ident,/^--/))return null;var n=this.create(Oh);if(!n.setProperty(this._parseProperty()))return null;if(!this.accept(p.Colon))return this.finish(n,x.ColonExpected,[p.Colon]);this.prevToken&&(n.colonPosition=this.prevToken.offset);var r=this.mark();if(this.peek(p.CurlyL)){var i=this.create(Wh),s=this._parseDeclarations(this._parseRuleSetDeclaration.bind(this));if(i.setDeclarations(s)&&!s.isErroneous(!0)&&(i.addChild(this._parsePrio()),this.peek(p.SemiColon)))return this.finish(i),n.setPropertySet(i),n.semicolonPosition=this.token.offset,this.finish(n);this.restoreAtMark(r)}var a=this._parseExpr();return a&&!a.isErroneous(!0)&&(this._parsePrio(),this.peekOne.apply(this,Wo(Wo([],t||[],!1),[p.SemiColon,p.EOF],!1)))?(n.setValue(a),this.peek(p.SemiColon)&&(n.semicolonPosition=this.token.offset),this.finish(n)):(this.restoreAtMark(r),n.addChild(this._parseCustomPropertyValue(t)),n.addChild(this._parsePrio()),Pe(n.colonPosition)&&this.token.offset===n.colonPosition+1?this.finish(n,x.PropertyValueExpected):this.finish(n))},e.prototype._parseCustomPropertyValue=function(t){var n=this;t===void 0&&(t=[p.CurlyR]);var r=this.create(W),i=function(){return a===0&&o===0&&l===0},s=function(){return t.indexOf(n.token.type)!==-1},a=0,o=0,l=0;e:for(;;){switch(this.token.type){case p.SemiColon:if(i())break e;break;case p.Exclamation:if(i())break e;break;case p.CurlyL:a++;break;case p.CurlyR:if(a--,a<0){if(s()&&o===0&&l===0)break e;return this.finish(r,x.LeftCurlyExpected)}break;case p.ParenthesisL:o++;break;case p.ParenthesisR:if(o--,o<0){if(s()&&l===0&&a===0)break e;return this.finish(r,x.LeftParenthesisExpected)}break;case p.BracketL:l++;break;case p.BracketR:if(l--,l<0)return this.finish(r,x.LeftSquareBracketExpected);break;case p.BadString:break e;case p.EOF:var c=x.RightCurlyExpected;return l>0?c=x.RightSquareBracketExpected:o>0&&(c=x.RightParenthesisExpected),this.finish(r,c)}this.consumeToken()}return this.finish(r)},e.prototype._tryToParseDeclaration=function(t){var n=this.mark();return this._parseProperty()&&this.accept(p.Colon)?(this.restoreAtMark(n),this._parseDeclaration(t)):(this.restoreAtMark(n),null)},e.prototype._parseProperty=function(){var t=this.create(Br),n=this.mark();return(this.acceptDelim("*")||this.acceptDelim("_"))&&this.hasWhitespace()?(this.restoreAtMark(n),null):t.setIdentifier(this._parsePropertyIdentifier())?this.finish(t):null},e.prototype._parsePropertyIdentifier=function(){return this._parseIdent()},e.prototype._parseCharset=function(){if(!this.peek(p.Charset))return null;var t=this.create(W);return this.consumeToken(),this.accept(p.String)?this.accept(p.SemiColon)?this.finish(t):this.finish(t,x.SemiColonExpected):this.finish(t,x.IdentifierExpected)},e.prototype._parseImport=function(){if(!this.peekKeyword("@import"))return null;var t=this.create(jr);return this.consumeToken(),!t.addChild(this._parseURILiteral())&&!t.addChild(this._parseStringLiteral())?this.finish(t,x.URIOrStringExpected):(!this.peek(p.SemiColon)&&!this.peek(p.EOF)&&t.setMedialist(this._parseMediaQueryList()),this.finish(t))},e.prototype._parseNamespace=function(){if(!this.peekKeyword("@namespace"))return null;var t=this.create(Kh);return this.consumeToken(),!t.addChild(this._parseURILiteral())&&(t.addChild(this._parseIdent()),!t.addChild(this._parseURILiteral())&&!t.addChild(this._parseStringLiteral()))?this.finish(t,x.URIExpected,[p.SemiColon]):this.accept(p.SemiColon)?this.finish(t):this.finish(t,x.SemiColonExpected)},e.prototype._parseFontFace=function(){if(!this.peekKeyword("@font-face"))return null;var t=this.create(Aa);return this.consumeToken(),this._parseBody(t,this._parseRuleSetDeclaration.bind(this))},e.prototype._parseViewPort=function(){if(!this.peekKeyword("@-ms-viewport")&&!this.peekKeyword("@-o-viewport")&&!this.peekKeyword("@viewport"))return null;var t=this.create(Hh);return this.consumeToken(),this._parseBody(t,this._parseRuleSetDeclaration.bind(this))},e.prototype._parseKeyframe=function(){if(!this.peekRegExp(p.AtKeyword,this.keyframeRegex))return null;var t=this.create(Ma),n=this.create(W);return this.consumeToken(),t.setKeyword(this.finish(n)),n.matches("@-ms-keyframes")&&this.markError(n,x.UnknownKeyword),t.setIdentifier(this._parseKeyframeIdent())?this._parseBody(t,this._parseKeyframeSelector.bind(this)):this.finish(t,x.IdentifierExpected,[p.CurlyR])},e.prototype._parseKeyframeIdent=function(){return this._parseIdent([J.Keyframe])},e.prototype._parseKeyframeSelector=function(){var t=this.create(Na);if(!t.addChild(this._parseIdent())&&!this.accept(p.Percentage))return null;for(;this.accept(p.Comma);)if(!t.addChild(this._parseIdent())&&!this.accept(p.Percentage))return this.finish(t,x.PercentageExpected);return this._parseBody(t,this._parseRuleSetDeclaration.bind(this))},e.prototype._tryParseKeyframeSelector=function(){var t=this.create(Na),n=this.mark();if(!t.addChild(this._parseIdent())&&!this.accept(p.Percentage))return null;for(;this.accept(p.Comma);)if(!t.addChild(this._parseIdent())&&!this.accept(p.Percentage))return this.restoreAtMark(n),null;return this.peek(p.CurlyL)?this._parseBody(t,this._parseRuleSetDeclaration.bind(this)):(this.restoreAtMark(n),null)},e.prototype._parseSupports=function(t){if(t===void 0&&(t=!1),!this.peekKeyword("@supports"))return null;var n=this.create(qr);return this.consumeToken(),n.addChild(this._parseSupportsCondition()),this._parseBody(n,this._parseSupportsDeclaration.bind(this,t))},e.prototype._parseSupportsDeclaration=function(t){return t===void 0&&(t=!1),t?this._tryParseRuleset(!0)||this._tryToParseDeclaration()||this._parseStylesheetStatement(!0):this._parseStylesheetStatement(!1)},e.prototype._parseSupportsCondition=function(){var t=this.create(en);if(this.acceptIdent("not"))t.addChild(this._parseSupportsConditionInParens());else if(t.addChild(this._parseSupportsConditionInParens()),this.peekRegExp(p.Ident,/^(and|or)$/i))for(var n=this.token.text.toLowerCase();this.acceptIdent(n);)t.addChild(this._parseSupportsConditionInParens());return this.finish(t)},e.prototype._parseSupportsConditionInParens=function(){var t=this.create(en);if(this.accept(p.ParenthesisL))return this.prevToken&&(t.lParent=this.prevToken.offset),!t.addChild(this._tryToParseDeclaration([p.ParenthesisR]))&&!this._parseSupportsCondition()?this.finish(t,x.ConditionExpected):this.accept(p.ParenthesisR)?(this.prevToken&&(t.rParent=this.prevToken.offset),this.finish(t)):this.finish(t,x.RightParenthesisExpected,[p.ParenthesisR],[]);if(this.peek(p.Ident)){var n=this.mark();if(this.consumeToken(),!this.hasWhitespace()&&this.accept(p.ParenthesisL)){for(var r=1;this.token.type!==p.EOF&&r!==0;)this.token.type===p.ParenthesisL?r++:this.token.type===p.ParenthesisR&&r--,this.consumeToken();return this.finish(t)}else this.restoreAtMark(n)}return this.finish(t,x.LeftParenthesisExpected,[],[p.ParenthesisL])},e.prototype._parseMediaDeclaration=function(t){return t===void 0&&(t=!1),t?this._tryParseRuleset(!0)||this._tryToParseDeclaration()||this._parseStylesheetStatement(!0):this._parseStylesheetStatement(!1)},e.prototype._parseMedia=function(t){if(t===void 0&&(t=!1),!this.peekKeyword("@media"))return null;var n=this.create(Pa);return this.consumeToken(),n.addChild(this._parseMediaQueryList())?this._parseBody(n,this._parseMediaDeclaration.bind(this,t)):this.finish(n,x.MediaQueryExpected)},e.prototype._parseMediaQueryList=function(){var t=this.create(Ia);if(!t.addChild(this._parseMediaQuery()))return this.finish(t,x.MediaQueryExpected);for(;this.accept(p.Comma);)if(!t.addChild(this._parseMediaQuery()))return this.finish(t,x.MediaQueryExpected);return this.finish(t)},e.prototype._parseMediaQuery=function(){var t=this.create(La),n=this.mark();if(this.acceptIdent("not"),this.peek(p.ParenthesisL))this.restoreAtMark(n),t.addChild(this._parseMediaCondition());else{if(this.acceptIdent("only"),!t.addChild(this._parseIdent()))return null;this.acceptIdent("and")&&t.addChild(this._parseMediaCondition())}return this.finish(t)},e.prototype._parseRatio=function(){var t=this.mark(),n=this.create(sd);return this._parseNumeric()?this.acceptDelim("/")?this._parseNumeric()?this.finish(n):this.finish(n,x.NumberExpected):(this.restoreAtMark(t),null):null},e.prototype._parseMediaCondition=function(){var t=this.create(Zh);this.acceptIdent("not");for(var n=!0;n;){if(!this.accept(p.ParenthesisL))return this.finish(t,x.LeftParenthesisExpected,[],[p.CurlyL]);if(this.peek(p.ParenthesisL)||this.peekIdent("not")?t.addChild(this._parseMediaCondition()):t.addChild(this._parseMediaFeature()),!this.accept(p.ParenthesisR))return this.finish(t,x.RightParenthesisExpected,[],[p.CurlyL]);n=this.acceptIdent("and")||this.acceptIdent("or")}return this.finish(t)},e.prototype._parseMediaFeature=function(){var t=this,n=[p.ParenthesisR],r=this.create(ed),i=function(){return t.acceptDelim("<")||t.acceptDelim(">")?(t.hasWhitespace()||t.acceptDelim("="),!0):!!t.acceptDelim("=")};if(r.addChild(this._parseMediaFeatureName())){if(this.accept(p.Colon)){if(!r.addChild(this._parseMediaFeatureValue()))return this.finish(r,x.TermExpected,[],n)}else if(i()){if(!r.addChild(this._parseMediaFeatureValue()))return this.finish(r,x.TermExpected,[],n);if(i()&&!r.addChild(this._parseMediaFeatureValue()))return this.finish(r,x.TermExpected,[],n)}}else if(r.addChild(this._parseMediaFeatureValue())){if(!i())return this.finish(r,x.OperatorExpected,[],n);if(!r.addChild(this._parseMediaFeatureName()))return this.finish(r,x.IdentifierExpected,[],n);if(i()&&!r.addChild(this._parseMediaFeatureValue()))return this.finish(r,x.TermExpected,[],n)}else return this.finish(r,x.IdentifierExpected,[],n);return this.finish(r)},e.prototype._parseMediaFeatureName=function(){return this._parseIdent()},e.prototype._parseMediaFeatureValue=function(){return this._parseRatio()||this._parseTermExpression()},e.prototype._parseMedium=function(){var t=this.create(W);return t.addChild(this._parseIdent())?this.finish(t):null},e.prototype._parsePageDeclaration=function(){return this._parsePageMarginBox()||this._parseRuleSetDeclaration()},e.prototype._parsePage=function(){if(!this.peekKeyword("@page"))return null;var t=this.create(td);if(this.consumeToken(),t.addChild(this._parsePageSelector())){for(;this.accept(p.Comma);)if(!t.addChild(this._parsePageSelector()))return this.finish(t,x.IdentifierExpected)}return this._parseBody(t,this._parsePageDeclaration.bind(this))},e.prototype._parsePageMarginBox=function(){if(!this.peek(p.AtKeyword))return null;var t=this.create(nd);return this.acceptOneKeyword(Md)||this.markError(t,x.UnknownAtRule,[],[p.CurlyL]),this._parseBody(t,this._parseRuleSetDeclaration.bind(this))},e.prototype._parsePageSelector=function(){if(!this.peek(p.Ident)&&!this.peek(p.Colon))return null;var t=this.create(W);return t.addChild(this._parseIdent()),this.accept(p.Colon)&&!t.addChild(this._parseIdent())?this.finish(t,x.IdentifierExpected):this.finish(t)},e.prototype._parseDocument=function(){if(!this.peekKeyword("@-moz-document"))return null;var t=this.create(Qh);return this.consumeToken(),this.resync([],[p.CurlyL]),this._parseBody(t,this._parseStylesheetStatement.bind(this))},e.prototype._parseUnknownAtRule=function(){if(!this.peek(p.AtKeyword))return null;var t=this.create(Wa);t.addChild(this._parseUnknownAtRuleName());var n=function(){return i===0&&s===0&&a===0},r=0,i=0,s=0,a=0;e:for(;;){switch(this.token.type){case p.SemiColon:if(n())break e;break;case p.EOF:return i>0?this.finish(t,x.RightCurlyExpected):a>0?this.finish(t,x.RightSquareBracketExpected):s>0?this.finish(t,x.RightParenthesisExpected):this.finish(t);case p.CurlyL:r++,i++;break;case p.CurlyR:if(i--,r>0&&i===0){if(this.consumeToken(),a>0)return this.finish(t,x.RightSquareBracketExpected);if(s>0)return this.finish(t,x.RightParenthesisExpected);break e}if(i<0){if(s===0&&a===0)break e;return this.finish(t,x.LeftCurlyExpected)}break;case p.ParenthesisL:s++;break;case p.ParenthesisR:if(s--,s<0)return this.finish(t,x.LeftParenthesisExpected);break;case p.BracketL:a++;break;case p.BracketR:if(a--,a<0)return this.finish(t,x.LeftSquareBracketExpected);break}this.consumeToken()}return t},e.prototype._parseUnknownAtRuleName=function(){var t=this.create(W);return this.accept(p.AtKeyword)?this.finish(t):t},e.prototype._parseOperator=function(){if(this.peekDelim("/")||this.peekDelim("*")||this.peekDelim("+")||this.peekDelim("-")||this.peek(p.Dashmatch)||this.peek(p.Includes)||this.peek(p.SubstringOperator)||this.peek(p.PrefixOperator)||this.peek(p.SuffixOperator)||this.peekDelim("=")){var t=this.createNode(g.Operator);return this.consumeToken(),this.finish(t)}else return null},e.prototype._parseUnaryOperator=function(){if(!this.peekDelim("+")&&!this.peekDelim("-"))return null;var t=this.create(W);return this.consumeToken(),this.finish(t)},e.prototype._parseCombinator=function(){if(this.peekDelim(">")){var t=this.create(W);this.consumeToken();var n=this.mark();if(!this.hasWhitespace()&&this.acceptDelim(">")){if(!this.hasWhitespace()&&this.acceptDelim(">"))return t.type=g.SelectorCombinatorShadowPiercingDescendant,this.finish(t);this.restoreAtMark(n)}return t.type=g.SelectorCombinatorParent,this.finish(t)}else if(this.peekDelim("+")){var t=this.create(W);return this.consumeToken(),t.type=g.SelectorCombinatorSibling,this.finish(t)}else if(this.peekDelim("~")){var t=this.create(W);return this.consumeToken(),t.type=g.SelectorCombinatorAllSiblings,this.finish(t)}else if(this.peekDelim("/")){var t=this.create(W);this.consumeToken();var n=this.mark();if(!this.hasWhitespace()&&this.acceptIdent("deep")&&!this.hasWhitespace()&&this.acceptDelim("/"))return t.type=g.SelectorCombinatorShadowPiercingDescendant,this.finish(t);this.restoreAtMark(n)}return null},e.prototype._parseSimpleSelector=function(){var t=this.create(Pt),n=0;for(t.addChild(this._parseElementName())&&n++;(n===0||!this.hasWhitespace())&&t.addChild(this._parseSimpleSelectorBody());)n++;return n>0?this.finish(t):null},e.prototype._parseSimpleSelectorBody=function(){return this._parsePseudo()||this._parseHash()||this._parseClass()||this._parseAttrib()},e.prototype._parseSelectorIdent=function(){return this._parseIdent()},e.prototype._parseHash=function(){if(!this.peek(p.Hash)&&!this.peekDelim("#"))return null;var t=this.createNode(g.IdentifierSelector);if(this.acceptDelim("#")){if(this.hasWhitespace()||!t.addChild(this._parseSelectorIdent()))return this.finish(t,x.IdentifierExpected)}else this.consumeToken();return this.finish(t)},e.prototype._parseClass=function(){if(!this.peekDelim("."))return null;var t=this.createNode(g.ClassSelector);return this.consumeToken(),this.hasWhitespace()||!t.addChild(this._parseSelectorIdent())?this.finish(t,x.IdentifierExpected):this.finish(t)},e.prototype._parseElementName=function(){var t=this.mark(),n=this.createNode(g.ElementNameSelector);return n.addChild(this._parseNamespacePrefix()),!n.addChild(this._parseSelectorIdent())&&!this.acceptDelim("*")?(this.restoreAtMark(t),null):this.finish(n)},e.prototype._parseNamespacePrefix=function(){var t=this.mark(),n=this.createNode(g.NamespacePrefix);return!n.addChild(this._parseIdent())&&this.acceptDelim("*"),this.acceptDelim("|")?this.finish(n):(this.restoreAtMark(t),null)},e.prototype._parseAttrib=function(){if(!this.peek(p.BracketL))return null;var t=this.create(id);return this.consumeToken(),t.setNamespacePrefix(this._parseNamespacePrefix()),t.setIdentifier(this._parseIdent())?(t.setOperator(this._parseOperator())&&(t.setValue(this._parseBinaryExpr()),this.acceptIdent("i"),this.acceptIdent("s")),this.accept(p.BracketR)?this.finish(t):this.finish(t,x.RightSquareBracketExpected)):this.finish(t,x.IdentifierExpected)},e.prototype._parsePseudo=function(){var t=this,n=this._tryParsePseudoIdentifier();if(n){if(!this.hasWhitespace()&&this.accept(p.ParenthesisL)){var r=function(){var i=t.create(W);if(!i.addChild(t._parseSelector(!1)))return null;for(;t.accept(p.Comma)&&i.addChild(t._parseSelector(!1)););return t.peek(p.ParenthesisR)?t.finish(i):null};if(n.addChild(this.try(r)||this._parseBinaryExpr()),!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected)}return this.finish(n)}return null},e.prototype._tryParsePseudoIdentifier=function(){if(!this.peek(p.Colon))return null;var t=this.mark(),n=this.createNode(g.PseudoSelector);return this.consumeToken(),this.hasWhitespace()?(this.restoreAtMark(t),null):(this.accept(p.Colon),this.hasWhitespace()||!n.addChild(this._parseIdent())?this.finish(n,x.IdentifierExpected):this.finish(n))},e.prototype._tryParsePrio=function(){var t=this.mark(),n=this._parsePrio();return n||(this.restoreAtMark(t),null)},e.prototype._parsePrio=function(){if(!this.peek(p.Exclamation))return null;var t=this.createNode(g.Prio);return this.accept(p.Exclamation)&&this.acceptIdent("important")?this.finish(t):null},e.prototype._parseExpr=function(t){t===void 0&&(t=!1);var n=this.create(Ta);if(!n.addChild(this._parseBinaryExpr()))return null;for(;;){if(this.peek(p.Comma)){if(t)return this.finish(n);this.consumeToken()}else if(!this.hasWhitespace())break;if(!n.addChild(this._parseBinaryExpr()))break}return this.finish(n)},e.prototype._parseUnicodeRange=function(){if(!this.peekIdent("u"))return null;var t=this.create(Lh);return this.acceptUnicodeRange()?this.finish(t):null},e.prototype._parseNamedLine=function(){if(!this.peek(p.BracketL))return null;var t=this.createNode(g.GridLine);for(this.consumeToken();t.addChild(this._parseIdent()););return this.accept(p.BracketR)?this.finish(t):this.finish(t,x.RightSquareBracketExpected)},e.prototype._parseBinaryExpr=function(t,n){var r=this.create($r);if(!r.setLeft(t||this._parseTerm()))return null;if(!r.setOperator(n||this._parseOperator()))return this.finish(r);if(!r.setRight(this._parseTerm()))return this.finish(r,x.TermExpected);r=this.finish(r);var i=this._parseOperator();return i&&(r=this._parseBinaryExpr(r,i)),this.finish(r)},e.prototype._parseTerm=function(){var t=this.create(rd);return t.setOperator(this._parseUnaryOperator()),t.setExpression(this._parseTermExpression())?this.finish(t):null},e.prototype._parseTermExpression=function(){return this._parseURILiteral()||this._parseUnicodeRange()||this._parseFunction()||this._parseIdent()||this._parseStringLiteral()||this._parseNumeric()||this._parseHexColor()||this._parseOperation()||this._parseNamedLine()},e.prototype._parseOperation=function(){if(!this.peek(p.ParenthesisL))return null;var t=this.create(W);return this.consumeToken(),t.addChild(this._parseExpr()),this.accept(p.ParenthesisR)?this.finish(t):this.finish(t,x.RightParenthesisExpected)},e.prototype._parseNumeric=function(){if(this.peek(p.Num)||this.peek(p.Percentage)||this.peek(p.Resolution)||this.peek(p.Length)||this.peek(p.EMS)||this.peek(p.EXS)||this.peek(p.Angle)||this.peek(p.Time)||this.peek(p.Dimension)||this.peek(p.Freq)){var t=this.create(Gr);return this.consumeToken(),this.finish(t)}return null},e.prototype._parseStringLiteral=function(){if(!this.peek(p.String)&&!this.peek(p.BadString))return null;var t=this.createNode(g.StringLiteral);return this.consumeToken(),this.finish(t)},e.prototype._parseURILiteral=function(){if(!this.peekRegExp(p.Ident,/^url(-prefix)?$/i))return null;var t=this.mark(),n=this.createNode(g.URILiteral);return this.accept(p.Ident),this.hasWhitespace()||!this.peek(p.ParenthesisL)?(this.restoreAtMark(t),null):(this.scanner.inURL=!0,this.consumeToken(),n.addChild(this._parseURLArgument()),this.scanner.inURL=!1,this.accept(p.ParenthesisR)?this.finish(n):this.finish(n,x.RightParenthesisExpected))},e.prototype._parseURLArgument=function(){var t=this.create(W);return!this.accept(p.String)&&!this.accept(p.BadString)&&!this.acceptUnquotedString()?null:this.finish(t)},e.prototype._parseIdent=function(t){if(!this.peek(p.Ident))return null;var n=this.create(Me);return t&&(n.referenceTypes=t),n.isCustomProperty=this.peekRegExp(p.Ident,/^--/),this.consumeToken(),this.finish(n)},e.prototype._parseFunction=function(){var t=this.mark(),n=this.create(Zt);if(!n.setIdentifier(this._parseFunctionIdentifier()))return null;if(this.hasWhitespace()||!this.accept(p.ParenthesisL))return this.restoreAtMark(t),null;if(n.getArguments().addChild(this._parseFunctionArgument()))for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)n.getArguments().addChild(this._parseFunctionArgument())||this.markError(n,x.ExpressionExpected);return this.accept(p.ParenthesisR)?this.finish(n):this.finish(n,x.RightParenthesisExpected)},e.prototype._parseFunctionIdentifier=function(){if(!this.peek(p.Ident))return null;var t=this.create(Me);if(t.referenceTypes=[J.Function],this.acceptIdent("progid")){if(this.accept(p.Colon))for(;this.accept(p.Ident)&&this.acceptDelim("."););return this.finish(t)}return this.consumeToken(),this.finish(t)},e.prototype._parseFunctionArgument=function(){var t=this.create(It);return t.setValue(this._parseExpr(!0))?this.finish(t):null},e.prototype._parseHexColor=function(){if(this.peekRegExp(p.Hash,/^#([A-Fa-f0-9]{3}|[A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{8})$/g)){var t=this.create(Hr);return this.consumeToken(),this.finish(t)}else return null},e}();function Nd(e,t){var n=0,r=e.length;if(r===0)return 0;for(;nt+n||this.offset===t&&this.length===n?this.findInScope(t,n):null},e.prototype.findInScope=function(t,n){n===void 0&&(n=0);var r=t+n,i=Nd(this.children,function(a){return a.offset>r});if(i===0)return this;var s=this.children[i-1];return s.offset<=t&&s.offset+s.length>=t+n?s.findInScope(t,n):this},e.prototype.addSymbol=function(t){this.symbols.push(t)},e.prototype.getSymbol=function(t,n){for(var r=0;r{var e={470:r=>{function i(o){if(typeof o!="string")throw new TypeError("Path must be a string. Received "+JSON.stringify(o))}function s(o,l){for(var c,h="",u=0,f=-1,m=0,b=0;b<=o.length;++b){if(b2){var y=h.lastIndexOf("/");if(y!==h.length-1){y===-1?(h="",u=0):u=(h=h.slice(0,y)).length-1-h.lastIndexOf("/"),f=b,m=0;continue}}else if(h.length===2||h.length===1){h="",u=0,f=b,m=0;continue}}l&&(h.length>0?h+="/..":h="..",u=2)}else h.length>0?h+="/"+o.slice(f+1,b):h=o.slice(f+1,b),u=b-f-1;f=b,m=0}else c===46&&m!==-1?++m:m=-1}return h}var a={resolve:function(){for(var o,l="",c=!1,h=arguments.length-1;h>=-1&&!c;h--){var u;h>=0?u=arguments[h]:(o===void 0&&(o=process.cwd()),u=o),i(u),u.length!==0&&(l=u+"/"+l,c=u.charCodeAt(0)===47)}return l=s(l,!c),c?l.length>0?"/"+l:"/":l.length>0?l:"."},normalize:function(o){if(i(o),o.length===0)return".";var l=o.charCodeAt(0)===47,c=o.charCodeAt(o.length-1)===47;return(o=s(o,!l)).length!==0||l||(o="."),o.length>0&&c&&(o+="/"),l?"/"+o:o},isAbsolute:function(o){return i(o),o.length>0&&o.charCodeAt(0)===47},join:function(){if(arguments.length===0)return".";for(var o,l=0;l0&&(o===void 0?o=c:o+="/"+c)}return o===void 0?".":a.normalize(o)},relative:function(o,l){if(i(o),i(l),o===l||(o=a.resolve(o))===(l=a.resolve(l)))return"";for(var c=1;cb){if(l.charCodeAt(f+v)===47)return l.slice(f+v+1);if(v===0)return l.slice(f+v)}else u>b&&(o.charCodeAt(c+v)===47?y=v:v===0&&(y=0));break}var w=o.charCodeAt(c+v);if(w!==l.charCodeAt(f+v))break;w===47&&(y=v)}var C="";for(v=c+y+1;v<=h;++v)v!==h&&o.charCodeAt(v)!==47||(C.length===0?C+="..":C+="/..");return C.length>0?C+l.slice(f+y):(f+=y,l.charCodeAt(f)===47&&++f,l.slice(f))},_makeLong:function(o){return o},dirname:function(o){if(i(o),o.length===0)return".";for(var l=o.charCodeAt(0),c=l===47,h=-1,u=!0,f=o.length-1;f>=1;--f)if((l=o.charCodeAt(f))===47){if(!u){h=f;break}}else u=!1;return h===-1?c?"/":".":c&&h===1?"//":o.slice(0,h)},basename:function(o,l){if(l!==void 0&&typeof l!="string")throw new TypeError('"ext" argument must be a string');i(o);var c,h=0,u=-1,f=!0;if(l!==void 0&&l.length>0&&l.length<=o.length){if(l.length===o.length&&l===o)return"";var m=l.length-1,b=-1;for(c=o.length-1;c>=0;--c){var y=o.charCodeAt(c);if(y===47){if(!f){h=c+1;break}}else b===-1&&(f=!1,b=c+1),m>=0&&(y===l.charCodeAt(m)?--m==-1&&(u=c):(m=-1,u=b))}return h===u?u=b:u===-1&&(u=o.length),o.slice(h,u)}for(c=o.length-1;c>=0;--c)if(o.charCodeAt(c)===47){if(!f){h=c+1;break}}else u===-1&&(f=!1,u=c+1);return u===-1?"":o.slice(h,u)},extname:function(o){i(o);for(var l=-1,c=0,h=-1,u=!0,f=0,m=o.length-1;m>=0;--m){var b=o.charCodeAt(m);if(b!==47)h===-1&&(u=!1,h=m+1),b===46?l===-1?l=m:f!==1&&(f=1):l!==-1&&(f=-1);else if(!u){c=m+1;break}}return l===-1||h===-1||f===0||f===1&&l===h-1&&l===c+1?"":o.slice(l,h)},format:function(o){if(o===null||typeof o!="object")throw new TypeError('The "pathObject" argument must be of type Object. Received type '+typeof o);return function(l,c){var h=c.dir||c.root,u=c.base||(c.name||"")+(c.ext||"");return h?h===c.root?h+u:h+"/"+u:u}(0,o)},parse:function(o){i(o);var l={root:"",dir:"",base:"",ext:"",name:""};if(o.length===0)return l;var c,h=o.charCodeAt(0),u=h===47;u?(l.root="/",c=1):c=0;for(var f=-1,m=0,b=-1,y=!0,v=o.length-1,w=0;v>=c;--v)if((h=o.charCodeAt(v))!==47)b===-1&&(y=!1,b=v+1),h===46?f===-1?f=v:w!==1&&(w=1):f!==-1&&(w=-1);else if(!y){m=v+1;break}return f===-1||b===-1||w===0||w===1&&f===b-1&&f===m+1?b!==-1&&(l.base=l.name=m===0&&u?o.slice(1,b):o.slice(m,b)):(m===0&&u?(l.name=o.slice(1,f),l.base=o.slice(1,b)):(l.name=o.slice(m,f),l.base=o.slice(m,b)),l.ext=o.slice(f,b)),m>0?l.dir=o.slice(0,m-1):u&&(l.dir="/"),l},sep:"/",delimiter:":",win32:null,posix:null};a.posix=a,r.exports=a},447:(r,i,s)=>{var a;if(s.r(i),s.d(i,{URI:()=>C,Utils:()=>V}),typeof process=="object")a=process.platform==="win32";else if(typeof navigator=="object"){var o=navigator.userAgent;a=o.indexOf("Windows")>=0}var l,c,h=(l=function(E,S){return(l=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(F,P){F.__proto__=P}||function(F,P){for(var $ in P)Object.prototype.hasOwnProperty.call(P,$)&&(F[$]=P[$])})(E,S)},function(E,S){if(typeof S!="function"&&S!==null)throw new TypeError("Class extends value "+String(S)+" is not a constructor or null");function F(){this.constructor=E}l(E,S),E.prototype=S===null?Object.create(S):(F.prototype=S.prototype,new F)}),u=/^\w[\w\d+.-]*$/,f=/^\//,m=/^\/\//;function b(E,S){if(!E.scheme&&S)throw new Error('[UriError]: Scheme is missing: {scheme: "", authority: "'.concat(E.authority,'", path: "').concat(E.path,'", query: "').concat(E.query,'", fragment: "').concat(E.fragment,'"}'));if(E.scheme&&!u.test(E.scheme))throw new Error("[UriError]: Scheme contains illegal characters.");if(E.path){if(E.authority){if(!f.test(E.path))throw new Error('[UriError]: If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character')}else if(m.test(E.path))throw new Error('[UriError]: If a URI does not contain an authority component, then the path cannot begin with two slash characters ("//")')}}var y="",v="/",w=/^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/,C=function(){function E(S,F,P,$,G,Z){Z===void 0&&(Z=!1),typeof S=="object"?(this.scheme=S.scheme||y,this.authority=S.authority||y,this.path=S.path||y,this.query=S.query||y,this.fragment=S.fragment||y):(this.scheme=function(He,we){return He||we?He:"file"}(S,Z),this.authority=F||y,this.path=function(He,we){switch(He){case"https":case"http":case"file":we?we[0]!==v&&(we=v+we):we=v}return we}(this.scheme,P||y),this.query=$||y,this.fragment=G||y,b(this,Z))}return E.isUri=function(S){return S instanceof E||!!S&&typeof S.authority=="string"&&typeof S.fragment=="string"&&typeof S.path=="string"&&typeof S.query=="string"&&typeof S.scheme=="string"&&typeof S.fsPath=="string"&&typeof S.with=="function"&&typeof S.toString=="function"},Object.defineProperty(E.prototype,"fsPath",{get:function(){return D(this,!1)},enumerable:!1,configurable:!0}),E.prototype.with=function(S){if(!S)return this;var F=S.scheme,P=S.authority,$=S.path,G=S.query,Z=S.fragment;return F===void 0?F=this.scheme:F===null&&(F=y),P===void 0?P=this.authority:P===null&&(P=y),$===void 0?$=this.path:$===null&&($=y),G===void 0?G=this.query:G===null&&(G=y),Z===void 0?Z=this.fragment:Z===null&&(Z=y),F===this.scheme&&P===this.authority&&$===this.path&&G===this.query&&Z===this.fragment?this:new I(F,P,$,G,Z)},E.parse=function(S,F){F===void 0&&(F=!1);var P=w.exec(S);return P?new I(P[2]||y,z(P[4]||y),z(P[5]||y),z(P[7]||y),z(P[9]||y),F):new I(y,y,y,y,y)},E.file=function(S){var F=y;if(a&&(S=S.replace(/\\/g,v)),S[0]===v&&S[1]===v){var P=S.indexOf(v,2);P===-1?(F=S.substring(2),S=v):(F=S.substring(2,P),S=S.substring(P)||v)}return new I("file",F,S,y,y)},E.from=function(S){var F=new I(S.scheme,S.authority,S.path,S.query,S.fragment);return b(F,!0),F},E.prototype.toString=function(S){return S===void 0&&(S=!1),R(this,S)},E.prototype.toJSON=function(){return this},E.revive=function(S){if(S){if(S instanceof E)return S;var F=new I(S);return F._formatted=S.external,F._fsPath=S._sep===_?S.fsPath:null,F}return S},E}(),_=a?1:void 0,I=function(E){function S(){var F=E!==null&&E.apply(this,arguments)||this;return F._formatted=null,F._fsPath=null,F}return h(S,E),Object.defineProperty(S.prototype,"fsPath",{get:function(){return this._fsPath||(this._fsPath=D(this,!1)),this._fsPath},enumerable:!1,configurable:!0}),S.prototype.toString=function(F){return F===void 0&&(F=!1),F?R(this,!0):(this._formatted||(this._formatted=R(this,!1)),this._formatted)},S.prototype.toJSON=function(){var F={$mid:1};return this._fsPath&&(F.fsPath=this._fsPath,F._sep=_),this._formatted&&(F.external=this._formatted),this.path&&(F.path=this.path),this.scheme&&(F.scheme=this.scheme),this.authority&&(F.authority=this.authority),this.query&&(F.query=this.query),this.fragment&&(F.fragment=this.fragment),F},S}(C),L=((c={})[58]="%3A",c[47]="%2F",c[63]="%3F",c[35]="%23",c[91]="%5B",c[93]="%5D",c[64]="%40",c[33]="%21",c[36]="%24",c[38]="%26",c[39]="%27",c[40]="%28",c[41]="%29",c[42]="%2A",c[43]="%2B",c[44]="%2C",c[59]="%3B",c[61]="%3D",c[32]="%20",c);function X(E,S){for(var F=void 0,P=-1,$=0;$=97&&G<=122||G>=65&&G<=90||G>=48&&G<=57||G===45||G===46||G===95||G===126||S&&G===47)P!==-1&&(F+=encodeURIComponent(E.substring(P,$)),P=-1),F!==void 0&&(F+=E.charAt($));else{F===void 0&&(F=E.substr(0,$));var Z=L[G];Z!==void 0?(P!==-1&&(F+=encodeURIComponent(E.substring(P,$)),P=-1),F+=Z):P===-1&&(P=$)}}return P!==-1&&(F+=encodeURIComponent(E.substring(P))),F!==void 0?F:E}function Q(E){for(var S=void 0,F=0;F1&&E.scheme==="file"?"//".concat(E.authority).concat(E.path):E.path.charCodeAt(0)===47&&(E.path.charCodeAt(1)>=65&&E.path.charCodeAt(1)<=90||E.path.charCodeAt(1)>=97&&E.path.charCodeAt(1)<=122)&&E.path.charCodeAt(2)===58?S?E.path.substr(1):E.path[1].toLowerCase()+E.path.substr(2):E.path,a&&(F=F.replace(/\//g,"\\")),F}function R(E,S){var F=S?Q:X,P="",$=E.scheme,G=E.authority,Z=E.path,He=E.query,we=E.fragment;if($&&(P+=$,P+=":"),(G||$==="file")&&(P+=v,P+=v),G){var Ae=G.indexOf("@");if(Ae!==-1){var xt=G.substr(0,Ae);G=G.substr(Ae+1),(Ae=xt.indexOf(":"))===-1?P+=F(xt,!1):(P+=F(xt.substr(0,Ae),!1),P+=":",P+=F(xt.substr(Ae+1),!1)),P+="@"}(Ae=(G=G.toLowerCase()).indexOf(":"))===-1?P+=F(G,!1):(P+=F(G.substr(0,Ae),!1),P+=G.substr(Ae))}if(Z){if(Z.length>=3&&Z.charCodeAt(0)===47&&Z.charCodeAt(2)===58)(et=Z.charCodeAt(1))>=65&&et<=90&&(Z="/".concat(String.fromCharCode(et+32),":").concat(Z.substr(3)));else if(Z.length>=2&&Z.charCodeAt(1)===58){var et;(et=Z.charCodeAt(0))>=65&&et<=90&&(Z="".concat(String.fromCharCode(et+32),":").concat(Z.substr(2)))}P+=F(Z,!0)}return He&&(P+="?",P+=F(He,!1)),we&&(P+="#",P+=S?we:X(we,!1)),P}function N(E){try{return decodeURIComponent(E)}catch{return E.length>3?E.substr(0,3)+N(E.substr(3)):E}}var M=/(%[0-9A-Za-z][0-9A-Za-z])+/g;function z(E){return E.match(M)?E.replace(M,function(S){return N(S)}):E}var V,j=s(470),ae=function(E,S,F){if(F||arguments.length===2)for(var P,$=0,G=S.length;${for(var s in i)n.o(i,s)&&!n.o(r,s)&&Object.defineProperty(r,s,{enumerable:!0,get:i[s]})},n.o=(r,i)=>Object.prototype.hasOwnProperty.call(r,i),n.r=r=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})},n(447)})();var{URI:oi,Utils:li}=Vo,Td=function(e,t,n){if(n||arguments.length===2)for(var r=0,i=t.length,s;r0&&s[s.length-1])&&(c[0]===6||c[0]===2)){n=0;continue}if(c[0]===3&&(!s||c[1]>s[0]&&c[1]0&&s[s.length-1])&&(c[0]===6||c[0]===2)){n=0;continue}if(c[0]===3&&(!s||c[1]>s[0]&&c[1]=0;a--){var o=this.nodePath[a];if(o instanceof Br)this.getCompletionsForDeclarationProperty(o.getParent(),s);else if(o instanceof Ta)o.parent instanceof Jr?this.getVariableProposals(null,s):this.getCompletionsForExpression(o,s);else if(o instanceof Pt){var l=o.findAParent(g.ExtendsReference,g.Ruleset);if(l)if(l.type===g.ExtendsReference)this.getCompletionsForExtendsReference(l,o,s);else{var c=l;this.getCompletionsForSelector(c,c&&c.isNested(),s)}}else if(o instanceof It)this.getCompletionsForFunctionArgument(o,o.getParent(),s);else if(o instanceof Ur)this.getCompletionsForDeclarations(o,s);else if(o instanceof In)this.getCompletionsForVariableDeclaration(o,s);else if(o instanceof Nt)this.getCompletionsForRuleSet(o,s);else if(o instanceof Jr)this.getCompletionsForInterpolation(o,s);else if(o instanceof Pn)this.getCompletionsForFunctionDeclaration(o,s);else if(o instanceof Ln)this.getCompletionsForMixinReference(o,s);else if(o instanceof Zt)this.getCompletionsForFunctionArgument(null,o,s);else if(o instanceof qr)this.getCompletionsForSupports(o,s);else if(o instanceof en)this.getCompletionsForSupportsCondition(o,s);else if(o instanceof tn)this.getCompletionsForExtendsReference(o,null,s);else if(o.type===g.URILiteral)this.getCompletionForUriLiteralValue(o,s);else if(o.parent===null)this.getCompletionForTopLevel(s);else if(o.type===g.StringLiteral&&this.isImportPathParent(o.parent.type))this.getCompletionForImportPath(o,s);else continue;if(s.items.length>0||this.offset>o.offset)return this.finalize(s)}return this.getCompletionsForStylesheet(s),s.items.length===0&&this.variablePrefix&&this.currentWord.indexOf(this.variablePrefix)===0&&this.getVariableProposals(null,s),this.finalize(s)}finally{this.position=null,this.currentWord=null,this.textDocument=null,this.styleSheet=null,this.symbolContext=null,this.defaultReplaceRange=null,this.nodePath=null}},e.prototype.isImportPathParent=function(t){return t===g.Import},e.prototype.finalize=function(t){return t},e.prototype.findInNodePath=function(){for(var t=[],n=0;n=0;r--){var i=this.nodePath[r];if(t.indexOf(i.type)!==-1)return i}return null},e.prototype.getCompletionsForDeclarationProperty=function(t,n){return this.getPropertyProposals(t,n)},e.prototype.getPropertyProposals=function(t,n){var r=this,i=this.isTriggerPropertyValueCompletionEnabled,s=this.isCompletePropertyWithSemicolonEnabled,a=this.cssDataManager.getProperties();return a.forEach(function(o){var l,c,h=!1;t?(l=r.getCompletionRange(t.getProperty()),c=o.name,Pe(t.colonPosition)||(c+=": ",h=!0)):(l=r.getCompletionRange(null),c=o.name+": ",h=!0),!t&&s&&(c+="$0;"),t&&!t.semicolonPosition&&s&&r.offset>=r.textDocument.offsetAt(l.end)&&(c+="$0;");var u={label:o.name,documentation:ht(o,r.doesSupportMarkdown()),tags:dn(o)?[bt.Deprecated]:[],textEdit:q.replace(l,c),insertTextFormat:De.Snippet,kind:B.Property};o.restrictions||(h=!1),i&&h&&(u.command=qo);var f=typeof o.relevance=="number"?Math.min(Math.max(o.relevance,0),99):50,m=(255-f).toString(16),b=he(o.name,"-")?$e.VendorPrefixed:$e.Normal;u.sortText=b+"_"+m,n.items.push(u)}),this.completionParticipants.forEach(function(o){o.onCssProperty&&o.onCssProperty({propertyName:r.currentWord,range:r.defaultReplaceRange})}),n},Object.defineProperty(e.prototype,"isTriggerPropertyValueCompletionEnabled",{get:function(){var t,n;return(n=(t=this.documentSettings)===null||t===void 0?void 0:t.triggerPropertyValueCompletion)!==null&&n!==void 0?n:!0},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"isCompletePropertyWithSemicolonEnabled",{get:function(){var t,n;return(n=(t=this.documentSettings)===null||t===void 0?void 0:t.completePropertyWithSemicolon)!==null&&n!==void 0?n:!0},enumerable:!1,configurable:!0}),e.prototype.getCompletionsForDeclarationValue=function(t,n){for(var r=this,i=t.getFullPropertyName(),s=this.cssDataManager.getProperty(i),a=t.getValue()||null;a&&a.hasChildren();)a=a.findChildAtOffset(this.offset,!1);if(this.completionParticipants.forEach(function(b){b.onCssPropertyValue&&b.onCssPropertyValue({propertyName:i,propertyValue:r.currentWord,range:r.getCompletionRange(a)})}),s){if(s.restrictions)for(var o=0,l=s.restrictions;o=t.offset+2&&this.getVariableProposals(null,n),n},e.prototype.getVariableProposals=function(t,n){for(var r=this.getSymbolContext().findSymbolsAtOffset(this.offset,J.Variable),i=0,s=r;i0){var s=this.currentWord.match(/^-?\d[\.\d+]*/);s&&(i=s[0],r.isIncomplete=i.length===this.currentWord.length)}else this.currentWord.length===0&&(r.isIncomplete=!0);if(n&&n.parent&&n.parent.type===g.Term&&(n=n.getParent()),t.restrictions)for(var a=0,o=t.restrictions;a=r.end;if(i)return this.getCompletionForTopLevel(n);var s=!r||this.offset<=r.offset;return s?this.getCompletionsForSelector(t,t.isNested(),n):this.getCompletionsForDeclarations(t.getDeclarations(),n)},e.prototype.getCompletionsForSelector=function(t,n,r){var i=this,s=this.findInNodePath(g.PseudoSelector,g.IdentifierSelector,g.ClassSelector,g.ElementNameSelector);!s&&this.hasCharacterAtPosition(this.offset-this.currentWord.length-1,":")&&(this.currentWord=":"+this.currentWord,this.hasCharacterAtPosition(this.offset-this.currentWord.length-1,":")&&(this.currentWord=":"+this.currentWord),this.defaultReplaceRange=te.create(Se.create(this.position.line,this.position.character-this.currentWord.length),this.position));var a=this.cssDataManager.getPseudoClasses();a.forEach(function(v){var w=Ot(v.name),C={label:v.name,textEdit:q.replace(i.getCompletionRange(s),w),documentation:ht(v,i.doesSupportMarkdown()),tags:dn(v)?[bt.Deprecated]:[],kind:B.Function,insertTextFormat:v.name!==w?Xe:void 0};he(v.name,":-")&&(C.sortText=$e.VendorPrefixed),r.items.push(C)});var o=this.cssDataManager.getPseudoElements();if(o.forEach(function(v){var w=Ot(v.name),C={label:v.name,textEdit:q.replace(i.getCompletionRange(s),w),documentation:ht(v,i.doesSupportMarkdown()),tags:dn(v)?[bt.Deprecated]:[],kind:B.Function,insertTextFormat:v.name!==w?Xe:void 0};he(v.name,"::-")&&(C.sortText=$e.VendorPrefixed),r.items.push(C)}),!n){for(var l=0,c=Ad;l0){var w=b.substr(v.offset,v.length);return w.charAt(0)==="."&&!m[w]&&(m[w]=!0,r.items.push({label:w,textEdit:q.replace(i.getCompletionRange(s),w),kind:B.Keyword})),!1}return!0}),t&&t.isNested()){var y=t.getSelectors().findFirstChildBeforeOffset(this.offset);y&&t.getSelectors().getChildren().indexOf(y)===0&&this.getPropertyProposals(null,r)}return r},e.prototype.getCompletionsForDeclarations=function(t,n){if(!t||this.offset===t.offset)return n;var r=t.findFirstChildBeforeOffset(this.offset);if(!r)return this.getCompletionsForDeclarationProperty(null,n);if(r instanceof Vr){var i=r;if(!Pe(i.colonPosition)||this.offset<=i.colonPosition)return this.getCompletionsForDeclarationProperty(i,n);if(Pe(i.semicolonPosition)&&i.semicolonPositiont.colonPosition&&this.getVariableProposals(t.getValue(),n),n},e.prototype.getCompletionsForExpression=function(t,n){var r=t.getParent();if(r instanceof It)return this.getCompletionsForFunctionArgument(r,r.getParent(),n),n;var i=t.findParent(g.Declaration);if(!i)return this.getTermProposals(void 0,null,n),n;var s=t.findChildAtOffset(this.offset,!0);return s?s instanceof Gr||s instanceof Me?this.getCompletionsForDeclarationValue(i,n):n:this.getCompletionsForDeclarationValue(i,n)},e.prototype.getCompletionsForFunctionArgument=function(t,n,r){var i=n.getIdentifier();return i&&i.matches("var")&&(!n.getArguments().hasChildren()||n.getArguments().getChild(0)===t)&&this.getVariableProposalsForCSSVarFunction(r),r},e.prototype.getCompletionsForFunctionDeclaration=function(t,n){var r=t.getDeclarations();return r&&this.offset>r.offset&&this.offsett.lParent&&(!Pe(t.rParent)||this.offset<=t.rParent)?this.getCompletionsForDeclarationProperty(null,n):n},e.prototype.getCompletionsForSupports=function(t,n){var r=t.getDeclarations(),i=!r||this.offset<=r.offset;if(i){var s=t.findFirstChildBeforeOffset(this.offset);return s instanceof en?this.getCompletionsForSupportsCondition(s,n):n}return this.getCompletionForTopLevel(n)},e.prototype.getCompletionsForExtendsReference=function(t,n,r){return r},e.prototype.getCompletionForUriLiteralValue=function(t,n){var r,i,s;if(t.hasChildren()){var o=t.getChild(0);r=o.getText(),i=this.position,s=this.getCompletionRange(o)}else{r="",i=this.position;var a=this.textDocument.positionAt(t.offset+4);s=te.create(a,a)}return this.completionParticipants.forEach(function(l){l.onCssURILiteralValue&&l.onCssURILiteralValue({uriValue:r,position:i,range:s})}),n},e.prototype.getCompletionForImportPath=function(t,n){var r=this;return this.completionParticipants.forEach(function(i){i.onCssImportPath&&i.onCssImportPath({pathValue:t.getText(),position:r.position,range:r.getCompletionRange(t)})}),n},e.prototype.hasCharacterAtPosition=function(t,n){var r=this.textDocument.getText();return t>=0&&t=0&&` +\r":{[()]},*>+`.indexOf(r.charAt(n))===-1;)n--;return r.substring(n+1,t)}function $o(e){return e.toLowerCase()in Hn||/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(e)}var Ho=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),Yd=We(),fi=function(){function e(){this.parent=null,this.children=null,this.attributes=null}return e.prototype.findAttribute=function(t){if(this.attributes)for(var n=0,r=this.attributes;n"),this.writeLine(n,i.join(""))},e}(),Ye;(function(e){function t(r,i){return i+n(r)+i}e.ensure=t;function n(r){var i=r.match(/^['"](.*)["']$/);return i?i[1]:r}e.remove=n})(Ye||(Ye={}));var Jo=function(){function e(){this.id=0,this.attr=0,this.tag=0}return e}();function Xo(e,t){for(var n=new fi,r=0,i=e.getChildren();r1){var c=t.cloneWithParent();n.addChild(c.findRoot()),n=c}n.append(a[l])}}break;case g.SelectorPlaceholder:if(s.matches("@at-root"))return n;case g.ElementNameSelector:var h=s.getText();n.addAttr("name",h==="*"?"element":Ie(h));break;case g.ClassSelector:n.addAttr("class",Ie(s.getText().substring(1)));break;case g.IdentifierSelector:n.addAttr("id",Ie(s.getText().substring(1)));break;case g.MixinDeclaration:n.addAttr("class",s.getName());break;case g.PseudoSelector:n.addAttr(Ie(s.getText()),"");break;case g.AttributeSelector:var u=s,f=u.getIdentifier();if(f){var m=u.getValue(),b=u.getOperator(),y=void 0;if(m&&b)switch(Ie(b.getText())){case"|=":y="".concat(Ye.remove(Ie(m.getText())),"-…");break;case"^=":y="".concat(Ye.remove(Ie(m.getText())),"…");break;case"$=":y="…".concat(Ye.remove(Ie(m.getText())));break;case"~=":y=" … ".concat(Ye.remove(Ie(m.getText()))," … ");break;case"*=":y="…".concat(Ye.remove(Ie(m.getText())),"…");break;default:y=Ye.remove(Ie(m.getText()));break}n.addAttr(Ie(f.getText()),y)}break}}return n}function Ie(e){var t=new Kt;t.setSource(e);var n=t.scanUnquotedString();return n?n.text:e}var Kd=function(){function e(t){this.cssDataManager=t}return e.prototype.selectorToMarkedString=function(t){var n=eu(t);if(n){var r=new Go('"').print(n);return r.push(this.selectorToSpecificityMarkedString(t)),r}else return[]},e.prototype.simpleSelectorToMarkedString=function(t){var n=Xo(t),r=new Go('"').print(n);return r.push(this.selectorToSpecificityMarkedString(t)),r},e.prototype.isPseudoElementIdentifier=function(t){var n=t.match(/^::?([\w-]+)/);return n?!!this.cssDataManager.getPseudoElement("::"+n[1]):!1},e.prototype.selectorToSpecificityMarkedString=function(t){var n=this,r=function(s){var a=new Jo;e:for(var o=0,l=s.getChildren();o0){for(var u=new Jo,f=0,m=c.getChildren();fu.id){u=C;continue}else if(C.idu.attr){u=C;continue}else if(C.attru.tag){u=C;continue}}}a.id+=u.id,a.attr+=u.attr,a.tag+=u.tag;continue e}a.attr++;break}if(c.getChildren().length>0){var C=r(c);a.id+=C.id,a.attr+=C.attr,a.tag+=C.tag}}return a},i=r(t);return Yd("specificity","[Selector Specificity](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity): ({0}, {1}, {2})",i.id,i.attr,i.tag)},e}(),Qd=function(){function e(t){this.prev=null,this.element=t}return e.prototype.processSelector=function(t){var n=null;if(!(this.element instanceof Ut)&&t.getChildren().some(function(h){return h.hasChildren()&&h.getChild(0).type===g.SelectorCombinator})){var r=this.element.findRoot();r.parent instanceof Ut&&(n=this.element,this.element=r.parent,this.element.removeChild(r),this.prev=null)}for(var i=0,s=t.getChildren();i=0;a--){var o=n[a].getSelectors().getChild(0);o&&s.processSelector(o)}return s.processSelector(e),t}var gi=function(){function e(t,n){this.clientCapabilities=t,this.cssDataManager=n,this.selectorPrinting=new Kd(n)}return e.prototype.configure=function(t){this.defaultSettings=t},e.prototype.doHover=function(t,n,r,i){i===void 0&&(i=this.defaultSettings);function s(v){return te.create(t.positionAt(v.offset),t.positionAt(v.end))}for(var a=t.offsetAt(n),o=Or(r,a),l=null,c=0;c0&&s[s.length-1])&&(c[0]===6||c[0]===2)){n=0;continue}if(c[0]===3&&(!s||c[1]>s[0]&&c[1]=s.length/2&&a.push({property:w.name,score:C})}),a.sort(function(w,C){return C.score-w.score||w.property.localeCompare(C.property)});for(var o=3,l=0,c=a;l=0;l--){var c=o[l];if(c instanceof qe){var h=c.getProperty();if(h&&h.offset===s&&h.end===a){this.getFixesForUnknownProperty(t,h,r,i);return}}}},e}(),lu=function(){function e(t){this.fullPropertyName=t.getFullPropertyName().toLowerCase(),this.node=t}return e}();function fn(e,t,n,r){var i=e[t];i.value=n,n&&(Oo(i.properties,r)||i.properties.push(r))}function cu(e,t,n){fn(e,"top",t,n),fn(e,"right",t,n),fn(e,"bottom",t,n),fn(e,"left",t,n)}function ve(e,t,n,r){t==="top"||t==="right"||t==="bottom"||t==="left"?fn(e,t,n,r):cu(e,n,r)}function yi(e,t,n){switch(t.length){case 1:ve(e,void 0,t[0],n);break;case 2:ve(e,"top",t[0],n),ve(e,"bottom",t[0],n),ve(e,"right",t[1],n),ve(e,"left",t[1],n);break;case 3:ve(e,"top",t[0],n),ve(e,"right",t[1],n),ve(e,"left",t[1],n),ve(e,"bottom",t[2],n);break;case 4:ve(e,"top",t[0],n),ve(e,"right",t[1],n),ve(e,"bottom",t[2],n),ve(e,"left",t[3],n);break}}function wi(e,t){for(var n=0,r=t;n"u"))switch(i.fullPropertyName){case"box-sizing":return{top:{value:!1,properties:[]},right:{value:!1,properties:[]},bottom:{value:!1,properties:[]},left:{value:!1,properties:[]}};case"width":t.width=i;break;case"height":t.height=i;break;default:var a=i.fullPropertyName.split("-");switch(a[0]){case"border":switch(a[1]){case void 0:case"top":case"right":case"bottom":case"left":switch(a[2]){case void 0:ve(t,a[1],du(s),i);break;case"width":ve(t,a[1],mn(s,!1),i);break;case"style":ve(t,a[1],Zn(s,!0),i);break}break;case"width":yi(t,tl(s.getChildren(),!1),i);break;case"style":yi(t,hu(s.getChildren(),!0),i);break}break;case"padding":a.length===1?yi(t,tl(s.getChildren(),!0),i):ve(t,a[1],mn(s,!0),i);break}break}}return t}var Ke=We(),nl=function(){function e(){this.data={}}return e.prototype.add=function(t,n,r){var i=this.data[t];i||(i={nodes:[],names:[]},this.data[t]=i),i.names.push(n),r&&i.nodes.push(r)},e}(),pu=function(){function e(t,n,r){var i=this;this.cssDataManager=r,this.warnings=[],this.settings=n,this.documentText=t.getText(),this.keyframes=new nl,this.validProperties={};var s=n.getSetting(iu.ValidProperties);Array.isArray(s)&&s.forEach(function(a){if(typeof a=="string"){var o=a.trim().toLowerCase();o.length&&(i.validProperties[o]=!0)}})}return e.entries=function(t,n,r,i,s){var a=new e(n,r,i);return t.acceptVisitor(a),a.completeValidations(),a.getEntries(s)},e.prototype.isValidPropertyDeclaration=function(t){var n=t.fullPropertyName;return this.validProperties[n]},e.prototype.fetch=function(t,n){for(var r=[],i=0,s=t;i0)for(var y=this.fetch(r,"float"),v=0;v0)for(var y=this.fetch(r,"vertical-align"),v=0;v1)for(var X=0;X")||this.peekDelim("<")||this.peekIdent("and")||this.peekIdent("or")||this.peekDelim("%")){var n=this.createNode(g.Operator);return this.consumeToken(),this.finish(n)}return e.prototype._parseOperator.call(this)},t.prototype._parseUnaryOperator=function(){if(this.peekIdent("not")){var n=this.create(W);return this.consumeToken(),this.finish(n)}return e.prototype._parseUnaryOperator.call(this)},t.prototype._parseRuleSetDeclaration=function(){return this.peek(p.AtKeyword)?this._parseKeyframe()||this._parseImport()||this._parseMedia(!0)||this._parseFontFace()||this._parseWarnAndDebug()||this._parseControlStatement()||this._parseFunctionDeclaration()||this._parseExtends()||this._parseMixinReference()||this._parseMixinContent()||this._parseMixinDeclaration()||this._parseRuleset(!0)||this._parseSupports(!0)||e.prototype._parseRuleSetDeclarationAtStatement.call(this):this._parseVariableDeclaration()||this._tryParseRuleset(!0)||e.prototype._parseRuleSetDeclaration.call(this)},t.prototype._parseDeclaration=function(n){var r=this._tryParseCustomPropertyDeclaration(n);if(r)return r;var i=this.create(qe);if(!i.setProperty(this._parseProperty()))return null;if(!this.accept(p.Colon))return this.finish(i,x.ColonExpected,[p.Colon],n||[p.SemiColon]);this.prevToken&&(i.colonPosition=this.prevToken.offset);var s=!1;if(i.setValue(this._parseExpr())&&(s=!0,i.addChild(this._parsePrio())),this.peek(p.CurlyL))i.setNestedProperties(this._parseNestedProperties());else if(!s)return this.finish(i,x.PropertyValueExpected);return this.peek(p.SemiColon)&&(i.semicolonPosition=this.token.offset),this.finish(i)},t.prototype._parseNestedProperties=function(){var n=this.create(za);return this._parseBody(n,this._parseDeclaration.bind(this))},t.prototype._parseExtends=function(){if(this.peekKeyword("@extend")){var n=this.create(tn);if(this.consumeToken(),!n.getSelectors().addChild(this._parseSimpleSelector()))return this.finish(n,x.SelectorExpected);for(;this.accept(p.Comma);)n.getSelectors().addChild(this._parseSimpleSelector());return this.accept(p.Exclamation)&&!this.acceptIdent("optional")?this.finish(n,x.UnknownKeyword):this.finish(n)}return null},t.prototype._parseSimpleSelectorBody=function(){return this._parseSelectorCombinator()||this._parseSelectorPlaceholder()||e.prototype._parseSimpleSelectorBody.call(this)},t.prototype._parseSelectorCombinator=function(){if(this.peekDelim("&")){var n=this.createNode(g.SelectorCombinator);for(this.consumeToken();!this.hasWhitespace()&&(this.acceptDelim("-")||this.accept(p.Num)||this.accept(p.Dimension)||n.addChild(this._parseIdent())||this.acceptDelim("&")););return this.finish(n)}return null},t.prototype._parseSelectorPlaceholder=function(){if(this.peekDelim("%")){var n=this.createNode(g.SelectorPlaceholder);return this.consumeToken(),this._parseIdent(),this.finish(n)}else if(this.peekKeyword("@at-root")){var n=this.createNode(g.SelectorPlaceholder);return this.consumeToken(),this.finish(n)}return null},t.prototype._parseElementName=function(){var n=this.mark(),r=e.prototype._parseElementName.call(this);return r&&!this.hasWhitespace()&&this.peek(p.ParenthesisL)?(this.restoreAtMark(n),null):r},t.prototype._tryParsePseudoIdentifier=function(){return this._parseInterpolation()||e.prototype._tryParsePseudoIdentifier.call(this)},t.prototype._parseWarnAndDebug=function(){if(!this.peekKeyword("@debug")&&!this.peekKeyword("@warn")&&!this.peekKeyword("@error"))return null;var n=this.createNode(g.Debug);return this.consumeToken(),n.addChild(this._parseExpr()),this.finish(n)},t.prototype._parseControlStatement=function(n){return n===void 0&&(n=this._parseRuleSetDeclaration.bind(this)),this.peek(p.AtKeyword)?this._parseIfStatement(n)||this._parseForStatement(n)||this._parseEachStatement(n)||this._parseWhileStatement(n):null},t.prototype._parseIfStatement=function(n){return this.peekKeyword("@if")?this._internalParseIfStatement(n):null},t.prototype._internalParseIfStatement=function(n){var r=this.create(Vh);if(this.consumeToken(),!r.setExpression(this._parseExpr(!0)))return this.finish(r,x.ExpressionExpected);if(this._parseBody(r,n),this.acceptKeyword("@else")){if(this.peekIdent("if"))r.setElseClause(this._internalParseIfStatement(n));else if(this.peek(p.CurlyL)){var i=this.create($h);this._parseBody(i,n),r.setElseClause(i)}}return this.finish(r)},t.prototype._parseForStatement=function(n){if(!this.peekKeyword("@for"))return null;var r=this.create(Bh);return this.consumeToken(),r.setVariable(this._parseVariable())?this.acceptIdent("from")?r.addChild(this._parseBinaryExpr())?!this.acceptIdent("to")&&!this.acceptIdent("through")?this.finish(r,Fi.ThroughOrToExpected,[p.CurlyR]):r.addChild(this._parseBinaryExpr())?this._parseBody(r,n):this.finish(r,x.ExpressionExpected,[p.CurlyR]):this.finish(r,x.ExpressionExpected,[p.CurlyR]):this.finish(r,Fi.FromExpected,[p.CurlyR]):this.finish(r,x.VariableNameExpected,[p.CurlyR])},t.prototype._parseEachStatement=function(n){if(!this.peekKeyword("@each"))return null;var r=this.create(jh);this.consumeToken();var i=r.getVariables();if(!i.addChild(this._parseVariable()))return this.finish(r,x.VariableNameExpected,[p.CurlyR]);for(;this.accept(p.Comma);)if(!i.addChild(this._parseVariable()))return this.finish(r,x.VariableNameExpected,[p.CurlyR]);return this.finish(i),this.acceptIdent("in")?r.addChild(this._parseExpr())?this._parseBody(r,n):this.finish(r,x.ExpressionExpected,[p.CurlyR]):this.finish(r,Fi.InExpected,[p.CurlyR])},t.prototype._parseWhileStatement=function(n){if(!this.peekKeyword("@while"))return null;var r=this.create(qh);return this.consumeToken(),r.addChild(this._parseBinaryExpr())?this._parseBody(r,n):this.finish(r,x.ExpressionExpected,[p.CurlyR])},t.prototype._parseFunctionBodyDeclaration=function(){return this._parseVariableDeclaration()||this._parseReturnStatement()||this._parseWarnAndDebug()||this._parseControlStatement(this._parseFunctionBodyDeclaration.bind(this))},t.prototype._parseFunctionDeclaration=function(){if(!this.peekKeyword("@function"))return null;var n=this.create(Pn);if(this.consumeToken(),!n.setIdentifier(this._parseIdent([J.Function])))return this.finish(n,x.IdentifierExpected,[p.CurlyR]);if(!this.accept(p.ParenthesisL))return this.finish(n,x.LeftParenthesisExpected,[p.CurlyR]);if(n.getParameters().addChild(this._parseParameterDeclaration())){for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getParameters().addChild(this._parseParameterDeclaration()))return this.finish(n,x.VariableNameExpected)}return this.accept(p.ParenthesisR)?this._parseBody(n,this._parseFunctionBodyDeclaration.bind(this)):this.finish(n,x.RightParenthesisExpected,[p.CurlyR])},t.prototype._parseReturnStatement=function(){if(!this.peekKeyword("@return"))return null;var n=this.createNode(g.ReturnStatement);return this.consumeToken(),n.addChild(this._parseExpr())?this.finish(n):this.finish(n,x.ExpressionExpected)},t.prototype._parseMixinDeclaration=function(){if(!this.peekKeyword("@mixin"))return null;var n=this.create(nn);if(this.consumeToken(),!n.setIdentifier(this._parseIdent([J.Mixin])))return this.finish(n,x.IdentifierExpected,[p.CurlyR]);if(this.accept(p.ParenthesisL)){if(n.getParameters().addChild(this._parseParameterDeclaration())){for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getParameters().addChild(this._parseParameterDeclaration()))return this.finish(n,x.VariableNameExpected)}if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected,[p.CurlyR])}return this._parseBody(n,this._parseRuleSetDeclaration.bind(this))},t.prototype._parseParameterDeclaration=function(){var n=this.create(Nn);return n.setIdentifier(this._parseVariable())?(this.accept(tr),this.accept(p.Colon)&&!n.setDefaultValue(this._parseExpr(!0))?this.finish(n,x.VariableValueExpected,[],[p.Comma,p.ParenthesisR]):this.finish(n)):null},t.prototype._parseMixinContent=function(){if(!this.peekKeyword("@content"))return null;var n=this.create(cd);if(this.consumeToken(),this.accept(p.ParenthesisL)){if(n.getArguments().addChild(this._parseFunctionArgument())){for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getArguments().addChild(this._parseFunctionArgument()))return this.finish(n,x.ExpressionExpected)}if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected)}return this.finish(n)},t.prototype._parseMixinReference=function(){if(!this.peekKeyword("@include"))return null;var n=this.create(Ln);this.consumeToken();var r=this._parseIdent([J.Mixin]);if(!n.setIdentifier(r))return this.finish(n,x.IdentifierExpected,[p.CurlyR]);if(!this.hasWhitespace()&&this.acceptDelim(".")&&!this.hasWhitespace()){var i=this._parseIdent([J.Mixin]);if(!i)return this.finish(n,x.IdentifierExpected,[p.CurlyR]);var s=this.create(Oa);r.referenceTypes=[J.Module],s.setIdentifier(r),n.setIdentifier(i),n.addChild(s)}if(this.accept(p.ParenthesisL)){if(n.getArguments().addChild(this._parseFunctionArgument())){for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getArguments().addChild(this._parseFunctionArgument()))return this.finish(n,x.ExpressionExpected)}if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected)}return(this.peekIdent("using")||this.peek(p.CurlyL))&&n.setContent(this._parseMixinContentDeclaration()),this.finish(n)},t.prototype._parseMixinContentDeclaration=function(){var n=this.create(hd);if(this.acceptIdent("using")){if(!this.accept(p.ParenthesisL))return this.finish(n,x.LeftParenthesisExpected,[p.CurlyL]);if(n.getParameters().addChild(this._parseParameterDeclaration())){for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getParameters().addChild(this._parseParameterDeclaration()))return this.finish(n,x.VariableNameExpected)}if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected,[p.CurlyL])}return this.peek(p.CurlyL)&&this._parseBody(n,this._parseMixinReferenceBodyStatement.bind(this)),this.finish(n)},t.prototype._parseMixinReferenceBodyStatement=function(){return this._tryParseKeyframeSelector()||this._parseRuleSetDeclaration()},t.prototype._parseFunctionArgument=function(){var n=this.create(It),r=this.mark(),i=this._parseVariable();if(i)if(this.accept(p.Colon))n.setIdentifier(i);else{if(this.accept(tr))return n.setValue(i),this.finish(n);this.restoreAtMark(r)}return n.setValue(this._parseExpr(!0))?(this.accept(tr),n.addChild(this._parsePrio()),this.finish(n)):n.setValue(this._tryParsePrio())?this.finish(n):null},t.prototype._parseURLArgument=function(){var n=this.mark(),r=e.prototype._parseURLArgument.call(this);if(!r||!this.peek(p.ParenthesisR)){this.restoreAtMark(n);var i=this.create(W);return i.addChild(this._parseBinaryExpr()),this.finish(i)}return r},t.prototype._parseOperation=function(){if(!this.peek(p.ParenthesisL))return null;var n=this.create(W);for(this.consumeToken();n.addChild(this._parseListElement());)this.accept(p.Comma);return this.accept(p.ParenthesisR)?this.finish(n):this.finish(n,x.RightParenthesisExpected)},t.prototype._parseListElement=function(){var n=this.create(dd),r=this._parseBinaryExpr();if(!r)return null;if(this.accept(p.Colon)){if(n.setKey(r),!n.setValue(this._parseBinaryExpr()))return this.finish(n,x.ExpressionExpected)}else n.setValue(r);return this.finish(n)},t.prototype._parseUse=function(){if(!this.peekKeyword("@use"))return null;var n=this.create(Gh);if(this.consumeToken(),!n.addChild(this._parseStringLiteral()))return this.finish(n,x.StringLiteralExpected);if(!this.peek(p.SemiColon)&&!this.peek(p.EOF)){if(!this.peekRegExp(p.Ident,/as|with/))return this.finish(n,x.UnknownKeyword);if(this.acceptIdent("as")&&!n.setIdentifier(this._parseIdent([J.Module]))&&!this.acceptDelim("*"))return this.finish(n,x.IdentifierOrWildcardExpected);if(this.acceptIdent("with")){if(!this.accept(p.ParenthesisL))return this.finish(n,x.LeftParenthesisExpected,[p.ParenthesisR]);if(!n.getParameters().addChild(this._parseModuleConfigDeclaration()))return this.finish(n,x.VariableNameExpected);for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getParameters().addChild(this._parseModuleConfigDeclaration()))return this.finish(n,x.VariableNameExpected);if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected)}}return!this.accept(p.SemiColon)&&!this.accept(p.EOF)?this.finish(n,x.SemiColonExpected):this.finish(n)},t.prototype._parseModuleConfigDeclaration=function(){var n=this.create(Jh);return n.setIdentifier(this._parseVariable())?!this.accept(p.Colon)||!n.setValue(this._parseExpr(!0))?this.finish(n,x.VariableValueExpected,[],[p.Comma,p.ParenthesisR]):this.accept(p.Exclamation)&&(this.hasWhitespace()||!this.acceptIdent("default"))?this.finish(n,x.UnknownKeyword):this.finish(n):null},t.prototype._parseForward=function(){if(!this.peekKeyword("@forward"))return null;var n=this.create(Xh);if(this.consumeToken(),!n.addChild(this._parseStringLiteral()))return this.finish(n,x.StringLiteralExpected);if(this.acceptIdent("with")){if(!this.accept(p.ParenthesisL))return this.finish(n,x.LeftParenthesisExpected,[p.ParenthesisR]);if(!n.getParameters().addChild(this._parseModuleConfigDeclaration()))return this.finish(n,x.VariableNameExpected);for(;this.accept(p.Comma)&&!this.peek(p.ParenthesisR);)if(!n.getParameters().addChild(this._parseModuleConfigDeclaration()))return this.finish(n,x.VariableNameExpected);if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected)}if(!this.peek(p.SemiColon)&&!this.peek(p.EOF)){if(!this.peekRegExp(p.Ident,/as|hide|show/))return this.finish(n,x.UnknownKeyword);if(this.acceptIdent("as")){var r=this._parseIdent([J.Forward]);if(!n.setIdentifier(r))return this.finish(n,x.IdentifierExpected);if(this.hasWhitespace()||!this.acceptDelim("*"))return this.finish(n,x.WildcardExpected)}if((this.peekIdent("hide")||this.peekIdent("show"))&&!n.addChild(this._parseForwardVisibility()))return this.finish(n,x.IdentifierOrVariableExpected)}return!this.accept(p.SemiColon)&&!this.accept(p.EOF)?this.finish(n,x.SemiColonExpected):this.finish(n)},t.prototype._parseForwardVisibility=function(){var n=this.create(Yh);for(n.setIdentifier(this._parseIdent());n.addChild(this._parseVariable()||this._parseIdent());)this.accept(p.Comma);return n.getChildren().length>1?n:null},t.prototype._parseSupportsCondition=function(){return this._parseInterpolation()||e.prototype._parseSupportsCondition.call(this)},t}(si),Fu=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),A=We(),Ru=function(e){Fu(t,e);function t(n,r){var i=e.call(this,"$",n,r)||this;return cl(t.scssModuleLoaders),cl(t.scssModuleBuiltIns),i}return t.prototype.isImportPathParent=function(n){return n===g.Forward||n===g.Use||e.prototype.isImportPathParent.call(this,n)},t.prototype.getCompletionForImportPath=function(n,r){var i=n.getParent().type;if(i===g.Forward||i===g.Use)for(var s=0,a=t.scssModuleBuiltIns;s0){var n=typeof t.documentation=="string"?{kind:"markdown",value:t.documentation}:{kind:"markdown",value:t.documentation.value};n.value+=` + +`,n.value+=t.references.map(function(r){return"[".concat(r.name,"](").concat(r.url,")")}).join(" | "),t.documentation=n}})}var Eu=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),hl="/".charCodeAt(0),Du=` +`.charCodeAt(0),Au="\r".charCodeAt(0),zu="\f".charCodeAt(0),Ri="`".charCodeAt(0),Ei=".".charCodeAt(0),Mu=p.CustomToken,Di=Mu++,dl=function(e){Eu(t,e);function t(){return e!==null&&e.apply(this,arguments)||this}return t.prototype.scanNext=function(n){var r=this.escapedJavaScript();return r!==null?this.finishToken(n,r):this.stream.advanceIfChars([Ei,Ei,Ei])?this.finishToken(n,Di):e.prototype.scanNext.call(this,n)},t.prototype.comment=function(){return e.prototype.comment.call(this)?!0:!this.inURL&&this.stream.advanceIfChars([hl,hl])?(this.stream.advanceWhileChar(function(n){switch(n){case Du:case Au:case zu:return!1;default:return!0}}),!0):!1},t.prototype.escapedJavaScript=function(){var n=this.stream.peekChar();return n===Ri?(this.stream.advance(1),this.stream.advanceWhileChar(function(r){return r!==Ri}),this.stream.advanceIfChar(Ri)?p.EscapedJavaScript:p.BadEscapedJavaScript):null},t}(Kt),Nu=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),Pu=function(e){Nu(t,e);function t(){return e.call(this,new dl)||this}return t.prototype._parseStylesheetStatement=function(n){return n===void 0&&(n=!1),this.peek(p.AtKeyword)?this._parseVariableDeclaration()||this._parsePlugin()||e.prototype._parseStylesheetAtStatement.call(this,n):this._tryParseMixinDeclaration()||this._tryParseMixinReference()||this._parseFunction()||this._parseRuleset(!0)},t.prototype._parseImport=function(){if(!this.peekKeyword("@import")&&!this.peekKeyword("@import-once"))return null;var n=this.create(jr);if(this.consumeToken(),this.accept(p.ParenthesisL)){if(!this.accept(p.Ident))return this.finish(n,x.IdentifierExpected,[p.SemiColon]);do if(!this.accept(p.Comma))break;while(this.accept(p.Ident));if(!this.accept(p.ParenthesisR))return this.finish(n,x.RightParenthesisExpected,[p.SemiColon])}return!n.addChild(this._parseURILiteral())&&!n.addChild(this._parseStringLiteral())?this.finish(n,x.URIOrStringExpected,[p.SemiColon]):(!this.peek(p.SemiColon)&&!this.peek(p.EOF)&&n.setMedialist(this._parseMediaQueryList()),this.finish(n))},t.prototype._parsePlugin=function(){if(!this.peekKeyword("@plugin"))return null;var n=this.createNode(g.Plugin);return this.consumeToken(),n.addChild(this._parseStringLiteral())?this.accept(p.SemiColon)?this.finish(n):this.finish(n,x.SemiColonExpected):this.finish(n,x.StringLiteralExpected)},t.prototype._parseMediaQuery=function(){var n=e.prototype._parseMediaQuery.call(this);if(!n){var r=this.create(La);return r.addChild(this._parseVariable())?this.finish(r):null}return n},t.prototype._parseMediaDeclaration=function(n){return n===void 0&&(n=!1),this._tryParseRuleset(n)||this._tryToParseDeclaration()||this._tryParseMixinDeclaration()||this._tryParseMixinReference()||this._parseDetachedRuleSetMixin()||this._parseStylesheetStatement(n)},t.prototype._parseMediaFeatureName=function(){return this._parseIdent()||this._parseVariable()},t.prototype._parseVariableDeclaration=function(n){n===void 0&&(n=[]);var r=this.create(In),i=this.mark();if(!r.setVariable(this._parseVariable(!0)))return null;if(this.accept(p.Colon)){if(this.prevToken&&(r.colonPosition=this.prevToken.offset),r.setValue(this._parseDetachedRuleSet()))r.needsSemicolon=!1;else if(!r.setValue(this._parseExpr()))return this.finish(r,x.VariableValueExpected,[],n);r.addChild(this._parsePrio())}else return this.restoreAtMark(i),null;return this.peek(p.SemiColon)&&(r.semicolonPosition=this.token.offset),this.finish(r)},t.prototype._parseDetachedRuleSet=function(){var n=this.mark();if(this.peekDelim("#")||this.peekDelim("."))if(this.consumeToken(),!this.hasWhitespace()&&this.accept(p.ParenthesisL)){var r=this.create(nn);if(r.getParameters().addChild(this._parseMixinParameter()))for(;(this.accept(p.Comma)||this.accept(p.SemiColon))&&!this.peek(p.ParenthesisR);)r.getParameters().addChild(this._parseMixinParameter())||this.markError(r,x.IdentifierExpected,[],[p.ParenthesisR]);if(!this.accept(p.ParenthesisR))return this.restoreAtMark(n),null}else return this.restoreAtMark(n),null;if(!this.peek(p.CurlyL))return null;var i=this.create(se);return this._parseBody(i,this._parseDetachedRuleSetBody.bind(this)),this.finish(i)},t.prototype._parseDetachedRuleSetBody=function(){return this._tryParseKeyframeSelector()||this._parseRuleSetDeclaration()},t.prototype._addLookupChildren=function(n){if(!n.addChild(this._parseLookupValue()))return!1;for(var r=!1;this.peek(p.BracketL)&&(r=!0),!!n.addChild(this._parseLookupValue());)r=!1;return!r},t.prototype._parseLookupValue=function(){var n=this.create(W),r=this.mark();return this.accept(p.BracketL)?(n.addChild(this._parseVariable(!1,!0))||n.addChild(this._parsePropertyIdentifier()))&&this.accept(p.BracketR)||this.accept(p.BracketR)?n:(this.restoreAtMark(r),null):(this.restoreAtMark(r),null)},t.prototype._parseVariable=function(n,r){n===void 0&&(n=!1),r===void 0&&(r=!1);var i=!n&&this.peekDelim("$");if(!this.peekDelim("@")&&!i&&!this.peek(p.AtKeyword))return null;for(var s=this.create(Xr),a=this.mark();this.acceptDelim("@")||!n&&this.acceptDelim("$");)if(this.hasWhitespace())return this.restoreAtMark(a),null;return!this.accept(p.AtKeyword)&&!this.accept(p.Ident)?(this.restoreAtMark(a),null):!r&&this.peek(p.BracketL)&&!this._addLookupChildren(s)?(this.restoreAtMark(a),null):s},t.prototype._parseTermExpression=function(){return this._parseVariable()||this._parseEscaped()||e.prototype._parseTermExpression.call(this)||this._tryParseMixinReference(!1)},t.prototype._parseEscaped=function(){if(this.peek(p.EscapedJavaScript)||this.peek(p.BadEscapedJavaScript)){var n=this.createNode(g.EscapedValue);return this.consumeToken(),this.finish(n)}if(this.peekDelim("~")){var n=this.createNode(g.EscapedValue);return this.consumeToken(),this.accept(p.String)||this.accept(p.EscapedJavaScript)?this.finish(n):this.finish(n,x.TermExpected)}return null},t.prototype._parseOperator=function(){var n=this._parseGuardOperator();return n||e.prototype._parseOperator.call(this)},t.prototype._parseGuardOperator=function(){if(this.peekDelim(">")){var n=this.createNode(g.Operator);return this.consumeToken(),this.acceptDelim("="),n}else if(this.peekDelim("=")){var n=this.createNode(g.Operator);return this.consumeToken(),this.acceptDelim("<"),n}else if(this.peekDelim("<")){var n=this.createNode(g.Operator);return this.consumeToken(),this.acceptDelim("="),n}return null},t.prototype._parseRuleSetDeclaration=function(){return this.peek(p.AtKeyword)?this._parseKeyframe()||this._parseMedia(!0)||this._parseImport()||this._parseSupports(!0)||this._parseDetachedRuleSetMixin()||this._parseVariableDeclaration()||e.prototype._parseRuleSetDeclarationAtStatement.call(this):this._tryParseMixinDeclaration()||this._tryParseRuleset(!0)||this._tryParseMixinReference()||this._parseFunction()||this._parseExtend()||e.prototype._parseRuleSetDeclaration.call(this)},t.prototype._parseKeyframeIdent=function(){return this._parseIdent([J.Keyframe])||this._parseVariable()},t.prototype._parseKeyframeSelector=function(){return this._parseDetachedRuleSetMixin()||e.prototype._parseKeyframeSelector.call(this)},t.prototype._parseSimpleSelectorBody=function(){return this._parseSelectorCombinator()||e.prototype._parseSimpleSelectorBody.call(this)},t.prototype._parseSelector=function(n){var r=this.create(Qt),i=!1;for(n&&(i=r.addChild(this._parseCombinator()));r.addChild(this._parseSimpleSelector());){i=!0;var s=this.mark();if(r.addChild(this._parseGuard())&&this.peek(p.CurlyL))break;this.restoreAtMark(s),r.addChild(this._parseCombinator())}return i?this.finish(r):null},t.prototype._parseSelectorCombinator=function(){if(this.peekDelim("&")){var n=this.createNode(g.SelectorCombinator);for(this.consumeToken();!this.hasWhitespace()&&(this.acceptDelim("-")||this.accept(p.Num)||this.accept(p.Dimension)||n.addChild(this._parseIdent())||this.acceptDelim("&")););return this.finish(n)}return null},t.prototype._parseSelectorIdent=function(){if(!this.peekInterpolatedIdent())return null;var n=this.createNode(g.SelectorInterpolation),r=this._acceptInterpolatedIdent(n);return r?this.finish(n):null},t.prototype._parsePropertyIdentifier=function(n){n===void 0&&(n=!1);var r=/^[\w-]+/;if(!this.peekInterpolatedIdent()&&!this.peekRegExp(this.token.type,r))return null;var i=this.mark(),s=this.create(Me);s.isCustomProperty=this.acceptDelim("-")&&this.acceptDelim("-");var a=!1;return n?s.isCustomProperty?a=s.addChild(this._parseIdent()):a=s.addChild(this._parseRegexp(r)):s.isCustomProperty?a=this._acceptInterpolatedIdent(s):a=this._acceptInterpolatedIdent(s,r),a?(!n&&!this.hasWhitespace()&&(this.acceptDelim("+"),this.hasWhitespace()||this.acceptIdent("_")),this.finish(s)):(this.restoreAtMark(i),null)},t.prototype.peekInterpolatedIdent=function(){return this.peek(p.Ident)||this.peekDelim("@")||this.peekDelim("$")||this.peekDelim("-")},t.prototype._acceptInterpolatedIdent=function(n,r){for(var i=this,s=!1,a=function(){var l=i.mark();return i.acceptDelim("-")&&(i.hasWhitespace()||i.acceptDelim("-"),i.hasWhitespace())?(i.restoreAtMark(l),null):i._parseInterpolation()},o=r?function(){return i.acceptRegexp(r)}:function(){return i.accept(p.Ident)};(o()||n.addChild(this._parseInterpolation()||this.try(a)))&&(s=!0,!this.hasWhitespace()););return s},t.prototype._parseInterpolation=function(){var n=this.mark();if(this.peekDelim("@")||this.peekDelim("$")){var r=this.createNode(g.Interpolation);return this.consumeToken(),this.hasWhitespace()||!this.accept(p.CurlyL)?(this.restoreAtMark(n),null):r.addChild(this._parseIdent())?this.accept(p.CurlyR)?this.finish(r):this.finish(r,x.RightCurlyExpected):this.finish(r,x.IdentifierExpected)}return null},t.prototype._tryParseMixinDeclaration=function(){var n=this.mark(),r=this.create(nn);if(!r.setIdentifier(this._parseMixinDeclarationIdentifier())||!this.accept(p.ParenthesisL))return this.restoreAtMark(n),null;if(r.getParameters().addChild(this._parseMixinParameter()))for(;(this.accept(p.Comma)||this.accept(p.SemiColon))&&!this.peek(p.ParenthesisR);)r.getParameters().addChild(this._parseMixinParameter())||this.markError(r,x.IdentifierExpected,[],[p.ParenthesisR]);return this.accept(p.ParenthesisR)?(r.setGuard(this._parseGuard()),this.peek(p.CurlyL)?this._parseBody(r,this._parseMixInBodyDeclaration.bind(this)):(this.restoreAtMark(n),null)):(this.restoreAtMark(n),null)},t.prototype._parseMixInBodyDeclaration=function(){return this._parseFontFace()||this._parseRuleSetDeclaration()},t.prototype._parseMixinDeclarationIdentifier=function(){var n;if(this.peekDelim("#")||this.peekDelim(".")){if(n=this.create(Me),this.consumeToken(),this.hasWhitespace()||!n.addChild(this._parseIdent()))return null}else if(this.peek(p.Hash))n=this.create(Me),this.consumeToken();else return null;return n.referenceTypes=[J.Mixin],this.finish(n)},t.prototype._parsePseudo=function(){if(!this.peek(p.Colon))return null;var n=this.mark(),r=this.create(tn);return this.consumeToken(),this.acceptIdent("extend")?this._completeExtends(r):(this.restoreAtMark(n),e.prototype._parsePseudo.call(this))},t.prototype._parseExtend=function(){if(!this.peekDelim("&"))return null;var n=this.mark(),r=this.create(tn);return this.consumeToken(),this.hasWhitespace()||!this.accept(p.Colon)||!this.acceptIdent("extend")?(this.restoreAtMark(n),null):this._completeExtends(r)},t.prototype._completeExtends=function(n){if(!this.accept(p.ParenthesisL))return this.finish(n,x.LeftParenthesisExpected);var r=n.getSelectors();if(!r.addChild(this._parseSelector(!0)))return this.finish(n,x.SelectorExpected);for(;this.accept(p.Comma);)if(!r.addChild(this._parseSelector(!0)))return this.finish(n,x.SelectorExpected);return this.accept(p.ParenthesisR)?this.finish(n):this.finish(n,x.RightParenthesisExpected)},t.prototype._parseDetachedRuleSetMixin=function(){if(!this.peek(p.AtKeyword))return null;var n=this.mark(),r=this.create(Ln);return r.addChild(this._parseVariable(!0))&&(this.hasWhitespace()||!this.accept(p.ParenthesisL))?(this.restoreAtMark(n),null):this.accept(p.ParenthesisR)?this.finish(r):this.finish(r,x.RightParenthesisExpected)},t.prototype._tryParseMixinReference=function(n){n===void 0&&(n=!0);for(var r=this.mark(),i=this.create(Ln),s=this._parseMixinDeclarationIdentifier();s;){this.acceptDelim(">");var a=this._parseMixinDeclarationIdentifier();if(a)i.getNamespaces().addChild(s),s=a;else break}if(!i.setIdentifier(s))return this.restoreAtMark(r),null;var o=!1;if(this.accept(p.ParenthesisL)){if(o=!0,i.getArguments().addChild(this._parseMixinArgument())){for(;(this.accept(p.Comma)||this.accept(p.SemiColon))&&!this.peek(p.ParenthesisR);)if(!i.getArguments().addChild(this._parseMixinArgument()))return this.finish(i,x.ExpressionExpected)}if(!this.accept(p.ParenthesisR))return this.finish(i,x.RightParenthesisExpected);s.referenceTypes=[J.Mixin]}else s.referenceTypes=[J.Mixin,J.Rule];return this.peek(p.BracketL)?n||this._addLookupChildren(i):i.addChild(this._parsePrio()),!o&&!this.peek(p.SemiColon)&&!this.peek(p.CurlyR)&&!this.peek(p.EOF)?(this.restoreAtMark(r),null):this.finish(i)},t.prototype._parseMixinArgument=function(){var n=this.create(It),r=this.mark(),i=this._parseVariable();return i&&(this.accept(p.Colon)?n.setIdentifier(i):this.restoreAtMark(r)),n.setValue(this._parseDetachedRuleSet()||this._parseExpr(!0))?this.finish(n):(this.restoreAtMark(r),null)},t.prototype._parseMixinParameter=function(){var n=this.create(Nn);if(this.peekKeyword("@rest")){var r=this.create(W);return this.consumeToken(),this.accept(Di)?(n.setIdentifier(this.finish(r)),this.finish(n)):this.finish(n,x.DotExpected,[],[p.Comma,p.ParenthesisR])}if(this.peek(Di)){var i=this.create(W);return this.consumeToken(),n.setIdentifier(this.finish(i)),this.finish(n)}var s=!1;return n.setIdentifier(this._parseVariable())&&(this.accept(p.Colon),s=!0),!n.setDefaultValue(this._parseDetachedRuleSet()||this._parseExpr(!0))&&!s?null:this.finish(n)},t.prototype._parseGuard=function(){if(!this.peekIdent("when"))return null;var n=this.create(ud);if(this.consumeToken(),n.isNegated=this.acceptIdent("not"),!n.getConditions().addChild(this._parseGuardCondition()))return this.finish(n,x.ConditionExpected);for(;this.acceptIdent("and")||this.accept(p.Comma);)if(!n.getConditions().addChild(this._parseGuardCondition()))return this.finish(n,x.ConditionExpected);return this.finish(n)},t.prototype._parseGuardCondition=function(){if(!this.peek(p.ParenthesisL))return null;var n=this.create(pd);return this.consumeToken(),n.addChild(this._parseExpr()),this.accept(p.ParenthesisR)?this.finish(n):this.finish(n,x.RightParenthesisExpected)},t.prototype._parseFunction=function(){var n=this.mark(),r=this.create(Zt);if(!r.setIdentifier(this._parseFunctionIdentifier()))return null;if(this.hasWhitespace()||!this.accept(p.ParenthesisL))return this.restoreAtMark(n),null;if(r.getArguments().addChild(this._parseMixinArgument())){for(;(this.accept(p.Comma)||this.accept(p.SemiColon))&&!this.peek(p.ParenthesisR);)if(!r.getArguments().addChild(this._parseMixinArgument()))return this.finish(r,x.ExpressionExpected)}return this.accept(p.ParenthesisR)?this.finish(r):this.finish(r,x.RightParenthesisExpected)},t.prototype._parseFunctionIdentifier=function(){if(this.peekDelim("%")){var n=this.create(Me);return n.referenceTypes=[J.Function],this.consumeToken(),this.finish(n)}return e.prototype._parseFunctionIdentifier.call(this)},t.prototype._parseURLArgument=function(){var n=this.mark(),r=e.prototype._parseURLArgument.call(this);if(!r||!this.peek(p.ParenthesisR)){this.restoreAtMark(n);var i=this.create(W);return i.addChild(this._parseBinaryExpr()),this.finish(i)}return r},t}(si),Iu=function(){var e=function(t,n){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(r,i){r.__proto__=i}||function(r,i){for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(r[s]=i[s])},e(t,n)};return function(t,n){if(typeof n!="function"&&n!==null)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");e(t,n);function r(){this.constructor=t}t.prototype=n===null?Object.create(n):(r.prototype=n.prototype,new r)}}(),U=We(),Lu=function(e){Iu(t,e);function t(n,r){return e.call(this,"@",n,r)||this}return t.prototype.createFunctionProposals=function(n,r,i,s){for(var a=0,o=n;a 50%"),example:"percentage(@number);",type:"percentage"},{name:"round",description:U("less.builtin.round","rounds a number to a number of places"),example:"round(number, [places: 0]);"},{name:"sqrt",description:U("less.builtin.sqrt","calculates square root of a number"),example:"sqrt(number);"},{name:"sin",description:U("less.builtin.sin","sine function"),example:"sin(number);"},{name:"tan",description:U("less.builtin.tan","tangent function"),example:"tan(number);"},{name:"atan",description:U("less.builtin.atan","arctangent - inverse of tangent function"),example:"atan(number);"},{name:"pi",description:U("less.builtin.pi","returns pi"),example:"pi();"},{name:"pow",description:U("less.builtin.pow","first argument raised to the power of the second argument"),example:"pow(@base, @exponent);"},{name:"mod",description:U("less.builtin.mod","first argument modulus second argument"),example:"mod(number, number);"},{name:"min",description:U("less.builtin.min","returns the lowest of one or more values"),example:"min(@x, @y);"},{name:"max",description:U("less.builtin.max","returns the lowest of one or more values"),example:"max(@x, @y);"}],t.colorProposals=[{name:"argb",example:"argb(@color);",description:U("less.builtin.argb","creates a #AARRGGBB")},{name:"hsl",example:"hsl(@hue, @saturation, @lightness);",description:U("less.builtin.hsl","creates a color")},{name:"hsla",example:"hsla(@hue, @saturation, @lightness, @alpha);",description:U("less.builtin.hsla","creates a color")},{name:"hsv",example:"hsv(@hue, @saturation, @value);",description:U("less.builtin.hsv","creates a color")},{name:"hsva",example:"hsva(@hue, @saturation, @value, @alpha);",description:U("less.builtin.hsva","creates a color")},{name:"hue",example:"hue(@color);",description:U("less.builtin.hue","returns the `hue` channel of `@color` in the HSL space")},{name:"saturation",example:"saturation(@color);",description:U("less.builtin.saturation","returns the `saturation` channel of `@color` in the HSL space")},{name:"lightness",example:"lightness(@color);",description:U("less.builtin.lightness","returns the `lightness` channel of `@color` in the HSL space")},{name:"hsvhue",example:"hsvhue(@color);",description:U("less.builtin.hsvhue","returns the `hue` channel of `@color` in the HSV space")},{name:"hsvsaturation",example:"hsvsaturation(@color);",description:U("less.builtin.hsvsaturation","returns the `saturation` channel of `@color` in the HSV space")},{name:"hsvvalue",example:"hsvvalue(@color);",description:U("less.builtin.hsvvalue","returns the `value` channel of `@color` in the HSV space")},{name:"red",example:"red(@color);",description:U("less.builtin.red","returns the `red` channel of `@color`")},{name:"green",example:"green(@color);",description:U("less.builtin.green","returns the `green` channel of `@color`")},{name:"blue",example:"blue(@color);",description:U("less.builtin.blue","returns the `blue` channel of `@color`")},{name:"alpha",example:"alpha(@color);",description:U("less.builtin.alpha","returns the `alpha` channel of `@color`")},{name:"luma",example:"luma(@color);",description:U("less.builtin.luma","returns the `luma` value (perceptual brightness) of `@color`")},{name:"saturate",example:"saturate(@color, 10%);",description:U("less.builtin.saturate","return `@color` 10% points more saturated")},{name:"desaturate",example:"desaturate(@color, 10%);",description:U("less.builtin.desaturate","return `@color` 10% points less saturated")},{name:"lighten",example:"lighten(@color, 10%);",description:U("less.builtin.lighten","return `@color` 10% points lighter")},{name:"darken",example:"darken(@color, 10%);",description:U("less.builtin.darken","return `@color` 10% points darker")},{name:"fadein",example:"fadein(@color, 10%);",description:U("less.builtin.fadein","return `@color` 10% points less transparent")},{name:"fadeout",example:"fadeout(@color, 10%);",description:U("less.builtin.fadeout","return `@color` 10% points more transparent")},{name:"fade",example:"fade(@color, 50%);",description:U("less.builtin.fade","return `@color` with 50% transparency")},{name:"spin",example:"spin(@color, 10);",description:U("less.builtin.spin","return `@color` with a 10 degree larger in hue")},{name:"mix",example:"mix(@color1, @color2, [@weight: 50%]);",description:U("less.builtin.mix","return a mix of `@color1` and `@color2`")},{name:"greyscale",example:"greyscale(@color);",description:U("less.builtin.greyscale","returns a grey, 100% desaturated color")},{name:"contrast",example:"contrast(@color1, [@darkcolor: black], [@lightcolor: white], [@threshold: 43%]);",description:U("less.builtin.contrast","return `@darkcolor` if `@color1 is> 43% luma` otherwise return `@lightcolor`, see notes")},{name:"multiply",example:"multiply(@color1, @color2);"},{name:"screen",example:"screen(@color1, @color2);"},{name:"overlay",example:"overlay(@color1, @color2);"},{name:"softlight",example:"softlight(@color1, @color2);"},{name:"hardlight",example:"hardlight(@color1, @color2);"},{name:"difference",example:"difference(@color1, @color2);"},{name:"exclusion",example:"exclusion(@color1, @color2);"},{name:"average",example:"average(@color1, @color2);"},{name:"negation",example:"negation(@color1, @color2);"}],t}(ui);function Tu(e,t){var n=Wu(e);return Ou(n,t)}function Wu(e){function t(u){return e.positionAt(u.offset).line}function n(u){return e.positionAt(u.offset+u.len).line}function r(){switch(e.languageId){case"scss":return new ll;case"less":return new dl;default:return new Kt}}function i(u,f){var m=t(u),b=n(u);return m!==b?{startLine:m,endLine:b,kind:f}:null}var s=[],a=[],o=r();o.ignoreComment=!1,o.setSource(e.getText());for(var l=o.scan(),c=null,h=function(){switch(l.type){case p.CurlyL:case er:{a.push({line:t(l),type:"brace",isStart:!0});break}case p.CurlyR:{if(a.length!==0){var u=ul(a,"brace");if(!u)break;var f=n(l);u.type==="brace"&&(c&&n(c)!==f&&f--,u.line!==f&&s.push({startLine:u.line,endLine:f,kind:void 0}))}break}case p.Comment:{var m=function(w){return w==="#region"?{line:t(l),type:"comment",isStart:!0}:{line:n(l),type:"comment",isStart:!1}},b=function(w){var C=w.text.match(/^\s*\/\*\s*(#region|#endregion)\b\s*(.*?)\s*\*\//);if(C)return m(C[1]);if(e.languageId==="scss"||e.languageId==="less"){var _=w.text.match(/^\s*\/\/\s*(#region|#endregion)\b\s*(.*?)\s*/);if(_)return m(_[1])}return null},y=b(l);if(y)if(y.isStart)a.push(y);else{var u=ul(a,"comment");if(!u)break;u.type==="comment"&&u.line!==y.line&&s.push({startLine:u.line,endLine:y.line,kind:"region"})}else{var v=i(l,"comment");v&&s.push(v)}break}}c=l,l=o.scan()};l.type!==p.EOF;)h();return s}function ul(e,t){if(e.length===0)return null;for(var n=e.length-1;n>=0;n--)if(e[n].type===t&&e[n].isStart)return e.splice(n,1)[0];return null}function Ou(e,t){var n=t&&t.rangeLimit||Number.MAX_VALUE,r=e.sort(function(a,o){var l=a.startLine-o.startLine;return l===0&&(l=a.endLine-o.endLine),l}),i=[],s=-1;return r.forEach(function(a){a.startLine=0;c--)if(this.__items[c].match(l))return!0;return!1},s.prototype.set_indent=function(l,c){this.is_empty()&&(this.__indent_count=l||0,this.__alignment_count=c||0,this.__character_count=this.__parent.get_indent_size(this.__indent_count,this.__alignment_count))},s.prototype._set_wrap_point=function(){this.__parent.wrap_line_length&&(this.__wrap_point_index=this.__items.length,this.__wrap_point_character_count=this.__character_count,this.__wrap_point_indent_count=this.__parent.next_line.__indent_count,this.__wrap_point_alignment_count=this.__parent.next_line.__alignment_count)},s.prototype._should_wrap=function(){return this.__wrap_point_index&&this.__character_count>this.__parent.wrap_line_length&&this.__wrap_point_character_count>this.__parent.next_line.__character_count},s.prototype._allow_wrap=function(){if(this._should_wrap()){this.__parent.add_new_line();var l=this.__parent.current_line;return l.set_indent(this.__wrap_point_indent_count,this.__wrap_point_alignment_count),l.__items=this.__items.slice(this.__wrap_point_index),this.__items=this.__items.slice(0,this.__wrap_point_index),l.__character_count+=this.__character_count-this.__wrap_point_character_count,this.__character_count=this.__wrap_point_character_count,l.__items[0]===" "&&(l.__items.splice(0,1),l.__character_count-=1),!0}return!1},s.prototype.is_empty=function(){return this.__items.length===0},s.prototype.last=function(){return this.is_empty()?null:this.__items[this.__items.length-1]},s.prototype.push=function(l){this.__items.push(l);var c=l.lastIndexOf(` +`);c!==-1?this.__character_count=l.length-c:this.__character_count+=l.length},s.prototype.pop=function(){var l=null;return this.is_empty()||(l=this.__items.pop(),this.__character_count-=l.length),l},s.prototype._remove_indent=function(){this.__indent_count>0&&(this.__indent_count-=1,this.__character_count-=this.__parent.indent_size)},s.prototype._remove_wrap_indent=function(){this.__wrap_point_indent_count>0&&(this.__wrap_point_indent_count-=1)},s.prototype.trim=function(){for(;this.last()===" ";)this.__items.pop(),this.__character_count-=1},s.prototype.toString=function(){var l="";return this.is_empty()?this.__parent.indent_empty_lines&&(l=this.__parent.get_indent_string(this.__indent_count)):(l=this.__parent.get_indent_string(this.__indent_count,this.__alignment_count),l+=this.__items.join("")),l};function a(l,c){this.__cache=[""],this.__indent_size=l.indent_size,this.__indent_string=l.indent_char,l.indent_with_tabs||(this.__indent_string=new Array(l.indent_size+1).join(l.indent_char)),c=c||"",l.indent_level>0&&(c=new Array(l.indent_level+1).join(this.__indent_string)),this.__base_string=c,this.__base_string_length=c.length}a.prototype.get_indent_size=function(l,c){var h=this.__base_string_length;return c=c||0,l<0&&(h=0),h+=l*this.__indent_size,h+=c,h},a.prototype.get_indent_string=function(l,c){var h=this.__base_string;return c=c||0,l<0&&(l=0,h=""),c+=l*this.__indent_size,this.__ensure_cache(c),h+=this.__cache[c],h},a.prototype.__ensure_cache=function(l){for(;l>=this.__cache.length;)this.__add_column()},a.prototype.__add_column=function(){var l=this.__cache.length,c=0,h="";this.__indent_size&&l>=this.__indent_size&&(c=Math.floor(l/this.__indent_size),l-=c*this.__indent_size,h=new Array(c+1).join(this.__indent_string)),l&&(h+=new Array(l+1).join(" ")),this.__cache.push(h)};function o(l,c){this.__indent_cache=new a(l,c),this.raw=!1,this._end_with_newline=l.end_with_newline,this.indent_size=l.indent_size,this.wrap_line_length=l.wrap_line_length,this.indent_empty_lines=l.indent_empty_lines,this.__lines=[],this.previous_line=null,this.current_line=null,this.next_line=new s(this),this.space_before_token=!1,this.non_breaking_space=!1,this.previous_token_wrapped=!1,this.__add_outputline()}o.prototype.__add_outputline=function(){this.previous_line=this.current_line,this.current_line=this.next_line.clone_empty(),this.__lines.push(this.current_line)},o.prototype.get_line_number=function(){return this.__lines.length},o.prototype.get_indent_string=function(l,c){return this.__indent_cache.get_indent_string(l,c)},o.prototype.get_indent_size=function(l,c){return this.__indent_cache.get_indent_size(l,c)},o.prototype.is_empty=function(){return!this.previous_line&&this.current_line.is_empty()},o.prototype.add_new_line=function(l){return this.is_empty()||!l&&this.just_added_newline()?!1:(this.raw||this.__add_outputline(),!0)},o.prototype.get_code=function(l){this.trim(!0);var c=this.current_line.pop();c&&(c[c.length-1]===` +`&&(c=c.replace(/\n+$/g,"")),this.current_line.push(c)),this._end_with_newline&&this.__add_outputline();var h=this.__lines.join(` +`);return l!==` +`&&(h=h.replace(/[\n]/g,l)),h},o.prototype.set_wrap_point=function(){this.current_line._set_wrap_point()},o.prototype.set_indent=function(l,c){return l=l||0,c=c||0,this.next_line.set_indent(l,c),this.__lines.length>1?(this.current_line.set_indent(l,c),!0):(this.current_line.set_indent(),!1)},o.prototype.add_raw_token=function(l){for(var c=0;c1&&this.current_line.is_empty();)this.__lines.pop(),this.current_line=this.__lines[this.__lines.length-1],this.current_line.trim();this.previous_line=this.__lines.length>1?this.__lines[this.__lines.length-2]:null},o.prototype.just_added_newline=function(){return this.current_line.is_empty()},o.prototype.just_added_blankline=function(){return this.is_empty()||this.current_line.is_empty()&&this.previous_line.is_empty()},o.prototype.ensure_empty_line_above=function(l,c){for(var h=this.__lines.length-2;h>=0;){var u=this.__lines[h];if(u.is_empty())break;if(u.item(0).indexOf(l)!==0&&u.item(-1)!==c){this.__lines.splice(h+1,0,new s(this)),this.previous_line=this.__lines[this.__lines.length-2];break}h--}},i.exports.Output=o},,,,function(i){function s(l,c){this.raw_options=a(l,c),this.disabled=this._get_boolean("disabled"),this.eol=this._get_characters("eol","auto"),this.end_with_newline=this._get_boolean("end_with_newline"),this.indent_size=this._get_number("indent_size",4),this.indent_char=this._get_characters("indent_char"," "),this.indent_level=this._get_number("indent_level"),this.preserve_newlines=this._get_boolean("preserve_newlines",!0),this.max_preserve_newlines=this._get_number("max_preserve_newlines",32786),this.preserve_newlines||(this.max_preserve_newlines=0),this.indent_with_tabs=this._get_boolean("indent_with_tabs",this.indent_char===" "),this.indent_with_tabs&&(this.indent_char=" ",this.indent_size===1&&(this.indent_size=4)),this.wrap_line_length=this._get_number("wrap_line_length",this._get_number("max_char")),this.indent_empty_lines=this._get_boolean("indent_empty_lines"),this.templating=this._get_selection_list("templating",["auto","none","django","erb","handlebars","php","smarty"],["auto"])}s.prototype._get_array=function(l,c){var h=this.raw_options[l],u=c||[];return typeof h=="object"?h!==null&&typeof h.concat=="function"&&(u=h.concat()):typeof h=="string"&&(u=h.split(/[^a-zA-Z0-9_\/\-]+/)),u},s.prototype._get_boolean=function(l,c){var h=this.raw_options[l],u=h===void 0?!!c:!!h;return u},s.prototype._get_characters=function(l,c){var h=this.raw_options[l],u=c||"";return typeof h=="string"&&(u=h.replace(/\\r/,"\r").replace(/\\n/,` +`).replace(/\\t/," ")),u},s.prototype._get_number=function(l,c){var h=this.raw_options[l];c=parseInt(c,10),isNaN(c)&&(c=0);var u=parseInt(h,10);return isNaN(u)&&(u=c),u},s.prototype._get_selection=function(l,c,h){var u=this._get_selection_list(l,c,h);if(u.length!==1)throw new Error("Invalid Option Value: The option '"+l+`' can only be one of the following values: +`+c+` +You passed in: '`+this.raw_options[l]+"'");return u[0]},s.prototype._get_selection_list=function(l,c,h){if(!c||c.length===0)throw new Error("Selection list cannot be empty.");if(h=h||[c[0]],!this._is_valid_selection(h,c))throw new Error("Invalid Default Value!");var u=this._get_array(l,h);if(!this._is_valid_selection(u,c))throw new Error("Invalid Option Value: The option '"+l+`' can contain only the following values: +`+c+` +You passed in: '`+this.raw_options[l]+"'");return u},s.prototype._is_valid_selection=function(l,c){return l.length&&c.length&&!l.some(function(h){return c.indexOf(h)===-1})};function a(l,c){var h={};l=o(l);var u;for(u in l)u!==c&&(h[u]=l[u]);if(c&&l[c])for(u in l[c])h[u]=l[c][u];return h}function o(l){var c={},h;for(h in l){var u=h.replace(/-/g,"_");c[u]=l[h]}return c}i.exports.Options=s,i.exports.normalizeOpts=o,i.exports.mergeOpts=a},,function(i){var s=RegExp.prototype.hasOwnProperty("sticky");function a(o){this.__input=o||"",this.__input_length=this.__input.length,this.__position=0}a.prototype.restart=function(){this.__position=0},a.prototype.back=function(){this.__position>0&&(this.__position-=1)},a.prototype.hasNext=function(){return this.__position=0&&o=0&&l=o.length&&this.__input.substring(l-o.length,l).toLowerCase()===o},i.exports.InputScanner=a},,,,,function(i){function s(a,o){a=typeof a=="string"?a:a.source,o=typeof o=="string"?o:o.source,this.__directives_block_pattern=new RegExp(a+/ beautify( \w+[:]\w+)+ /.source+o,"g"),this.__directive_pattern=/ (\w+)[:](\w+)/g,this.__directives_end_ignore_pattern=new RegExp(a+/\sbeautify\signore:end\s/.source+o,"g")}s.prototype.get_directives=function(a){if(!a.match(this.__directives_block_pattern))return null;var o={};this.__directive_pattern.lastIndex=0;for(var l=this.__directive_pattern.exec(a);l;)o[l[1]]=l[2],l=this.__directive_pattern.exec(a);return o},s.prototype.readIgnored=function(a){return a.readUntilAfter(this.__directives_end_ignore_pattern)},i.exports.Directives=s},,function(i,s,a){var o=a(16).Beautifier,l=a(17).Options;function c(h,u){var f=new o(h,u);return f.beautify()}i.exports=c,i.exports.defaultOptions=function(){return new l}},function(i,s,a){var o=a(17).Options,l=a(2).Output,c=a(8).InputScanner,h=a(13).Directives,u=new h(/\/\*/,/\*\//),f=/\r\n|[\r\n]/,m=/\r\n|[\r\n]/g,b=/\s/,y=/(?:\s|\n)+/g,v=/\/\*(?:[\s\S]*?)((?:\*\/)|$)/g,w=/\/\/(?:[^\n\r\u2028\u2029]*)/g;function C(_,I){this._source_text=_||"",this._options=new o(I),this._ch=null,this._input=null,this.NESTED_AT_RULE={"@page":!0,"@font-face":!0,"@keyframes":!0,"@media":!0,"@supports":!0,"@document":!0},this.CONDITIONAL_GROUP_RULE={"@media":!0,"@supports":!0,"@document":!0}}C.prototype.eatString=function(_){var I="";for(this._ch=this._input.next();this._ch;){if(I+=this._ch,this._ch==="\\")I+=this._input.next();else if(_.indexOf(this._ch)!==-1||this._ch===` +`)break;this._ch=this._input.next()}return I},C.prototype.eatWhitespace=function(_){for(var I=b.test(this._input.peek()),L=0;b.test(this._input.peek());)this._ch=this._input.next(),_&&this._ch===` +`&&(L===0||L0&&this._indentLevel--},C.prototype.beautify=function(){if(this._options.disabled)return this._source_text;var _=this._source_text,I=this._options.eol;I==="auto"&&(I=` +`,_&&f.test(_||"")&&(I=_.match(f)[0])),_=_.replace(m,` +`);var L=_.match(/^[\t ]*/)[0];this._output=new l(this._options,L),this._input=new c(_),this._indentLevel=0,this._nestedLevel=0,this._ch=null;for(var X=0,Q=!1,D=!1,R=!1,N=!1,M=!1,z=this._ch,V,j,ae;V=this._input.read(y),j=V!=="",ae=z,this._ch=this._input.next(),this._ch==="\\"&&this._input.hasNext()&&(this._ch+=this._input.next()),z=this._ch,this._ch;)if(this._ch==="/"&&this._input.peek()==="*"){this._output.add_new_line(),this._input.back();var ue=this._input.read(v),E=u.get_directives(ue);E&&E.ignore==="start"&&(ue+=u.readIgnored(this._input)),this.print_string(ue),this.eatWhitespace(!0),this._output.add_new_line()}else if(this._ch==="/"&&this._input.peek()==="/")this._output.space_before_token=!0,this._input.back(),this.print_string(this._input.read(w)),this.eatWhitespace(!0);else if(this._ch==="@")if(this.preserveSingleSpace(j),this._input.peek()==="{")this.print_string(this._ch+this.eatString("}"));else{this.print_string(this._ch);var S=this._input.peekUntilAfter(/[: ,;{}()[\]\/='"]/g);S.match(/[ :]$/)&&(S=this.eatString(": ").replace(/\s$/,""),this.print_string(S),this._output.space_before_token=!0),S=S.replace(/\s$/,""),S==="extend"?N=!0:S==="import"&&(M=!0),S in this.NESTED_AT_RULE?(this._nestedLevel+=1,S in this.CONDITIONAL_GROUP_RULE&&(R=!0)):!Q&&X===0&&S.indexOf(":")!==-1&&(D=!0,this.indent())}else this._ch==="#"&&this._input.peek()==="{"?(this.preserveSingleSpace(j),this.print_string(this._ch+this.eatString("}"))):this._ch==="{"?(D&&(D=!1,this.outdent()),R?(R=!1,Q=this._indentLevel>=this._nestedLevel):Q=this._indentLevel>=this._nestedLevel-1,this._options.newline_between_rules&&Q&&this._output.previous_line&&this._output.previous_line.item(-1)!=="{"&&this._output.ensure_empty_line_above("/",","),this._output.space_before_token=!0,this._options.brace_style==="expand"?(this._output.add_new_line(),this.print_string(this._ch),this.indent(),this._output.set_indent(this._indentLevel)):(this.indent(),this.print_string(this._ch)),this.eatWhitespace(!0),this._output.add_new_line()):this._ch==="}"?(this.outdent(),this._output.add_new_line(),ae==="{"&&this._output.trim(!0),M=!1,N=!1,D&&(this.outdent(),D=!1),this.print_string(this._ch),Q=!1,this._nestedLevel&&this._nestedLevel--,this.eatWhitespace(!0),this._output.add_new_line(),this._options.newline_between_rules&&!this._output.just_added_blankline()&&this._input.peek()!=="}"&&this._output.add_new_line(!0)):this._ch===":"?(Q||R)&&!(this._input.lookBack("&")||this.foundNestedPseudoClass())&&!this._input.lookBack("(")&&!N&&X===0?(this.print_string(":"),D||(D=!0,this._output.space_before_token=!0,this.eatWhitespace(!0),this.indent())):(this._input.lookBack(" ")&&(this._output.space_before_token=!0),this._input.peek()===":"?(this._ch=this._input.next(),this.print_string("::")):this.print_string(":")):this._ch==='"'||this._ch==="'"?(this.preserveSingleSpace(j),this.print_string(this._ch+this.eatString(this._ch)),this.eatWhitespace(!0)):this._ch===";"?X===0?(D&&(this.outdent(),D=!1),N=!1,M=!1,this.print_string(this._ch),this.eatWhitespace(!0),this._input.peek()!=="/"&&this._output.add_new_line()):(this.print_string(this._ch),this.eatWhitespace(!0),this._output.space_before_token=!0):this._ch==="("?this._input.lookBack("url")?(this.print_string(this._ch),this.eatWhitespace(),X++,this.indent(),this._ch=this._input.next(),this._ch===")"||this._ch==='"'||this._ch==="'"?this._input.back():this._ch&&(this.print_string(this._ch+this.eatString(")")),X&&(X--,this.outdent()))):(this.preserveSingleSpace(j),this.print_string(this._ch),this.eatWhitespace(),X++,this.indent()):this._ch===")"?(X&&(X--,this.outdent()),this.print_string(this._ch)):this._ch===","?(this.print_string(this._ch),this.eatWhitespace(!0),this._options.selector_separator_newline&&!D&&X===0&&!M&&!N?this._output.add_new_line():this._output.space_before_token=!0):(this._ch===">"||this._ch==="+"||this._ch==="~")&&!D&&X===0?this._options.space_around_combinator?(this._output.space_before_token=!0,this.print_string(this._ch),this._output.space_before_token=!0):(this.print_string(this._ch),this.eatWhitespace(),this._ch&&b.test(this._ch)&&(this._ch="")):this._ch==="]"?this.print_string(this._ch):this._ch==="["?(this.preserveSingleSpace(j),this.print_string(this._ch)):this._ch==="="?(this.eatWhitespace(),this.print_string("="),b.test(this._ch)&&(this._ch="")):this._ch==="!"&&!this._input.lookBack("\\")?(this.print_string(" "),this.print_string(this._ch)):(this.preserveSingleSpace(j),this.print_string(this._ch));var F=this._output.get_code(I);return F},i.exports.Beautifier=C},function(i,s,a){var o=a(6).Options;function l(c){o.call(this,c,"css"),this.selector_separator_newline=this._get_boolean("selector_separator_newline",!0),this.newline_between_rules=this._get_boolean("newline_between_rules",!0);var h=this._get_boolean("space_around_selector_separator");this.space_around_combinator=this._get_boolean("space_around_combinator")||h;var u=this._get_selection_list("brace_style",["collapse","expand","end-expand","none","preserve-inline"]);this.brace_style="collapse";for(var f=0;f0&&gl(r,c-1);)c--;c===0||ml(r,c-1)?l=c:c0){var y=n.insertSpaces?Da(" ",o*s):Da(" ",s);b=b.split(` +`).join(` +`+y),t.start.character===0&&(b=y+b)}return[{range:t,newText:b}]}function fl(e){return e.replace(/^\s+/,"")}var Bu="{".charCodeAt(0),ju="}".charCodeAt(0);function qu(e,t){for(;t>=0;){var n=e.charCodeAt(t);if(n===Bu)return!0;if(n===ju)return!1;t--}return!1}function Ze(e,t,n){if(e&&e.hasOwnProperty(t)){var r=e[t];if(r!==null)return r}return n}function $u(e,t,n){for(var r=t,i=0,s=n.tabSize||4;r && ]#",relevance:50,description:"@counter-style descriptor. Specifies the symbols used by the marker-construction algorithm specified by the system descriptor. Needs to be specified if the counter system is 'additive'.",restrictions:["integer","string","image","identifier"]},{name:"align-content",values:[{name:"center",description:"Lines are packed toward the center of the flex container."},{name:"flex-end",description:"Lines are packed toward the end of the flex container."},{name:"flex-start",description:"Lines are packed toward the start of the flex container."},{name:"space-around",description:"Lines are evenly distributed in the flex container, with half-size spaces on either end."},{name:"space-between",description:"Lines are evenly distributed in the flex container."},{name:"stretch",description:"Lines stretch to take up the remaining space."}],syntax:"normal | | | ? ",relevance:62,description:"Aligns a flex container’s lines within the flex container when there is extra space in the cross-axis, similar to how 'justify-content' aligns individual items within the main-axis.",restrictions:["enum"]},{name:"align-items",values:[{name:"baseline",description:"If the flex item’s inline axis is the same as the cross axis, this value is identical to 'flex-start'. Otherwise, it participates in baseline alignment."},{name:"center",description:"The flex item’s margin box is centered in the cross axis within the line."},{name:"flex-end",description:"The cross-end margin edge of the flex item is placed flush with the cross-end edge of the line."},{name:"flex-start",description:"The cross-start margin edge of the flex item is placed flush with the cross-start edge of the line."},{name:"stretch",description:"If the cross size property of the flex item computes to auto, and neither of the cross-axis margins are auto, the flex item is stretched."}],syntax:"normal | stretch | | [ ? ]",relevance:85,description:"Aligns flex items along the cross axis of the current line of the flex container.",restrictions:["enum"]},{name:"justify-items",values:[{name:"auto"},{name:"normal"},{name:"end"},{name:"start"},{name:"flex-end",description:'"Flex items are packed toward the end of the line."'},{name:"flex-start",description:'"Flex items are packed toward the start of the line."'},{name:"self-end",description:"The item is packed flush to the edge of the alignment container of the end side of the item, in the appropriate axis."},{name:"self-start",description:"The item is packed flush to the edge of the alignment container of the start side of the item, in the appropriate axis.."},{name:"center",description:"The items are packed flush to each other toward the center of the of the alignment container."},{name:"left"},{name:"right"},{name:"baseline"},{name:"first baseline"},{name:"last baseline"},{name:"stretch",description:"If the cross size property of the flex item computes to auto, and neither of the cross-axis margins are auto, the flex item is stretched."},{name:"save"},{name:"unsave"},{name:"legacy"}],syntax:"normal | stretch | | ? [ | left | right ] | legacy | legacy && [ left | right | center ]",relevance:53,description:"Defines the default justify-self for all items of the box, giving them the default way of justifying each box along the appropriate axis",restrictions:["enum"]},{name:"justify-self",values:[{name:"auto"},{name:"normal"},{name:"end"},{name:"start"},{name:"flex-end",description:'"Flex items are packed toward the end of the line."'},{name:"flex-start",description:'"Flex items are packed toward the start of the line."'},{name:"self-end",description:"The item is packed flush to the edge of the alignment container of the end side of the item, in the appropriate axis."},{name:"self-start",description:"The item is packed flush to the edge of the alignment container of the start side of the item, in the appropriate axis.."},{name:"center",description:"The items are packed flush to each other toward the center of the of the alignment container."},{name:"left"},{name:"right"},{name:"baseline"},{name:"first baseline"},{name:"last baseline"},{name:"stretch",description:"If the cross size property of the flex item computes to auto, and neither of the cross-axis margins are auto, the flex item is stretched."},{name:"save"},{name:"unsave"}],syntax:"auto | normal | stretch | | ? [ | left | right ]",relevance:53,description:"Defines the way of justifying a box inside its container along the appropriate axis.",restrictions:["enum"]},{name:"align-self",values:[{name:"auto",description:"Computes to the value of 'align-items' on the element’s parent, or 'stretch' if the element has no parent. On absolutely positioned elements, it computes to itself."},{name:"baseline",description:"If the flex item’s inline axis is the same as the cross axis, this value is identical to 'flex-start'. Otherwise, it participates in baseline alignment."},{name:"center",description:"The flex item’s margin box is centered in the cross axis within the line."},{name:"flex-end",description:"The cross-end margin edge of the flex item is placed flush with the cross-end edge of the line."},{name:"flex-start",description:"The cross-start margin edge of the flex item is placed flush with the cross-start edge of the line."},{name:"stretch",description:"If the cross size property of the flex item computes to auto, and neither of the cross-axis margins are auto, the flex item is stretched."}],syntax:"auto | normal | stretch | | ? ",relevance:72,description:"Allows the default alignment along the cross axis to be overridden for individual flex items.",restrictions:["enum"]},{name:"all",browsers:["E79","FF27","S9.1","C37","O24"],values:[],syntax:"initial | inherit | unset | revert",relevance:53,references:[{name:"MDN Reference",url:"https://developer.mozilla.org/docs/Web/CSS/all"}],description:"Shorthand that resets all properties except 'direction' and 'unicode-bidi'.",restrictions:["enum"]},{name:"alt",browsers:["S9"],values:[],relevance:50,references:[{name:"MDN Reference",url:"https://developer.mozilla.org/docs/Web/CSS/alt"}],description:"Provides alternative text for assistive technology to replace the generated content of a ::before or ::after element.",restrictions:["string","enum"]},{name:"animation",values:[{name:"alternate",description:"The animation cycle iterations that are odd counts are played in the normal direction, and the animation cycle iterations that are even counts are played in a reverse direction."},{name:"alternate-reverse",description:"The animation cycle iterations that are odd counts are played in the reverse direction, and the animation cycle iterations that are even counts are played in a normal direction."},{name:"backwards",description:"The beginning property value (as defined in the first @keyframes at-rule) is applied before the animation is displayed, during the period defined by 'animation-delay'."},{name:"both",description:"Both forwards and backwards fill modes are applied."},{name:"forwards",description:"The final property value (as defined in the last @keyframes at-rule) is maintained after the animation completes."},{name:"infinite",description:"Causes the animation to repeat forever."},{name:"none",description:"No animation is performed"},{name:"normal",description:"Normal playback."},{name:"reverse",description:"All iterations of the animation are played in the reverse direction from the way they were specified."}],syntax:"#",relevance:82,references:[{name:"MDN Reference",url:"https://developer.mozilla.org/docs/Web/CSS/animation"}],description:"Shorthand property combines six of the animation properties into a single property.",restrictions:["time","timing-function","enum","identifier","number"]},{name:"animation-delay",syntax:"