From 6be894f0fd8af71c823b4d491d44bfd74b37a9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E6=89=BF=E7=A5=A5?= <1142819049@qq.com> Date: Tue, 8 Dec 2020 15:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dfire/controller/ScheduleCenterController.java | 8 ++++++++ hera-admin/src/main/resources/config/application.yml | 2 +- hera-admin/src/main/resources/static/js/jobDetail.js | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hera-admin/src/main/java/com/dfire/controller/ScheduleCenterController.java b/hera-admin/src/main/java/com/dfire/controller/ScheduleCenterController.java index 2b722426..d487f833 100755 --- a/hera-admin/src/main/java/com/dfire/controller/ScheduleCenterController.java +++ b/hera-admin/src/main/java/com/dfire/controller/ScheduleCenterController.java @@ -402,6 +402,14 @@ public class ScheduleCenterController extends BaseHeraController { return new JsonResponse(true, heraJobHistoryService.findLogById(id)); } + @RequestMapping(value = "jobInstLog", method = RequestMethod.GET) + @ResponseBody + @RunAuth() + @ApiOperation("获取任务日志接口") + public String jobInstLog(@ApiParam(value = "任务ID", required = true) Integer id,Integer hisId) { + return heraJobHistoryService.findLogById(hisId).getLog(); + } + @RequestMapping(value = "/status/{jobId}", method = RequestMethod.GET) @ResponseBody diff --git a/hera-admin/src/main/resources/config/application.yml b/hera-admin/src/main/resources/config/application.yml index 77812a9b..085cc43a 100755 --- a/hera-admin/src/main/resources/config/application.yml +++ b/hera-admin/src/main/resources/config/application.yml @@ -28,7 +28,7 @@ druid: username: root #数据库用户名 password: moye #数据库密码 driver-class-name: com.mysql.jdbc.Driver #数据库驱动 - url: jdbc:mysql://localhost:3306/hera?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=false + url: jdbc:mysql://localhost:3306/hera2.4.2?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=false initial-size: 5 #初始化连接池数量 min-idle: 1 #最小生存连接数 max-active: 16 #最大连接池数量 diff --git a/hera-admin/src/main/resources/static/js/jobDetail.js b/hera-admin/src/main/resources/static/js/jobDetail.js index 09b75a9c..26eeef1c 100755 --- a/hera-admin/src/main/resources/static/js/jobDetail.js +++ b/hera-admin/src/main/resources/static/js/jobDetail.js @@ -443,7 +443,7 @@ layui.use(['table'], function () { re = js_manualJob_nonclick +"|"+js_cancelJob_nonclick +"|"+js_manualForce_nonclick ; } - logdetail=' 日志' + logdetail=' 日志' return re + "|" + logdetail; }