1. 合并base改包代码

2025-09-22 15:10:53 +08:00
parent 98d71810a8 386d47fde1
commit 516fdb6fa0
670 changed files with 23530 additions and 811 deletions
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/message/MpAutoReplyController.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/message/MpAutoReplyController.java
@@ -12,12 +12,13 @@ import com.zt.plat.module.mp.service.message.MpAutoReplyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;

@Tag(name = "管理后台 - 公众号自动回复")
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/message/MpMessageController.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/message/MpMessageController.java
@@ -10,12 +10,13 @@ import com.zt.plat.module.mp.dal.dataobject.message.MpMessageDO;
 import com.zt.plat.module.mp.service.message.MpMessageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;

@Tag(name = "管理后台 - 公众号消息")
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/user/MpUserController.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/controller/admin/user/MpUserController.java
@@ -11,12 +11,13 @@ import com.zt.plat.module.mp.service.user.MpUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;

@Tag(name = "管理后台 - 公众号粉丝")
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/account/MpAccountDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/account/MpAccountDO.java
@@ -1,9 +1,9 @@
 package com.zt.plat.module.mp.dal.dataobject.account;

+import com.zt.plat.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zt.plat.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/material/MpMaterialDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/material/MpMaterialDO.java
@@ -1,10 +1,10 @@
 package com.zt.plat.module.mp.dal.dataobject.material;

+import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
-import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import lombok.*;
 import me.chanjar.weixin.common.api.WxConsts;

--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/menu/MpMenuDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/menu/MpMenuDO.java
@@ -1,13 +1,13 @@
 package com.zt.plat.module.mp.dal.dataobject.menu;

+import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
+import com.zt.plat.module.mp.dal.dataobject.message.MpMessageDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
-import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
-import com.zt.plat.module.mp.dal.dataobject.message.MpMessageDO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/message/MpAutoReplyDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/message/MpAutoReplyDO.java
@@ -1,15 +1,15 @@
 package com.zt.plat.module.mp.dal.dataobject.message;

-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.zt.plat.framework.common.util.collection.SetUtils;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import com.zt.plat.module.mp.enums.message.MpAutoReplyMatchEnum;
 import com.zt.plat.module.mp.enums.message.MpAutoReplyTypeEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/message/MpMessageDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/message/MpMessageDO.java
@@ -1,14 +1,14 @@
 package com.zt.plat.module.mp.dal.dataobject.message;

+import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
+import com.zt.plat.module.mp.dal.dataobject.user.MpUserDO;
+import com.zt.plat.module.mp.enums.message.MpMessageSendFromEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
-import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
-import com.zt.plat.module.mp.dal.dataobject.user.MpUserDO;
-import com.zt.plat.module.mp.enums.message.MpMessageSendFromEnum;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/tag/MpTagDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/tag/MpTagDO.java
@@ -1,12 +1,10 @@
 package com.zt.plat.module.mp.dal.dataobject.tag;

-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import lombok.*;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import me.chanjar.weixin.mp.bean.tag.WxUserTag;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/user/MpUserDO.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/dal/dataobject/user/MpUserDO.java
@@ -1,14 +1,14 @@
 package com.zt.plat.module.mp.dal.dataobject.user;

-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.zt.plat.framework.common.enums.CommonStatusEnum;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import com.zt.plat.framework.mybatis.core.type.LongListTypeHandler;
 import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import com.zt.plat.module.mp.dal.dataobject.tag.MpTagDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;

 import java.time.LocalDateTime;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/config/MpConfiguration.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/config/MpConfiguration.java
@@ -1,11 +1,10 @@
 package com.zt.plat.module.mp.framework.mp.config;

-import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import com.zt.plat.module.mp.framework.mp.core.DefaultMpServiceFactory;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
 import com.zt.plat.module.mp.service.handler.menu.MenuHandler;
-import com.zt.plat.module.mp.service.handler.message.MessageAutoReplyHandler;
 import com.zt.plat.module.mp.service.handler.message.MessageReceiveHandler;
+import com.zt.plat.module.mp.service.handler.message.MessageAutoReplyHandler;
 import com.zt.plat.module.mp.service.handler.other.KfSessionHandler;
 import com.zt.plat.module.mp.service.handler.other.NullHandler;
 import com.zt.plat.module.mp.service.handler.other.ScanHandler;
@@ -13,6 +12,7 @@ import com.zt.plat.module.mp.service.handler.other.StoreCheckNotifyHandler;
 import com.zt.plat.module.mp.service.handler.user.LocationHandler;
 import com.zt.plat.module.mp.service.handler.user.SubscribeHandler;
 import com.zt.plat.module.mp.service.handler.user.UnsubscribeHandler;
