style 微调消息通知相关代码

DavidAlphaFox · Jul 28, 2023 · c847c27 · c847c27
1 parent 744fd09
commit c847c27
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 41 deletions.
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
@@ -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
@@ -14,7 +14,7 @@
 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
@@ -11,7 +11,7 @@
 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
@@ -21,7 +21,7 @@
 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
@@ -5,7 +5,7 @@
 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
@@ -14,7 +14,7 @@
 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/...tx/platform/daxpay/mq/PayEventSender.java → ...platform/daxpay/event/PayEventSender.java b/...tx/platform/daxpay/mq/PayEventSender.java → ...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/...tx/platform/daxpay/mq/PayMqMsgSender.java → ...platform/daxpay/event/PayMqMsgSender.java b/...tx/platform/daxpay/mq/PayMqMsgSender.java → ...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/...tform/daxpay/mq/event/PayCancelEvent.java → ...m/daxpay/event/domain/PayCancelEvent.java b/...tform/daxpay/mq/event/PayCancelEvent.java → ...m/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/...orm/daxpay/mq/event/PayCompleteEvent.java → ...daxpay/event/domain/PayCompleteEvent.java b/...orm/daxpay/mq/event/PayCompleteEvent.java → ...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/...tx/platform/daxpay/mq/event/PayEvent.java → ...latform/daxpay/event/domain/PayEvent.java b/...tx/platform/daxpay/mq/event/PayEvent.java → ...latform/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/.../daxpay/mq/event/PayExpiredTimeEvent.java → ...pay/event/domain/PayExpiredTimeEvent.java b/.../daxpay/mq/event/PayExpiredTimeEvent.java → ...pay/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/...tform/daxpay/mq/event/PayRefundEvent.java → ...m/daxpay/event/domain/PayRefundEvent.java b/...tform/daxpay/mq/event/PayRefundEvent.java → ...m/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/...tive/listener/PayActiveMqMsgListener.java → ...tive/listener/PayActiveMqMsgListener.java b/...tive/listener/PayActiveMqMsgListener.java → ...tive/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/...r/active/sender/PayActiveMqMsgSender.java → ...r/active/sender/PayActiveMqMsgSender.java b/...r/active/sender/PayActiveMqMsgSender.java → ...r/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/.../rabbit/config/PayRabbitBeanRegistry.java → .../rabbit/config/PayRabbitBeanRegistry.java b/.../rabbit/config/PayRabbitBeanRegistry.java → .../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/...bbit/listener/PayRabbitMqMsgListener.java → ...bbit/listener/PayRabbitMqMsgListener.java b/...bbit/listener/PayRabbitMqMsgListener.java → ...bbit/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/...r/rabbit/sender/PayRabbitMqMsgSender.java → ...r/rabbit/sender/PayRabbitMqMsgSender.java b/...r/rabbit/sender/PayRabbitMqMsgSender.java → ...r/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/...cket/listener/PayRocketMqMsgListener.java → ...cket/listener/PayRocketMqMsgListener.java b/...cket/listener/PayRocketMqMsgListener.java → ...cket/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/...r/rocket/sender/PayRocketMqMsgSender.java → ...r/rocket/sender/PayRocketMqMsgSender.java b/...r/rocket/sender/PayRocketMqMsgSender.java → ...r/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/...der/spring/sender/PaySpringMsgSender.java → ...der/spring/sender/PaySpringMsgSender.java b/...der/spring/sender/PaySpringMsgSender.java → ...der/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
@@ -2,8 +2,8 @@
 
 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;