diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonAutoConfig.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonAutoConfig.java index 21e7ac9e..45248947 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonAutoConfig.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonAutoConfig.java @@ -1,5 +1,6 @@ package com.xxl.job.core.executor.impl; +import com.xxl.job.core.executor.XxlJobExecutor; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; @@ -7,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * auto config XxlJobExecutor + * * @author noear 2021/5/22 created */ @Configuration @@ -38,7 +41,7 @@ public class XxlJobSolonAutoConfig { private int logRetentionDays; @Bean - public XxlJobSolonExecutor xxlJobExecutor() { + public XxlJobExecutor xxlJobExecutor() { logger.info(">>>>>>>>>>> xxl-job config init."); XxlJobSolonExecutor executor = new XxlJobSolonExecutor(); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonExecutor.java index 24db21ac..2fb71574 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonExecutor.java @@ -15,7 +15,7 @@ public class XxlJobSolonExecutor extends XxlJobExecutor { @Override public void start() throws Exception { - // refresh GlueFactory + // refresh GlueFactory (add solon inject) GlueFactory.refreshInstance(2); // super start diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonPlugin.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonPlugin.java index b13910c2..c9bd3eaf 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonPlugin.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSolonPlugin.java @@ -17,13 +17,16 @@ import java.lang.reflect.Method; public class XxlJobSolonPlugin implements Plugin, BeanExtractor { @Override public void start(SolonApp app) { + //add extractor for bean method Aop.context().beanExtractorAdd(XxlJob.class, this); - Aop.context().beanMake(XxlJobSolonAutoConfig.class); - XxlJobSolonExecutor executor = Aop.get(XxlJobSolonExecutor.class); + Aop.context().beanMake(XxlJobSolonAutoConfig.class); Aop.beanOnloaded(() -> { try { + // + XxlJobExecutor executor = Aop.get(XxlJobExecutor.class); + executor.start(); } catch (Exception e) { throw new RuntimeException(e); diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-solon/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-solon/pom.xml index 9b3d81c9..adbc6ad6 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-solon/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-solon/pom.xml @@ -35,7 +35,7 @@ org.noear - solon-api + solon diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java deleted file mode 100644 index f5886108..00000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.xxl.job.executor.config; - -import com.xxl.job.core.executor.impl.XxlJobSolonExecutor; -import org.noear.solon.annotation.Bean; -import org.noear.solon.annotation.Configuration; -import org.noear.solon.annotation.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * xxl-job config - * - * @author xuxueli 2017-04-28 - * @author noear 2021/5/22 created - */ -@Configuration -public class XxlJobConfig { - private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); - - @Inject("${xxl.job.admin.addresses}") - private String adminAddresses; - - @Inject("${xxl.job.accessToken}") - private String accessToken; - - @Inject("${xxl.job.executor.appname}") - private String appname; - - @Inject("${xxl.job.executor.address}") - private String address; - - @Inject("${xxl.job.executor.ip}") - private String ip; - - @Inject("${xxl.job.executor.port}") - private int port; - - @Inject("${xxl.job.executor.logpath}") - private String logPath; - - @Inject("${xxl.job.executor.logretentiondays}") - private int logRetentionDays; - - - @Bean - public XxlJobSolonExecutor xxlJobExecutor() { - logger.info(">>>>>>>>>>> xxl-job config init."); - - XxlJobSolonExecutor executor = new XxlJobSolonExecutor(); - - executor.setAdminAddresses(adminAddresses); - executor.setAppname(appname); - executor.setAddress(address); - executor.setIp(ip); - executor.setPort(port); - executor.setAccessToken(accessToken); - executor.setLogPath(logPath); - executor.setLogRetentionDays(logRetentionDays); - - return executor; - } - -} \ No newline at end of file diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/jobhandler/SampleXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/jobhandler/SampleXxlJob.java index 094e5de8..d9bedeb3 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/jobhandler/SampleXxlJob.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-solon/src/main/java/com/xxl/job/executor/jobhandler/SampleXxlJob.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; * XxlJob开发示例（Bean模式） * * 开发步骤： - * 1、任务开发：在Spring Bean实例中，开发Job方法； + * 1、任务开发：在Solon Bean实例中，开发Job方法； * 2、注解配置：为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")"，注解value值对应的是调度中心新建任务的JobHandler属性的值。 * 3、执行日志：需要通过 "XxlJobHelper.log" 打印执行日志； * 4、任务结果：默认任务结果为 "成功" 状态，不需要主动设置；如有诉求，比如设置任务结果为失败，可以通过 "XxlJobHelper.handleFail/handleSuccess" 自主设置任务结果； @@ -250,5 +250,4 @@ public class SampleXxlJob { logger.info("destory"); } - }