+import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/DefaultMpServiceFactory.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/DefaultMpServiceFactory.java
@@ -1,11 +1,9 @@
 package com.zt.plat.module.mp.framework.mp.core;

-import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
-import com.google.common.collect.Maps;
 import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import com.zt.plat.module.mp.service.handler.menu.MenuHandler;
-import com.zt.plat.module.mp.service.handler.message.MessageAutoReplyHandler;
 import com.zt.plat.module.mp.service.handler.message.MessageReceiveHandler;
+import com.zt.plat.module.mp.service.handler.message.MessageAutoReplyHandler;
 import com.zt.plat.module.mp.service.handler.other.KfSessionHandler;
 import com.zt.plat.module.mp.service.handler.other.NullHandler;
 import com.zt.plat.module.mp.service.handler.other.ScanHandler;
@@ -13,6 +11,8 @@ import com.zt.plat.module.mp.service.handler.other.StoreCheckNotifyHandler;
 import com.zt.plat.module.mp.service.handler.user.LocationHandler;
 import com.zt.plat.module.mp.service.handler.user.SubscribeHandler;
 import com.zt.plat.module.mp.service.handler.user.UnsubscribeHandler;
+import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
+import com.google.common.collect.Maps;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/context/MpContextHolder.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/context/MpContextHolder.java
@@ -17,8 +17,9 @@

 package com.zt.plat.module.mp.framework.mp.core.context;

-import com.alibaba.ttl.TransmittableThreadLocal;
 import com.zt.plat.module.mp.controller.admin.open.vo.MpOpenHandleMessageReqVO;
+import com.alibaba.ttl.TransmittableThreadLocal;
+import lombok.experimental.UtilityClass;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/util/MpUtils.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/framework/mp/core/util/MpUtils.java
@@ -2,10 +2,11 @@ package com.zt.plat.module.mp.framework.mp.core.util;

 import cn.hutool.core.util.StrUtil;
 import com.zt.plat.framework.common.util.validation.ValidationUtils;
-import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;

