mirror of
https://github.com/scxwhite/hera.git
synced 2025-05-10 01:42:22 +08:00
修复日志问题
This commit is contained in:
parent
3041bdd453
commit
6be894f0fd
@ -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
|
||||
|
@ -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 #最大连接池数量
|
||||
|
@ -443,7 +443,7 @@ layui.use(['table'], function () {
|
||||
re = js_manualJob_nonclick +"|"+js_cancelJob_nonclick +"|"+js_manualForce_nonclick ;
|
||||
}
|
||||
|
||||
logdetail='<a target="_blank" href="jobInstLog?id=' + row['id'] + '&jobId=' + row['jobId'] +'"> 日志</a>'
|
||||
logdetail='<a target="_blank" href="scheduleCenter/jobInstLog?hisId=' + row['id'] + '&id=' + row['jobId'] +'"> 日志</a>'
|
||||
|
||||
return re + "|" + logdetail;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user