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

byit-myth-admin/src/main/resources/application-local.yml

@@ -50,8 +50,7 @@ myth-job:
 
 myth:
   plugin:
-    env: plugin_test
-    biz: byit-myth-job
-    port: 8971
+    env: ${myth-rpc.registry.env}
+    biz: ${myth-rpc.registry.biz}
   register:
-    url: http://localhost:8080/myth-register
+    url: ${myth-rpc.registry.address}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/JavaTaskAndLogServiceServiceImpl.java

@@ -7,6 +7,7 @@ import com.byit.model.RunRecording;
 import com.byit.service.JavaTaskService;
 import com.byit.service.mapservice.JavaTaskAndLogService;
 import com.byit.task.JavaTaskJobTask;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
@@ -25,14 +26,16 @@ public class JavaTaskAndLogServiceServiceImpl implements JavaTaskAndLogService {
 
     @Override
     public void updateJavaTaskAndSaveLog(JavaTask javaTask) {
+        JavaTask updateJavaTask = new JavaTask();
         try {
-            javaTask.setTriggerTime(new CronExpression(javaTask.getCron()).getNextValidTimeAfter(new Date()).getTime());
+            BeanUtils.copyProperties(javaTask,updateJavaTask);
+            updateJavaTask.setTriggerTime(new CronExpression(javaTask.getCron()).getNextValidTimeAfter(new Date()).getTime());
         } catch (ParseException e) {
             javaTask.setTriggerTime(999999999999999999L);
             e.printStackTrace();
         }
 
-        javaTaskService.updateById(javaTask);
+        javaTaskService.updateById(updateJavaTask);
         //保存到调度轮
         JavaTaskJobTask javaTaskJobTask = new JavaTaskJobTask(javaTask);
         WorkRoulette.addJob(javaTaskJobTask,javaTask.getTriggerTime());

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaTaskJobTask.java

@@ -35,9 +35,7 @@ public class JavaTaskJobTask implements TimerTask {
 
     @Override
     public void run(Timeout timeout) throws Exception {
-        MythJobAutoConfigure.LOW_LEVEL_JOB_THREAD_POOL.execute(()->{
-            runJob();
-        });
+        MythJobAutoConfigure.LOW_LEVEL_JOB_THREAD_POOL.execute(this::runJob);
 
     }
 
@@ -95,4 +93,7 @@ public class JavaTaskJobTask implements TimerTask {
     }
 
 
+    public JavaTask getJavaTask() {
+        return javaTask;
+    }
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/JavaTaskThreadRunHelper.java

@@ -21,6 +21,7 @@ public class JavaTaskThreadRunHelper  extends BaseThreadRunHelper {
     private final JavaTaskService javaTaskService;
     private final JavaTaskAndLogService javaTaskAndLogService;
     private static final long PRE_READ_MS = 7000;
+    private static final long JAVA_TASK_WAIT_TIME = 15000;
 
     public JavaTaskThreadRunHelper(DataSource dataSource, JavaTaskService javaTaskService, JavaTaskAndLogService javaTaskAndLogService) {
         this.dataSource = dataSource;
@@ -42,7 +43,7 @@ public class JavaTaskThreadRunHelper  extends BaseThreadRunHelper {
                 javaTaskAndLogService.updateJavaTaskAndSaveLog(javaTask);
             });
         }
-        return PRE_READ_MS;
+        return JAVA_TASK_WAIT_TIME;
     }
 
     @Override

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

@@ -56,4 +56,9 @@ public @interface TaskHandler {
      * @return
      */
     String sendEmail() default "";
+
+    /**
+     * 扩展信息
+     */
+    String expand() default "";
 }

byit-plugin-core/myth-plugin-rpc-server/src/main/java/com/byit/factory/RpcSpringPluginServerFactory.java

@@ -5,6 +5,7 @@ import com.byit.registry.PluginServiceRegistry;
 import com.byit.server.PluginServer;
 import com.byit.task.annotations.TaskHandler;
 import com.byit.task.handler.interfaces.IJobHandler;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -13,6 +14,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * spring实现
@@ -24,6 +26,8 @@ public class RpcSpringPluginServerFactory extends PluginServerFactory implements
     private String env;
     private int port;
 
+    private Map<String,String> taskNameExpand = new ConcurrentHashMap<>(8);
+
     public RpcSpringPluginServerFactory(String address, String biz, String env, int port) {
         this.address = address;
         this.biz = biz;
@@ -50,9 +54,17 @@ public class RpcSpringPluginServerFactory extends PluginServerFactory implements
                 TaskHandler annotation = value.getClass().getAnnotation(TaskHandler.class);
                 String taskName = annotation.taskName();
                 super.addService(taskName,value);
+                String expand = annotation.expand();
+                if (StringUtils.isNotBlank(expand)) {
+                    taskNameExpand.put(taskName,expand);
+                }
             }else{
                 System.err.println("警告！bean"+key+"不是【com.byit.task.handler.interfaces.IJobHandler】类型！忽略该bean！");
             }
         });
     }
+
+    public RpcSpringPluginServerFactory(Map<String, String> taskNameExpand) {
+        this.taskNameExpand = taskNameExpand;
+    }
 }

byit-plugin-core/myth-plugin-rpc-server/src/main/java/com/byit/server/netty/handler/NettyPluginServerHandler.java

@@ -59,7 +59,7 @@ public class NettyPluginServerHandler extends SimpleChannelInboundHandler<Plugin
                 rpcResponsePacket.setStatus(true);
                 rpcResponsePacket.setRunTime(endTime-startTime);
                 rpcResponsePacket.setExtension(msg.getExtension());
-            }catch (Exception e){
+            }catch (Throwable e){
                 rpcResponsePacket.setCode("500000");
                 rpcResponsePacket.setMsg(e.getMessage());
                 rpcResponsePacket.setStatus(false);

demo-client/plugin-test-spring-boot/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 myth:
   plugin:
-    env: plugin_test
+    env: huangfu
     biz: byit-myth-job
     port: 8971
   register: