From 7e626ea2193d39217fa7321a865bfab014c5ea69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 13:07:36 +0800
Subject: [PATCH] update xxl-job 2.3.0 => 2.3.1
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
index f8f0b43..454610c 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
@@ -52,9 +52,9 @@
// package result
Map<String, Object> maps = new HashMap<String, Object>();
- maps.put("recordsTotal" , list_count); // 鎬昏褰曟暟
- maps.put("recordsFiltered" , list_count); // 杩囨护鍚庣殑鎬昏褰曟暟
- maps.put("data" , list); // 鍒嗛〉鍒楄〃
+ maps.put("recordsTotal", list_count); // 鎬昏褰曟暟
+ maps.put("recordsFiltered", list_count); // 杩囨护鍚庣殑鎬昏褰曟暟
+ maps.put("data", list); // 鍒嗛〉鍒楄〃
return maps;
}
@@ -105,7 +105,7 @@
}
// 銆媐ix "\r" in shell
if (GlueTypeEnum.GLUE_SHELL == GlueTypeEnum.match(jobInfo.getGlueType()) && jobInfo.getGlueSource() != null) {
- jobInfo.setGlueSource(jobInfo.getGlueSource().replaceAll("\r" , ""));
+ jobInfo.setGlueSource(jobInfo.getGlueSource().replaceAll("\r", ""));
}
// valid advanced
@@ -373,10 +373,10 @@
int executorCount = executorAddressSet.size();
Map<String, Object> dashboardMap = new HashMap<String, Object>();
- dashboardMap.put("jobInfoCount" , jobInfoCount);
- dashboardMap.put("jobLogCount" , jobLogCount);
- dashboardMap.put("jobLogSuccessCount" , jobLogSuccessCount);
- dashboardMap.put("executorCount" , executorCount);
+ dashboardMap.put("jobInfoCount", jobInfoCount);
+ dashboardMap.put("jobLogCount", jobLogCount);
+ dashboardMap.put("jobLogSuccessCount", jobLogSuccessCount);
+ dashboardMap.put("executorCount", executorCount);
return dashboardMap;
}
@@ -420,14 +420,14 @@
}
Map<String, Object> result = new HashMap<String, Object>();
- result.put("triggerDayList" , triggerDayList);
- result.put("triggerDayCountRunningList" , triggerDayCountRunningList);
- result.put("triggerDayCountSucList" , triggerDayCountSucList);
- result.put("triggerDayCountFailList" , triggerDayCountFailList);
+ result.put("triggerDayList", triggerDayList);
+ result.put("triggerDayCountRunningList", triggerDayCountRunningList);
+ result.put("triggerDayCountSucList", triggerDayCountSucList);
+ result.put("triggerDayCountFailList", triggerDayCountFailList);
- result.put("triggerCountRunningTotal" , triggerCountRunningTotal);
- result.put("triggerCountSucTotal" , triggerCountSucTotal);
- result.put("triggerCountFailTotal" , triggerCountFailTotal);
+ result.put("triggerCountRunningTotal", triggerCountRunningTotal);
+ result.put("triggerCountSucTotal", triggerCountSucTotal);
+ result.put("triggerCountFailTotal", triggerCountFailTotal);
return new ReturnT<Map<String, Object>>(result);
}
--
Gitblit v1.9.3