From 8c6fe3be7ece35cfa3621c1f55f36d661c15b60a Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 10 Apr 2019 12:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BB=BB=E5=8A=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=97=B6=EF=BC=8C=E4=BF=9D=E7=95=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=B1=9E=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/ServletUtils.java | 2 -- .../main/java/com/ruoyi/quartz/controller/SysJobController.java | 2 +- sql/ry_20190401.sql | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java index 4dab7190..451b180f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -107,7 +107,6 @@ public class ServletUtils */ public static boolean isAjaxRequest(HttpServletRequest request) { - String accept = request.getHeader("accept"); if (accept != null && accept.indexOf("application/json") != -1) { @@ -131,7 +130,6 @@ public class ServletUtils { return true; } - return false; } } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 0caa6778..8c8141e9 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -91,7 +91,7 @@ public class SysJobController extends BaseController @ResponseBody public AjaxResult changeStatus(SysJob job) throws SchedulerException { - Job newJob = jobService.selectJobById(job.getJobId()); + SysJob newJob = jobService.selectJobById(job.getJobId()); newJob.setStatus(job.getStatus()); return toAjax(jobService.changeStatus(newJob)); } diff --git a/sql/ry_20190401.sql b/sql/ry_20190401.sql index 0b48e348..801fa802 100644 --- a/sql/ry_20190401.sql +++ b/sql/ry_20190401.sql @@ -491,7 +491,7 @@ insert into sys_dict_data values(20, 5, '导出', '5', 'sys_oper_type', insert into sys_dict_data values(21, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '导入操作'); insert into sys_dict_data values(22, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '强退操作'); insert into sys_dict_data values(23, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '生成操作'); -insert into sys_dict_data values(24, 8, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作'); +insert into sys_dict_data values(24, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作'); insert into sys_dict_data values(25, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态'); insert into sys_dict_data values(26, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态');