修改插件端任务实体的名字

byit-myth-admin/src/main/java/com/byit/controller/JobController.java

 package com.byit.controller;
 
 import com.byit.job.WorkRoulette;
-import com.byit.job.model.JavaBeanJobInfo;
+import com.byit.job.model.PluginBeanJobInfo;
 import com.byit.job.model.ReturnResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.*;
 public class JobController {
 
     @PostMapping(value = "addJob")
-    public String addJob(@RequestBody JavaBeanJobInfo javaBeanJobInfo){
-        WorkRoulette.addJob(javaBeanJobInfo );
+    public String addJob(@RequestBody PluginBeanJobInfo pluginBeanJobInfo){
+        WorkRoulette.addJob(pluginBeanJobInfo);
         return "SUCCESS";
     }
 

byit-myth-core/myth-admin-core/src/main/java/com/byit/job/WorkRoulette.java

 package com.byit.job;
 
-import com.byit.job.model.JavaBeanJobInfo;
+import com.byit.job.model.PluginBeanJobInfo;
 import com.byit.task.JavaBeanJobTask;
 import io.netty.util.HashedWheelTimer;
 
@@ -30,8 +30,8 @@ public class WorkRoulette {
     }, 1, TimeUnit.SECONDS, 8, true, 0);
 
 
-    public static void addJob(JavaBeanJobInfo javaBeanJobInfo) {
-        JavaBeanJobTask javaBeanJobTask = new JavaBeanJobTask(javaBeanJobInfo);
+    public static void addJob(PluginBeanJobInfo pluginBeanJobInfo) {
+        JavaBeanJobTask javaBeanJobTask = new JavaBeanJobTask(pluginBeanJobInfo);
         hashedWheelTimer.newTimeout(javaBeanJobTask, TimeUnit.SECONDS.toNanos(20), TimeUnit.NANOSECONDS);
     }
 

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

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.byit.job.exceptions.plugin.PluginException;
-import com.byit.job.model.JavaBeanJobInfo;
+import com.byit.job.model.PluginBeanJobInfo;
 import com.byit.job.utils.IpUtil;
 import com.byit.rpc.remoting.invoker.route.LoadBalance;
 import com.byit.rpc.remoting.invoker.route.RpcLoadBalance;
@@ -20,20 +20,20 @@ import lombok.extern.slf4j.Slf4j;
  **/
 @Slf4j
 public class JavaBeanJobTask implements TimerTask {
-    private JavaBeanJobInfo javaBeanJobInfo;
+    private PluginBeanJobInfo pluginBeanJobInfo;
 
-    public JavaBeanJobTask(JavaBeanJobInfo javaBeanJobInfo) {
-        this.javaBeanJobInfo = javaBeanJobInfo;
+    public JavaBeanJobTask(PluginBeanJobInfo pluginBeanJobInfo) {
+        this.pluginBeanJobInfo = pluginBeanJobInfo;
     }
 
     @Override
     public void run(Timeout timeout) {
         //根据负责均衡方案获取对应IP
-        RpcLoadBalance rpcInvokerRouter = LoadBalance.match(javaBeanJobInfo.getRoutingStrategy( ), LoadBalance.ROUND).rpcInvokerRouter;
+        RpcLoadBalance rpcInvokerRouter = LoadBalance.match(pluginBeanJobInfo.getRoutingStrategy( ), LoadBalance.ROUND).rpcInvokerRouter;
         try{
-            String url = IpUtil.electiveUrl(javaBeanJobInfo.getUrl( ), rpcInvokerRouter);
-            String jobHandelName = javaBeanJobInfo.getJobHandelName( );
-            String param = javaBeanJobInfo.getParam( );
+            String url = IpUtil.electiveUrl(pluginBeanJobInfo.getUrl( ), rpcInvokerRouter);
+            String jobHandelName = pluginBeanJobInfo.getJobHandelName( );
+            String param = pluginBeanJobInfo.getParam( );
 
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("jobHandelName",jobHandelName);

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

@@ -15,7 +15,7 @@ import lombok.ToString;
 @AllArgsConstructor
 @NoArgsConstructor
 @ToString
-public class JavaBeanJobInfo {
+public class PluginBeanJobInfo {
     /**
      * 任务名称
      */
@@ -62,7 +62,7 @@ public class JavaBeanJobInfo {
 
     @Override
     public String toString() {
-        return "JavaBeanJobInfo{" +
+        return "PluginBeanJobInfo{" +
                 "jobHandelName='" + jobHandelName + '\'' +
                 ", url='" + url + '\'' +
                 ", mythCron='" + mythCron + '\'' +

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

@@ -5,8 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.byit.job.enums.plugin.PluginEnum;
 import com.byit.job.exceptions.plugin.PluginException;
 import com.byit.job.handler.interfaces.IJobHandler;
-import com.byit.job.model.JavaBeanJobInfo;
-import lombok.extern.log4j.Log4j;
+import com.byit.job.model.PluginBeanJobInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -37,13 +36,13 @@ public class JobUtils {
 
     /**
      * 添加一个任务节点
-     * @param javaBeanJobInfo 任务节点的详尽配置
+     * @param pluginBeanJobInfo 任务节点的详尽配置
      * @return 添加结果
      */
-    public static String addJob(JavaBeanJobInfo javaBeanJobInfo){
-        log.info("---------------开始添加一个任务,jobHandelName:{}---------------------",javaBeanJobInfo.getJobHandelName());
-        String requestHost = javaBeanJobInfo.getRequestHost();
-        String requestPort = javaBeanJobInfo.getRequestPort( );
+    public static String addJob(PluginBeanJobInfo pluginBeanJobInfo){
+        log.info("---------------开始添加一个任务,jobHandelName:{}---------------------", pluginBeanJobInfo.getJobHandelName());
+        String requestHost = pluginBeanJobInfo.getRequestHost();
+        String requestPort = pluginBeanJobInfo.getRequestPort( );
         if(StringUtils.isBlank(requestHost) || StringUtils.isBlank(requestPort)){
             log.error("------------------任务添加失败----------------------");
             throw new PluginException(PluginEnum.REQUEST_PORT_OR_IP_IS_MISSING);
@@ -51,7 +50,7 @@ public class JobUtils {
         //请求的路径
         String requestUrl = REQUEST_PREFIX+requestHost+":"+requestPort+REQUEST_ADD_JOB_RESOURCES_SUFFIX;
         //发送请求 添加任务
-        String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(javaBeanJobInfo));
+        String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginBeanJobInfo));
         log.info("--------------------添加任务完成，添加结果为：{}------------------------",addRequestResult);
         return addRequestResult;
     }

byit-myth-executor/myth-executor-api/src/main/java/com/byit/plugin/api/JobOperating.java

 package com.byit.plugin.api;
 
-import com.byit.job.model.JavaBeanJobInfo;
+import com.byit.job.model.PluginBeanJobInfo;
 
 /**
  * @program: byit-myth-job->JobOperating
@@ -11,7 +11,7 @@ import com.byit.job.model.JavaBeanJobInfo;
 public interface JobOperating {
     /**
      * 添加一个任务
-     * @param javaBeanJobInfo 任务的详细配置
+     * @param pluginBeanJobInfo 任务的详细配置
      */
-    void addJob(JavaBeanJobInfo javaBeanJobInfo);
+    void addJob(PluginBeanJobInfo pluginBeanJobInfo);
 }

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

 package com.byit.job;
 
-import cn.hutool.cron.pattern.CronPattern;
-import com.byit.job.model.JavaBeanJobInfo;
-import com.byit.job.utils.CronExpression;
+import com.byit.job.model.PluginBeanJobInfo;
 import com.byit.launcher.JobRunServerLauncher;
 import com.byit.rpc.remoting.invoker.route.LoadBalance;
-import com.byit.utils.JobUtils;
 
 import java.io.IOException;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @program: byit-myth-job->Mains
@@ -31,12 +25,12 @@ public class Mains {
         String requestPort="8080";
         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);
+        PluginBeanJobInfo pluginBeanJobInfo = new PluginBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param);
+        System.out.println(pluginBeanJobInfo);
+        //PluginBeanJobInfo javaBeanJobInfo1 = new PluginBeanJobInfo(name,plServerUrl,mythCron,routingStrategy,blockingStrategy,callbackToken,gatewayToken,requestIP,requestPort,param);
         //javaBeanJobInfo1.setJobHandelName("addJob1");
         //JobUtils.addJob(javaBeanJobInfo1);
-        //JobUtils.addJob(javaBeanJobInfo);
+        //JobUtils.addJob(pluginBeanJobInfo);
     }
 
 }