openapi 包结构重构

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、邮箱多种方式；

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.model.KillRequest;
+import com.xxl.job.core.openapi.executor.dto.KillRequest;
-import com.xxl.job.core.openapi.model.LogRequest;
+import com.xxl.job.core.openapi.executor.dto.LogRequest;
-import com.xxl.job.core.openapi.model.LogResult;
+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;

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<String, ExecutorBiz> executorBizRepository = new ConcurrentHashMap<String, ExecutorBiz>();
+    private static ConcurrentMap<String, ExecutorBiz> executorBizRepository = new ConcurrentHashMap<>();
     public static ExecutorBiz getExecutorBiz(String address) throws Exception {
         // valid
         if (StringTool.isBlank(address)) {

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.admin.AdminBiz;
-import com.xxl.job.core.openapi.model.CallbackRequest;
+import com.xxl.job.core.openapi.admin.dto.CallbackRequest;
-import com.xxl.job.core.openapi.model.RegistryRequest;
+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;

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;

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.model.IdleBeatRequest;
+import com.xxl.job.core.openapi.executor.dto.IdleBeatRequest;
-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;

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;

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.executor.ExecutorBiz;
-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;

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;

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.*;

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;

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;

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;

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;

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;

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;

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.model.TriggerRequest;
+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;

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.admin.AdminBiz;
-import com.xxl.job.core.openapi.model.CallbackRequest;
+import com.xxl.job.core.openapi.admin.dto.CallbackRequest;
-import com.xxl.job.core.openapi.model.RegistryRequest;
+import com.xxl.job.core.openapi.admin.dto.RegistryRequest;
 import com.xxl.tool.response.Response;
 import org.springframework.stereotype.Service;
 

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.admin.AdminBiz;
-import com.xxl.job.core.openapi.model.CallbackRequest;
+import com.xxl.job.core.openapi.admin.dto.CallbackRequest;
-import com.xxl.job.core.openapi.model.RegistryRequest;
+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;

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.model.*;
+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;

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;

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;

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.admin.dto.CallbackRequest;
-import com.xxl.job.core.openapi.model.RegistryRequest;
+import com.xxl.job.core.openapi.admin.dto.RegistryRequest;
 import com.xxl.tool.response.Response;
 
 import java.util.List;

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;
 

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;
 

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;
 
 /**

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;
 

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;
 

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;
 

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;
 

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;
 

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.model.*;
+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;

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.executor.ExecutorBiz;
-import com.xxl.job.core.openapi.impl.ExecutorBizImpl;
+import com.xxl.job.core.openapi.executor.impl.ExecutorBizImpl;
-import com.xxl.job.core.openapi.model.IdleBeatRequest;
+import com.xxl.job.core.openapi.executor.dto.IdleBeatRequest;
-import com.xxl.job.core.openapi.model.KillRequest;
+import com.xxl.job.core.openapi.executor.dto.KillRequest;
-import com.xxl.job.core.openapi.model.LogRequest;
+import com.xxl.job.core.openapi.executor.dto.LogRequest;
-import com.xxl.job.core.openapi.model.TriggerRequest;
+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;

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.admin.AdminBiz;
-import com.xxl.job.core.openapi.model.RegistryRequest;
+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;

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.admin.dto.CallbackRequest;
-import com.xxl.job.core.openapi.model.TriggerRequest;
+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;

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.admin.AdminBiz;
-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.concurrent.MessageQueue;
 import com.xxl.tool.core.ArrayTool;