diff --git a/inside-notices/pom.xml b/inside-notices/pom.xml
index 4e6a3325..16462b72 100644
--- a/inside-notices/pom.xml
+++ b/inside-notices/pom.xml
@@ -69,6 +69,11 @@
com.xuxueli
xxl-job-core
+
+ cn.axzo.infra
+ adapter
+ 2.0.1-SNAPSHOT
+
cn.axzo.pluto
pluto-api
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCacheReloadJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCacheReloadJob.java
index 2c05989e..6fcdacd4 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCacheReloadJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCacheReloadJob.java
@@ -7,7 +7,7 @@ import cn.hutool.core.date.StopWatch;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/AppendWorkspaceTypeJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/AppendWorkspaceTypeJob.java
index 63969466..c4ca5ebf 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/AppendWorkspaceTypeJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/AppendWorkspaceTypeJob.java
@@ -4,9 +4,9 @@ import cn.axzo.msg.center.dal.MessageRouterConfigDao;
import cn.axzo.msg.center.domain.entity.MessageRouterConfig;
import cn.axzo.msg.center.service.enums.TerminalTypeEnum;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
-import com.xxl.job.core.log.XxlJobLogger;
+import cn.axzo.infra.xxl220to250.XxlJobLogger;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/ExpungeTodoLogJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/ExpungeTodoLogJob.java
index 1929fba1..328862de 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/ExpungeTodoLogJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/ExpungeTodoLogJob.java
@@ -4,7 +4,7 @@ import cn.axzo.msg.center.dal.mapper.TodoLogMapper;
import cn.axzo.msg.center.domain.entity.TodoLog;
import cn.axzo.msg.center.inside.notices.config.PendingMessageBizConfig;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateFromPendingMessageJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateFromPendingMessageJob.java
index ab9674f1..b4f6636a 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateFromPendingMessageJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateFromPendingMessageJob.java
@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateOldMsgHotDataJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateOldMsgHotDataJob.java
index 70225da8..27427624 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateOldMsgHotDataJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateOldMsgHotDataJob.java
@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.taobao.api.internal.util.NamedThreadFactory;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.Data;
import lombok.RequiredArgsConstructor;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateRouterJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateRouterJob.java
index 65a36e69..d2580dde 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateRouterJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateRouterJob.java
@@ -9,7 +9,7 @@ import cn.azxo.framework.common.model.Page;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.*;
import lombok.extern.slf4j.Slf4j;
diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateTemplateV3ChannelStyleVersionJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateTemplateV3ChannelStyleVersionJob.java
index 3efd626b..68b35d48 100644
--- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateTemplateV3ChannelStyleVersionJob.java
+++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateTemplateV3ChannelStyleVersionJob.java
@@ -14,9 +14,9 @@ import cn.axzo.msg.center.service.enums.PushTerminalEnum;
import cn.axzo.msg.center.service.pending.card.domain.CardElementConfig;
import com.alibaba.fastjson.JSON;
import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
+import cn.axzo.infra.xxl220to250.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
-import com.xxl.job.core.log.XxlJobLogger;
+import cn.axzo.infra.xxl220to250.XxlJobLogger;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/msg-notices/msg-notices-client/pom.xml b/msg-notices/msg-notices-client/pom.xml
index 3a153b0d..5338a813 100644
--- a/msg-notices/msg-notices-client/pom.xml
+++ b/msg-notices/msg-notices-client/pom.xml
@@ -48,6 +48,11 @@
com.xuxueli
xxl-job-core
+
+ cn.axzo.infra
+ adapter
+ 2.0.1-SNAPSHOT
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
diff --git a/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/util/XxlAppender.java b/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/util/XxlAppender.java
index 6bdc890a..5fab3fdf 100644
--- a/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/util/XxlAppender.java
+++ b/msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/util/XxlAppender.java
@@ -4,6 +4,7 @@ import ch.qos.logback.core.Layout;
import ch.qos.logback.core.UnsynchronizedAppenderBase;
import ch.qos.logback.core.encoder.Encoder;
import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
+import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.log.XxlJobFileAppender;
import java.util.concurrent.locks.ReentrantLock;
@@ -26,7 +27,7 @@ public class XxlAppender extends UnsynchronizedAppenderBase {
@Override
protected void append(E event) {
- String logFileName = XxlJobFileAppender.contextHolder.get();
+ String logFileName = XxlJobContext.getXxlJobContext().getJobLogFileName();
if (logFileName == null) return;
if (encoder == null) return;
byte[] bytes = encoder.encode(event);
diff --git a/pom.xml b/pom.xml
index b1cf17a4..c3c2e677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
1.0.1-SNAPSHOT
1.0.1-SNAPSHOT
2.0.0-SNAPSHOT
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
1.18.22
4.5.0
1.4.2.Final