From 9aeb0cc1f334f062bc276d481786959a880a9895 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 17 May 2020 15:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E5=90=8E=E4=B8=8D=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/monitor/job/index.vue | 2 +-
.../ruoyi/project/monitor/controller/SysJobLogController.java | 3 +++
.../com/ruoyi/project/tool/gen/controller/GenController.java | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index ee4ae4c..499ab26 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -397,7 +397,7 @@ export default {
type: "warning"
}).then(function() {
return runJob(row.jobId, row.jobGroup);
- }).then(function() {
+ }).then(() => {
this.msgSuccess("执行成功");
}).catch(function() {});
},
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index dc287de..ba11816 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -76,6 +76,9 @@ public class SysJobLogController extends BaseController
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}
+ /**
+ * 清空定时任务调度日志
+ */
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "调度日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 2951012..05f9414 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -124,6 +124,9 @@ public class GenController extends BaseController
return AjaxResult.success();
}
+ /**
+ * 删除代码生成
+ */
@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
@Log(title = "代码生成", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")