From c847c27687bb95df7134fbe735495fc5d95c0a9c Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 28 Jul 2023 16:45:41 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E5=BE=AE=E8=B0=83=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daxpay/core/pay/builder/PayEventBuilder.java | 2 +- .../daxpay/core/pay/service/PayCallbackService.java | 2 +- .../daxpay/core/pay/service/PayCancelService.java | 2 +- .../platform/daxpay/core/pay/service/PayService.java | 2 +- .../core/sync/service/PayExpiredTimeService.java | 2 +- .../daxpay/core/sync/service/PaySyncService.java | 2 +- .../platform/daxpay/{mq => event}/PayEventSender.java | 10 +++++----- .../platform/daxpay/{mq => event}/PayMqMsgSender.java | 4 ++-- .../{mq/event => event/domain}/PayCancelEvent.java | 2 +- .../{mq/event => event/domain}/PayCompleteEvent.java | 2 +- .../daxpay/{mq/event => event/domain}/PayEvent.java | 2 +- .../event => event/domain}/PayExpiredTimeEvent.java | 2 +- .../{mq/event => event/domain}/PayRefundEvent.java | 2 +- .../vender/active/listener/PayActiveMqMsgListener.java | 2 +- .../vender/active/sender/PayActiveMqMsgSender.java | 6 +++--- .../vender/rabbit/config/PayRabbitBeanRegistry.java | 4 ++-- .../vender/rabbit/listener/PayRabbitMqMsgListener.java | 8 ++++---- .../vender/rabbit/sender/PayRabbitMqMsgSender.java | 6 +++--- .../vender/rocket/listener/PayRocketMqMsgListener.java | 2 +- .../vender/rocket/sender/PayRocketMqMsgSender.java | 6 +++--- .../vender/spring/sender/PaySpringMsgSender.java | 7 +++---- .../daxpay/task/PayExpiredTimeTaskService.java | 4 ++-- 22 files changed, 40 insertions(+), 41 deletions(-) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/PayEventSender.java (81%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/PayMqMsgSender.java (79%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq/event => event/domain}/PayCancelEvent.java (90%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq/event => event/domain}/PayCompleteEvent.java (90%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq/event => event/domain}/PayEvent.java (87%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq/event => event/domain}/PayExpiredTimeEvent.java (91%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq/event => event/domain}/PayRefundEvent.java (90%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/active/listener/PayActiveMqMsgListener.java (83%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/active/sender/PayActiveMqMsgSender.java (88%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/rabbit/config/PayRabbitBeanRegistry.java (96%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/rabbit/listener/PayRabbitMqMsgListener.java (86%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/rabbit/sender/PayRabbitMqMsgSender.java (87%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/rocket/listener/PayRocketMqMsgListener.java (90%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/rocket/sender/PayRocketMqMsgSender.java (83%) rename dax-pay/src/main/java/cn/bootx/platform/daxpay/{mq => event}/vender/spring/sender/PaySpringMsgSender.java (82%) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java index aa2739e9b..07922bc0f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/builder/PayEventBuilder.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.core.pay.builder; import cn.bootx.platform.daxpay.core.payment.entity.Payment; -import cn.bootx.platform.daxpay.mq.event.*; +import cn.bootx.platform.daxpay.event.domain.*; import lombok.experimental.UtilityClass; /** diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java index 24640feb8..41c79f286 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCallbackService.java @@ -14,7 +14,7 @@ import cn.bootx.platform.daxpay.core.pay.func.PayStrategyConsumer; import cn.bootx.platform.daxpay.core.pay.result.PayCallbackResult; import cn.bootx.platform.daxpay.core.payment.entity.Payment; import cn.bootx.platform.daxpay.core.payment.service.PaymentService; -import cn.bootx.platform.daxpay.mq.PayEventSender; +import cn.bootx.platform.daxpay.event.PayEventSender; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java index 1ec25921b..e84a66016 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayCancelService.java @@ -11,7 +11,7 @@ import cn.bootx.platform.daxpay.core.payment.service.PaymentService; import cn.bootx.platform.daxpay.exception.payment.PayFailureException; import cn.bootx.platform.daxpay.exception.payment.PayNotExistedException; import cn.bootx.platform.daxpay.exception.payment.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.mq.PayEventSender; +import cn.bootx.platform.daxpay.event.PayEventSender; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java index f1b65ab56..017c54b22 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/service/PayService.java @@ -21,7 +21,7 @@ import cn.bootx.platform.daxpay.dto.pay.PayResult; import cn.bootx.platform.daxpay.exception.payment.PayFailureException; import cn.bootx.platform.daxpay.exception.payment.PayNotExistedException; import cn.bootx.platform.daxpay.exception.payment.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.mq.PayEventSender; +import cn.bootx.platform.daxpay.event.PayEventSender; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.util.PayWayUtil; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PayExpiredTimeService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PayExpiredTimeService.java index dc31134a5..b1eb4948c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PayExpiredTimeService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PayExpiredTimeService.java @@ -5,7 +5,7 @@ import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy; import cn.bootx.platform.daxpay.core.payment.entity.Payment; import cn.bootx.platform.daxpay.core.payment.service.PaymentService; import cn.bootx.platform.daxpay.core.sync.result.PaySyncResult; -import cn.bootx.platform.daxpay.mq.PayEventSender; +import cn.bootx.platform.daxpay.event.PayEventSender; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PaySyncService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PaySyncService.java index 099d1ee21..840f947d8 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PaySyncService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/service/PaySyncService.java @@ -14,7 +14,7 @@ import cn.bootx.platform.daxpay.core.sync.record.service.PaySyncRecordService; import cn.bootx.platform.daxpay.core.sync.result.PaySyncResult; import cn.bootx.platform.daxpay.exception.payment.PayFailureException; import cn.bootx.platform.daxpay.exception.payment.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.mq.PayEventSender; +import cn.bootx.platform.daxpay.event.PayEventSender; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.util.PayWayUtil; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayEventSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayEventSender.java similarity index 81% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayEventSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayEventSender.java index c2ce454d0..0f56b2cfe 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayEventSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayEventSender.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.mq; +package cn.bootx.platform.daxpay.event; -import cn.bootx.platform.daxpay.mq.event.PayCancelEvent; -import cn.bootx.platform.daxpay.mq.event.PayCompleteEvent; -import cn.bootx.platform.daxpay.mq.event.PayExpiredTimeEvent; -import cn.bootx.platform.daxpay.mq.event.PayRefundEvent; +import cn.bootx.platform.daxpay.event.domain.PayCancelEvent; +import cn.bootx.platform.daxpay.event.domain.PayCompleteEvent; +import cn.bootx.platform.daxpay.event.domain.PayExpiredTimeEvent; +import cn.bootx.platform.daxpay.event.domain.PayRefundEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.retry.annotation.Retryable; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayMqMsgSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayMqMsgSender.java similarity index 79% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayMqMsgSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayMqMsgSender.java index 2998ac7bb..d144e9a03 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/PayMqMsgSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/PayMqMsgSender.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.mq; +package cn.bootx.platform.daxpay.event; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.domain.PayEvent; /** * 支付消息队列发送接口定义 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCancelEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCancelEvent.java similarity index 90% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCancelEvent.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCancelEvent.java index 33307b1b9..085595584 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCancelEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCancelEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.event; +package cn.bootx.platform.daxpay.event.domain; import lombok.Data; import lombok.experimental.Accessors; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCompleteEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCompleteEvent.java similarity index 90% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCompleteEvent.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCompleteEvent.java index 8ee4db12b..c372fd306 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayCompleteEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayCompleteEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.event; +package cn.bootx.platform.daxpay.event.domain; import lombok.Data; import lombok.experimental.Accessors; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayEvent.java similarity index 87% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayEvent.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayEvent.java index c4aa45b3e..1c33ea738 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.event; +package cn.bootx.platform.daxpay.event.domain; import cn.bootx.platform.common.jackson.util.JacksonUtil; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayExpiredTimeEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayExpiredTimeEvent.java similarity index 91% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayExpiredTimeEvent.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayExpiredTimeEvent.java index cc9efaa99..dca278178 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayExpiredTimeEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayExpiredTimeEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.event; +package cn.bootx.platform.daxpay.event.domain; import cn.bootx.platform.daxpay.code.PaymentEventCode; import lombok.Data; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayRefundEvent.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayRefundEvent.java similarity index 90% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayRefundEvent.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayRefundEvent.java index ff76e40e8..55958d2ab 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/event/PayRefundEvent.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/domain/PayRefundEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.event; +package cn.bootx.platform.daxpay.event.domain; import lombok.Data; import lombok.experimental.Accessors; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/listener/PayActiveMqMsgListener.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/listener/PayActiveMqMsgListener.java similarity index 83% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/listener/PayActiveMqMsgListener.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/listener/PayActiveMqMsgListener.java index 389a05cc4..757391829 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/listener/PayActiveMqMsgListener.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/listener/PayActiveMqMsgListener.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.vender.active.listener; +package cn.bootx.platform.daxpay.event.vender.active.listener; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/sender/PayActiveMqMsgSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/sender/PayActiveMqMsgSender.java similarity index 88% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/sender/PayActiveMqMsgSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/sender/PayActiveMqMsgSender.java index 0331395b6..6ef58eec2 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/active/sender/PayActiveMqMsgSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/active/sender/PayActiveMqMsgSender.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.mq.vender.active.sender; +package cn.bootx.platform.daxpay.event.vender.active.sender; -import cn.bootx.platform.daxpay.mq.PayMqMsgSender; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.PayMqMsgSender; +import cn.bootx.platform.daxpay.event.domain.PayEvent; import lombok.RequiredArgsConstructor; import org.apache.activemq.ScheduledMessage; import org.apache.activemq.command.ActiveMQQueue; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/config/PayRabbitBeanRegistry.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/config/PayRabbitBeanRegistry.java similarity index 96% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/config/PayRabbitBeanRegistry.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/config/PayRabbitBeanRegistry.java index e44b7108e..0f8991ffd 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/config/PayRabbitBeanRegistry.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/config/PayRabbitBeanRegistry.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.mq.vender.rabbit.config; +package cn.bootx.platform.daxpay.event.vender.rabbit.config; import cn.bootx.platform.daxpay.code.PaymentEventCode; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.domain.PayEvent; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/listener/PayRabbitMqMsgListener.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/listener/PayRabbitMqMsgListener.java similarity index 86% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/listener/PayRabbitMqMsgListener.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/listener/PayRabbitMqMsgListener.java index f2bf088e8..0ce03aeef 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/listener/PayRabbitMqMsgListener.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/listener/PayRabbitMqMsgListener.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.mq.vender.rabbit.listener; +package cn.bootx.platform.daxpay.event.vender.rabbit.listener; import cn.bootx.platform.daxpay.code.PaymentEventCode; import cn.bootx.platform.daxpay.core.sync.service.PayExpiredTimeService; -import cn.bootx.platform.daxpay.mq.event.PayCancelEvent; -import cn.bootx.platform.daxpay.mq.event.PayCompleteEvent; -import cn.bootx.platform.daxpay.mq.event.PayRefundEvent; +import cn.bootx.platform.daxpay.event.domain.PayCancelEvent; +import cn.bootx.platform.daxpay.event.domain.PayCompleteEvent; +import cn.bootx.platform.daxpay.event.domain.PayRefundEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/sender/PayRabbitMqMsgSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/sender/PayRabbitMqMsgSender.java similarity index 87% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/sender/PayRabbitMqMsgSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/sender/PayRabbitMqMsgSender.java index 1fc08ffcb..c2b93eeeb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rabbit/sender/PayRabbitMqMsgSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rabbit/sender/PayRabbitMqMsgSender.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.mq.vender.rabbit.sender; +package cn.bootx.platform.daxpay.event.vender.rabbit.sender; -import cn.bootx.platform.daxpay.mq.PayMqMsgSender; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.PayMqMsgSender; +import cn.bootx.platform.daxpay.event.domain.PayEvent; import lombok.RequiredArgsConstructor; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/listener/PayRocketMqMsgListener.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/listener/PayRocketMqMsgListener.java similarity index 90% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/listener/PayRocketMqMsgListener.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/listener/PayRocketMqMsgListener.java index ce3d14afd..baba40d45 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/listener/PayRocketMqMsgListener.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/listener/PayRocketMqMsgListener.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.mq.vender.rocket.listener; +package cn.bootx.platform.daxpay.event.vender.rocket.listener; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.core.RocketMQListener; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/sender/PayRocketMqMsgSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/sender/PayRocketMqMsgSender.java similarity index 83% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/sender/PayRocketMqMsgSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/sender/PayRocketMqMsgSender.java index 583109ab4..bef652b95 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/rocket/sender/PayRocketMqMsgSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/rocket/sender/PayRocketMqMsgSender.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.mq.vender.rocket.sender; +package cn.bootx.platform.daxpay.event.vender.rocket.sender; -import cn.bootx.platform.daxpay.mq.PayMqMsgSender; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.PayMqMsgSender; +import cn.bootx.platform.daxpay.event.domain.PayEvent; import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/spring/sender/PaySpringMsgSender.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/spring/sender/PaySpringMsgSender.java similarity index 82% rename from dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/spring/sender/PaySpringMsgSender.java rename to dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/spring/sender/PaySpringMsgSender.java index 5bcf0a791..da65cdcdf 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/mq/vender/spring/sender/PaySpringMsgSender.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/event/vender/spring/sender/PaySpringMsgSender.java @@ -1,12 +1,11 @@ -package cn.bootx.platform.daxpay.mq.vender.spring.sender; +package cn.bootx.platform.daxpay.event.vender.spring.sender; -import cn.bootx.platform.daxpay.mq.PayMqMsgSender; -import cn.bootx.platform.daxpay.mq.event.PayEvent; +import cn.bootx.platform.daxpay.event.PayMqMsgSender; +import cn.bootx.platform.daxpay.event.domain.PayEvent; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; /** * Spring 事件方式 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java index d7ba083d5..a9be6366f 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/task/PayExpiredTimeTaskService.java @@ -2,8 +2,8 @@ package cn.bootx.platform.daxpay.task; import cn.bootx.platform.common.core.util.CollUtil; import cn.bootx.platform.daxpay.core.payment.dao.PaymentExpiredTimeRepository; -import cn.bootx.platform.daxpay.mq.PayEventSender; -import cn.bootx.platform.daxpay.mq.event.PayExpiredTimeEvent; +import cn.bootx.platform.daxpay.event.PayEventSender; +import cn.bootx.platform.daxpay.event.domain.PayExpiredTimeEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;