diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 1fb86a89..c20f8b04 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -18,6 +18,7 @@ import com.xxl.job.core.biz.model.ReturnT; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.DateTool; import com.xxl.tool.core.StringTool; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -159,35 +160,35 @@ public class JobLogController { @RequestMapping("/logDetailCat") @ResponseBody - public ReturnT logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum){ + public Response logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum){ try { // valid XxlJobLog jobLog = xxlJobLogMapper.load(logId); // todo, need to improve performance if (jobLog == null) { - return ReturnT.ofFail(I18nUtil.getString("joblog_logid_unvalid")); + return Response.ofFail(I18nUtil.getString("joblog_logid_unvalid")); } // log cat ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(jobLog.getExecutorAddress()); - ReturnT logResult = executorBiz.log(new LogRequest(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); + Response logResult = executorBiz.log(new LogRequest(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); // is end - if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) { + if (logResult.getData()!=null && logResult.getData().getFromLineNum() > logResult.getData().getToLineNum()) { if (jobLog.getHandleCode() > 0) { - logResult.getContent().setEnd(true); + logResult.getData().setEnd(true); } } // fix xss - if (logResult.getContent()!=null && StringTool.isNotBlank(logResult.getContent().getLogContent())) { - String newLogContent = filter(logResult.getContent().getLogContent()); - logResult.getContent().setLogContent(newLogContent); + if (logResult.getData()!=null && StringTool.isNotBlank(logResult.getData().getLogContent())) { + String newLogContent = filter(logResult.getData().getLogContent()); + logResult.getData().setLogContent(newLogContent); } return logResult; } catch (Exception e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail(e.getMessage()); + return Response.ofFail(e.getMessage()); } } @@ -240,13 +241,13 @@ public class JobLogController { JobGroupPermissionUtil.validJobGroupPermission(request, jobInfo.getJobGroup()); // request of kill - ReturnT runResult = null; + Response runResult = null; try { ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(log.getExecutorAddress()); runResult = executorBiz.kill(new KillRequest(jobInfo.getId())); } catch (Exception e) { logger.error(e.getMessage(), e); - runResult = ReturnT.ofFail( e.getMessage()); + runResult = Response.ofFail( e.getMessage()); } if (ReturnT.SUCCESS_CODE == runResult.getCode()) { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/JobApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java similarity index 96% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/JobApiController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java index f7c499b9..0a8273b5 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/JobApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java @@ -20,7 +20,7 @@ import java.util.List; * Created by xuxueli on 17/5/10. */ @Controller -public class JobApiController { +public class OpenApiController { @Resource private AdminBiz adminBiz; @@ -31,7 +31,7 @@ public class JobApiController { @RequestMapping("/api/{uri}") @ResponseBody @XxlSso(login = false) - public ReturnT api(HttpServletRequest request, + public Object api(HttpServletRequest request, @PathVariable("uri") String uri, @RequestHeader(XxlJobRemotingUtil.XXL_JOB_ACCESS_TOKEN) String accesstoken, @RequestBody(required = false) String requestBody) { 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 0d53a615..2d6583f4 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,7 +1,7 @@ package com.xxl.job.admin.scheduler.route; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +19,6 @@ public abstract class ExecutorRouter { * @param addressList executor address list * @return ReturnT.content=address */ - public abstract ReturnT route(TriggerRequest triggerParam, List addressList); + public abstract Response route(TriggerRequest triggerParam, List addressList); } 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 821338b2..59021d8c 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 @@ -5,8 +5,8 @@ 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.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; @@ -16,17 +16,17 @@ import java.util.List; public class ExecutorRouteBusyover extends ExecutorRouter { @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { StringBuffer idleBeatResultSB = new StringBuffer(); for (String address : addressList) { // beat - ReturnT idleBeatResult = null; + Response idleBeatResult = null; try { ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(address); idleBeatResult = executorBiz.idleBeat(new IdleBeatRequest(triggerParam.getJobId())); } catch (Exception e) { logger.error(e.getMessage(), e); - idleBeatResult = ReturnT.ofFail( ""+e ); + idleBeatResult = Response.ofFail( ""+e ); } idleBeatResultSB.append( (idleBeatResultSB.length()>0)?"

":"") .append(I18nUtil.getString("jobconf_idleBeat") + "：") @@ -37,12 +37,12 @@ public class ExecutorRouteBusyover extends ExecutorRouter { // beat success if (idleBeatResult.isSuccess()) { idleBeatResult.setMsg(idleBeatResultSB.toString()); - idleBeatResult.setContent(address); + idleBeatResult.setData(address); return idleBeatResult; } } - return ReturnT.ofFail( idleBeatResultSB.toString()); + return Response.ofFail( idleBeatResultSB.toString()); } } 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 9414fb42..53363c76 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -81,9 +81,9 @@ public class ExecutorRouteConsistentHash extends ExecutorRouter { } @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { String address = hashJob(triggerParam.getJobId(), addressList); - return ReturnT.ofSuccess(address); + return Response.ofSuccess(address); } } 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 cd926cdf..36da2a4c 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 @@ -6,6 +6,7 @@ import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; @@ -15,18 +16,18 @@ import java.util.List; public class ExecutorRouteFailover extends ExecutorRouter { @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { StringBuffer beatResultSB = new StringBuffer(); for (String address : addressList) { // beat - ReturnT beatResult = null; + Response beatResult = null; try { ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(address); beatResult = executorBiz.beat(); } catch (Exception e) { logger.error(e.getMessage(), e); - beatResult = ReturnT.ofFail(e.getMessage() ); + beatResult = Response.ofFail(e.getMessage() ); } beatResultSB.append( (beatResultSB.length()>0)?"

":"") .append(I18nUtil.getString("jobconf_beat") + "：") @@ -38,11 +39,11 @@ public class ExecutorRouteFailover extends ExecutorRouter { if (beatResult.isSuccess()) { beatResult.setMsg(beatResultSB.toString()); - beatResult.setContent(address); + beatResult.setData(address); return beatResult; } } - return ReturnT.ofFail( beatResultSB.toString()); + return Response.ofFail( beatResultSB.toString()); } } 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 c95686b6..d02a15e0 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; @@ -12,8 +12,8 @@ import java.util.List; public class ExecutorRouteFirst extends ExecutorRouter { @Override - public ReturnT route(TriggerRequest triggerParam, List addressList){ - return ReturnT.ofSuccess(addressList.get(0)); + public Response route(TriggerRequest triggerParam, List addressList){ + return Response.ofSuccess(addressList.get(0)); } } 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 9b5b90eb..6a55e5eb 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -70,9 +70,9 @@ public class ExecutorRouteLFU extends ExecutorRouter { } @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { String address = route(triggerParam.getJobId(), addressList); - return ReturnT.ofSuccess(address); + return Response.ofSuccess(address); } } 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 5f0761df..bffdc6f7 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -72,9 +72,9 @@ public class ExecutorRouteLRU extends ExecutorRouter { } @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { String address = route(triggerParam.getJobId(), addressList); - return ReturnT.ofSuccess(address); + return Response.ofSuccess(address); } } 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 5f7c31ef..103c72ee 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; @@ -12,8 +12,8 @@ import java.util.List; public class ExecutorRouteLast extends ExecutorRouter { @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { - return ReturnT.ofSuccess(addressList.get(addressList.size()-1)); + public Response route(TriggerRequest triggerParam, List addressList) { + return Response.ofSuccess(addressList.get(addressList.size()-1)); } } 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 0f395ba4..b0baca14 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; import java.util.Random; @@ -15,9 +15,9 @@ public class ExecutorRouteRandom extends ExecutorRouter { private static Random localRandom = new Random(); @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { String address = addressList.get(localRandom.nextInt(addressList.size())); - return ReturnT.ofSuccess(address); + return Response.ofSuccess(address); } } 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 b75c4829..4d33c1cf 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,8 +1,8 @@ package com.xxl.job.admin.scheduler.route.strategy; import com.xxl.job.admin.scheduler.route.ExecutorRouter; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; +import com.xxl.tool.response.Response; import java.util.List; import java.util.Random; @@ -38,9 +38,9 @@ public class ExecutorRouteRound extends ExecutorRouter { } @Override - public ReturnT route(TriggerRequest triggerParam, List addressList) { + public Response route(TriggerRequest triggerParam, List addressList) { String address = addressList.get(count(triggerParam.getJobId())%addressList.size()); - return ReturnT.ofSuccess(address); + return Response.ofSuccess(address); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java index 12f45008..3b512835 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java @@ -6,6 +6,7 @@ import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.biz.model.HandleCallbackRequest; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.tool.core.DateTool; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -136,30 +137,30 @@ public class JobCompleteHelper { // ---------------------- helper ---------------------- - public ReturnT callback(List callbackParamList) { + public Response callback(List callbackParamList) { callbackThreadPool.execute(new Runnable() { @Override public void run() { for (HandleCallbackRequest handleCallbackParam: callbackParamList) { - ReturnT callbackResult = callback(handleCallbackParam); + Response callbackResult = doCallback(handleCallbackParam); logger.debug(">>>>>>>>> JobApiController.callback {}, handleCallbackParam={}, callbackResult={}", (callbackResult.isSuccess()?"success":"fail"), handleCallbackParam, callbackResult); } } }); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } - private ReturnT callback(HandleCallbackRequest handleCallbackParam) { + private Response doCallback(HandleCallbackRequest handleCallbackParam) { // valid log item XxlJobLog log = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().load(handleCallbackParam.getLogId()); if (log == null) { - return ReturnT.ofFail( "log item not found."); + return Response.ofFail( "log item not found."); } if (log.getHandleCode() > 0) { - return ReturnT.ofFail("log repeate callback."); // avoid repeat callback, trigger child job etc + return Response.ofFail("log repeate callback."); // avoid repeat callback, trigger child job etc } // handle msg @@ -177,7 +178,7 @@ public class JobCompleteHelper { log.setHandleMsg(handleMsg.toString()); XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(log); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } 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 9334b218..69dee24d 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 @@ -4,9 +4,9 @@ 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.biz.model.ReturnT; import com.xxl.job.core.enums.RegistryConfig; import com.xxl.tool.core.StringTool; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -154,13 +154,13 @@ public class JobRegistryHelper { /** * registry */ - public ReturnT registry(RegistryRequest registryParam) { + public Response registry(RegistryRequest registryParam) { // valid if (StringTool.isBlank(registryParam.getRegistryGroup()) || StringTool.isBlank(registryParam.getRegistryKey()) || StringTool.isBlank(registryParam.getRegistryValue())) { - return ReturnT.ofFail("Illegal Argument."); + return Response.ofFail("Illegal Argument."); } // async execute @@ -183,19 +183,19 @@ public class JobRegistryHelper { } }); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } /** * registry remove */ - public ReturnT registryRemove(RegistryRequest registryParam) { + public Response registryRemove(RegistryRequest registryParam) { // valid if (StringTool.isBlank(registryParam.getRegistryGroup()) || StringTool.isBlank(registryParam.getRegistryKey()) || StringTool.isBlank(registryParam.getRegistryValue())) { - return ReturnT.ofFail("Illegal Argument."); + return Response.ofFail("Illegal Argument."); } // async execute @@ -210,7 +210,7 @@ public class JobRegistryHelper { } }); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } private void freshGroupRegistryInfo(RegistryRequest registryParam){ 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 dcff54fd..133b44a3 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 @@ -10,12 +10,12 @@ 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.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; import com.xxl.tool.core.StringTool; import com.xxl.tool.exception.ThrowableTool; import com.xxl.tool.http.IPTool; +import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,7 +163,7 @@ public class JobTrigger { // 3、init address String address = null; - ReturnT routeAddressResult = null; + Response routeAddressResult = null; if (group.getRegistryList()!=null && !group.getRegistryList().isEmpty()) { if (ExecutorRouteStrategyEnum.SHARDING_BROADCAST == executorRouteStrategyEnum) { if (index < group.getRegistryList().size()) { @@ -174,19 +174,19 @@ public class JobTrigger { } else { routeAddressResult = executorRouteStrategyEnum.getRouter().route(triggerParam, group.getRegistryList()); if (routeAddressResult.isSuccess()) { - address = routeAddressResult.getContent(); + address = routeAddressResult.getData(); } } } else { - routeAddressResult = ReturnT.ofFail( I18nUtil.getString("jobconf_trigger_address_empty")); + routeAddressResult = Response.ofFail( I18nUtil.getString("jobconf_trigger_address_empty")); } // 4、trigger remote executor - ReturnT triggerResult = null; + Response triggerResult = null; if (address != null) { triggerResult = doTrigger(triggerParam, address); } else { - triggerResult = ReturnT.ofFail(null); + triggerResult = Response.ofFail(null); } // 5、collection trigger info @@ -228,14 +228,14 @@ public class JobTrigger { * @param address the address * @return return */ - private ReturnT doTrigger(TriggerRequest triggerParam, String address){ - ReturnT runResult = null; + private Response doTrigger(TriggerRequest triggerParam, String address){ + Response runResult = null; try { ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(address); runResult = executorBiz.run(triggerParam); } catch (Exception e) { logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e); - runResult = ReturnT.ofFail(ThrowableTool.toString(e)); + runResult = Response.ofFail(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/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java index 335e8f7a..43f1049e 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 @@ -4,7 +4,7 @@ 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.tool.response.Response; import org.springframework.stereotype.Service; import java.util.List; @@ -15,19 +15,18 @@ import java.util.List; @Service public class AdminBizImpl implements AdminBiz { - @Override - public ReturnT callback(List handleCallbackRequestList) { + public Response callback(List handleCallbackRequestList) { return XxlJobAdminBootstrap.getInstance().getJobCompleteHelper().callback(handleCallbackRequestList); } @Override - public ReturnT registry(RegistryRequest registryRequest) { + public Response registry(RegistryRequest registryRequest) { return XxlJobAdminBootstrap.getInstance().getJobRegistryHelper().registry(registryRequest); } @Override - public ReturnT registryRemove(RegistryRequest registryRequest) { + public Response registryRemove(RegistryRequest registryRequest) { return XxlJobAdminBootstrap.getInstance().getJobRegistryHelper().registryRemove(registryRequest); } 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 9d454854..a5e1a2fe 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 @@ -4,9 +4,9 @@ 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.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.tool.response.Response; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -37,7 +37,7 @@ public class AdminBizTest { List callbackParamList = Arrays.asList(param); - ReturnT returnT = adminBiz.callback(callbackParamList); + Response returnT = adminBiz.callback(callbackParamList); assertTrue(returnT.isSuccess()); } @@ -52,7 +52,7 @@ public class AdminBizTest { AdminBiz adminBiz = new AdminBizClient(addressUrl, accessToken, timeoutSecond); RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); - ReturnT returnT = adminBiz.registry(registryParam); + Response returnT = adminBiz.registry(registryParam); assertTrue(returnT.isSuccess()); } @@ -67,7 +67,7 @@ public class AdminBizTest { AdminBiz adminBiz = new AdminBizClient(addressUrl, accessToken, timeoutSecond); RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); - ReturnT returnT = adminBiz.registryRemove(registryParam); + Response returnT = adminBiz.registryRemove(registryParam); assertTrue(returnT.isSuccess()); 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 ea214f0a..92039e60 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 @@ -5,6 +5,7 @@ import com.xxl.job.core.biz.client.ExecutorBizClient; import com.xxl.job.core.biz.model.*; import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; +import com.xxl.tool.response.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -24,11 +25,11 @@ public class ExecutorBizTest { public void beat() throws Exception { ExecutorBiz executorBiz = new ExecutorBizClient(addressUrl, accessToken, timeout); // Act - final ReturnT retval = executorBiz.beat(); + final Response retval = executorBiz.beat(); // Assert result Assertions.assertNotNull(retval); - Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertNull(((Response) retval).getData()); Assertions.assertEquals(200, retval.getCode()); Assertions.assertNull(retval.getMsg()); } @@ -40,11 +41,11 @@ public class ExecutorBizTest { final int jobId = 0; // Act - final ReturnT retval = executorBiz.idleBeat(new IdleBeatRequest(jobId)); + final Response retval = executorBiz.idleBeat(new IdleBeatRequest(jobId)); // Assert result Assertions.assertNotNull(retval); - Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertNull(((Response) retval).getData()); Assertions.assertEquals(500, retval.getCode()); Assertions.assertEquals("job thread is running or has trigger queue.", retval.getMsg()); } @@ -66,7 +67,7 @@ public class ExecutorBizTest { triggerParam.setLogDateTime(System.currentTimeMillis()); // Act - final ReturnT retval = executorBiz.run(triggerParam); + final Response retval = executorBiz.run(triggerParam); // Assert result Assertions.assertNotNull(retval); @@ -80,11 +81,11 @@ public class ExecutorBizTest { final int jobId = 0; // Act - final ReturnT retval = executorBiz.kill(new KillRequest(jobId)); + final Response retval = executorBiz.kill(new KillRequest(jobId)); // Assert result Assertions.assertNotNull(retval); - Assertions.assertNull(((ReturnT) retval).getContent()); + Assertions.assertNull(((Response) retval).getData()); Assertions.assertEquals(200, retval.getCode()); Assertions.assertNull(retval.getMsg()); } @@ -98,7 +99,7 @@ public class ExecutorBizTest { final int fromLineNum = 0; // Act - final ReturnT retval = executorBiz.log(new LogRequest(logDateTim, logId, fromLineNum)); + final Response retval = executorBiz.log(new LogRequest(logDateTim, logId, fromLineNum)); // Assert result Assertions.assertNotNull(retval); 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/biz/AdminBiz.java index f32c5503..16dfd299 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/biz/AdminBiz.java @@ -2,7 +2,7 @@ package com.xxl.job.core.biz; 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.tool.response.Response; import java.util.List; @@ -20,7 +20,7 @@ public interface AdminBiz { * @param handleCallbackRequestList * @return */ - public ReturnT callback(List handleCallbackRequestList); + public Response callback(List handleCallbackRequestList); // ---------------------- registry ---------------------- @@ -31,7 +31,7 @@ public interface AdminBiz { * @param registryRequest * @return */ - public ReturnT registry(RegistryRequest registryRequest); + public Response registry(RegistryRequest registryRequest); /** * registry remove @@ -39,7 +39,7 @@ public interface AdminBiz { * @param registryRequest * @return */ - public ReturnT registryRemove(RegistryRequest registryRequest); + public Response registryRemove(RegistryRequest registryRequest); // ---------------------- biz (custome) ---------------------- 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/biz/ExecutorBiz.java index 6b50b1c1..c7b2840e 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/biz/ExecutorBiz.java @@ -1,6 +1,7 @@ package com.xxl.job.core.biz; import com.xxl.job.core.biz.model.*; +import com.xxl.tool.response.Response; /** * Created by xuxueli on 17/3/1. @@ -9,37 +10,37 @@ public interface ExecutorBiz { /** * beat - * @return + * @return response */ - public ReturnT beat(); + public Response beat(); /** * idle beat * - * @param idleBeatRequest - * @return + * @param idleBeatRequest idleBeatRequest + * @return response */ - public ReturnT idleBeat(IdleBeatRequest idleBeatRequest); + public Response idleBeat(IdleBeatRequest idleBeatRequest); /** * run - * @param triggerRequest - * @return + * @param triggerRequest triggerRequest + * @return response */ - public ReturnT run(TriggerRequest triggerRequest); + public Response run(TriggerRequest triggerRequest); /** * kill - * @param killRequest - * @return + * @param killRequest killRequest + * @return response */ - public ReturnT kill(KillRequest killRequest); + public Response kill(KillRequest killRequest); /** * log - * @param logRequest - * @return + * @param logRequest logRequest + * @return response */ - public ReturnT log(LogRequest logRequest); + public Response log(LogRequest logRequest); } 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/biz/client/AdminBizClient.java index 8df7c71d..f0c3aad2 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/biz/client/AdminBizClient.java @@ -3,8 +3,8 @@ package com.xxl.job.core.biz.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.biz.model.ReturnT; import com.xxl.job.core.util.XxlJobRemotingUtil; +import com.xxl.tool.response.Response; import java.util.List; @@ -37,17 +37,17 @@ public class AdminBizClient implements AdminBiz { @Override - public ReturnT callback(List handleCallbackRequestList) { + public Response callback(List handleCallbackRequestList) { return XxlJobRemotingUtil.postBody(addressUrl+"api/callback", accessToken, timeout, handleCallbackRequestList, String.class); } @Override - public ReturnT registry(RegistryRequest registryRequest) { + public Response registry(RegistryRequest registryRequest) { return XxlJobRemotingUtil.postBody(addressUrl + "api/registry", accessToken, timeout, registryRequest, String.class); } @Override - public ReturnT registryRemove(RegistryRequest registryRequest) { + public Response registryRemove(RegistryRequest registryRequest) { return XxlJobRemotingUtil.postBody(addressUrl + "api/registryRemove", accessToken, timeout, registryRequest, String.class); } 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/biz/client/ExecutorBizClient.java index 4a0ca84b..37b339d4 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/biz/client/ExecutorBizClient.java @@ -3,6 +3,7 @@ package com.xxl.job.core.biz.client; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.*; import com.xxl.job.core.util.XxlJobRemotingUtil; +import com.xxl.tool.response.Response; /** * admin api test @@ -33,27 +34,27 @@ public class ExecutorBizClient implements ExecutorBiz { @Override - public ReturnT beat() { + public Response beat() { return XxlJobRemotingUtil.postBody(addressUrl+"beat", accessToken, timeout, "", String.class); } @Override - public ReturnT idleBeat(IdleBeatRequest idleBeatRequest){ + public Response idleBeat(IdleBeatRequest idleBeatRequest){ return XxlJobRemotingUtil.postBody(addressUrl+"idleBeat", accessToken, timeout, idleBeatRequest, String.class); } @Override - public ReturnT run(TriggerRequest triggerRequest) { + public Response run(TriggerRequest triggerRequest) { return XxlJobRemotingUtil.postBody(addressUrl + "run", accessToken, timeout, triggerRequest, String.class); } @Override - public ReturnT kill(KillRequest killRequest) { + public Response kill(KillRequest killRequest) { return XxlJobRemotingUtil.postBody(addressUrl + "kill", accessToken, timeout, killRequest, String.class); } @Override - public ReturnT log(LogRequest logRequest) { + public Response log(LogRequest logRequest) { return XxlJobRemotingUtil.postBody(addressUrl + "log", accessToken, timeout, logRequest, LogResult.class); } 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/biz/impl/ExecutorBizImpl.java index b83292af..a42eba0c 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/biz/impl/ExecutorBizImpl.java @@ -11,6 +11,7 @@ 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.thread.JobThread; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,12 +24,12 @@ public class ExecutorBizImpl implements ExecutorBiz { private static Logger logger = LoggerFactory.getLogger(ExecutorBizImpl.class); @Override - public ReturnT beat() { - return ReturnT.ofSuccess(); + public Response beat() { + return Response.ofSuccess(); } @Override - public ReturnT idleBeat(IdleBeatRequest idleBeatRequest) { + public Response idleBeat(IdleBeatRequest idleBeatRequest) { // isRunningOrHasQueue boolean isRunningOrHasQueue = false; @@ -38,13 +39,13 @@ public class ExecutorBizImpl implements ExecutorBiz { } if (isRunningOrHasQueue) { - return ReturnT.ofFail("job thread is running or has trigger queue."); + return Response.ofFail("job thread is running or has trigger queue."); } - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @Override - public ReturnT run(TriggerRequest triggerRequest) { + public Response run(TriggerRequest triggerRequest) { // load old：jobHandler + jobThread JobThread jobThread = XxlJobExecutor.loadJobThread(triggerRequest.getJobId()); IJobHandler jobHandler = jobThread!=null?jobThread.getHandler():null; @@ -70,7 +71,7 @@ public class ExecutorBizImpl implements ExecutorBiz { if (jobHandler == null) { jobHandler = newJobHandler; if (jobHandler == null) { - return ReturnT.ofFail( "job handler [" + triggerRequest.getExecutorHandler() + "] not found."); + return Response.ofFail( "job handler [" + triggerRequest.getExecutorHandler() + "] not found."); } } @@ -94,7 +95,7 @@ public class ExecutorBizImpl implements ExecutorBiz { jobHandler = new GlueJobHandler(originJobHandler, triggerRequest.getGlueUpdatetime()); } catch (Exception e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail( e.getMessage()); + return Response.ofFail( e.getMessage()); } } } else if (glueTypeEnum!=null && glueTypeEnum.isScript()) { @@ -115,7 +116,7 @@ public class ExecutorBizImpl implements ExecutorBiz { jobHandler = new ScriptJobHandler(triggerRequest.getJobId(), triggerRequest.getGlueUpdatetime(), triggerRequest.getGlueSource(), GlueTypeEnum.match(triggerRequest.getGlueType())); } } else { - return ReturnT.ofFail("glueType[" + triggerRequest.getGlueType() + "] is not valid."); + return Response.ofFail("glueType[" + triggerRequest.getGlueType() + "] is not valid."); } // executor block strategy @@ -124,7 +125,7 @@ public class ExecutorBizImpl implements ExecutorBiz { if (ExecutorBlockStrategyEnum.DISCARD_LATER == blockStrategy) { // discard when running if (jobThread.isRunningOrHasQueue()) { - return ReturnT.ofFail("block strategy effect："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle()); + return Response.ofFail("block strategy effect："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle()); } } else if (ExecutorBlockStrategyEnum.COVER_EARLY == blockStrategy) { // kill running jobThread @@ -144,29 +145,29 @@ public class ExecutorBizImpl implements ExecutorBiz { } // push data to queue - ReturnT pushResult = jobThread.pushTriggerQueue(triggerRequest); + Response pushResult = jobThread.pushTriggerQueue(triggerRequest); return pushResult; } @Override - public ReturnT kill(KillRequest killRequest) { + public Response kill(KillRequest killRequest) { // kill handlerThread, and create new one JobThread jobThread = XxlJobExecutor.loadJobThread(killRequest.getJobId()); if (jobThread != null) { XxlJobExecutor.removeJobThread(killRequest.getJobId(), "scheduling center kill job."); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } - return ReturnT.ofSuccess( "job thread already killed."); + return Response.ofSuccess( "job thread already killed."); } @Override - public ReturnT log(LogRequest logRequest) { + public Response log(LogRequest logRequest) { // log filename: logPath/yyyy-MM-dd/9999.log String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logRequest.getLogDateTim()), logRequest.getLogId()); LogResult logResult = XxlJobFileAppender.readLog(logFileName, logRequest.getFromLineNum()); - return ReturnT.ofSuccess(logResult); + return Response.ofSuccess(logResult); } } 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 e1fdf93c..ed5a296d 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 @@ -155,7 +155,7 @@ public class EmbedServer { @Override public void run() { // do invoke - Object responseObj = process(httpMethod, uri, requestData, accessTokenReq); + Object responseObj = dispatchRequest(httpMethod, uri, requestData, accessTokenReq); // to json String responseJson = GsonTool.toJson(responseObj); @@ -166,16 +166,16 @@ public class EmbedServer { }); } - private Object process(HttpMethod httpMethod, String uri, String requestData, String accessTokenReq) { + private Object dispatchRequest(HttpMethod httpMethod, String uri, String requestData, String accessTokenReq) { // valid if (HttpMethod.POST != httpMethod) { return ReturnT.ofFail("invalid request, HttpMethod not support."); } - if (uri == null || uri.trim().length() == 0) { + if (uri == null || uri.trim().isEmpty()) { return ReturnT.ofFail( "invalid request, uri-mapping empty."); } if (accessToken != null - && accessToken.trim().length() > 0 + && !accessToken.trim().isEmpty() && !accessToken.equals(accessTokenReq)) { return ReturnT.ofFail("The access token is wrong."); } 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 7f82e835..d3d975d1 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 @@ -2,9 +2,9 @@ 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.biz.model.ReturnT; import com.xxl.job.core.enums.RegistryConfig; import com.xxl.job.core.executor.XxlJobExecutor; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,9 +45,9 @@ public class ExecutorRegistryThread { RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), appname, address); for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { try { - ReturnT registryResult = adminBiz.registry(registryParam); + Response registryResult = adminBiz.registry(registryParam); if (registryResult!=null && registryResult.isSuccess()) { - registryResult = ReturnT.ofSuccess(); + registryResult = Response.ofSuccess(); logger.debug(">>>>>>>>>>> xxl-job registry success, registryParam:{}, registryResult:{}", new Object[]{registryParam, registryResult}); break; } else { @@ -81,9 +81,9 @@ public class ExecutorRegistryThread { RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), appname, address); for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { try { - ReturnT registryResult = adminBiz.registryRemove(registryParam); + Response registryResult = adminBiz.registryRemove(registryParam); if (registryResult!=null && registryResult.isSuccess()) { - registryResult = ReturnT.ofSuccess(); + registryResult = Response.ofSuccess(); logger.info(">>>>>>>>>>> xxl-job registry-remove success, registryParam:{}, registryResult:{}", new Object[]{registryParam, registryResult}); break; } else { 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 7d05ff57..be94b890 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,13 +1,13 @@ package com.xxl.job.core.thread; import com.xxl.job.core.biz.model.HandleCallbackRequest; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.TriggerRequest; 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.handler.IJobHandler; import com.xxl.job.core.log.XxlJobFileAppender; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,16 +57,16 @@ public class JobThread extends Thread{ * @param triggerParam * @return */ - public ReturnT pushTriggerQueue(TriggerRequest triggerParam) { + public Response pushTriggerQueue(TriggerRequest triggerParam) { // avoid repeat if (!triggerLogIdSet.add(triggerParam.getLogId())) { logger.info(">>>>>>>>>>> repeate trigger job, logId:{}", triggerParam.getLogId()); - return ReturnT.ofFail("repeate trigger job, logId:" + triggerParam.getLogId()); + return Response.ofFail("repeate trigger job, logId:" + triggerParam.getLogId()); } // push trigger queue triggerQueue.add(triggerParam); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } /** 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 f32ae70d..f8cd0b67 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 @@ -2,7 +2,6 @@ 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.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.enums.RegistryConfig; @@ -14,6 +13,7 @@ import com.xxl.tool.core.StringTool; import com.xxl.tool.encrypt.Md5Tool; import com.xxl.tool.gson.GsonTool; import com.xxl.tool.io.FileTool; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,7 +181,7 @@ public class TriggerCallbackThread { // callback, will retry if error for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { try { - ReturnT callbackResult = adminBiz.callback(callbackParamList); + Response callbackResult = adminBiz.callback(callbackParamList); if (callbackResult!=null && callbackResult.isSuccess()) { callbackLog(callbackParamList, "
----------- xxl-job job callback finish."); callbackRet = true; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java index fac0741b..a2b61696 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java @@ -1,7 +1,7 @@ package com.xxl.job.core.util; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.tool.gson.GsonTool; +import com.xxl.tool.response.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +65,7 @@ public class XxlJobRemotingUtil { * @param returnTargClassOfT * @return */ - public static ReturnT postBody(String url, String accessToken, int timeout, Object requestObj, Class returnTargClassOfT) { + public static Response postBody(String url, String accessToken, int timeout, Object requestObj, Class returnTargClassOfT) { HttpURLConnection connection = null; BufferedReader bufferedReader = null; DataOutputStream dataOutputStream = null; @@ -119,7 +119,7 @@ public class XxlJobRemotingUtil { // valid StatusCode int statusCode = connection.getResponseCode(); if (statusCode != 200) { - return ReturnT.ofFail("xxl-job remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url); + return Response.ofFail("xxl-job remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url); } // result @@ -133,16 +133,16 @@ public class XxlJobRemotingUtil { // parse returnT try { - ReturnT returnT = GsonTool.fromJson(resultJson, ReturnT.class, returnTargClassOfT); + Response returnT = GsonTool.fromJson(resultJson, Response.class, returnTargClassOfT); return returnT; } catch (Exception e) { logger.error("xxl-job remoting (url="+url+") response content invalid("+ resultJson +").", e); - return ReturnT.ofFail("xxl-job remoting (url="+url+") response content invalid("+ resultJson +")."); + return Response.ofFail("xxl-job remoting (url="+url+") response content invalid("+ resultJson +")."); } } catch (Exception e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail("xxl-job remoting error("+ e.getMessage() +"), for url : " + url); + return Response.ofFail("xxl-job remoting error("+ e.getMessage() +"), for url : " + url); } finally { try { if (dataOutputStream != null) {