升级velocity到最新版本2.3

RuoYi

2021-11-24 08885f65cd6815fbc18a5b485eb9fd99c2a0d2cf

 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java

@@ -1,6 +1,5 @@
package com.ruoyi.job.controller;



import java.io.IOException;

import java.util.List;

import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;

@@ -16,7 +15,7 @@
import com.ruoyi.common.core.web.page.TableDataInfo;

import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessType;

import com.ruoyi.common.security.annotation.PreAuthorize;

import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.job.domain.SysJobLog;

import com.ruoyi.job.service.ISysJobLogService;



@@ -35,7 +34,7 @@
    /**

     * 查询定时任务调度日志列表

     */

    @PreAuthorize(hasPermi = "monitor:job:list")

    @RequiresPermissions("monitor:job:list")

    @GetMapping("/list")

    public TableDataInfo list(SysJobLog sysJobLog)

    {

@@ -47,10 +46,10 @@
    /**

     * 导出定时任务调度日志列表

     */

    @PreAuthorize(hasPermi = "monitor:job:export")

    @RequiresPermissions("monitor:job:export")

    @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysJobLog sysJobLog) throws IOException

    public void export(HttpServletResponse response, SysJobLog sysJobLog)

    {

        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);

        ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);

@@ -60,7 +59,7 @@
    /**

     * 根据调度编号获取详细信息

     */

    @PreAuthorize(hasPermi = "monitor:job:query")

    @RequiresPermissions("monitor:job:query")

    @GetMapping(value = "/{configId}")

    public AjaxResult getInfo(@PathVariable Long jobLogId)

    {

@@ -70,7 +69,7 @@
    /**

     * 删除定时任务调度日志

     */

    @PreAuthorize(hasPermi = "monitor:job:remove")

    @RequiresPermissions("monitor:job:remove")

    @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)

    @DeleteMapping("/{jobLogIds}")

    public AjaxResult remove(@PathVariable Long[] jobLogIds)

@@ -81,7 +80,7 @@
    /**

     * 清空定时任务调度日志

     */

    @PreAuthorize(hasPermi = "monitor:job:remove")

    @RequiresPermissions("monitor:job:remove")

    @Log(title = "调度日志", businessType = BusinessType.CLEAN)

    @DeleteMapping("/clean")

    public AjaxResult clean()