Merge remote-tracking branch 'origin/developer' into developer

byit-plugin-core/byit-plugin-rpc-common/pom.xml

@@ -64,5 +64,9 @@
             <version>4.0.38</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/task/annotations/TaskHandler.java

@@ -49,7 +49,7 @@ public @interface TaskHandler {
     /**
      * 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
      */
-    String alarmlAction() default "1";
+    String alarmlAction() default "0";
 
     String sendEmail() default "";
 }

byit-plugin-core/myth-plugin-rpc-server/src/main/java/com/byit/callback/DefaultRemainingOperationsCallBack.java

 package com.byit.callback;
 
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.byit.dto.plugin.JavaTask;
+import com.byit.dto.web.ResponseResult;
 import com.byit.task.annotations.TaskHandler;
 import com.byit.task.handler.interfaces.IJobHandler;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 
+import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
+
 /**
  * 默认的后续处理器
  * @author huangfu
@@ -20,11 +27,48 @@ public class DefaultRemainingOperationsCallBack implements RemainingOperationsCa
                     TaskHandler annotation = nodeClass.getAnnotation(TaskHandler.class);
                     //如果是自动注册 就实现自动注册
                     if (annotation.autoPublish()) {
+                        String publishUrl = annotation.publishUrl();
+                        if(StringUtils.isNotBlank(publishUrl)) {
+                            JavaTask javaTask = annotationParse(annotation);
+                            String javaTaskJson = JSON.toJSONString(javaTask,WriteClassName);
+                            String post = HttpUtil.post(publishUrl, javaTaskJson);
+                            ResponseResult responseResult = JSON.parseObject(post, ResponseResult.class);
+                            String msg = responseResult.getMsg();
+                            System.err.println("------"+nodeClass.getName()+":"+msg+"-------------");
+                        }
+
 
                     }
                 }
             });
-        });
+        }).start();
+    }
+
+    /**
+     * 注解解析
+     * @param taskHandler
+     * @return
+     */
+    private JavaTask annotationParse(TaskHandler taskHandler){
+        String email = taskHandler.sendEmail();
+        String taskName = taskHandler.taskName();
+        String cron = taskHandler.cron();
+        int schedulingCount = taskHandler.schedulingCount();
+
+        String jobName = taskHandler.jobName();
+        if (StringUtils.isBlank(jobName)) {
+            jobName = taskName;
+        }
+        String alarmlAction = taskHandler.alarmlAction();
+
+        JavaTask javaTask = new JavaTask();
+        javaTask.setJobName(jobName);
+        javaTask.setAlarmEmail(email);
+        javaTask.setCron(cron);
+        javaTask.setRepeatCount(schedulingCount);
+        javaTask.setTaskName(taskName);
+        javaTask.setAlarmlAction(alarmlAction);
+        return javaTask;
     }
 
 }