minbox-projects · hengboy · Jul 17, 2020 · Jul 17, 2020
diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -113,11 +113,6 @@
         </dependency>
 
         <!--ApiBoot Quartz Plugin-->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>api-boot-plugin-quartz</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -256,6 +251,11 @@
             <artifactId>jpush-client</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!--apiboot tools-->
         <dependency>
             <groupId>org.minbox.framework</groupId>

diff --git a/...va/org/minbox/framework/api/boot/autoconfigure/quartz/ApiBootQuartzAutoConfiguration.java b/...va/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
@@ -245,11 +245,6 @@
                 <artifactId>quartz</artifactId>
                 <version>${quartz.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.minbox.framework</groupId>
-                <artifactId>api-boot-plugin-quartz</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-quartz</artifactId>

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
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
@@ -21,7 +21,6 @@
         <module>api-boot-plugin</module>
         <module>api-boot-plugin-security</module>
         <module>api-boot-plugin-oauth</module>
-        <module>api-boot-plugin-quartz</module>
         <module>api-boot-plugin-resource-load</module>
         <module>api-boot-plugin-rate-limiter</module>
         <module>api-boot-plugin-sequence</module>

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
@@ -33,10 +33,32 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <!--ApiBoot Quartz Plugin-->
+        <!--Quartz-->
         <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-quartz</artifactId>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>c3p0</artifactId>
+                    <groupId>com.mchange</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>HikariCP-java6</artifactId>
+                    <groupId>com.zaxxer</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/api-boot-project/api-boot/pom.xml b/api-boot-project/api-boot/pom.xml
@@ -28,6 +28,16 @@
             <artifactId>spring-core</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--Spring Boot-->
         <dependency>
@@ -86,6 +96,17 @@
         <dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jpush-client</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

diff --git a/...t/plugin/quartz/ApiBootQuartzService.java → ...api/boot/quartz/ApiBootQuartzService.java b/...t/plugin/quartz/ApiBootQuartzService.java → ...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
      * <p>
-     * 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}
      * </p>
      *
      * @param jobKey       {@link ApiBootJobWrapper#getJobKey()}

diff --git a/...t/ApiBootQuartzServiceDefaultSupport.java → ...t/ApiBootQuartzServiceDefaultSupport.java b/...t/ApiBootQuartzServiceDefaultSupport.java → ...t/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
      * <p>
-     * 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}
      * </p>
      *
      * @param jobKey       {@link ApiBootJobWrapper#getJobKey()}

diff --git a/...uartz/wrapper/ApiBootJobParamWrapper.java → ...uartz/wrapper/ApiBootJobParamWrapper.java b/...uartz/wrapper/ApiBootJobParamWrapper.java → ...uartz/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/...gin/quartz/wrapper/ApiBootJobWrapper.java → ...oot/quartz/wrapper/ApiBootJobWrapper.java b/...gin/quartz/wrapper/ApiBootJobWrapper.java → ...oot/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/...rapper/support/ApiBootCronJobWrapper.java → ...rapper/support/ApiBootCronJobWrapper.java b/...rapper/support/ApiBootCronJobWrapper.java → ...rapper/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/...rapper/support/ApiBootLoopJobWrapper.java → ...rapper/support/ApiBootLoopJobWrapper.java b/...rapper/support/ApiBootLoopJobWrapper.java → ...rapper/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/...rapper/support/ApiBootOnceJobWrapper.java → ...rapper/support/ApiBootOnceJobWrapper.java b/...rapper/support/ApiBootOnceJobWrapper.java → ...rapper/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
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...tz/src/main/java/org/minbox/framework/api/boot/sample/quartz/ApiBootQuartzController.java b/...tz/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
@@ -13,7 +13,7 @@ api:
   boot:
     quartz:
       # 配置使用Jdbc方式存储任务
-      job-store-type: jdbc
+      job-store-type: memory
       # 扩展properties配置列表
       properties:
           # key - value形式进行配置