diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java index b9ac59a389870f4c368dd19ce5eb64e1835ba6a5..279ad7d16debf7179b08c8a618e54b1f0218bab7 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java @@ -47,7 +47,7 @@ public class XxlJobCompleter { // 1、handle success, to trigger child job String triggerChildMsg = null; - if (XxlJobContext.HANDLE_COCE_SUCCESS == xxlJobLog.getHandleCode()) { + if (XxlJobContext.HANDLE_CODE_SUCCESS == xxlJobLog.getHandleCode()) { XxlJobInfo xxlJobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(xxlJobLog.getJobId()); if (xxlJobInfo!=null && xxlJobInfo.getChildJobId()!=null && xxlJobInfo.getChildJobId().trim().length()>0) { triggerChildMsg = "

>>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_child_run") +"<<<<<<<<<<<
"; 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 c33c6364e291c563b4b78e55eba21cf811691620..6fb89e7f8029a1cefc0ed93bc59dc7ebee2e26dd 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 @@ -32,7 +32,7 @@ public class AdminBizTest { HandleCallbackParam param = new HandleCallbackParam(); param.setLogId(1); - param.setHandleCode(XxlJobContext.HANDLE_COCE_SUCCESS); + param.setHandleCode(XxlJobContext.HANDLE_CODE_SUCCESS); List callbackParamList = Arrays.asList(param); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java index 0657cf761ec33914e2cd4b864645187024239be5..7e35012998463db1f77e3f60b25cfb941d56aa6f 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java @@ -8,9 +8,9 @@ package com.xxl.job.core.context; */ public class XxlJobContext { - public static final int HANDLE_COCE_SUCCESS = 200; - public static final int HANDLE_COCE_FAIL = 500; - public static final int HANDLE_COCE_TIMEOUT = 502; + public static final int HANDLE_CODE_SUCCESS = 200; + public static final int HANDLE_CODE_FAIL = 500; + public static final int HANDLE_CODE_TIMEOUT = 502; // ---------------------- base info ---------------------- @@ -68,7 +68,7 @@ public class XxlJobContext { this.shardIndex = shardIndex; this.shardTotal = shardTotal; - this.handleCode = HANDLE_COCE_SUCCESS; // default success + this.handleCode = HANDLE_CODE_SUCCESS; // default success } public long getJobId() { diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java index cec7f587c3281f389a47a556d4c0af0b38d42b32..eb20c1812b573d6dd18f6ef6f91f81529c4abd4b 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java @@ -177,7 +177,7 @@ public class XxlJobHelper { * @return */ public static boolean handleSuccess(){ - return handleResult(XxlJobContext.HANDLE_COCE_SUCCESS, null); + return handleResult(XxlJobContext.HANDLE_CODE_SUCCESS, null); } /** @@ -187,7 +187,7 @@ public class XxlJobHelper { * @return */ public static boolean handleSuccess(String handleMsg) { - return handleResult(XxlJobContext.HANDLE_COCE_SUCCESS, handleMsg); + return handleResult(XxlJobContext.HANDLE_CODE_SUCCESS, handleMsg); } /** @@ -196,7 +196,7 @@ public class XxlJobHelper { * @return */ public static boolean handleFail(){ - return handleResult(XxlJobContext.HANDLE_COCE_FAIL, null); + return handleResult(XxlJobContext.HANDLE_CODE_FAIL, null); } /** @@ -206,7 +206,7 @@ public class XxlJobHelper { * @return */ public static boolean handleFail(String handleMsg) { - return handleResult(XxlJobContext.HANDLE_COCE_FAIL, handleMsg); + return handleResult(XxlJobContext.HANDLE_CODE_FAIL, handleMsg); } /** @@ -215,7 +215,7 @@ public class XxlJobHelper { * @return */ public static boolean handleTimeout(){ - return handleResult(XxlJobContext.HANDLE_COCE_TIMEOUT, null); + return handleResult(XxlJobContext.HANDLE_CODE_TIMEOUT, null); } /** @@ -225,7 +225,7 @@ public class XxlJobHelper { * @return */ public static boolean handleTimeout(String handleMsg){ - return handleResult(XxlJobContext.HANDLE_COCE_TIMEOUT, handleMsg); + return handleResult(XxlJobContext.HANDLE_CODE_TIMEOUT, handleMsg); } /** 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 0ea04f0c1e5d479475643a1115ac920a51d94693..5c7553c17bb59612bbba42758f9b249adc077f11 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 @@ -215,7 +215,7 @@ public class JobThread extends Thread{ TriggerCallbackThread.pushCallBack(new HandleCallbackParam( triggerParam.getLogId(), triggerParam.getLogDateTime(), - XxlJobContext.HANDLE_COCE_FAIL, + XxlJobContext.HANDLE_CODE_FAIL, stopReason + " [job running, killed]" ) ); } @@ -231,7 +231,7 @@ public class JobThread extends Thread{ TriggerCallbackThread.pushCallBack(new HandleCallbackParam( triggerParam.getLogId(), triggerParam.getLogDateTime(), - XxlJobContext.HANDLE_COCE_FAIL, + XxlJobContext.HANDLE_CODE_FAIL, stopReason + " [job not executed, in the job queue, killed.]") ); }