wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-20250416' into 'master'

Browse Source 
Release 20250416

See merge request universal/infrastructure/backend/msg-center-plat!370
This commit is contained in:
谭杰 2025-04-16 06:01:25 +00:00
commit 2e65bb5405
11 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inside-notices/pom.xml
View File

@ -69,6 +69,11 @@
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
<dependency>
<groupId>cn.axzo.infra</groupId>
<artifactId>adapter</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.axzo.pluto</groupId>
<artifactId>pluto-api</artifactId>

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCacheReloadJob.java
View File

@ -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;

4
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/AppendWorkspaceTypeJob.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/ExpungeTodoLogJob.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateFromPendingMessageJob.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateOldMsgHotDataJob.java
View File

@ -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;

2
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateRouterJob.java
View File

@ -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;

4
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateTemplateV3ChannelStyleVersionJob.java
View File

@ -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;

5
msg-notices/msg-notices-client/pom.xml
View File

@ -48,6 +48,11 @@
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
<dependency>
<groupId>cn.axzo.infra</groupId>
<artifactId>adapter</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

3
msg-notices/msg-notices-client/src/main/java/cn/axzo/msg/center/notices/client/util/XxlAppender.java
View File

@ -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<E> extends UnsynchronizedAppenderBase<E> {
@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);

2
pom.xml
View File

@ -35,7 +35,7 @@
<msg-center-api-version>1.0.1-SNAPSHOT</msg-center-api-version>
<msg-center-api-v2-version>1.0.1-SNAPSHOT</msg-center-api-v2-version>
<axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version>
<axzo-dependencies.version>2.0.0-SNAPSHOT</axzo-dependencies.version>
<axzo-dependencies.version>2.0.1-SNAPSHOT</axzo-dependencies.version>
<lombok.version>1.18.22</lombok.version>
<binarywang.weixin-java.version>4.5.0</binarywang.weixin-java.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>