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 ca2ed3fe..20ffa95f 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 @@ -108,10 +108,10 @@ public class JobLogController { // base check XxlJobLog log = xxlJobLogDao.load(id); if (log == null) { - return new ReturnT(500, "参数异常"); + return new ReturnT(500, "查看执行日志失败: 参数异常"); } if (!(ResponseModel.SUCCESS.equals(log.getTriggerStatus()) || StringUtils.isNotBlank(log.getHandleStatus()))) { - return new ReturnT(500, "调度失败,无法查看执行日志"); + return new ReturnT(500, "查看执行日志失败: 任务发起调度失败,无法查看执行日志"); } // trigger id, trigger time @@ -125,7 +125,7 @@ public class JobLogController { if (ResponseModel.SUCCESS.equals(responseModel.getStatus())) { return new ReturnT(responseModel.getMsg()); } else { - return new ReturnT(500, responseModel.getMsg()); + return new ReturnT(500, "查看执行日志失败: " + responseModel.getMsg()); } } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/ByteWriteFactory.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/ByteWriteFactory.java index 51cc236a..36051294 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/ByteWriteFactory.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/ByteWriteFactory.java @@ -16,6 +16,9 @@ public class ByteWriteFactory { public ByteWriteFactory() { m_byteBuf = ByteBuffer.allocate(1024 * 4); } + public ByteWriteFactory(int capacity) { + m_byteBuf = ByteBuffer.allocate(capacity); + } public void writeInt(int intValue) { byte[] intBytes = new byte[4]; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java index 7afb3cae..c7744ee8 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java @@ -42,7 +42,7 @@ public class XxlJobNetCommUtil { int len = ByteHexConverter.getByteLen(json); // json to byte[] - ByteWriteFactory byteWriteFactory = new ByteWriteFactory(); + ByteWriteFactory byteWriteFactory = new ByteWriteFactory(4 + len); byteWriteFactory.writeInt(len); byteWriteFactory.writeString(json, len); byte[] bytes = byteWriteFactory.getBytes();