diff --git a/pom.xml b/pom.xml index 8537789..77d4b50 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ com.xiang.starter - xmc-quartz-starter - 1.0-SNAPSHOT + xservice-quartz-core + 1.1 com.xiang.starter diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/schedule/TestXxzJob.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/schedule/TestXxzJob.java index d897785..fa84b18 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/schedule/TestXxzJob.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/schedule/TestXxzJob.java @@ -1,6 +1,6 @@ package com.xiang.app.modules.jntyzx.schedule; -import com.xiang.xmc.service.quartz.annotation.XxzJob; +import com.xiang.core.quartz.annotation.XxzJob; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/xservice-core/src/main/java/com/xiang/app/schedule/TestTask1.java b/xservice-core/src/main/java/com/xiang/app/schedule/TestTask1.java new file mode 100644 index 0000000..4e0766f --- /dev/null +++ b/xservice-core/src/main/java/com/xiang/app/schedule/TestTask1.java @@ -0,0 +1,19 @@ +package com.xiang.app.schedule; + +import com.xiang.core.quartz.annotation.XxzJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @Author: xiang + * @Date: 2026-01-14 17:17 + */ +@Slf4j +@Component +public class TestTask1 { + + @XxzJob(name = "ts") + public void ts() { + log.info("111"); + } +} diff --git a/xservice-server/src/main/java/com/xiang/app/Application.java b/xservice-server/src/main/java/com/xiang/app/Application.java index 7e1149a..4a43540 100644 --- a/xservice-server/src/main/java/com/xiang/app/Application.java +++ b/xservice-server/src/main/java/com/xiang/app/Application.java @@ -1,6 +1,6 @@ package com.xiang.app; -import com.xiang.xmc.service.quartz.annotation.EnableXxzJob; +import com.xiang.core.quartz.annotation.EnableXxzJob; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,10 +18,9 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesScan; "com.xiang.app.common.config", }) @MapperScan(basePackages = { - "com.xiang.xmc.service.quartz", "com.xiang.app.modules.*.mapper" }) -@EnableXxzJob(basePackages = {"com.xiang.app.modules.*.schedule"}) +@EnableXxzJob(basePackages = {"com.xiang.app.schedule"}) public class Application { private static final Logger log = LoggerFactory.getLogger(Application.class); diff --git a/xservice-server/src/main/java/com/xiang/app/JobScannerRun.java b/xservice-server/src/main/java/com/xiang/app/JobScannerRun.java index 2e3f3ee..c8d2eda 100644 --- a/xservice-server/src/main/java/com/xiang/app/JobScannerRun.java +++ b/xservice-server/src/main/java/com/xiang/app/JobScannerRun.java @@ -1,7 +1,7 @@ package com.xiang.app; -import com.xiang.xmc.service.quartz.domain.JobDefinition; -import com.xiang.xmc.service.quartz.holder.JobDefinitionHolder; +import com.xiang.core.quartz.holder.JobDefinitionHolder; +import com.xiang.core.quartz.model.JobDefinition; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/xservice-server/src/main/resources/application-dev.yml b/xservice-server/src/main/resources/application-test.yml similarity index 94% rename from xservice-server/src/main/resources/application-dev.yml rename to xservice-server/src/main/resources/application-test.yml index 612f7b2..0df1efd 100644 --- a/xservice-server/src/main/resources/application-dev.yml +++ b/xservice-server/src/main/resources/application-test.yml @@ -36,7 +36,9 @@ spring: min-idle: 0 max-wait: 1000 xxz-job: - appName: xservice-cornucopia + app-name: xservice-cornucopia + admin-address: http://127.0.0.1:30030 + namespace: 1 dingtalk: robot: diff --git a/xservice-server/src/main/resources/application.yml b/xservice-server/src/main/resources/application.yml index 59d2c5c..c8a6a59 100644 --- a/xservice-server/src/main/resources/application.yml +++ b/xservice-server/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: test application: name: xservice-cornucopia main: