From 739f13d3b799e97272f594799f59759671e5f571 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 27 Jun 2024 14:06:31 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2318:=20=E5=A4=84=E7=90=86=E7=B1=BB?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notices/service/impl/InsideMessageTemplateApiImpl.java | 2 +- .../main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java | 2 +- .../cn/axzo/msg/center/common/utils/PlaceholderResolver.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java index e0c3c5ab..4acf8c90 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageTemplateApiImpl.java @@ -22,8 +22,8 @@ import cn.axzo.msg.center.inside.notices.service.MessageTemplateService; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.compress.utils.Lists; import org.springframework.core.env.Environment; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java index df324b27..d07572f2 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/UpdateOuIdJob.java @@ -10,13 +10,13 @@ import cn.axzo.msg.center.message.migrate.OuIdMigrateService; import cn.axzo.msg.center.service.enums.YesOrNo; 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 com.xxl.job.core.handler.annotation.XxlJob; import lombok.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java index e59c0151..307633b9 100644 --- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java +++ b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java @@ -3,8 +3,8 @@ package cn.axzo.msg.center.common.utils; import cn.axzo.msg.center.common.template.TemplateParser; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import java.util.HashSet;