review代码和文档

byit-myth-core/myth-core-common/src/main/java/com/byit/job/model/JavaBeanJobInfo.java

 package com.byit.job.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 /**
  * @program: byit-myth-job->JobInfo
  * @description: 远程任务的详细配置
  * @author: huangfu
  * @date: 2019/11/18 11:27
  **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class JavaBeanJobInfo {
-    public JavaBeanJobInfo() {
-    }
-
     /**
      * 任务名称
      */
@@ -42,7 +48,7 @@ public class JavaBeanJobInfo {
     /**
      * 添加任务的IP
      */
-    private String requestIP;
+    private String requestHost;
     /**
      * 添加任务的port
      */
@@ -64,103 +70,10 @@ public class JavaBeanJobInfo {
                 ", blockingStrategy='" + blockingStrategy + '\'' +
                 ", callbackToken='" + callbackToken + '\'' +
                 ", gatewayToken='" + gatewayToken + '\'' +
-                ", requestIP='" + requestIP + '\'' +
+                ", requestHost='" + requestHost + '\'' +
                 ", requestPort=" + requestPort +
                 ", param='" + param + '\'' +
                 '}';
     }
 
-    public String getRequestIP() {
-        return requestIP;
-    }
-
-    public void setRequestIP(String requestIP) {
-        this.requestIP = requestIP;
-    }
-
-    public String getRequestPort() {
-        return requestPort;
-    }
-
-    public void setRequestPort(String requestPort) {
-        this.requestPort = requestPort;
-    }
-
-    public JavaBeanJobInfo(String jobHandelName, String url, String mythCron, String routingStrategy, String blockingStrategy, String callbackToken, String gatewayToken, String requestIP, String requestPort, String param) {
-        this.jobHandelName = jobHandelName;
-        this.url = url;
-        this.mythCron = mythCron;
-        this.routingStrategy = routingStrategy;
-        this.blockingStrategy = blockingStrategy;
-        this.callbackToken = callbackToken;
-        this.gatewayToken = gatewayToken;
-        this.requestIP = requestIP;
-        this.requestPort = requestPort;
-        this.param = param;
-    }
-
-    public String getJobHandelName() {
-        return jobHandelName;
-    }
-
-    public void setJobHandelName(String jobHandelName) {
-        this.jobHandelName = jobHandelName;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getMythCron() {
-        return mythCron;
-    }
-
-    public void setMythCron(String mythCron) {
-        this.mythCron = mythCron;
-    }
-
-    public String getRoutingStrategy() {
-        return routingStrategy;
-    }
-
-    public void setRoutingStrategy(String routingStrategy) {
-        this.routingStrategy = routingStrategy;
-    }
-
-    public String getBlockingStrategy() {
-        return blockingStrategy;
-    }
-
-    public void setBlockingStrategy(String blockingStrategy) {
-        this.blockingStrategy = blockingStrategy;
-    }
-
-    public String getCallbackToken() {
-        return callbackToken;
-    }
-
-    public void setCallbackToken(String callbackToken) {
-        this.callbackToken = callbackToken;
-    }
-
-    public String getGatewayToken() {
-        return gatewayToken;
-    }
-
-    public String getParam() {
-        return param;
-    }
-
-    public void setParam(String param) {
-        this.param = param;
-    }
-
-    public void setGatewayToken(String gatewayToken) {
-
-        this.gatewayToken = gatewayToken;
-    }
 }

byit-myth-executor/myth-exector-plugin/src/main/java/com/byit/launcher/JobRunServerLauncher.java

@@ -14,14 +14,18 @@ public class JobRunServerLauncher {
     /**
      * 线程是否已经被启动的标志
      */
-    public static volatile String THREAD_RUN_MARK = null;
+    public static volatile boolean THREAD_RUN_MARK = false;
 
     public  JobRunServerLauncher(int port) {
         runServer(port);
     }
 
+    /**
+     * 开始启动服务  设置启动标志
+     * @param port
+     */
     private void runServer(int port){
-        if(THREAD_RUN_MARK==null){
+        if(!THREAD_RUN_MARK){
             new Thread(new ServerRunThread(port)).start();
             log.info("---------------------线程启动------------------");
         }

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

@@ -6,6 +6,9 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @program: byit-myth-job->ServerChannelInitializer
  * @description: 处理器初始化
@@ -19,7 +22,7 @@ public class ServerChannelInitializer extends ChannelInitializer<SocketChannel>
         //将请求委托给真正的最终处理类  自定义
         pipeline.addLast(new HttpServerCodec());
         // http 消息聚合器
-        pipeline.addLast("httpAggregator",new HttpObjectAggregator(512*1024));
+        pipeline.addLast("httpAggregator",new HttpObjectAggregator(1024*1024));
         pipeline.addLast(new RunJobServerHandler());
 
     }

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

@@ -34,7 +34,7 @@ public class ServerRunThread implements Runnable {
         }
         iScanProject.addJobCache();
 
-        JobRunServerLauncher.THREAD_RUN_MARK = "SUCCESS";
+        JobRunServerLauncher.THREAD_RUN_MARK = true;
         this.port = port;
     }
 

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

@@ -42,14 +42,14 @@ public class JobUtils {
      */
     public static String addJob(JavaBeanJobInfo javaBeanJobInfo){
         log.info("---------------开始添加一个任务,jobHandelName:{}---------------------",javaBeanJobInfo.getJobHandelName());
-        String requestIP = javaBeanJobInfo.getRequestIP();
+        String requestHost = javaBeanJobInfo.getRequestHost();
         String requestPort = javaBeanJobInfo.getRequestPort( );
-        if(StringUtils.isBlank(requestIP) || StringUtils.isBlank(requestPort)){
+        if(StringUtils.isBlank(requestHost) || StringUtils.isBlank(requestPort)){
             log.error("------------------任务添加失败----------------------");
             throw new PluginException(PluginEnum.REQUEST_PORT_OR_IP_IS_MISSING);
         }
         //请求的路径
-        String requestUrl = REQUEST_PREFIX+requestIP+":"+requestPort+REQUEST_ADD_JOB_RESOURCES_SUFFIX;
+        String requestUrl = REQUEST_PREFIX+requestHost+":"+requestPort+REQUEST_ADD_JOB_RESOURCES_SUFFIX;
         //发送请求 添加任务
         String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(javaBeanJobInfo));
         log.info("--------------------添加任务完成，添加结果为：{}------------------------",addRequestResult);

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

@@ -32,10 +32,11 @@ public class Mains {
         String param="sadsadsa";
         String name="addJob";
         JavaBeanJobInfo javaBeanJobInfo = new JavaBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param);
+        System.out.println(javaBeanJobInfo);
         //JavaBeanJobInfo javaBeanJobInfo1 = new JavaBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param);
         //javaBeanJobInfo1.setJobHandelName("addJob1");
         //JobUtils.addJob(javaBeanJobInfo1);
-        JobUtils.addJob(javaBeanJobInfo);
+        //JobUtils.addJob(javaBeanJobInfo);
     }
 
 }