+import jakarta.validation.Validator;
+
 /**
 * 公众号工具类
 *
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/account/MpAccountService.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/account/MpAccountService.java
@@ -5,8 +5,8 @@ import com.zt.plat.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
 import com.zt.plat.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
 import com.zt.plat.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
 import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
-import jakarta.validation.Valid;

+import jakarta.validation.Valid;
 import java.util.List;

 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/account/MpAccountServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/account/MpAccountServiceImpl.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.mp.service.account;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
-import com.google.common.annotations.VisibleForTesting;
 import com.zt.plat.framework.common.exception.util.ServiceExceptionUtil;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.tenant.core.util.TenantUtils;
@@ -14,8 +13,7 @@ import com.zt.plat.module.mp.dal.dataobject.account.MpAccountDO;
 import com.zt.plat.module.mp.dal.mysql.account.MpAccountMapper;
 import com.zt.plat.module.mp.enums.ErrorCodeConstants;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
+import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -26,6 +24,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/menu/MenuHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/menu/MenuHandler.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.mp.service.handler.menu;

 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.menu.MpMenuService;
-import jakarta.annotation.Resource;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -10,6 +9,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/message/MessageAutoReplyHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/message/MessageAutoReplyHandler.java
@@ -3,7 +3,6 @@ package com.zt.plat.module.mp.service.handler.message;
 import com.zt.plat.module.mp.dal.dataobject.message.MpAutoReplyDO;
 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.message.MpAutoReplyService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
@@ -12,6 +11,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/message/MessageReceiveHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/message/MessageReceiveHandler.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.mp.service.handler.message;

 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.message.MpMessageService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
@@ -11,6 +10,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/LocationHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/LocationHandler.java
@@ -3,7 +3,6 @@ package com.zt.plat.module.mp.service.handler.user;
 import cn.hutool.core.util.ObjectUtil;
 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.message.MpAutoReplyService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.session.WxSessionManager;
@@ -13,6 +12,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/SubscribeHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/SubscribeHandler.java
@@ -3,7 +3,6 @@ package com.zt.plat.module.mp.service.handler.user;
 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.message.MpAutoReplyService;
 import com.zt.plat.module.mp.service.user.MpUserService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
@@ -14,6 +13,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/UnsubscribeHandler.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/handler/user/UnsubscribeHandler.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.mp.service.handler.user;

 import com.zt.plat.module.mp.framework.mp.core.context.MpContextHolder;
 import com.zt.plat.module.mp.service.user.MpUserService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
@@ -12,6 +11,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

+import jakarta.annotation.Resource;
 import java.util.Map;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialService.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialService.java
@@ -6,9 +6,9 @@ import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialUploadNewsIm
 import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialUploadPermanentReqVO;
 import com.zt.plat.module.mp.controller.admin.material.vo.MpMaterialUploadTemporaryReqVO;
 import com.zt.plat.module.mp.dal.dataobject.material.MpMaterialDO;
-import jakarta.validation.Valid;
 import me.chanjar.weixin.common.api.WxConsts;

+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/material/MpMaterialServiceImpl.java
@@ -16,7 +16,6 @@ import com.zt.plat.module.mp.dal.dataobject.material.MpMaterialDO;
 import com.zt.plat.module.mp.dal.mysql.material.MpMaterialMapper;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
 import com.zt.plat.module.mp.service.account.MpAccountService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -26,6 +25,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/menu/MpMenuService.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/menu/MpMenuService.java
@@ -2,9 +2,9 @@ package com.zt.plat.module.mp.service.menu;

 import com.zt.plat.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
 import com.zt.plat.module.mp.dal.dataobject.menu.MpMenuDO;
-import jakarta.validation.Valid;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;

+import jakarta.validation.Valid;
 import java.util.List;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/menu/MpMenuServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/menu/MpMenuServiceImpl.java
@@ -12,8 +12,6 @@ import com.zt.plat.module.mp.framework.mp.core.util.MpUtils;
 import com.zt.plat.module.mp.service.account.MpAccountService;
 import com.zt.plat.module.mp.service.message.MpMessageService;
 import com.zt.plat.module.mp.service.message.bo.MpMessageSendOutReqBO;
-import jakarta.annotation.Resource;
-import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.menu.WxMenu;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -24,6 +22,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.Resource;
+import jakarta.validation.Validator;
 import java.util.List;

 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/message/MpAutoReplyServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/message/MpAutoReplyServiceImpl.java
@@ -16,8 +16,6 @@ import com.zt.plat.module.mp.enums.message.MpAutoReplyTypeEnum;
 import com.zt.plat.module.mp.framework.mp.core.util.MpUtils;
 import com.zt.plat.module.mp.service.account.MpAccountService;
 import com.zt.plat.module.mp.service.message.bo.MpMessageSendOutReqBO;
-import jakarta.annotation.Resource;
-import jakarta.validation.Validator;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
@@ -25,6 +23,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.Resource;
+import jakarta.validation.Validator;
 import java.util.List;

 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/statistics/MpStatisticsServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/statistics/MpStatisticsServiceImpl.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.mp.service.statistics;

 import cn.hutool.core.date.DateUtil;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
-import jakarta.annotation.Resource;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeInterfaceResult;
@@ -12,6 +11,7 @@ import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;

+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;

--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/tag/MpTagService.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/tag/MpTagService.java
@@ -5,8 +5,8 @@ import com.zt.plat.module.mp.controller.admin.tag.vo.MpTagCreateReqVO;
 import com.zt.plat.module.mp.controller.admin.tag.vo.MpTagPageReqVO;
 import com.zt.plat.module.mp.controller.admin.tag.vo.MpTagUpdateReqVO;
 import com.zt.plat.module.mp.dal.dataobject.tag.MpTagDO;
-import jakarta.validation.Valid;

+import jakarta.validation.Valid;
 import java.util.List;

 /**
--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/tag/MpTagServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/tag/MpTagServiceImpl.java
@@ -11,7 +11,6 @@ import com.zt.plat.module.mp.dal.dataobject.tag.MpTagDO;
 import com.zt.plat.module.mp.dal.mysql.tag.MpTagMapper;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
 import com.zt.plat.module.mp.service.account.MpAccountService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -21,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;

--- a/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/user/MpUserServiceImpl.java
+++ b/zt-module-mp/zt-module-mp-server/src/main/java/com/zt/plat/module/mp/service/user/MpUserServiceImpl.java
@@ -13,7 +13,6 @@ import com.zt.plat.module.mp.dal.dataobject.user.MpUserDO;
 import com.zt.plat.module.mp.dal.mysql.user.MpUserMapper;
 import com.zt.plat.module.mp.framework.mp.core.MpServiceFactory;
 import com.zt.plat.module.mp.service.account.MpAccountService;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -24,6 +23,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;