From 1273b16caf2b87b863faf91cad629580caad829d Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 14 Mar 2021 00:48:13 +0800 Subject: [PATCH] feat: show job according to creation order --- .gitignore | 9 ++++++++- .../processors/impl/FileCleanupProcessorTest.java | 2 +- .../server/persistence/remote/model/JobInfoDO.java | 2 ++ .../powerjob/server/web/controller/JobController.java | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47d2017f..32b2010d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,11 @@ build/ *.jar *.log */.DS_Store -.DS_Store \ No newline at end of file +.DS_Store + +.phd +.txt +.trc +*/.phd +*/.txt +*/.trc \ No newline at end of file diff --git a/powerjob-official-processors/src/test/java/tech/powerjob/official/processors/impl/FileCleanupProcessorTest.java b/powerjob-official-processors/src/test/java/tech/powerjob/official/processors/impl/FileCleanupProcessorTest.java index 56c01174..8e3ddcc2 100644 --- a/powerjob-official-processors/src/test/java/tech/powerjob/official/processors/impl/FileCleanupProcessorTest.java +++ b/powerjob-official-processors/src/test/java/tech/powerjob/official/processors/impl/FileCleanupProcessorTest.java @@ -53,7 +53,7 @@ class FileCleanupProcessorTest { @Test void testCleanWorkerScript() throws Exception { JSONObject params = new JSONObject(); - params.put("dirPath", "/Users/tjq/powerjob/script"); + params.put("dirPath", "/"); params.put("filePattern", "(shell|python)_[0-9]*\\.(sh|py)"); params.put("retentionTime", 24); JSONArray array = new JSONArray(); diff --git a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java index 93b534f1..7b2efc42 100644 --- a/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java +++ b/powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/remote/model/JobInfoDO.java @@ -44,6 +44,8 @@ public class JobInfoDO { /** * 任务自带的参数 */ + @Lob + @Column private String jobParams; /* ************************** 定时参数 ************************** */ diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java index 0a48a6f0..9d261736 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java @@ -70,7 +70,7 @@ public class JobController { @PostMapping("/list") public ResultDTO> listJobs(@RequestBody QueryJobInfoRequest request) { - Sort sort = Sort.by(Sort.Direction.DESC, "gmtCreate"); + Sort sort = Sort.by(Sort.Direction.ASC, "id"); PageRequest pageRequest = PageRequest.of(request.getIndex(), request.getPageSize(), sort); Page jobInfoPage;