diff --git a/doc/XXL-JOB-English-Documentation.md b/doc/XXL-JOB-English-Documentation.md
index f2c8e9c1..7af37c11 100644
--- a/doc/XXL-JOB-English-Documentation.md
+++ b/doc/XXL-JOB-English-Documentation.md
@@ -1003,7 +1003,7 @@ The scheduling center provides API services for executors and business parties t
3. Executor registration remove services;
4. Triggers a single execution service, and support the task to be triggered according to the business event;
-The scheduling center API service location: com.xxl.job.core.biz.AdminBiz.java
+The scheduling center API service location: com.xxl.job.core.openapi.AdminBiz.java
The scheduling center API service requests reference code：com.xxl.job.adminbiz.AdminBizTest.java
diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 07e54d69..899023d9 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1775,7 +1775,7 @@ XXL-JOB 目标是一种跨平台、跨语言的任务调度规范和协议。
### 6.1 调度中心 RESTful API
-API服务位置：com.xxl.job.core.biz.AdminBiz （ com.xxl.job.admin.controller.JobApiController ）
+API服务位置：com.xxl.job.core.openapi.AdminBiz （ com.xxl.job.admin.controller.JobApiController ）
API服务请求参考代码：com.xxl.job.adminbiz.AdminBizTest
#### a、任务回调
@@ -1857,7 +1857,7 @@ Header：
### 6.2 执行器 RESTful API
-API服务位置：com.xxl.job.core.biz.ExecutorBiz
+API服务位置：com.xxl.job.core.openapi.ExecutorBiz
API服务请求参考代码：com.xxl.job.executorbiz.ExecutorBizTest
#### a、心跳检测
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java
index 5b7c2bfe..a49a3277 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java
@@ -10,7 +10,7 @@ import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum;
import com.xxl.job.admin.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.openapi.model.ReturnT;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.helper.XxlSsoHelper;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
index 12ca233f..51fd36c2 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
@@ -6,7 +6,7 @@ import com.xxl.job.admin.mapper.XxlJobUserMapper;
import com.xxl.job.admin.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobUser;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.openapi.model.ReturnT;
import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java
index bfcc7faa..fdbab03e 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java
@@ -6,7 +6,7 @@ import com.xxl.job.admin.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.tool.response.ResponseCode;
+import com.xxl.job.core.context.XxlJobContext;
import jakarta.mail.internet.MimeMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +41,10 @@ public class EmailJobAlarm implements JobAlarm {
// alarmContent
String alarmContent = "Alarm Job LogId=" + jobLog.getId();
- if (jobLog.getTriggerCode() != ResponseCode.CODE_200.getCode()) {
+ if (jobLog.getTriggerCode() != XxlJobContext.HANDLE_CODE_SUCCESS) {
alarmContent += "
TriggerMsg=
" + jobLog.getTriggerMsg();
}
- if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ResponseCode.CODE_200.getCode()) {
+ if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != XxlJobContext.HANDLE_CODE_SUCCESS) {
alarmContent += "
HandleCode=" + jobLog.getHandleMsg();
}
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java
index b70f6aff..4a76f225 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java
@@ -6,8 +6,8 @@ import com.xxl.job.admin.scheduler.complete.JobCompleter;
import com.xxl.job.admin.scheduler.thread.*;
import com.xxl.job.admin.scheduler.trigger.JobTrigger;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.client.ExecutorBizClient;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.client.ExecutorBizClient;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.tool.core.StringTool;
import jakarta.annotation.Resource;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java
index 0a8273b5..e1fc7336 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java
@@ -1,10 +1,10 @@
package com.xxl.job.admin.scheduler.openapi;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.RegistryRequest;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
+import com.xxl.job.core.openapi.model.ReturnT;
import com.xxl.job.core.util.XxlJobRemotingUtil;
import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.tool.core.StringTool;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java
index 2d6583f4..b777c782 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java
@@ -1,6 +1,6 @@
package com.xxl.job.admin.scheduler.route;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.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/scheduler/route/strategy/ExecutorRouteBusyover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java
index 59021d8c..1e5e85b5 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteBusyover.java
@@ -3,9 +3,9 @@ package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.model.IdleBeatRequest;
-import com.xxl.job.core.biz.model.TriggerRequest;
+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.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java
index 53363c76..879fc37b 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteConsistentHash.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.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/scheduler/route/strategy/ExecutorRouteFailover.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java
index f2e62a60..4d8974f6 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java
@@ -3,8 +3,8 @@ package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java
index d02a15e0..407276c5 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFirst.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java
index 6a55e5eb..2f98d407 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLFU.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.*;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java
index bffdc6f7..089bb781 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLRU.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.ArrayList;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java
index 103c72ee..62747d85 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteLast.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java
index b0baca14..ae760d29 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRandom.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java
index 4d33c1cf..8242e68b 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteRound.java
@@ -1,7 +1,7 @@
package com.xxl.job.admin.scheduler.route.strategy;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java
index 69dee24d..2e0bcf9e 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java
@@ -3,7 +3,7 @@ package com.xxl.job.admin.scheduler.thread;
import com.xxl.job.admin.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobRegistry;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.job.core.enums.RegistryConfig;
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/scheduler/trigger/JobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java
index 133b44a3..89108571 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java
@@ -9,8 +9,9 @@ import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.util.I18nUtil;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.model.TriggerRequest;
+import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.tool.core.StringTool;
import com.xxl.tool.exception.ThrowableTool;
@@ -178,7 +179,7 @@ public class JobTrigger {
}
}
} else {
- routeAddressResult = Response.ofFail( I18nUtil.getString("jobconf_trigger_address_empty"));
+ routeAddressResult = Response.of(XxlJobContext.HANDLE_CODE_FAIL, I18nUtil.getString("jobconf_trigger_address_empty"));
}
// 4、trigger remote executor
@@ -186,7 +187,7 @@ public class JobTrigger {
if (address != null) {
triggerResult = doTrigger(triggerParam, address);
} else {
- triggerResult = Response.ofFail(null);
+ triggerResult = Response.of(XxlJobContext.HANDLE_CODE_FAIL, null);
}
// 5、collection trigger info
@@ -198,14 +199,15 @@ public class JobTrigger {
triggerMsgSb.append("
").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append("：").append(group.getRegistryList());
triggerMsgSb.append("
").append(I18nUtil.getString("jobinfo_field_executorRouteStrategy")).append("：").append(executorRouteStrategyEnum.getTitle());
if (shardingParam != null) {
- triggerMsgSb.append("("+shardingParam+")");
+ triggerMsgSb.append("(").append(shardingParam).append(")");
}
triggerMsgSb.append("
").append(I18nUtil.getString("jobinfo_field_executorBlockStrategy")).append("：").append(blockStrategy.getTitle());
triggerMsgSb.append("
").append(I18nUtil.getString("jobinfo_field_timeout")).append("：").append(jobInfo.getExecutorTimeout());
triggerMsgSb.append("
").append(I18nUtil.getString("jobinfo_field_executorFailRetryCount")).append("：").append(finalFailRetryCount);
- triggerMsgSb.append("
>>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_run") +"<<<<<<<<<<<
")
- .append((routeAddressResult!=null&&routeAddressResult.getMsg()!=null)?routeAddressResult.getMsg()+"
":"").append(triggerResult.getMsg()!=null?triggerResult.getMsg():"");
+ triggerMsgSb.append("
>>>>>>>>>>>").append(I18nUtil.getString("jobconf_trigger_run")).append("<<<<<<<<<<<
")
+ .append((routeAddressResult!=null&&!routeAddressResult.isSuccess()&&routeAddressResult.getMsg()!=null)?routeAddressResult.getMsg()+"
":"")
+ .append((!triggerResult.isSuccess()&triggerResult.getMsg()!=null) ?triggerResult.getMsg():"");
// 6、save log trigger-info
jobLog.setExecutorAddress(address);
@@ -235,7 +237,7 @@ public class JobTrigger {
runResult = executorBiz.run(triggerParam);
} catch (Exception e) {
logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e);
- runResult = Response.ofFail(ThrowableTool.toString(e));
+ runResult = Response.of(XxlJobContext.HANDLE_CODE_FAIL, ThrowableTool.toString(e));
}
StringBuffer runResultSB = new StringBuffer(I18nUtil.getString("jobconf_trigger_run") + "：");
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java
index a210090f..d9be96b0 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java
@@ -2,8 +2,7 @@ package com.xxl.job.admin.service;
import com.xxl.job.admin.model.XxlJobInfo;
-import com.xxl.job.admin.model.XxlJobUser;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.openapi.model.ReturnT;
import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.response.Response;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
index 43f1049e..7cfd3d60 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
@@ -1,9 +1,9 @@
package com.xxl.job.admin.service.impl;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.tool.response.Response;
import org.springframework.stereotype.Service;
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
index 33009f33..5e99037d 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
@@ -14,7 +14,7 @@ import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum;
import com.xxl.job.admin.service.XxlJobService;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.openapi.model.ReturnT;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo;
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
index a5e1a2fe..3b122928 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
@@ -1,9 +1,9 @@
package com.xxl.job.adminbiz;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.client.AdminBizClient;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.client.AdminBizClient;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.enums.RegistryConfig;
import com.xxl.tool.response.Response;
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java
index 92039e60..ab7564bb 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java
@@ -1,8 +1,8 @@
package com.xxl.job.executorbiz;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.client.ExecutorBizClient;
-import com.xxl.job.core.biz.model.*;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.client.ExecutorBizClient;
+import com.xxl.job.core.openapi.model.*;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.tool.response.Response;
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 75a441ca..743ee3ad 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
@@ -1,7 +1,7 @@
package com.xxl.job.core.executor;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.client.AdminBizClient;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.client.AdminBizClient;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.handler.impl.MethodJobHandler;
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 4a107114..cad3c373 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.biz.model.LogResult;
+import com.xxl.job.core.openapi.model.LogResult;
import com.xxl.tool.core.StringTool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java
similarity index 85%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java
index 16dfd299..529cb94b 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java
@@ -1,7 +1,7 @@
-package com.xxl.job.core.biz;
+package com.xxl.job.core.openapi;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.tool.response.Response;
import java.util.List;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java
similarity index 91%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java
index c7b2840e..7245f595 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/ExecutorBiz.java
@@ -1,6 +1,6 @@
-package com.xxl.job.core.biz;
+package com.xxl.job.core.openapi;
-import com.xxl.job.core.biz.model.*;
+import com.xxl.job.core.openapi.model.*;
import com.xxl.tool.response.Response;
/**
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java
similarity index 88%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java
index f0c3aad2..08a7aa9f 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java
@@ -1,8 +1,8 @@
-package com.xxl.job.core.biz.client;
+package com.xxl.job.core.openapi.client;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.job.core.util.XxlJobRemotingUtil;
import com.xxl.tool.response.Response;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/ExecutorBizClient.java
similarity index 93%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/ExecutorBizClient.java
index 37b339d4..722f5c9b 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/ExecutorBizClient.java
@@ -1,7 +1,7 @@
-package com.xxl.job.core.biz.client;
+package com.xxl.job.core.openapi.client;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.model.*;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.model.*;
import com.xxl.job.core.util.XxlJobRemotingUtil;
import com.xxl.tool.response.Response;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java
similarity index 89%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java
index a42eba0c..38c289b4 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java
@@ -1,7 +1,8 @@
-package com.xxl.job.core.biz.impl;
+package com.xxl.job.core.openapi.impl;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.model.*;
+import com.xxl.job.core.context.XxlJobContext;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.model.*;
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.executor.XxlJobExecutor;
import com.xxl.job.core.glue.GlueFactory;
@@ -71,7 +72,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
if (jobHandler == null) {
jobHandler = newJobHandler;
if (jobHandler == null) {
- return Response.ofFail( "job handler [" + triggerRequest.getExecutorHandler() + "] not found.");
+ return Response.of(XxlJobContext.HANDLE_CODE_FAIL, "job handler [" + triggerRequest.getExecutorHandler() + "] not found.");
}
}
@@ -95,7 +96,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
jobHandler = new GlueJobHandler(originJobHandler, triggerRequest.getGlueUpdatetime());
} catch (Exception e) {
logger.error(e.getMessage(), e);
- return Response.ofFail( e.getMessage());
+ return Response.of(XxlJobContext.HANDLE_CODE_FAIL, e.getMessage());
}
}
} else if (glueTypeEnum!=null && glueTypeEnum.isScript()) {
@@ -116,7 +117,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
jobHandler = new ScriptJobHandler(triggerRequest.getJobId(), triggerRequest.getGlueUpdatetime(), triggerRequest.getGlueSource(), GlueTypeEnum.match(triggerRequest.getGlueType()));
}
} else {
- return Response.ofFail("glueType[" + triggerRequest.getGlueType() + "] is not valid.");
+ return Response.of(XxlJobContext.HANDLE_CODE_FAIL, "glueType[" + triggerRequest.getGlueType() + "] is not valid.");
}
// executor block strategy
@@ -125,7 +126,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
if (ExecutorBlockStrategyEnum.DISCARD_LATER == blockStrategy) {
// discard when running
if (jobThread.isRunningOrHasQueue()) {
- return Response.ofFail("block strategy effect："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle());
+ return Response.of(XxlJobContext.HANDLE_CODE_FAIL, "block strategy effect："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle());
}
} else if (ExecutorBlockStrategyEnum.COVER_EARLY == blockStrategy) {
// kill running jobThread
@@ -145,8 +146,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
}
// push data to queue
- Response pushResult = jobThread.pushTriggerQueue(triggerRequest);
- return pushResult;
+ return jobThread.pushTriggerQueue(triggerRequest);
}
@Override
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java
similarity index 97%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java
index e9adb745..3202535d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java
similarity index 91%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java
index a490c575..f794ec29 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/IdleBeatRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/KillRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java
similarity index 91%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/KillRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java
index e5422c86..f97017e8 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/KillRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/KillRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java
similarity index 95%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java
index 22ea1ea1..d4622c3c 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java
similarity index 96%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java
index 1ffdf7ce..f8bf1d8d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/LogResult.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java
similarity index 97%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java
index d75625bb..5a66bff6 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/RegistryRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java
similarity index 97%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java
index 0ceeb9a3..f86e1825 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java
similarity index 98%
rename from xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerRequest.java
rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java
index 84033ae4..ad23dcf2 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerRequest.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/TriggerRequest.java
@@ -1,4 +1,4 @@
-package com.xxl.job.core.biz.model;
+package com.xxl.job.core.openapi.model;
import java.io.Serializable;
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 ed5a296d..5b828ff3 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
@@ -1,8 +1,8 @@
package com.xxl.job.core.server;
-import com.xxl.job.core.biz.ExecutorBiz;
-import com.xxl.job.core.biz.impl.ExecutorBizImpl;
-import com.xxl.job.core.biz.model.*;
+import com.xxl.job.core.openapi.ExecutorBiz;
+import com.xxl.job.core.openapi.impl.ExecutorBizImpl;
+import com.xxl.job.core.openapi.model.*;
import com.xxl.job.core.thread.ExecutorRegistryThread;
import com.xxl.job.core.util.XxlJobRemotingUtil;
import com.xxl.tool.exception.ThrowableTool;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
index d3d975d1..9f3035ab 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
@@ -1,7 +1,7 @@
package com.xxl.job.core.thread;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.model.RegistryRequest;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.model.RegistryRequest;
import com.xxl.job.core.enums.RegistryConfig;
import com.xxl.job.core.executor.XxlJobExecutor;
import com.xxl.tool.response.Response;
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 be94b890..3cec9a25 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.biz.model.HandleCallbackRequest;
-import com.xxl.job.core.biz.model.TriggerRequest;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.model.TriggerRequest;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.executor.XxlJobExecutor;
@@ -61,7 +61,7 @@ public class JobThread extends Thread{
// avoid repeat
if (!triggerLogIdSet.add(triggerParam.getLogId())) {
logger.info(">>>>>>>>>>> repeate trigger job, logId:{}", triggerParam.getLogId());
- return Response.ofFail("repeate trigger job, logId:" + triggerParam.getLogId());
+ return Response.of(XxlJobContext.HANDLE_CODE_FAIL, "repeate trigger job, logId:" + triggerParam.getLogId());
}
// push trigger queue
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
index f8cd0b67..85ccd8aa 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
@@ -1,7 +1,7 @@
package com.xxl.job.core.thread;
-import com.xxl.job.core.biz.AdminBiz;
-import com.xxl.job.core.biz.model.HandleCallbackRequest;
+import com.xxl.job.core.openapi.AdminBiz;
+import com.xxl.job.core.openapi.model.HandleCallbackRequest;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.enums.RegistryConfig;