fix Trigger remove bug

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7</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.6</version>
+        <version>1.5.7</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.6</version>
+        <version>1.5.7</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.6</version>
+        <version>1.5.7</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.6</version>
+        <version>1.5.7</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

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

@@ -70,11 +70,12 @@ public void trigger(Trigger trigger){
             Class<? extends Trigger> triggerClass = getTriggerClass(handler);
             if(triggerClass.equals(clazz)) {
                 try {
-                    if (handler.preTrigger(trigger)) {
+                    boolean canTrigger = handler.preTrigger(trigger);
+                    if (canTrigger) {
                         handler.trigger(trigger);
-                        if (handler.remove()) {
-                            triggerHandlerList.remove(handler);
-                        }
+                    }
+                    if (handler.remove(trigger,canTrigger)) {
+                        triggerHandlerList.remove(handler);
                     }
                 }catch (Exception e){
                     log.warn("trigger error",e);

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

@@ -22,10 +22,11 @@ public interface TriggerHandler<T extends  Trigger> {
 
     /**
      * 执行完成以后是否删除触发器
+     * @param trigger 触发对象  {@link Trigger}
+     * @param canTrigger 是否执行过程trigger逻辑 true执行过程 false未执行
      * @return true删除
      */
-    default boolean remove(){
+    default boolean remove(Trigger trigger, boolean canTrigger){
         return false;
     }
-
 }

springboot-starter/src/test/java/com/codingapi/springboot/framework/trigger/TriggerHandlerContextTest.java

@@ -22,10 +22,6 @@ public void trigger(MyTrigger trigger) {
 
             }
 
-            @Override
-            public boolean remove() {
-                return false;
-            }
         });
 
         TriggerContext.getInstance().addTrigger(new TriggerHandler<MyTrigger2>() {
@@ -39,10 +35,6 @@ public void trigger(MyTrigger2 trigger) {
 
             }
 
-            @Override
-            public boolean remove() {
-                return false;
-            }
         });
 
         assertFalse(TriggerContext.getInstance().isEmpty(MyTrigger.class));
@@ -64,8 +56,8 @@ public void trigger(MyTrigger trigger) {
             }
 
             @Override
-            public boolean remove() {
-                return true;
+            public boolean remove(Trigger trigger, boolean canTrigger) {
+                return canTrigger;
             }
         });