From 5f795b62bc0cb8b9f323bf7f40884ce62ce2546f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 15 Sep 2023 19:26:36 +0800 Subject: [PATCH] =?UTF-8?q?feature:xxl=E5=8D=87=E7=BA=A72.4.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-base-service/pom.xml | 2 +- .../order/baseservice/config/BaseXxlJobConfig.java | 9 +++++++-- .../com/dxhy/order/baseservice/job/YpyjTask.java | 14 ++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/order-management-base-service/pom.xml b/order-management-base-service/pom.xml index ee0b1755..bd6b4ec0 100644 --- a/order-management-base-service/pom.xml +++ b/order-management-base-service/pom.xml @@ -248,7 +248,7 @@ com.xuxueli xxl-job-core - 1.9.1 + 2.4.0 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java index fde53335..cdb1aba6 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.config; import com.xxl.job.core.executor.XxlJobExecutor; +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -28,6 +29,9 @@ public class BaseXxlJobConfig { @Value("${xxl.job.executor.ip}") private String ip; + @Value("${xxl.job.executor.address}") + private String address; + @Value("${xxl.job.executor.port}") private int port; @@ -44,9 +48,10 @@ public class BaseXxlJobConfig { @Bean(initMethod = "start", destroyMethod = "destroy") public XxlJobExecutor BaseXxlJobExecutor() { log.info(">>>>>>>>>>> base xxl-job config init."); - XxlJobExecutor xxlJobExecutor = new XxlJobExecutor(); + XxlJobSpringExecutor xxlJobExecutor = new XxlJobSpringExecutor(); xxlJobExecutor.setAdminAddresses(adminAddresses); - xxlJobExecutor.setAppName(appName); + xxlJobExecutor.setAppname(appName); + xxlJobExecutor.setAddress(address); xxlJobExecutor.setIp(ip); xxlJobExecutor.setPort(port); xxlJobExecutor.setAccessToken(accessToken); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java index 78cb38c7..97772c26 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java @@ -19,8 +19,9 @@ import com.dxhy.order.baseservice.module.thirdservice.itaxmsg.service.ItaxMsgSer import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.utils.HttpInvoiceRequestUtil; import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.IJobHandler; -import com.xxl.job.core.handler.annotation.JobHandler; +//import com.xxl.job.core.handler.IJobHandler; +//import com.xxl.job.core.handler.annotation.JobHandler; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; @@ -43,8 +44,8 @@ import java.util.stream.Collectors; @SuppressWarnings("AlibabaMethodTooLong") @Slf4j @Component -@JobHandler(value = "/ypyjTask") -public class YpyjTask extends IJobHandler { + +public class YpyjTask { private static final String LOGGER_MSG = "(余票预警)"; @Resource private YpWarningService ypWarningService; @@ -57,7 +58,8 @@ public class YpyjTask extends IJobHandler { @Resource private BaseServiceConfig baseServiceConfig; - @Override + //@Override + @XxlJob(value = "/ypyjTask") public ReturnT execute(String s) { try { @@ -188,7 +190,7 @@ public class YpyjTask extends IJobHandler { } } catch (Exception e) { log.error("{}定时任务执行异常:{}", LOGGER_MSG, e); - return FAIL; + return ReturnT.FAIL; } return ReturnT.SUCCESS; }