From 6ef78c62b5a5b1efbfd2658d3f61f6d95a757f22 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 19 Jun 2026 23:32:30 +0800 Subject: [PATCH] =?UTF-8?q?openapi=20=E5=8C=85=E7=BB=93=E6=9E=84=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 2 +- .../admin/business/controller/JobLogController.java | 8 ++++---- .../scheduler/config/XxlJobAdminBootstrap.java | 4 ++-- .../scheduler/openapi/OpenApiController.java | 6 +++--- .../business/scheduler/route/ExecutorRouter.java | 2 +- .../route/strategy/ExecutorRouteBusyover.java | 6 +++--- .../route/strategy/ExecutorRouteConsistentHash.java | 2 +- .../route/strategy/ExecutorRouteFailover.java | 4 ++-- .../scheduler/route/strategy/ExecutorRouteFirst.java | 2 +- .../scheduler/route/strategy/ExecutorRouteLFU.java | 2 +- .../scheduler/route/strategy/ExecutorRouteLRU.java | 2 +- .../scheduler/route/strategy/ExecutorRouteLast.java | 2 +- .../route/strategy/ExecutorRouteRandom.java | 2 +- .../scheduler/route/strategy/ExecutorRouteRound.java | 2 +- .../business/scheduler/thread/JobCompleteHelper.java | 2 +- .../business/scheduler/thread/JobRegistryHelper.java | 2 +- .../admin/business/scheduler/trigger/JobTrigger.java | 4 ++-- .../admin/business/service/impl/AdminBizImpl.java | 6 +++--- .../test/java/com/xxl/job/openapi/AdminBizTest.java | 6 +++--- .../java/com/xxl/job/openapi/ExecutorBizTest.java | 4 ++-- .../com/xxl/job/core/executor/XxlJobExecutor.java | 2 +- .../com/xxl/job/core/log/XxlJobFileAppender.java | 2 +- .../xxl/job/core/openapi/{ => admin}/AdminBiz.java | 6 +++--- .../{model => admin/dto}/CallbackRequest.java | 2 +- .../{model => admin/dto}/RegistryRequest.java | 2 +- .../job/core/openapi/{ => executor}/ExecutorBiz.java | 4 ++-- .../{model => executor/dto}/IdleBeatRequest.java | 2 +- .../openapi/{model => executor/dto}/KillRequest.java | 2 +- .../openapi/{model => executor/dto}/LogRequest.java | 2 +- .../openapi/{model => executor/dto}/LogResult.java | 2 +- .../{model => executor/dto}/TriggerRequest.java | 2 +- .../openapi/{ => executor}/impl/ExecutorBizImpl.java | 6 +++--- .../java/com/xxl/job/core/server/EmbedServer.java | 12 ++++++------ .../core/thread/ExecutorRegistryThreadHelper.java | 4 ++-- .../main/java/com/xxl/job/core/thread/JobThread.java | 4 ++-- .../job/core/thread/TriggerCallbackThreadHelper.java | 4 ++-- 36 files changed, 64 insertions(+), 64 deletions(-) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{ => admin}/AdminBiz.java (86%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => admin/dto}/CallbackRequest.java (97%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => admin/dto}/RegistryRequest.java (96%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{ => executor}/ExecutorBiz.java (90%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => executor/dto}/IdleBeatRequest.java (90%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => executor/dto}/KillRequest.java (90%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => executor/dto}/LogRequest.java (95%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => executor/dto}/LogResult.java (96%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{model => executor/dto}/TriggerRequest.java (98%) rename xxl-job-core/src/main/java/com/xxl/job/core/openapi/{ => executor}/impl/ExecutorBizImpl.java (98%) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 4c69fa0b..1a825994 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2903,7 +2903,7 @@ alter table xxl_job_log ### 7.47 版本 v3.5.0 Release Notes[ING] - 1、【新增】GLUE模式开关：新增GLUE模式开关（xxl.job.executor.glueenabled），支持执行器维度设置是否启用GLUE模式； -- 2、【TODO】AccessToken线上化管理：执行期维度，限制操作当前执行期； +- 2、【TODO】执行器AccessToken：执行器维度AccessToken，线上化动态管理；执行器间AccessToken隔离，提升安全性； - 3、【TODO】调度中心OpenAPI增强：提供任务管理能力；封装Agent Skill并推送ClawHub； - 4、【TODO】配置线上化：发送邮箱配置线上管理、线程池配置调整； - 5、【TODO】任务告警：拆分“告警类型、告警配置”属性，支持Webhook、邮箱多种方式； diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java index 500960ae..34fac9c7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java @@ -13,10 +13,10 @@ import com.xxl.job.admin.business.service.XxlJobService; import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.admin.framework.util.JobGroupPermissionUtil; import com.xxl.job.core.context.XxlJobContext; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.KillRequest; -import com.xxl.job.core.openapi.model.LogRequest; -import com.xxl.job.core.openapi.model.LogResult; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.KillRequest; +import com.xxl.job.core.openapi.executor.dto.LogRequest; +import com.xxl.job.core.openapi.executor.dto.LogResult; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.DateTool; import com.xxl.tool.core.StringTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java index fae96b11..893b093e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/config/XxlJobAdminBootstrap.java @@ -6,7 +6,7 @@ import com.xxl.job.admin.business.scheduler.complete.JobCompleter; import com.xxl.job.admin.business.scheduler.thread.*; import com.xxl.job.admin.business.scheduler.trigger.JobTrigger; import com.xxl.job.core.constant.Const; -import com.xxl.job.core.openapi.ExecutorBiz; +import com.xxl.job.core.openapi.executor.ExecutorBiz; import com.xxl.tool.core.StringTool; import com.xxl.tool.http.HttpTool; import jakarta.annotation.Resource; @@ -135,7 +135,7 @@ public class XxlJobAdminBootstrap implements InitializingBean, DisposableBean { // ---------------------- executor-client ---------------------- - private static ConcurrentMap executorBizRepository = new ConcurrentHashMap(); + private static ConcurrentMap executorBizRepository = new ConcurrentHashMap<>(); public static ExecutorBiz getExecutorBiz(String address) throws Exception { // valid if (StringTool.isBlank(address)) { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java index 895f72ee..8c143ec1 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/openapi/OpenApiController.java @@ -2,9 +2,9 @@ package com.xxl.job.admin.business.scheduler.openapi; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.constant.Const; -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.CallbackRequest; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.AdminBiz; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.tool.core.StringTool; import com.xxl.tool.json.GsonTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java index 2a8a4b2d..bb9f6d3d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/ExecutorRouter.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.business.scheduler.route; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java index 2a04221f..20545f21 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteBusyover.java @@ -3,9 +3,9 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.admin.framework.util.I18nUtil; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.IdleBeatRequest; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.IdleBeatRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java index 2461da5a..1ab0e1c5 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteConsistentHash.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.nio.charset.StandardCharsets; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java index c235a17c..b335cbd7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFailover.java @@ -3,8 +3,8 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; import com.xxl.job.admin.framework.util.I18nUtil; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java index 01723582..3bca8101 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteFirst.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java index b9aca631..7aeafae4 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLFU.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.*; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java index 37eda780..1e1bf023 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLRU.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.ArrayList; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java index aa8840ff..16d902ab 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteLast.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java index a04b24bc..2def2b12 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRandom.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java index 0666ea81..13c296e8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/route/strategy/ExecutorRouteRound.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.business.scheduler.route.strategy; import com.xxl.job.admin.business.scheduler.route.ExecutorRouter; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java index 4cdbd340..ebad9339 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobCompleteHelper.java @@ -4,7 +4,7 @@ import com.xxl.job.admin.business.model.XxlJobLog; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.context.XxlJobContext; -import com.xxl.job.core.openapi.model.CallbackRequest; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; import com.xxl.tool.concurrent.CyclicThread; import com.xxl.tool.core.DateTool; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java index ce964f0a..b394d392 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/thread/JobRegistryHelper.java @@ -5,7 +5,7 @@ import com.xxl.job.admin.business.model.XxlJobRegistry; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.constant.Const; import com.xxl.job.core.constant.RegistTypeEnum; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.tool.concurrent.CyclicThread; import com.xxl.tool.core.StringTool; import com.xxl.tool.response.Response; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java index 3a027f9a..2d998d02 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/scheduler/trigger/JobTrigger.java @@ -11,8 +11,8 @@ import com.xxl.job.admin.business.scheduler.route.ExecutorRouteStrategyEnum; import com.xxl.job.admin.framework.util.I18nUtil; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.context.XxlJobContext; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.core.StringTool; import com.xxl.tool.error.ThrowableTool; import com.xxl.tool.http.IPTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java index 2f900cff..6509a3f6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/business/service/impl/AdminBizImpl.java @@ -1,9 +1,9 @@ package com.xxl.job.admin.business.service.impl; import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap; -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.CallbackRequest; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.AdminBiz; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.tool.response.Response; import org.springframework.stereotype.Service; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java index 897b6788..7e1c4780 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java @@ -1,9 +1,9 @@ package com.xxl.job.openapi; import com.xxl.job.core.constant.RegistTypeEnum; -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.CallbackRequest; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.AdminBiz; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.constant.Const; import com.xxl.tool.http.HttpTool; diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java index cdde86ef..24205ce9 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/ExecutorBizTest.java @@ -1,8 +1,8 @@ package com.xxl.job.openapi; import com.xxl.job.core.constant.Const; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.*; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.*; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.tool.http.HttpTool; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java index 61150923..bbe9f52f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java @@ -5,7 +5,7 @@ import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.impl.MethodJobHandler; import com.xxl.job.core.log.XxlJobFileAppender; -import com.xxl.job.core.openapi.AdminBiz; +import com.xxl.job.core.openapi.admin.AdminBiz; import com.xxl.job.core.server.EmbedServer; import com.xxl.job.core.thread.ExecutorRegistryThreadHelper; import com.xxl.job.core.thread.JobLogFileCleanThreadHelper; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java index 8cd99ecb..d4b1e62f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java @@ -1,6 +1,6 @@ package com.xxl.job.core.log; -import com.xxl.job.core.openapi.model.LogResult; +import com.xxl.job.core.openapi.executor.dto.LogResult; import com.xxl.tool.core.DateTool; import com.xxl.tool.core.StringTool; import com.xxl.tool.io.FileTool; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/AdminBiz.java similarity index 86% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/AdminBiz.java index 04bf6b34..a165a660 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/AdminBiz.java @@ -1,7 +1,7 @@ -package com.xxl.job.core.openapi; +package com.xxl.job.core.openapi.admin; -import com.xxl.job.core.openapi.model.CallbackRequest; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.tool.response.Response; import java.util.List; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java similarity index 97% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java index bb739e57..0dc2c035 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.admin.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java similarity index 96% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java index 5a66bff6..c1532531 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.admin.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/ExecutorBiz.java similarity index 90% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/ExecutorBiz.java index 1bcb33a8..da3e5d2a 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/ExecutorBiz.java @@ -1,6 +1,6 @@ -package com.xxl.job.core.openapi; +package com.xxl.job.core.openapi.executor; -import com.xxl.job.core.openapi.model.*; +import com.xxl.job.core.openapi.executor.dto.*; import com.xxl.tool.response.Response; /** diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/IdleBeatRequest.java similarity index 90% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/IdleBeatRequest.java index f794ec29..6a047e4d 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/IdleBeatRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.executor.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/KillRequest.java similarity index 90% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/KillRequest.java index f97017e8..9dd99d19 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/KillRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.executor.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java similarity index 95% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java index d4622c3c..c799d318 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.executor.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java similarity index 96% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java index f8bf1d8d..84fa803a 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.executor.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java similarity index 98% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java index 624d630e..78be09b1 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.model; +package com.xxl.job.core.openapi.executor.dto; import java.io.Serializable; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java similarity index 98% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java index 7a5d1d00..b343f30b 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.openapi.impl; +package com.xxl.job.core.openapi.executor.impl; import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.context.XxlJobContext; @@ -9,8 +9,8 @@ import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.impl.GlueJobHandler; import com.xxl.job.core.handler.impl.ScriptJobHandler; import com.xxl.job.core.log.XxlJobFileAppender; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.model.*; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.dto.*; import com.xxl.job.core.thread.JobThread; import com.xxl.tool.response.Response; import org.slf4j.Logger; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java index 36d71207..46d25a75 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java @@ -2,12 +2,12 @@ package com.xxl.job.core.server; import com.xxl.job.core.constant.Const; import com.xxl.job.core.executor.XxlJobExecutor; -import com.xxl.job.core.openapi.ExecutorBiz; -import com.xxl.job.core.openapi.impl.ExecutorBizImpl; -import com.xxl.job.core.openapi.model.IdleBeatRequest; -import com.xxl.job.core.openapi.model.KillRequest; -import com.xxl.job.core.openapi.model.LogRequest; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.executor.ExecutorBiz; +import com.xxl.job.core.openapi.executor.impl.ExecutorBizImpl; +import com.xxl.job.core.openapi.executor.dto.IdleBeatRequest; +import com.xxl.job.core.openapi.executor.dto.KillRequest; +import com.xxl.job.core.openapi.executor.dto.LogRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.tool.error.ThrowableTool; import com.xxl.tool.json.GsonTool; import com.xxl.tool.response.Response; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThreadHelper.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThreadHelper.java index a8b204ea..ca55eaf2 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThreadHelper.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThreadHelper.java @@ -1,8 +1,8 @@ package com.xxl.job.core.thread; import com.xxl.job.core.constant.RegistTypeEnum; -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.RegistryRequest; +import com.xxl.job.core.openapi.admin.AdminBiz; +import com.xxl.job.core.openapi.admin.dto.RegistryRequest; import com.xxl.job.core.constant.Const; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.tool.concurrent.CyclicThread; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java index 6a1b3388..077d3069 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java @@ -1,7 +1,7 @@ package com.xxl.job.core.thread; -import com.xxl.job.core.openapi.model.CallbackRequest; -import com.xxl.job.core.openapi.model.TriggerRequest; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; +import com.xxl.job.core.openapi.executor.dto.TriggerRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.executor.XxlJobExecutor; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java index b14f9d7a..46385aef 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java @@ -5,8 +5,8 @@ import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.job.core.log.XxlJobFileAppender; -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.CallbackRequest; +import com.xxl.job.core.openapi.admin.AdminBiz; +import com.xxl.job.core.openapi.admin.dto.CallbackRequest; import com.xxl.tool.concurrent.CyclicThread; import com.xxl.tool.concurrent.MessageQueue; import com.xxl.tool.core.ArrayTool;