diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml index f99fb88b..d3e85b4d 100644 --- a/api-boot-project/api-boot-autoconfigure/pom.xml +++ b/api-boot-project/api-boot-autoconfigure/pom.xml @@ -113,11 +113,6 @@ - - ${project.groupId} - api-boot-plugin-quartz - true - org.springframework.boot spring-boot-starter-jdbc @@ -256,6 +251,11 @@ jpush-client true + + org.quartz-scheduler + quartz + true + org.minbox.framework diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java index 13a630a8..fa22be7f 100644 --- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java +++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java @@ -1,7 +1,7 @@ package org.minbox.framework.api.boot.autoconfigure.quartz; -import org.minbox.framework.api.boot.plugin.quartz.ApiBootQuartzService; -import org.minbox.framework.api.boot.plugin.quartz.support.ApiBootQuartzServiceDefaultSupport; +import org.minbox.framework.api.boot.quartz.ApiBootQuartzService; +import org.minbox.framework.api.boot.quartz.support.ApiBootQuartzServiceDefaultSupport; import org.quartz.Calendar; import org.quartz.JobDetail; import org.quartz.Scheduler; diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml index 22d8cbd2..30370fbd 100644 --- a/api-boot-project/api-boot-dependencies/pom.xml +++ b/api-boot-project/api-boot-dependencies/pom.xml @@ -245,11 +245,6 @@ quartz ${quartz.version} - - org.minbox.framework - api-boot-plugin-quartz - ${project.version} - org.minbox.framework api-boot-starter-quartz diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml deleted file mode 100644 index a2012095..00000000 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - api-boot-plugins - org.minbox.framework - ${revision} - - 4.0.0 - ApiBoot集成Quartz - api-boot-plugin-quartz - - ${basedir}/../../.. - - - - - org.minbox.framework - api-boot-plugin - - - - org.quartz-scheduler - quartz - - - c3p0 - com.mchange - - - HikariCP-java6 - com.zaxxer - - - - - org.slf4j - slf4j-api - - - - org.springframework - spring-context-support - - - - org.springframework - spring-tx - - - - org.projectlombok - lombok - - - diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml index d2f0fea4..1ea15391 100644 --- a/api-boot-project/api-boot-plugins/pom.xml +++ b/api-boot-project/api-boot-plugins/pom.xml @@ -21,7 +21,6 @@ api-boot-plugin api-boot-plugin-security api-boot-plugin-oauth - api-boot-plugin-quartz api-boot-plugin-resource-load api-boot-plugin-rate-limiter api-boot-plugin-sequence diff --git a/api-boot-project/api-boot-starters/api-boot-starter-quartz/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-quartz/pom.xml index 160954dd..0ce3b6f8 100644 --- a/api-boot-project/api-boot-starters/api-boot-starter-quartz/pom.xml +++ b/api-boot-project/api-boot-starters/api-boot-starter-quartz/pom.xml @@ -33,10 +33,32 @@ org.minbox.framework api-boot-starter - + - org.minbox.framework - api-boot-plugin-quartz + org.quartz-scheduler + quartz + + + c3p0 + com.mchange + + + HikariCP-java6 + com.zaxxer + + + + + org.slf4j + slf4j-api + + + org.springframework + spring-context-support + + + org.springframework + spring-tx diff --git a/api-boot-project/api-boot/pom.xml b/api-boot-project/api-boot/pom.xml index 343ac205..4eef705b 100644 --- a/api-boot-project/api-boot/pom.xml +++ b/api-boot-project/api-boot/pom.xml @@ -28,6 +28,16 @@ spring-core true + + org.springframework + spring-tx + true + + + org.springframework + spring-context-support + true + @@ -86,6 +96,17 @@ cn.jpush.api jpush-client + true + + + org.slf4j + slf4j-api + true + + + org.quartz-scheduler + quartz + true diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/ApiBootQuartzService.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/ApiBootQuartzService.java similarity index 83% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/ApiBootQuartzService.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/ApiBootQuartzService.java index 77bd2d7a..0927942e 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/ApiBootQuartzService.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/ApiBootQuartzService.java @@ -1,11 +1,10 @@ -package org.minbox.framework.api.boot.plugin.quartz; +package org.minbox.framework.api.boot.quartz; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper; -import org.quartz.JobKey; + +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper; import org.quartz.Scheduler; import org.quartz.SchedulerException; - +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper; import java.util.Collection; import java.util.Date; @@ -30,9 +29,9 @@ public interface ApiBootQuartzService { * * @param jobWrapper {@link ApiBootJobWrapper} * @return {@link ApiBootJobWrapper#getJobKey()} - * @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper - * @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper - * @see org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper + * @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper + * @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper + * @see org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper */ String newJob(ApiBootJobWrapper jobWrapper); @@ -114,8 +113,8 @@ public interface ApiBootQuartzService { /** * Update job start time *

- * This method works for {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper} - * or {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper} + * This method works for {@link org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper} + * or {@link org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper} *

* * @param jobKey {@link ApiBootJobWrapper#getJobKey()} diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/support/ApiBootQuartzServiceDefaultSupport.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/support/ApiBootQuartzServiceDefaultSupport.java similarity index 95% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/support/ApiBootQuartzServiceDefaultSupport.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/support/ApiBootQuartzServiceDefaultSupport.java index d530fcca..48521034 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/support/ApiBootQuartzServiceDefaultSupport.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/support/ApiBootQuartzServiceDefaultSupport.java @@ -1,10 +1,10 @@ -package org.minbox.framework.api.boot.plugin.quartz.support; +package org.minbox.framework.api.boot.quartz.support; -import org.minbox.framework.api.boot.plugin.quartz.ApiBootQuartzService; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper; +import org.minbox.framework.api.boot.quartz.ApiBootQuartzService; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper; import org.quartz.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -248,8 +248,8 @@ public void updateJobCron(String jobKey, String cron) { /** * Update job start time *

- * This method works for {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper} - * or {@link org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper} + * This method works for {@link ApiBootOnceJobWrapper} + * or {@link ApiBootLoopJobWrapper} *

* * @param jobKey {@link ApiBootJobWrapper#getJobKey()} diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobParamWrapper.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobParamWrapper.java similarity index 94% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobParamWrapper.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobParamWrapper.java index 2d4539c9..b497ad33 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobParamWrapper.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobParamWrapper.java @@ -1,4 +1,4 @@ -package org.minbox.framework.api.boot.plugin.quartz.wrapper; +package org.minbox.framework.api.boot.quartz.wrapper; import lombok.Data; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobWrapper.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobWrapper.java similarity index 93% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobWrapper.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobWrapper.java index 285c06c3..4ae73b05 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/ApiBootJobWrapper.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/ApiBootJobWrapper.java @@ -1,7 +1,6 @@ -package org.minbox.framework.api.boot.plugin.quartz.wrapper; +package org.minbox.framework.api.boot.quartz.wrapper; import lombok.AllArgsConstructor; -import lombok.Getter; import lombok.Setter; import org.springframework.scheduling.quartz.QuartzJobBean; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootCronJobWrapper.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootCronJobWrapper.java similarity index 79% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootCronJobWrapper.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootCronJobWrapper.java index 72263af0..f6371ad0 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootCronJobWrapper.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootCronJobWrapper.java @@ -1,9 +1,8 @@ -package org.minbox.framework.api.boot.plugin.quartz.wrapper.support; +package org.minbox.framework.api.boot.quartz.wrapper.support; import lombok.Builder; -import lombok.Getter; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobParamWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobParamWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper; import org.springframework.scheduling.quartz.QuartzJobBean; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootLoopJobWrapper.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootLoopJobWrapper.java similarity index 87% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootLoopJobWrapper.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootLoopJobWrapper.java index 4bacc056..c63cb7fb 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootLoopJobWrapper.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootLoopJobWrapper.java @@ -1,9 +1,8 @@ -package org.minbox.framework.api.boot.plugin.quartz.wrapper.support; +package org.minbox.framework.api.boot.quartz.wrapper.support; import lombok.Builder; -import lombok.Getter; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobParamWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobParamWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper; import org.springframework.scheduling.quartz.QuartzJobBean; import java.util.Date; diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootOnceJobWrapper.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootOnceJobWrapper.java similarity index 77% rename from api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootOnceJobWrapper.java rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootOnceJobWrapper.java index 6f65f2e9..89609512 100644 --- a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/src/main/java/org/minbox/framework/api/boot/plugin/quartz/wrapper/support/ApiBootOnceJobWrapper.java +++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/quartz/wrapper/support/ApiBootOnceJobWrapper.java @@ -1,10 +1,9 @@ -package org.minbox.framework.api.boot.plugin.quartz.wrapper.support; +package org.minbox.framework.api.boot.quartz.wrapper.support; import lombok.Builder; -import lombok.Getter; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobParamWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobParamWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobWrapper; import org.springframework.scheduling.quartz.QuartzJobBean; import java.util.Date; diff --git a/api-boot-samples/api-boot-sample-quartz/pom.xml b/api-boot-samples/api-boot-sample-quartz/pom.xml index 6dbe0b07..87a14cd2 100644 --- a/api-boot-samples/api-boot-sample-quartz/pom.xml +++ b/api-boot-samples/api-boot-sample-quartz/pom.xml @@ -50,7 +50,7 @@ org.minbox.framework api-boot-dependencies - 2.2.2.RELEASE + ${api-boot.version} pom import diff --git a/api-boot-samples/api-boot-sample-quartz/src/main/java/org/minbox/framework/api/boot/sample/quartz/ApiBootQuartzController.java b/api-boot-samples/api-boot-sample-quartz/src/main/java/org/minbox/framework/api/boot/sample/quartz/ApiBootQuartzController.java index e9fee9ce..f171c155 100644 --- a/api-boot-samples/api-boot-sample-quartz/src/main/java/org/minbox/framework/api/boot/sample/quartz/ApiBootQuartzController.java +++ b/api-boot-samples/api-boot-sample-quartz/src/main/java/org/minbox/framework/api/boot/sample/quartz/ApiBootQuartzController.java @@ -1,11 +1,11 @@ package org.minbox.framework.api.boot.sample.quartz; import com.alibaba.fastjson.JSON; -import org.minbox.framework.api.boot.plugin.quartz.ApiBootQuartzService; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.ApiBootJobParamWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootCronJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootLoopJobWrapper; -import org.minbox.framework.api.boot.plugin.quartz.wrapper.support.ApiBootOnceJobWrapper; +import org.minbox.framework.api.boot.quartz.ApiBootQuartzService; +import org.minbox.framework.api.boot.quartz.wrapper.ApiBootJobParamWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootCronJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootLoopJobWrapper; +import org.minbox.framework.api.boot.quartz.wrapper.support.ApiBootOnceJobWrapper; import org.minbox.framework.api.boot.sample.quartz.jobs.DemoJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -50,7 +50,7 @@ public String startLoopJob() { .put("userAge", 24) ) // 每次循环的间隔时间,单位:毫秒 - .loopIntervalTime(2000) + .loopIntervalTime(2000L) // 循环次数 .repeatTimes(5) // 开始时间,10秒后执行 diff --git a/api-boot-samples/api-boot-sample-quartz/src/main/resources/application.yml b/api-boot-samples/api-boot-sample-quartz/src/main/resources/application.yml index 3584b085..d62dbb9c 100644 --- a/api-boot-samples/api-boot-sample-quartz/src/main/resources/application.yml +++ b/api-boot-samples/api-boot-sample-quartz/src/main/resources/application.yml @@ -13,7 +13,7 @@ api: boot: quartz: # 配置使用Jdbc方式存储任务 - job-store-type: jdbc + job-store-type: memory # 扩展properties配置列表 properties: # key - value形式进行配置