From 66fe8edc6febfe350b74619f7c8b8ad894ff57ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Mon, 25 Mar 2019 22:03:25 +0800 Subject: [PATCH 1/7] :art: Improving structure / format of the code. --- .../quartz/controller/SysJobController.java | 52 +++++++++---------- .../controller/SysJobLogController.java | 4 +- .../pigx/daemon/quartz/entity/SysJob.java | 6 +-- .../pigx/daemon/quartz/task/Demo.java | 6 ++- .../pigx/daemon/quartz/task/Demo1.java | 39 -------------- .../daemon/quartz/util/TaskInvokUtil.java | 12 ++--- 6 files changed, 41 insertions(+), 78 deletions(-) delete mode 100644 pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index adb4656c8..ff2c43100 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -49,8 +49,8 @@ import static com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum.*; */ @RestController @AllArgsConstructor -@RequestMapping("/sysjob") -@Api(value = "sysjob", description = "定时任务") +@RequestMapping("/sys-job") +@Api(value = "sys-job", description = "定时任务") public class SysJobController { private final SysJobService sysJobService; private final SysJobLogService sysJobLogService; @@ -75,13 +75,13 @@ public class SysJobController { /** * 通过id查询定时任务 * - * @param jobId id + * @param id id * @return R */ - @GetMapping("/{jobId}") + @GetMapping("/{id}") @ApiOperation(value = "唯一标识查询定时任务") - public R getById(@PathVariable("jobId") Integer jobId) { - return R.builder().data(sysJobService.getById(jobId)).build(); + public R getById(@PathVariable("id") Integer id) { + return R.builder().data(sysJobService.getById(id)).build(); } /** @@ -92,7 +92,7 @@ public class SysJobController { */ @SysLog("新增定时任务") @PostMapping - @PreAuthorize("@pms.hasPermission('job_sysjob_add')") + @PreAuthorize("@pms.hasPermission('job_sys_job_add')") @ApiOperation(value = "新增定时任务") public R save(@RequestBody SysJob sysJob) { sysJob.setJobStatus(JOB_STATUS_RELEASE.getType()); @@ -109,7 +109,7 @@ public class SysJobController { */ @SysLog("修改定时任务") @PutMapping - @PreAuthorize("@pms.hasPermission('job_sysjob_edit')") + @PreAuthorize("@pms.hasPermission('job_sys_job_edit')") @ApiOperation(value = "修改定时任务") public R updateById(@RequestBody SysJob sysJob) { sysJob.setUpdateBy(SecurityUtils.getUser().getUsername()); @@ -130,8 +130,8 @@ public class SysJobController { * @return R */ @SysLog("删除定时任务") - @DeleteMapping("/{jobId}") - @PreAuthorize("@pms.hasPermission('job_sysjob_del')") + @DeleteMapping("/{id}") + @PreAuthorize("@pms.hasPermission('job_sys_job_del')") @ApiOperation(value = "唯一标识查询定时任务，暂停任务才能删除") public R removeById(@PathVariable Integer jobId) { SysJob querySysJob = this.sysJobService.getById(jobId); @@ -150,8 +150,8 @@ public class SysJobController { * @return */ @SysLog("暂停全部定时任务") - @PostMapping("/shutdownJobs") - @PreAuthorize("@pms.hasPermission('job_sysjob_shutdownJobs')") + @PostMapping("/shutdown-jobs") + @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") @ApiOperation(value = "暂停全部定时任务") public R shutdownJobs() { taskUtil.pauseJobs(scheduler); @@ -174,8 +174,8 @@ public class SysJobController { * @return */ @SysLog("启动全部定时任务") - @PostMapping("/startJobs") - @PreAuthorize("@pms.hasPermission('job_sysjob_startJob')") + @PostMapping("/start-jobs") + @PreAuthorize("@pms.hasPermission('job_sys_job_start_job')") @ApiOperation(value = "启动全部定时任务") public R startJobs() { //更新定时任务状态条件，暂停状态3更新为运行状态2 @@ -192,8 +192,8 @@ public class SysJobController { * @return */ @SysLog("刷新全部定时任务") - @PostMapping("/refreshJobs") - @PreAuthorize("@pms.hasPermission('job_sysjob_refreshJobs')") + @PostMapping("/refresh-jobs") + @PreAuthorize("@pms.hasPermission('job_sys_job_refresh_job')") @ApiOperation(value = "刷新全部定时任务") public R refreshJobs() { sysJobService.list().forEach((sysjob) -> { @@ -217,10 +217,10 @@ public class SysJobController { * @return */ @SysLog("启动定时任务") - @GetMapping("/startJob/{jobId}") - @PreAuthorize("@pms.hasPermission('job_sysjob_startJob')") + @GetMapping("/start-job/{id}") + @PreAuthorize("@pms.hasPermission('job_sys_job_start_job')") @ApiOperation(value = "启动定时任务") - public R startJob(@PathVariable("jobId") Integer jobId) { + public R startJob(@PathVariable("id") Integer jobId) { SysJob querySysJob = this.sysJobService.getById(jobId); if (querySysJob != null && JOB_LOG_STATUS_FAIL.getType() .equals(querySysJob.getJobStatus())) { @@ -240,11 +240,11 @@ public class SysJobController { * @return */ @SysLog("暂停定时任务") - @GetMapping("/shutdownJob/{jobId}") - @PreAuthorize("@pms.hasPermission('job_sysjob_shutdownJob')") + @GetMapping("/shutdown-job/{id}") + @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") @ApiOperation(value = "暂停定时任务") - public R shutdownJob(@PathVariable("jobId") Integer jobId) { - SysJob querySysJob = this.sysJobService.getById(jobId); + public R shutdownJob(@PathVariable("id") Integer id) { + SysJob querySysJob = this.sysJobService.getById(id); //更新定时任务状态条件，运行状态2更新为暂停状态3 this.sysJobService.updateById(SysJob.builder().jobId(querySysJob.getJobId()) .jobStatus(JOB_STATUS_NOT_RUNNING.getType()).build()); @@ -257,7 +257,7 @@ public class SysJobController { * * @return */ - @GetMapping("/getJobLog") + @GetMapping("/job-log") @ApiOperation(value = "唯一标识查询定时执行日志") public R getJobLog(Page page, SysJobLog sysJobLog) { return R.builder().data(sysJobLogService.page(page, Wrappers.query(sysJobLog))).build(); @@ -268,7 +268,7 @@ public class SysJobController { * * @return */ - @PostMapping("/isValidCron") + @PostMapping("/is-valid-cron") @ApiOperation(value = "判断cron是否正确") public R isValidCron(@RequestParam String cronExpression) { return R.builder().data(this.taskUtil.isValidCron(cronExpression) @@ -280,7 +280,7 @@ public class SysJobController { * * @return */ - @PostMapping("/isValidTaskName") + @PostMapping("/is-valid-task-name") @ApiOperation(value = "检验任务名称和任务组联合是否唯一") public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) { return R.builder().data(this.sysJobService diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java index 0a6dd4d9b..0adfcde5f 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java @@ -38,8 +38,8 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @AllArgsConstructor -@RequestMapping("/sysjoblog") -@Api(value = "sysjoblog", description = "定时任务日志") +@RequestMapping("/sys-job-log") +@Api(value = "sys-job-log", description = "定时任务日志") public class SysJobLogController { private final SysJobLogService sysJobLogService; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java index 42044a88b..26fb702c3 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java @@ -117,15 +117,15 @@ public class SysJob extends Model { /** * 首次执行时间 */ - private LocalDateTime starttime; + private LocalDateTime startTime; /** * 上次执行时间 */ - private LocalDateTime previoustime; + private LocalDateTime previousTime; /** * 下次执行时间 */ - private LocalDateTime nexttime; + private LocalDateTime nextTime; /** * 租户id */ diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java index 80d145c28..cbe509236 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java @@ -23,6 +23,8 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; + /** * @author 郑健楠 */ @@ -30,11 +32,11 @@ import org.springframework.stereotype.Component; @Component("demo") public class Demo { /** - * + * 测试Spring Bean的演示方法 */ @SneakyThrows public String demoMethod(String para) { - log.info("郑健楠测试于:{}，输入参数L{}", DateUtil.now(), para); + log.info("测试于:{}，输入参数{}", LocalDateTime.now(), para); return PigxQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType(); } } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java deleted file mode 100644 index d693af166..000000000 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.daemon.quartz.task; - - -import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Date; - -/** - * @author 郑健楠 - */ -@Slf4j -@Component("demo1") -public class Demo1 { - @SneakyThrows - public String demoMethod(String para) { - log.info("demo1测试于:{}，输入参数L{}", new Date(), para); - return PigxQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType(); - } -} diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java index 8acfc2ce2..c496824de 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java @@ -110,9 +110,9 @@ public class TaskInvokUtil { sysJobLog.setExecuteTime(String.valueOf(endTime - startTime)); //任务表信息更新 updateSysjob.setJobExecuteStatus(PigxQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType()); - updateSysjob.setStarttime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - updateSysjob.setPrevioustime(trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - updateSysjob.setNexttime(trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setStartTime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setPreviousTime(trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setNextTime(trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); } catch (Throwable e) { //获取执行结束时间 endTime = System.currentTimeMillis(); @@ -123,9 +123,9 @@ public class TaskInvokUtil { sysJobLog.setExceptionInfo(StrUtil.sub(e.getMessage(), 0, 2000)); //任务表信息更新 updateSysjob.setJobExecuteStatus(PigxQuartzEnum.JOB_LOG_STATUS_FAIL.getType()); - updateSysjob.setStarttime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - updateSysjob.setPrevioustime(trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - updateSysjob.setNexttime(trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setStartTime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setPreviousTime(trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + updateSysjob.setNextTime(trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); } finally { publisher.publishEvent(new SysJobLogEvent(sysJobLog)); sysJobService.updateById(updateSysjob); From 3c4a3a51643afd4697b91fae32a3d2d502957bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Mon, 25 Mar 2019 22:56:30 +0800 Subject: [PATCH 2/7] :sparkles: Introducing new features.add RestTaskDemo --- .../config/pigx-daemon-quartz-dev.yml | 2 +- .../pigx/daemon/quartz/task/RestTaskDemo.java | 32 +++++++++++++++++++ .../{Demo.java => SpringBeanTaskDemo.java} | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java rename pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/{Demo.java => SpringBeanTaskDemo.java} (97%) diff --git a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml index bc84086b0..98166eba3 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-quartz-dev.yml @@ -9,7 +9,7 @@ security: ignore-urls: - /actuator/** - /v2/api-docs - - /innerjob/** + - /inner-job/** # 数据源配置 spring: diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java new file mode 100644 index 000000000..de61c1b70 --- /dev/null +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java @@ -0,0 +1,32 @@ +package com.pig4cloud.pigx.daemon.quartz.task; + +import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; + +/** + * 用于测试REST风格调用的demo + * + * @author lishangbu + * @date 2019/3/25 + */ +@RestController +@RequestMapping("/inner-job") +@Slf4j +public class RestTaskDemo { + /** + * 测试REST风格调用定时任务的演示方法 + */ + @GetMapping("/{param}") + public R demoMethod(@PathVariable("param") String param) { + log.info("测试于:{}，传入参数{}", LocalDateTime.now(), param); + return R.builder().build(); + } +} diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java similarity index 97% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java index cbe509236..491181004 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java @@ -30,7 +30,7 @@ import java.time.LocalDateTime; */ @Slf4j @Component("demo") -public class Demo { +public class SpringBeanTaskDemo { /** * 测试Spring Bean的演示方法 */ From 17803e39fdc90be8564b44e5656078561d1aad98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 26 Mar 2019 10:56:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#166=20?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=83=A8=E9=97=A8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index de0cb70cf..ac2822964 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -154,8 +154,8 @@ `user`.update_time AS uupdate_time, `user`.del_flag AS udel_flag, `user`.lock_flag AS lock_flag, - `user`.dept_id AS deptId, - `user`.tenant_id AS tenantId + `user`.tenant_id AS tenantId, + d.name AS deptName FROM sys_user AS `user` LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id From d69985b809f59855e26899ac16ff216983179e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 26 Mar 2019 10:56:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E3=80=82?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java | 4 +--- .../pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java index de61c1b70..c20563c8b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/RestTaskDemo.java @@ -1,8 +1,6 @@ package com.pig4cloud.pigx.daemon.quartz.task; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -17,9 +15,9 @@ import java.time.LocalDateTime; * @author lishangbu * @date 2019/3/25 */ +@Slf4j @RestController @RequestMapping("/inner-job") -@Slf4j public class RestTaskDemo { /** * 测试REST风格调用定时任务的演示方法 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java index 491181004..c4151cd69 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/SpringBeanTaskDemo.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.daemon.quartz.task; -import cn.hutool.core.date.DateUtil; import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; From 2c9393c9e04a22a6c6b9fe60bcc6a37699bacd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Tue, 26 Mar 2019 15:06:21 +0800 Subject: [PATCH 5/7] :art: Improving structure / format of the code.adjust request method --- .../quartz/controller/SysJobController.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index ff2c43100..582dfab3f 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -217,7 +217,7 @@ public class SysJobController { * @return */ @SysLog("启动定时任务") - @GetMapping("/start-job/{id}") + @PostMapping("/start-job/{id}") @PreAuthorize("@pms.hasPermission('job_sys_job_start_job')") @ApiOperation(value = "启动定时任务") public R startJob(@PathVariable("id") Integer jobId) { @@ -240,7 +240,7 @@ public class SysJobController { * @return */ @SysLog("暂停定时任务") - @GetMapping("/shutdown-job/{id}") + @PostMapping("/shutdown-job/{id}") @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") @ApiOperation(value = "暂停定时任务") public R shutdownJob(@PathVariable("id") Integer id) { @@ -263,24 +263,12 @@ public class SysJobController { return R.builder().data(sysJobLogService.page(page, Wrappers.query(sysJobLog))).build(); } - /** - * 判断cron表达式是否正确 - * - * @return - */ - @PostMapping("/is-valid-cron") - @ApiOperation(value = "判断cron是否正确") - public R isValidCron(@RequestParam String cronExpression) { - return R.builder().data(this.taskUtil.isValidCron(cronExpression) - ? CommonConstants.SUCCESS : CommonConstants.FAIL).build(); - } - /** * 检验任务名称和任务组联合是否唯一 * * @return */ - @PostMapping("/is-valid-task-name") + @GetMapping("/is-valid-task-name") @ApiOperation(value = "检验任务名称和任务组联合是否唯一") public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) { return R.builder().data(this.sysJobService From 8df0e3e4ccbb08c97c3690f7cb8a1c58aceae118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 27 Mar 2019 00:19:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?:bug:=20fix=20bug.=20=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E7=BB=9F=E4=B8=80=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=88=A0=E9=99=A4=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index d0c86958d..fb4ec98c3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -52,7 +52,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private final SysRoleMenuMapper sysRoleMenuMapper; @Override - @Cacheable(value = "menu_details#2000", key = "#roleId + '_menu'") + @Cacheable(value = "menu_details", key = "#roleId + '_menu'") public List findMenuByRoleId(Integer roleId) { return baseMapper.listMenusByRoleId(roleId); } From 734f136abf3f6ffe10cc3e9e76ba67be8261d2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 28 Mar 2019 11:33:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?:fire:=20Removing=20code=20or=20files.=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4mybatis-plus=20=E7=83=AD=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-config/src/main/resources/config/application-dev.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 05aca2bf3..f17f4065e 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -76,9 +76,6 @@ mybatis-plus: field-strategy: 1 # 默认数据库表下划线命名 table-underline: true - configuration: - map-underscore-to-camel-case: true - #swagger公共信息 swagger: