fix #76

xlorne · xlorne · commit eae17052507a · 2024-11-08T23:40:00.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java b/example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java
@@ -1,8 +1,6 @@
 package com.codingapi.example.handler;
 
-import com.codingapi.example.event.AEvent;
 import com.codingapi.example.event.CEvent;
-import com.codingapi.springboot.framework.event.EventPusher;
 import com.codingapi.springboot.framework.event.EventTraceContext;
 import com.codingapi.springboot.framework.event.IHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +14,13 @@ public class CHandler implements IHandler<CEvent> {
     public void handler(CEvent event) {
         log.info("c event:{},eventKey:{}", event, EventTraceContext.getInstance().getEventKey());
 
-        EventPusher.push(new AEvent());
+//        EventPusher.push(new AEvent());
+        throw new RuntimeException("c handler error");
+    }
+
+    @Override
+    public void error(Exception exception) throws Exception {
+        log.error("c handler error:{}", exception.getMessage());
+        throw exception;
     }
 }
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -13,11 +13,11 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
@@ -21,11 +21,6 @@
             <artifactId>spring-data-commons</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/ApplicationHandlerUtils.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/ApplicationHandlerUtils.java
@@ -1,5 +1,8 @@
 package com.codingapi.springboot.framework.event;
 
+import com.codingapi.springboot.framework.exception.EventException;
+import com.codingapi.springboot.framework.exception.EventLoopException;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,28 +43,32 @@ public void addHandler(IHandler handler) {
 
     @Override
     public void handler(IEvent event) {
+        Class<?> eventClass = event.getClass();
+        List<Exception> errorStack = new ArrayList<>();
+        boolean throwException = false;
         for (IHandler<IEvent> handler : handlers) {
             try {
-                Class<?> eventClass = event.getClass();
                 Class<?> targetClass = handler.getHandlerEventClass();
                 if (eventClass.equals(targetClass)) {
                     handler.handler(event);
                 }
             } catch (Exception e) {
-                Exception error = null;
+                if (e instanceof EventLoopException) {
+                    throw e;
+                }
                 try {
                     handler.error(e);
+                    errorStack.add(e);
                 } catch (Exception err) {
-                    error = err;
-                }
-                if (error != null) {
-                    throw new RuntimeException(error);
+                    throwException = true;
+                    errorStack.add(err);
                 }
             }
         }
+        if(throwException){
+            throw new EventException(errorStack);
+        }
     }
 
 
-
-
 }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/EventTraceContext.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/EventTraceContext.java
@@ -61,8 +61,8 @@ void checkEventState() {
                 traceKeys.remove(traceId);
                 EventStackContext.getInstance().remove(traceId);
             }
+            eventKeyState.remove(eventKey);
         }
-        eventKeyState.remove(eventKey);
         threadLocal.remove();
     }
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IHandler.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IHandler.java
@@ -18,6 +18,7 @@ public interface IHandler<T extends IEvent> {
 
     /**
      * 异常回掉,在多订阅的情况下,为了实现订阅的独立性,将异常的处理放在回掉函数中。
+     * 当异常抛出以后，会阻止后续的事件执行
      *
      * @param exception 异常信息
      */
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventHandler.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventHandler.java
@@ -30,14 +30,20 @@ public void onApplicationEvent(DomainEvent domainEvent) {
         String traceId = domainEvent.getTraceId();
 
         if (domainEvent.isSync()) {
-            EventTraceContext.getInstance().createEventKey(traceId);
-            ApplicationHandlerUtils.getInstance().handler(domainEvent.getEvent());
-            EventTraceContext.getInstance().checkEventState();
-        } else {
-            executorService.execute(() -> {
+            try {
                 EventTraceContext.getInstance().createEventKey(traceId);
                 ApplicationHandlerUtils.getInstance().handler(domainEvent.getEvent());
+            } finally {
                 EventTraceContext.getInstance().checkEventState();
+            }
+        } else {
+            executorService.execute(() -> {
+                try {
+                    EventTraceContext.getInstance().createEventKey(traceId);
+                    ApplicationHandlerUtils.getInstance().handler(domainEvent.getEvent());
+                } finally {
+                    EventTraceContext.getInstance().checkEventState();
+                }
             });
         }
     }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/exception/EventException.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/exception/EventException.java
@@ -0,0 +1,17 @@
+package com.codingapi.springboot.framework.exception;
+
+import lombok.Getter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+public class EventException extends RuntimeException {
+
+    private final List<Exception> error;
+
+    public EventException(List<Exception> error) {
+        super(error.stream().map(Exception::getMessage).collect(Collectors.joining("\n")));
+        this.error = error;
+    }
+}
