Commit 9aeb0cc1f334f062bc276d481786959a880a9895
1 parent
9f4918cc
修复定时任务执行一次按钮后不提示消息问题
Showing
3 changed files
with
7 additions
and
1 deletions
ruoyi-ui/src/views/monitor/job/index.vue
| @@ -397,7 +397,7 @@ export default { | @@ -397,7 +397,7 @@ export default { | ||
| 397 | type: "warning" | 397 | type: "warning" |
| 398 | }).then(function() { | 398 | }).then(function() { |
| 399 | return runJob(row.jobId, row.jobGroup); | 399 | return runJob(row.jobId, row.jobGroup); |
| 400 | - }).then(function() { | 400 | + }).then(() => { |
| 401 | this.msgSuccess("执行成功"); | 401 | this.msgSuccess("执行成功"); |
| 402 | }).catch(function() {}); | 402 | }).catch(function() {}); |
| 403 | }, | 403 | }, |
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
| @@ -76,6 +76,9 @@ public class SysJobLogController extends BaseController | @@ -76,6 +76,9 @@ public class SysJobLogController extends BaseController | ||
| 76 | return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); | 76 | return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | + /** | ||
| 80 | + * 清空定时任务调度日志 | ||
| 81 | + */ | ||
| 79 | @PreAuthorize("@ss.hasPermi('monitor:job:remove')") | 82 | @PreAuthorize("@ss.hasPermi('monitor:job:remove')") |
| 80 | @Log(title = "调度日志", businessType = BusinessType.CLEAN) | 83 | @Log(title = "调度日志", businessType = BusinessType.CLEAN) |
| 81 | @DeleteMapping("/clean") | 84 | @DeleteMapping("/clean") |
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
| @@ -124,6 +124,9 @@ public class GenController extends BaseController | @@ -124,6 +124,9 @@ public class GenController extends BaseController | ||
| 124 | return AjaxResult.success(); | 124 | return AjaxResult.success(); |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | + /** | ||
| 128 | + * 删除代码生成 | ||
| 129 | + */ | ||
| 127 | @PreAuthorize("@ss.hasPermi('tool:gen:remove')") | 130 | @PreAuthorize("@ss.hasPermi('tool:gen:remove')") |
| 128 | @Log(title = "代码生成", businessType = BusinessType.DELETE) | 131 | @Log(title = "代码生成", businessType = BusinessType.DELETE) |
| 129 | @DeleteMapping("/{tableIds}") | 132 | @DeleteMapping("/{tableIds}") |