From f51834df1456708d2c3fb3944553742714cf4293 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 23 Aug 2025 20:15:53 +0800 Subject: [PATCH] =?UTF-8?q?ReturnT=20=E9=87=8D=E6=9E=84=EF=BC=8C=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87API=E6=98=93=E7=94=A8=E6=80=A7=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xxl/job/admin/controller/JobGroupController.java | 2 +- .../com/xxl/job/admin/controller/JobInfoController.java | 2 +- .../java/com/xxl/job/admin/controller/JobLogController.java | 6 +++--- .../core/route/strategy/ExecutorRouteConsistentHash.java | 2 +- .../job/admin/core/route/strategy/ExecutorRouteFirst.java | 2 +- .../xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java | 2 +- .../xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java | 2 +- .../job/admin/core/route/strategy/ExecutorRouteLast.java | 2 +- .../job/admin/core/route/strategy/ExecutorRouteRandom.java | 2 +- .../job/admin/core/route/strategy/ExecutorRouteRound.java | 2 +- .../com/xxl/job/admin/service/impl/XxlJobServiceImpl.java | 4 ++-- .../java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java | 2 +- .../src/main/java/com/xxl/job/core/biz/model/ReturnT.java | 5 ----- 13 files changed, 15 insertions(+), 20 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index 0a4946b9..65435583 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -199,7 +199,7 @@ public class JobGroupController { @PermissionLimit(adminuser = true) public ReturnT loadById(@RequestParam("id") int id){ XxlJobGroup jobGroup = xxlJobGroupDao.load(id); - return jobGroup!=null?new ReturnT(jobGroup):new ReturnT(ReturnT.FAIL_CODE, null); + return jobGroup!=null?ReturnT.ofSuccess(jobGroup):ReturnT.ofFail(); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index cce6e7cd..7210ecd8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -157,7 +157,7 @@ public class JobInfoController { logger.error("nextTriggerTime error. scheduleType = {}, scheduleConf= {}", scheduleType, scheduleConf, e); return new ReturnT>(ReturnT.FAIL_CODE, (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage()); } - return new ReturnT>(result); + return ReturnT.ofSuccess(result); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 7ef3f4ea..9bec0f40 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -84,7 +84,7 @@ public class JobLogController { @ResponseBody public ReturnT> getJobsByGroup(@RequestParam("jobGroup") int jobGroup){ List list = xxlJobInfoDao.getJobsByGroup(jobGroup); - return new ReturnT>(list); + return ReturnT.ofSuccess(list); } @RequestMapping("/pageList") @@ -236,9 +236,9 @@ public class JobLogController { log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():"")); log.setHandleTime(new Date()); XxlJobCompleter.updateHandleInfoAndFinish(log); - return new ReturnT(runResult.getMsg()); + return ReturnT.ofSuccess(runResult.getMsg()); } else { - return new ReturnT(500, runResult.getMsg()); + return ReturnT.ofFail(runResult.getMsg()); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java index 41ac671c..6bd9c8f1 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java @@ -79,7 +79,7 @@ public class ExecutorRouteConsistentHash extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = hashJob(triggerParam.getJobId(), addressList); - return new ReturnT(address); + return ReturnT.ofSuccess(address); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java index de4d7afb..089a70d3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java @@ -13,7 +13,7 @@ public class ExecutorRouteFirst extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList){ - return new ReturnT(addressList.get(0)); + return ReturnT.ofSuccess(addressList.get(0)); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java index 9df19726..ce211b14 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java @@ -73,7 +73,7 @@ public class ExecutorRouteLFU extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = route(triggerParam.getJobId(), addressList); - return new ReturnT(address); + return ReturnT.ofSuccess(address); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java index 2d540067..7aaf115c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java @@ -70,7 +70,7 @@ public class ExecutorRouteLRU extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = route(triggerParam.getJobId(), addressList); - return new ReturnT(address); + return ReturnT.ofSuccess(address); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java index 4ff3cf6b..5cb71722 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java @@ -13,7 +13,7 @@ public class ExecutorRouteLast extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { - return new ReturnT(addressList.get(addressList.size()-1)); + return ReturnT.ofSuccess(addressList.get(addressList.size()-1)); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java index 5ea4a384..4f4bce8c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java @@ -17,7 +17,7 @@ public class ExecutorRouteRandom extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = addressList.get(localRandom.nextInt(addressList.size())); - return new ReturnT(address); + return ReturnT.ofSuccess(address); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java index d0ea2baa..6c9b0356 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java @@ -40,7 +40,7 @@ public class ExecutorRouteRound extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = addressList.get(count(triggerParam.getJobId())%addressList.size()); - return new ReturnT(address); + return ReturnT.ofSuccess(address); } } 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 3232bcf7..183a5b9a 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 @@ -162,7 +162,7 @@ public class XxlJobServiceImpl implements XxlJobService { return new ReturnT(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) ); } - return new ReturnT(String.valueOf(jobInfo.getId())); + return ReturnT.ofSuccess(String.valueOf(jobInfo.getId())); } private boolean isNumeric(String str){ @@ -494,7 +494,7 @@ public class XxlJobServiceImpl implements XxlJobService { result.put("triggerCountSucTotal", triggerCountSucTotal); result.put("triggerCountFailTotal", triggerCountFailTotal); - return new ReturnT>(result); + return ReturnT.ofSuccess(result); } } 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 5b1f4b83..8e0caa88 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 @@ -166,7 +166,7 @@ public class ExecutorBizImpl implements ExecutorBiz { String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logParam.getLogDateTim()), logParam.getLogId()); LogResult logResult = XxlJobFileAppender.readLog(logFileName, logParam.getFromLineNum()); - return new ReturnT(logResult); + return ReturnT.ofSuccess(logResult); } } 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/biz/model/ReturnT.java index b815f815..0ceeb9a3 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/biz/model/ReturnT.java @@ -30,11 +30,6 @@ public class ReturnT implements Serializable { this.content = content; } - public ReturnT(T content) { - this.code = SUCCESS_CODE; - this.content = content; - } - public int getCode() { return code; }