fix event bug

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.8.8</version>
+    <version>2.8.9</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.8</version>
+        <version>2.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.8</version>
+        <version>2.8.9</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.8.8</version>
+        <version>2.8.9</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/ApplicationHandlerUtils.java

@@ -1,18 +1,14 @@
 package com.codingapi.springboot.framework.handler;
 
 import com.codingapi.springboot.framework.event.IEvent;
-import lombok.extern.slf4j.Slf4j;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-@Slf4j
 class ApplicationHandlerUtils implements IHandler<IEvent> {
 
     private static ApplicationHandlerUtils instance;
-    private List<IHandler<IEvent>> handlers;
+    private final List<IHandler<IEvent>> handlers;
 
 
     private ApplicationHandlerUtils() {
@@ -47,39 +43,27 @@ public void addHandler(IHandler handler) {
     @Override
     public void handler(IEvent event) {
         for (IHandler<IEvent> handler : handlers) {
-            String targetClassName = null;
             try {
                 Class<?> eventClass = event.getClass();
-                Class<?> targetClass = getHandlerEventClass(handler);
+                Class<?> targetClass = handler.getHandlerEventClass();
                 if (eventClass.equals(targetClass)) {
-                    targetClassName = targetClass.getName();
                     handler.handler(event);
                 }
             } catch (Exception e) {
-                //IPersistenceEvent 抛出异常
-                if ("com.codingapi.springboot.framework.persistence.PersistenceEvent".equals(targetClassName)) {
-                    throw e;
+                Exception error = null;
+                try {
+                    handler.error(e);
+                } catch (Exception err) {
+                    error = err;
                 }
-                log.warn("handler exception", e);
-                handler.error(e);
-
-            }
-        }
-    }
-
-    private Class<?> getHandlerEventClass(IHandler<IEvent> handler) {
-        Type[] types = handler.getClass().getGenericInterfaces();
-        for (Type type : types) {
-            if (type instanceof ParameterizedType) {
-                ParameterizedType parameterizedType = (ParameterizedType) type;
-                Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
-                if (actualTypeArguments != null) {
-                    return (Class<?>) actualTypeArguments[0];
+                if (error != null) {
+                    throw new RuntimeException(error);
                 }
             }
         }
-        return null;
     }
 
 
+
+
 }

springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/IHandler.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.framework.handler;
 
 import com.codingapi.springboot.framework.event.IEvent;
+import org.springframework.core.ResolvableType;
 
 /**
  * handler 订阅
@@ -21,9 +22,18 @@ public interface IHandler<T extends IEvent> {
      *
      * @param exception 异常信息
      */
-    default void error(Exception exception) {
+    default void error(Exception exception) throws Exception{
+        throw exception;
+    }
+
+
+    /**
+     * 获取订阅的事件类型
+     */
+    default Class<?> getHandlerEventClass() {
+        ResolvableType resolvableType = ResolvableType.forClass(getClass()).as(IHandler.class);
+        return (Class<T>) resolvableType.getGeneric(0).resolve();
     }
 
-    ;
 
 }