From 3ff307180df80490aeebec83c6cd6d6922981555 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 19 Jun 2026 23:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/admin/dto/CallbackRequest.java | 18 +++++++++--------- .../openapi/admin/dto/RegistryRequest.java | 2 +- .../core/openapi/executor/dto/LogRequest.java | 14 +++++++------- .../core/openapi/executor/dto/LogResult.java | 10 +++++----- .../openapi/executor/dto/TriggerRequest.java | 2 +- .../openapi/executor/impl/ExecutorBizImpl.java | 2 +- .../thread/TriggerCallbackThreadHelper.java | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java index 0dc2c035..74ff1cf4 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/CallbackRequest.java @@ -9,15 +9,15 @@ public class CallbackRequest implements Serializable { private static final long serialVersionUID = 42L; private long logId; - private long logDateTim; + private long logDateTime; private int handleCode; private String handleMsg; public CallbackRequest(){} - public CallbackRequest(long logId, long logDateTim, int handleCode, String handleMsg) { + public CallbackRequest(long logId, long logDateTime, int handleCode, String handleMsg) { this.logId = logId; - this.logDateTim = logDateTim; + this.logDateTime = logDateTime; this.handleCode = handleCode; this.handleMsg = handleMsg; } @@ -30,12 +30,12 @@ public class CallbackRequest implements Serializable { this.logId = logId; } - public long getLogDateTim() { - return logDateTim; + public long getLogDateTime() { + return logDateTime; } - public void setLogDateTim(long logDateTim) { - this.logDateTim = logDateTim; + public void setLogDateTime(long logDateTime) { + this.logDateTime = logDateTime; } public int getHandleCode() { @@ -56,9 +56,9 @@ public class CallbackRequest implements Serializable { @Override public String toString() { - return "HandleCallbackParam{" + + return "CallbackRequest{" + "logId=" + logId + - ", logDateTim=" + logDateTim + + ", logDateTime=" + logDateTime + ", handleCode=" + handleCode + ", handleMsg='" + handleMsg + '\'' + '}'; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java index c1532531..006ad203 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/admin/dto/RegistryRequest.java @@ -45,7 +45,7 @@ public class RegistryRequest implements Serializable { @Override public String toString() { - return "RegistryParam{" + + return "RegistryRequest{" + "registryGroup='" + registryGroup + '\'' + ", registryKey='" + registryKey + '\'' + ", registryValue='" + registryValue + '\'' + diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java index c799d318..78cd17b1 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogRequest.java @@ -10,22 +10,22 @@ public class LogRequest implements Serializable { public LogRequest() { } - public LogRequest(long logDateTim, long logId, int fromLineNum) { - this.logDateTim = logDateTim; + public LogRequest(long logDateTime, long logId, int fromLineNum) { + this.logDateTime = logDateTime; this.logId = logId; this.fromLineNum = fromLineNum; } - private long logDateTim; + private long logDateTime; private long logId; private int fromLineNum; - public long getLogDateTim() { - return logDateTim; + public long getLogDateTime() { + return logDateTime; } - public void setLogDateTim(long logDateTim) { - this.logDateTim = logDateTim; + public void setLogDateTime(long logDateTime) { + this.logDateTime = logDateTime; } public long getLogId() { diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java index 84fa803a..9d43fc7f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/LogResult.java @@ -8,6 +8,11 @@ import java.io.Serializable; public class LogResult implements Serializable { private static final long serialVersionUID = 42L; + private int fromLineNum; + private int toLineNum; + private String logContent; + private boolean isEnd; + public LogResult() { } public LogResult(int fromLineNum, int toLineNum, String logContent, boolean isEnd) { @@ -17,11 +22,6 @@ public class LogResult implements Serializable { this.isEnd = isEnd; } - private int fromLineNum; - private int toLineNum; - private String logContent; - private boolean isEnd; - public int getFromLineNum() { return fromLineNum; } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java index 78be09b1..5ce285eb 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/dto/TriggerRequest.java @@ -130,7 +130,7 @@ public class TriggerRequest implements Serializable{ @Override public String toString() { - return "TriggerParam{" + + return "TriggerRequest{" + "jobId=" + jobId + ", executorHandler='" + executorHandler + '\'' + ", executorParams='" + executorParams + '\'' + diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java index b343f30b..be978b5f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/executor/impl/ExecutorBizImpl.java @@ -174,7 +174,7 @@ public class ExecutorBizImpl implements ExecutorBiz { @Override public Response log(LogRequest logRequest) { // log filename: logPath/yyyy-MM-dd/9999.log - String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logRequest.getLogDateTim()), logRequest.getLogId()); + String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logRequest.getLogDateTime()), logRequest.getLogId()); LogResult logResult = XxlJobFileAppender.readLog(logFileName, logRequest.getFromLineNum()); return Response.ofSuccess(logResult); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java index 46385aef..083d346e 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java @@ -183,7 +183,7 @@ public class TriggerCallbackThreadHelper { */ private void appendCallbackResult(List callbackParamList, String logContent){ for (CallbackRequest callbackParam: callbackParamList) { - String logFileName = XxlJobFileAppender.makeLogFileName(new Date(callbackParam.getLogDateTim()), callbackParam.getLogId()); + String logFileName = XxlJobFileAppender.makeLogFileName(new Date(callbackParam.getLogDateTime()), callbackParam.getLogId()); XxlJobContext.setXxlJobContext(new XxlJobContext( -1, null,