diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java index 2ba888381..b8384c3e9 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java @@ -40,7 +40,7 @@ import java.util.List; */ @Configuration @ConditionalOnBean(DataSource.class) -@MapperScan("com.pig4cloud.pigx.*.mapper") +@MapperScan("com.pig4cloud.pigx.**.mapper") public class MybatisPlusConfig { /** diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonQuartzApplication.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java similarity index 94% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonQuartzApplication.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java index 15148e52d..efd0b722c 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonQuartzApplication.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pigx.daemon; +package com.pig4cloud.pigx.daemon.quartz; import com.pig4cloud.pigx.common.security.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/AutowireCapableBeanJobFactory.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/AutowireCapableBeanJobFactory.java similarity index 97% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/AutowireCapableBeanJobFactory.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/AutowireCapableBeanJobFactory.java index dc6db4f46..64b0e7647 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/AutowireCapableBeanJobFactory.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/AutowireCapableBeanJobFactory.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; import org.quartz.spi.TriggerFiredBundle; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxInitQuartzJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java similarity index 88% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxInitQuartzJob.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java index f41d5e13a..772d14a69 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxInitQuartzJob.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxInitQuartzJob.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; -import com.pig4cloud.pigx.daemon.service.SysJobService; -import com.pig4cloud.pigx.daemon.util.TaskUtil; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobService; +import com.pig4cloud.pigx.daemon.quartz.util.TaskUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.Scheduler; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzConfig.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzConfig.java similarity index 98% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzConfig.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzConfig.java index 5d36d26ae..c926f1a5b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzConfig.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzConfig.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; import org.quartz.Calendar; import org.quartz.JobDetail; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzCustomizerConfig.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzCustomizerConfig.java similarity index 96% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzCustomizerConfig.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzCustomizerConfig.java index 0ca3e092d..ffb2a7820 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzCustomizerConfig.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzCustomizerConfig.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; import org.springframework.boot.autoconfigure.quartz.SchedulerFactoryBeanCustomizer; import org.springframework.context.annotation.Configuration; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzFactory.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzFactory.java similarity index 89% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzFactory.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzFactory.java index 0a9643b65..468407531 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzFactory.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzFactory.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; -import com.pig4cloud.pigx.daemon.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.quartz.DisallowConcurrentExecution; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzInvokeFactory.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzInvokeFactory.java similarity index 89% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzInvokeFactory.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzInvokeFactory.java index cbf4baa5e..a34e5c9c1 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzInvokeFactory.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/config/PigxQuartzInvokeFactory.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.config; +package com.pig4cloud.pigx.daemon.quartz.config; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.event.SysJobEvent; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.event.SysJobEvent; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/JobTypeQuartzEnum.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/JobTypeQuartzEnum.java similarity index 95% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/JobTypeQuartzEnum.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/JobTypeQuartzEnum.java index 710f06f02..54fdcfb91 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/JobTypeQuartzEnum.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/JobTypeQuartzEnum.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.constant.enums; +package com.pig4cloud.pigx.daemon.quartz.constant.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/PigxQuartzEnum.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/PigxQuartzEnum.java similarity index 97% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/PigxQuartzEnum.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/PigxQuartzEnum.java index 4a86aab88..72dc1ef73 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/PigxQuartzEnum.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/constant/enums/PigxQuartzEnum.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.constant.enums; +package com.pig4cloud.pigx.daemon.quartz.constant.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java similarity index 95% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobController.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index 0369b142a..8a0964c9e 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.controller; +package com.pig4cloud.pigx.daemon.quartz.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -26,11 +26,11 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; -import com.pig4cloud.pigx.daemon.service.SysJobLogService; -import com.pig4cloud.pigx.daemon.service.SysJobService; -import com.pig4cloud.pigx.daemon.util.TaskUtil; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobService; +import com.pig4cloud.pigx.daemon.quartz.util.TaskUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -38,7 +38,7 @@ import org.quartz.Scheduler; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import static com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum.*; +import static com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum.*; /** diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobLogController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java similarity index 92% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobLogController.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java index 811d4000f..0a6dd4d9b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobLogController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobLogController.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.controller; +package com.pig4cloud.pigx.daemon.quartz.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; -import com.pig4cloud.pigx.daemon.service.SysJobLogService; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java similarity index 98% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJob.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java index 70d3081ca..42044a88b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJob.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.entity; +package com.pig4cloud.pigx.daemon.quartz.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJobLog.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java similarity index 98% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJobLog.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java index 846096ed0..f5173c466 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJobLog.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.entity; +package com.pig4cloud.pigx.daemon.quartz.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/EventAutoConfiguration.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/EventAutoConfiguration.java similarity index 88% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/EventAutoConfiguration.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/EventAutoConfiguration.java index 14a6a32d7..594f05c0b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/EventAutoConfiguration.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/EventAutoConfiguration.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.event; +package com.pig4cloud.pigx.daemon.quartz.event; -import com.pig4cloud.pigx.daemon.config.PigxQuartzInvokeFactory; -import com.pig4cloud.pigx.daemon.service.SysJobLogService; -import com.pig4cloud.pigx.daemon.util.TaskInvokUtil; +import com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzInvokeFactory; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService; +import com.pig4cloud.pigx.daemon.quartz.util.TaskInvokUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.ApplicationEventPublisher; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobEvent.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobEvent.java similarity index 91% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobEvent.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobEvent.java index af7489c89..33bb60153 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobEvent.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobEvent.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.event; +package com.pig4cloud.pigx.daemon.quartz.event; -import com.pig4cloud.pigx.daemon.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; import lombok.AllArgsConstructor; import lombok.Getter; import org.quartz.Trigger; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobListener.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobListener.java similarity index 89% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobListener.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobListener.java index 09790a044..44483b374 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobListener.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobListener.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.event; +package com.pig4cloud.pigx.daemon.quartz.event; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.util.TaskInvokUtil; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.util.TaskInvokUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.Trigger; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogEvent.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogEvent.java similarity index 90% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogEvent.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogEvent.java index 14f891d19..dec575d8b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogEvent.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogEvent.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.event; +package com.pig4cloud.pigx.daemon.quartz.event; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogListener.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java similarity index 89% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogListener.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java index 6190bdd06..3b5a94f7f 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogListener.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/event/SysJobLogListener.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.event; +package com.pig4cloud.pigx.daemon.quartz.event; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; -import com.pig4cloud.pigx.daemon.service.SysJobLogService; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/exception/TaskException.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/exception/TaskException.java similarity index 95% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/exception/TaskException.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/exception/TaskException.java index 78b4f1c72..f3ce4e729 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/exception/TaskException.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/exception/TaskException.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.exception; +package com.pig4cloud.pigx.daemon.quartz.exception; /** * 定时任务异常 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobLogMapper.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java similarity index 90% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobLogMapper.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java index 699c1ffc1..970b940f6 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobLogMapper.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobLogMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.mapper; +package com.pig4cloud.pigx.daemon.quartz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; /** * 定时任务执行日志表 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobMapper.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java similarity index 90% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobMapper.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java index 5acfec630..a777f003b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobMapper.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/mapper/SysJobMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.mapper; +package com.pig4cloud.pigx.daemon.quartz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pigx.daemon.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; /** * 定时任务调度表 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobLogService.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobLogService.java similarity index 90% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobLogService.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobLogService.java index e41b0d5c7..ae181e26a 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobLogService.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobLogService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.service; +package com.pig4cloud.pigx.daemon.quartz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; /** * 定时任务执行日志表 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobService.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobService.java similarity index 90% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobService.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobService.java index fab1491de..832413598 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobService.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/SysJobService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.service; +package com.pig4cloud.pigx.daemon.quartz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pigx.daemon.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; /** * 定时任务调度表 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobLogServiceImpl.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobLogServiceImpl.java similarity index 83% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobLogServiceImpl.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobLogServiceImpl.java index 223a80933..534270d81 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobLogServiceImpl.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobLogServiceImpl.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.service.impl; +package com.pig4cloud.pigx.daemon.quartz.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; -import com.pig4cloud.pigx.daemon.mapper.SysJobLogMapper; -import com.pig4cloud.pigx.daemon.service.SysJobLogService; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobLogMapper; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobServiceImpl.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobServiceImpl.java similarity index 83% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobServiceImpl.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobServiceImpl.java index 084ace089..5d6afa798 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobServiceImpl.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/service/impl/SysJobServiceImpl.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.service.impl; +package com.pig4cloud.pigx.daemon.quartz.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.mapper.SysJobMapper; -import com.pig4cloud.pigx.daemon.service.SysJobService; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobMapper; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java similarity index 91% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java index 7c40a77be..ba676eb81 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.task; +package com.pig4cloud.pigx.daemon.quartz.task; import cn.hutool.core.date.DateUtil; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo1.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java similarity index 91% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo1.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java index bc8c8961e..77adff7cf 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo1.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/task/Demo1.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.task; +package com.pig4cloud.pigx.daemon.quartz.task; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/ITaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/ITaskInvok.java similarity index 86% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/ITaskInvok.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/ITaskInvok.java index f9b986a43..237daa5a3 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/ITaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/ITaskInvok.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; /** * 定时任务反射实现接口类 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JarTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java similarity index 92% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JarTaskInvok.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java index 43aed6472..b0bd72a41 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JarTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JavaClassTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java similarity index 93% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JavaClassTaskInvok.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java index 650fc1f47..217af850c 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JavaClassTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/RestTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java similarity index 91% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/RestTaskInvok.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java index b0dc9a2db..296a615a1 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/RestTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/SpringBeanTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java similarity index 92% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/SpringBeanTaskInvok.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java index 0694cf683..09516f065 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/SpringBeanTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java @@ -15,13 +15,13 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.ReflectionUtils; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskInvokUtil.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java similarity index 92% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskInvokUtil.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java index a081466ba..cee10ce4b 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskInvokUtil.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java @@ -15,18 +15,18 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; -import com.pig4cloud.pigx.daemon.constant.enums.JobTypeQuartzEnum; -import com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum; -import com.pig4cloud.pigx.daemon.entity.SysJob; -import com.pig4cloud.pigx.daemon.entity.SysJobLog; -import com.pig4cloud.pigx.daemon.event.SysJobLogEvent; -import com.pig4cloud.pigx.daemon.exception.TaskException; -import com.pig4cloud.pigx.daemon.service.SysJobService; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.JobTypeQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog; +import com.pig4cloud.pigx.daemon.quartz.event.SysJobLogEvent; +import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; +import com.pig4cloud.pigx.daemon.quartz.service.SysJobService; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskUtil.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskUtil.java similarity index 96% rename from pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskUtil.java rename to pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskUtil.java index 1a687514d..e7f7ad7a4 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskUtil.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskUtil.java @@ -15,15 +15,15 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.daemon.util; +package com.pig4cloud.pigx.daemon.quartz.util; -import com.pig4cloud.pigx.daemon.config.PigxQuartzFactory; -import com.pig4cloud.pigx.daemon.entity.SysJob; +import com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzFactory; +import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.springframework.stereotype.Component; -import static com.pig4cloud.pigx.daemon.constant.enums.PigxQuartzEnum.*; +import static com.pig4cloud.pigx.daemon.quartz.constant.enums.PigxQuartzEnum.*; /** * 定时任务的工具类 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml index 2edc410e4..635ffa8c2 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml index 864dd68e4..8f71fb8a1 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml @@ -1,7 +1,7 @@ - - + +