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

byit-myth-core/myth-admin-core/pom.xml

@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>myth-job</groupId>
-            <artifactId>byit-myth-dto</artifactId>
+            <artifactId>myth-dto-core</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

byit-myth-executor/myth-executor-api/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>myth-job</groupId>
-            <artifactId>byit-myth-dto</artifactId>
+            <artifactId>myth-dto-core</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

byit-myth-executor/myth-executor-plugin/pom.xml

@@ -43,6 +43,14 @@
             <artifactId>myth-executor-core</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/xstream/xstream -->
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
+
     </dependencies>
 
     <distributionManagement>

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/rpc/RunJobServerHandler.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.byit.dto.executor.AdminSenPluginDto;
 import com.byit.dto.executor.DispatchResponseDto;
 import com.byit.enums.JobResultEnum;
+import com.byit.thread.RunJobThread;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/scan/JarRunScanProject.java

@@ -46,7 +46,7 @@ public class JarRunScanProject implements IScanProject {
     public static void classScan() throws IOException {
         JarFile jarFile = new JarFile(rootPath);
         File file = new File(rootPath);
-        URL url = file.toURI( ).toURL( );
+        URL url = file.toURI( ).toURL();
         //获取当前jar的类加载器
         URLClassLoader urlClassLoader = new URLClassLoader(new URL[]{url});
 

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/rpc/RunJobThread.java → byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/thread/RunJobThread.java

-package com.byit.rpc;
+package com.byit.thread;
 
 import com.alibaba.fastjson.JSON;
 import com.byit.dto.executor.AdminSenPluginDto;
@@ -21,7 +21,7 @@ import java.util.Date;
 public class RunJobThread implements Runnable {
     private AdminSenPluginDto adminSenPluginDto;
 
-    RunJobThread(AdminSenPluginDto adminSenPluginDto) {
+    public RunJobThread(AdminSenPluginDto adminSenPluginDto) {
         this.adminSenPluginDto = adminSenPluginDto;
     }
 

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java

@@ -383,7 +383,6 @@ public class JobUtils {
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace( );
         }
-        System.out.println(path );
         return path;
     }
 

demo-client/byit-demo-client/pom.xml

@@ -33,6 +33,12 @@
         </dependency>
 
         <dependency>
+            <groupId>myth-job</groupId>
+            <artifactId>myth-executor-plugin</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.62</version>
@@ -46,12 +52,6 @@
             <groupId>myth-job</groupId>
             <artifactId>myth-executor-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>myth-job</groupId>
-            <artifactId>myth-executor-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

demo-client/byit-demo-client/src/main/java/com/byit/job/Mains.java

@@ -13,25 +13,6 @@ import java.io.IOException;
 public class Mains {
     public static void main(String[] args) throws IOException {
         new JobRunServerLauncher(8888);
-        /*String plServerUrl = "http://10.0.55.238:8888";
-        String mythCron = "时间";
-        String routingStrategy = LoadBalance.ROUND.name();
-        String blockingStrategy = "阻塞策略";
-        String callbackToken = "dsasadsad";
-        String gatewayToken="asdsadsa";
-        String requestIP = "10.0.55.238";
-        String requestPort="8080";
-        String param="不延迟任务";
-        String name="addJob";
-        String email = "huangfusuper@163.com";
-        String email1 = "huangfusuper@163.com";
-        PluginBeanJobInfo pluginBeanJobInfo = new PluginBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param,email,"");
-        System.out.println(pluginBeanJobInfo);
-        PluginBeanJobInfo javaBeanJobInfo1 = new PluginBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param,email1,"");
-        javaBeanJobInfo1.setJobHandelName("END");
-        javaBeanJobInfo1.setParam("延迟任务");
-        JobUtils.addJob(javaBeanJobInfo1);
-        JobUtils.addJob(pluginBeanJobInfo);*/
     }
 
 }