update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更...

疯狂的狮子Li

2023-01-13 0fc796b90d3f44b81ef30285edb897223df439f7

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

@@ -19,7 +19,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.text.MessageFormat;
import java.util.*;

@@ -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 @@
        }
        // 》fix "\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);
    }