diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java index 732f8b86d..726fc5065 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/controller/JobLogController.java @@ -294,14 +294,19 @@ public class JobLogController { @RequestMapping("/logDetailCat") @ResponseBody - public Response logDetailCat(@RequestParam("logId") long logId, @RequestParam("fromLineNum") int fromLineNum) { + public Response logDetailCat(HttpServletRequest request, + @RequestParam("logId") long logId, + @RequestParam("fromLineNum") int fromLineNum) { try { // valid - XxlJobLog jobLog = xxlJobLogMapper.load(logId); // todo, need to improve performance + XxlJobLog jobLog = xxlJobLogMapper.load(logId); if (jobLog == null) { return Response.ofFail(I18nUtil.getString("joblog_logid_invalid")); } + // valid permission + JobGroupPermissionUtil.validJobGroupPermission(request, jobLog.getJobGroup()); + // log cat ExecutorBiz executorBiz = XxlJobAdminBootstrap.getExecutorBiz(jobLog.getExecutorAddress()); Response logResult = executorBiz.log(new LogRequest(jobLog.getTriggerTime().getTime(), logId, fromLineNum)); diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java index 35fb29464..0ae4e5e5d 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/business/model/dto/XxlJobLogDTO.java @@ -40,10 +40,10 @@ public class XxlJobLogDTO { this.executorParam = xxlJobLog.getExecutorParam(); this.executorShardingParam = xxlJobLog.getExecutorShardingParam(); this.executorFailRetryCount = xxlJobLog.getExecutorFailRetryCount(); - this.triggerTime = DateTool.formatDateTime(xxlJobLog.getTriggerTime()); + this.triggerTime = xxlJobLog.getTriggerTime() != null ? DateTool.formatDateTime(xxlJobLog.getTriggerTime()) : null; this.triggerCode = xxlJobLog.getTriggerCode(); this.triggerMsg = xxlJobLog.getTriggerMsg(); - this.handleTime = DateTool.formatDateTime(xxlJobLog.getHandleTime()); + this.handleTime = xxlJobLog.getHandleTime() != null ? DateTool.formatDateTime(xxlJobLog.getHandleTime()) : null; this.handleCode = xxlJobLog.getHandleCode(); this.handleMsg = xxlJobLog.getHandleMsg(); this.alarmStatus = xxlJobLog.getAlarmStatus(); diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties index 4c824a64e..f3f99a386 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -1,6 +1,6 @@ admin_name=Scheduling Center admin_name_full=Distributed Task Scheduling Platform\uFF5CXXL-JOB -admin_version=3.4.1 +admin_version=3.4.2 admin_i18n=en ## system diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index ce4357e85..d51dcf02c 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -1,6 +1,6 @@ admin_name=\u4EFB\u52A1\u8C03\u5EA6\u4E2D\u5FC3 admin_name_full=\u5206\u5E03\u5F0F\u4EFB\u52A1\u8C03\u5EA6\u5E73\u53F0\uFF5CXXL-JOB -admin_version=3.4.1 +admin_version=3.4.2 admin_i18n= ## system diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index 1dce3e425..5e0ad1ea4 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -1,6 +1,6 @@ admin_name=\u4EFB\u52D9\u8ABF\u5EA6\u4E2D\u5FC3 admin_name_full=\u5206\u5E03\u5F0F\u4EFB\u52D9\u8ABF\u5EA6\u5E73\u81FA\uFF5CXXL-JOB -admin_version=3.4.1 +admin_version=3.4.2 admin_i18n= ## system