命名重构

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 + '\'' +
                 '}';

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 + '\'' +

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() {

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;
     }

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 + '\'' +

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<LogResult> 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);

xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThreadHelper.java

@@ -183,7 +183,7 @@ public class TriggerCallbackThreadHelper {
      */
     private void appendCallbackResult(List<CallbackRequest> 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,