wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-4418) - 调整 testController 中的函数

Browse Source
This commit is contained in:
wangli 2025-08-27 14:16:06 +08:00
parent 99a300f2d5
commit e83bdd6edb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
View File

@ -290,11 +290,15 @@ public class TestController {
}*/ }*/
@GetMapping("log") @GetMapping("log")
public String log(@RequestParam String keyword) throws Exception { public String log(@RequestParam String keyword, @RequestParam(required = false) Date date, @RequestParam(required = false) String grepKeyword) throws Exception {
if (!StringUtils.hasText(keyword)) { if (!StringUtils.hasText(keyword)) {
return "命令不能为空"; return "命令不能为空";
} }
return ShellUtil.grepRealTimeLog(profile, keyword); String s = ShellUtil.grepRealTimeLog(profile, keyword);
if (StringUtils.hasText(s)) {
return s;
}
return ShellUtil.grepLog(profile, keyword, Objects.isNull(date) ? new Date() : date, grepKeyword);
} }
@GetMapping("form") @GetMapping("form")