From 33fef492e2a6a8c275e03efcb17b763183343b99 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 7 May 2024 22:42:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BF=AE=E5=A4=8D=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../snailjob/server/common/alarm/AbstractAlarm.java  | 12 +++++++-----
 .../alarm/listener/JobTaskFailAlarmListener.java     |  2 +-
 .../listener/WorkflowTaskFailAlarmListener.java      |  2 +-
 .../RetryTaskFailDeadLetterAlarmListener.java        |  2 +-
 .../RetryTaskFailMoreThresholdAlarmListener.java     |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java
index f773bd0f..5e320f5d 100644
--- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java
+++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java
@@ -33,6 +33,7 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalApplicationListener;
+import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.util.CollectionUtils;
 
 import java.time.Duration;
@@ -46,8 +47,7 @@ import java.util.stream.Collectors;
  * @since 2.5.0
  */
 @Slf4j
-public abstract class AbstractAlarm<E extends ApplicationEvent, A extends AlarmInfo> implements
-    TransactionalApplicationListener<E>,
+public abstract class AbstractAlarm<E extends ApplicationEvent, A extends AlarmInfo> implements ApplicationListener<E>,
     Runnable,
     Lifecycle {
 
@@ -223,11 +223,13 @@ public abstract class AbstractAlarm<E extends ApplicationEvent, A extends AlarmI
 
     protected abstract int getNotifyScene();
 
-    @NotNull
     @Override
-    public TransactionPhase getTransactionPhase() {
-        return TransactionPhase.AFTER_COMPLETION;
+    @TransactionalEventListener(fallbackExecution = true, phase = TransactionPhase.AFTER_COMPLETION)
+    public void onApplicationEvent(@NotNull E event) {
+        doOnApplicationEvent(event);
     }
+
+    protected abstract void doOnApplicationEvent(E event);
 }
 
 
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
index 41669f67..167e6a79 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
@@ -106,7 +106,7 @@ public class JobTaskFailAlarmListener extends AbstractJobAlarm<JobTaskFailAlarmE
     }
 
     @Override
-    public void onApplicationEvent(JobTaskFailAlarmEvent event) {
+    public void doOnApplicationEvent(JobTaskFailAlarmEvent event) {
         if (!queue.offer(event.getJobTaskBatchId())) {
             SnailJobLog.LOCAL.warn("JOB任务执行失败告警队列已满");
         }
diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
index e3b12af3..2fb7ff2d 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
@@ -88,7 +88,7 @@ public class WorkflowTaskFailAlarmListener extends AbstractWorkflowAlarm<Workflo
     }
 
     @Override
-    public void onApplicationEvent(WorkflowTaskFailAlarmEvent event) {
+    public void doOnApplicationEvent(WorkflowTaskFailAlarmEvent event) {
         if (!queue.offer(event.getWorkflowTaskBatchId())) {
             SnailJobLog.LOCAL.warn("Workflow任务执行失败告警队列已满");
         }
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
index 4f70e833..a1a133d0 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
@@ -65,7 +65,7 @@ public class RetryTaskFailDeadLetterAlarmListener extends
     }
 
     @Override
-    public void onApplicationEvent(RetryTaskFailDeadLetterAlarmEvent event) {
+    public void doOnApplicationEvent(RetryTaskFailDeadLetterAlarmEvent event) {
         if (!queue.offer(event.getRetryDeadLetters())) {
             SnailJobLog.LOCAL.warn("任务重试失败进入死信队列告警队列已满");
         }
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailMoreThresholdAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailMoreThresholdAlarmListener.java
index 2dcfc2a2..3874d17d 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailMoreThresholdAlarmListener.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailMoreThresholdAlarmListener.java
@@ -64,7 +64,7 @@ public class RetryTaskFailMoreThresholdAlarmListener extends
     }
 
     @Override
-    public void onApplicationEvent(RetryTaskFailMoreThresholdAlarmEvent event) {
+    public void doOnApplicationEvent(RetryTaskFailMoreThresholdAlarmEvent event) {
         if (!queue.offer(event.getRetryTask())) {
             SnailJobLog.LOCAL.warn("任务失败数量超过阈值告警队列已满");
         }