Sfoglia il codice sorgente

:recycle: Refactoring code.一时重构一时爽,重构quartz工程增加子包名,避免一些未知问题

萌萌哒Sakura酱 6 anni fa
parent
commit
4185efc7e7
37 ha cambiato i file con 97 aggiunte e 97 eliminazioni
  1. 1 1
      pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java
  2. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonQuartzApplication.java
  3. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/AutowireCapableBeanJobFactory.java
  4. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxInitQuartzJob.java
  5. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzConfig.java
  6. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzCustomizerConfig.java
  7. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzFactory.java
  8. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/config/PigxQuartzInvokeFactory.java
  9. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/JobTypeQuartzEnum.java
  10. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/constant/enums/PigxQuartzEnum.java
  11. 7 7
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobController.java
  12. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/controller/SysJobLogController.java
  13. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJob.java
  14. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/entity/SysJobLog.java
  15. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/EventAutoConfiguration.java
  16. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobEvent.java
  17. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobListener.java
  18. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogEvent.java
  19. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/event/SysJobLogListener.java
  20. 1 1
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/exception/TaskException.java
  21. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobLogMapper.java
  22. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/mapper/SysJobMapper.java
  23. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobLogService.java
  24. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/SysJobService.java
  25. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobLogServiceImpl.java
  26. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/service/impl/SysJobServiceImpl.java
  27. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo.java
  28. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/task/Demo1.java
  29. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/ITaskInvok.java
  30. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JarTaskInvok.java
  31. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/JavaClassTaskInvok.java
  32. 3 3
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/RestTaskInvok.java
  33. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/SpringBeanTaskInvok.java
  34. 8 8
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskInvokUtil.java
  35. 4 4
      pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/util/TaskUtil.java
  36. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml
  37. 2 2
      pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml

+ 1 - 1
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 {
 
 	/**

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 7 - 7
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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.*;
 
 
 /**

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 1 - 1
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务异常

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务执行日志表

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务调度表

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务执行日志表

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务调度表

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 
 /**
  * 定时任务反射实现接口类

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;
 

+ 3 - 3
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 8 - 8
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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;

+ 4 - 4
pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/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.*;
 
 /**
  * 定时任务的工具类

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobLogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pig4cloud.pigx.daemon.mapper.SysJobLogMapper">
-	<resultMap id="sysJobLogMap" type="com.pig4cloud.pigx.daemon.entity.SysJobLog">
+<mapper namespace="com.pig4cloud.pigx.daemon.quartz.mapper.SysJobLogMapper">
+	<resultMap id="sysJobLogMap" type="com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog">
 		<id property="jobLogId" column="job_log_id"/>
 		<result property="jobId" column="job_id"/>
 		<result property="jobName" column="job_name"/>

+ 2 - 2
pigx-visual/pigx-daemon-quartz/src/main/resources/mapper/SysJobMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pig4cloud.pigx.daemon.mapper.SysJobMapper">
-	<resultMap id="sysJobMap" type="com.pig4cloud.pigx.daemon.entity.SysJob">
+<mapper namespace="com.pig4cloud.pigx.daemon.quartz.mapper.SysJobMapper">
+	<resultMap id="sysJobMap" type="com.pig4cloud.pigx.daemon.quartz.entity.SysJob">
 		<id property="jobId" column="job_id"/>
 		<result property="jobName" column="job_name"/>
 		<result property="jobGroup" column="job_group"/>