fix getTriggerClass bug

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8</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>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-id-generator/pom.xml

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

springboot-starter-security-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

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

springboot-starter/src/main/java/com/codingapi/springboot/framework/trigger/TriggerContext.java

@@ -38,7 +38,7 @@ private TriggerContext(){
      * @param handler 触发订阅
      */
     public void addTrigger(TriggerHandler handler){
-        Class<? extends Trigger> clazz = getTriggerClass(handler);
+        Class<? extends Trigger> clazz = getTriggerClass(handler.getClass());
         List<TriggerHandler> triggerList =  this.triggers.get(clazz);
         if(triggerList==null){
             triggerList = new CopyOnWriteArrayList<>();
@@ -53,9 +53,14 @@ public void addTrigger(TriggerHandler handler){
      * @param handler 触发订阅
      * @return Trigger类型
      */
-    private Class<? extends Trigger> getTriggerClass(TriggerHandler handler){
-        ParameterizedType parameterizedType = (ParameterizedType) handler.getClass().getGenericInterfaces()[0];
-        return (Class<? extends Trigger>) parameterizedType.getActualTypeArguments()[0];
+    private Class<? extends Trigger> getTriggerClass(Class<?> handler){
+        for(Class<?> superInterface : handler.getInterfaces()) {
+            if (superInterface.equals(TriggerHandler.class)) {
+                ParameterizedType parameterizedType = (ParameterizedType) handler.getGenericInterfaces()[0];
+                return (Class<? extends Trigger>) parameterizedType.getActualTypeArguments()[0];
+            }
+        }
+        return getTriggerClass(handler.getSuperclass());
     }
 
 
@@ -67,7 +72,7 @@ public void trigger(Trigger trigger){
         Class<? extends Trigger> clazz = trigger.getClass();
         List<TriggerHandler> triggerHandlerList = triggers.get(clazz);
         for(TriggerHandler handler:triggerHandlerList){
-            Class<? extends Trigger> triggerClass = getTriggerClass(handler);
+            Class<? extends Trigger> triggerClass = getTriggerClass(handler.getClass());
             if(triggerClass.equals(clazz)) {
                 try {
                     boolean canTrigger = handler.preTrigger(trigger);