Commit a8bb0672 by guo_minglei@163.com

修改目录结构

parent 1ab10bd6
package com.byit.controller; package com.byit.controller;
import com.byit.conf.MythJobAutoConfigure; import com.byit.conf.MythJobAutoConfigure;
import com.byit.executor.api.ScriptExecutorService; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.JobRunResultDto;
import com.byit.job.dto.JobRunResultDto; import com.byit.dto.executor.PluginBeanJobInfo;
import com.byit.job.dto.PluginBeanJobInfo;
import com.byit.model.JobTask; import com.byit.model.JobTask;
import com.byit.model.RunRecording;
import com.byit.rpc.remoting.invoker.annotation.RpcReference;
import com.byit.service.JobTaskService; import com.byit.service.JobTaskService;
import com.byit.service.RunScriptService; import com.byit.service.RunScriptService;
import com.byit.service.TestServiceImpl;
import com.byit.thread.LogCallbackThread; import com.byit.thread.LogCallbackThread;
import com.byit.thread.LogScanHelper;
import com.byit.thread.RunRecordingScanHelper; import com.byit.thread.RunRecordingScanHelper;
import com.byit.util.SourceObj2TargetObjUtil; import com.byit.util.SourceObj2TargetObjUtil;
import com.byit.utils.ValidationUtil; import com.byit.utils.ValidationUtil;
......
package com.byit.service; package com.byit.service;
import com.byit.dto.PluginFlow; import com.byit.dto.plugin.PluginFlow;
import com.byit.model.RunRecording; import com.byit.model.RunRecording;
import com.byit.model.vo.RunRecordingVo; import com.byit.model.vo.RunRecordingVo;
......
package com.byit.service; package com.byit.service;
import com.byit.executor.api.ScriptExecutorService; import com.byit.executor.api.ScriptExecutorService;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.rpc.remoting.invoker.annotation.RpcReference; import com.byit.rpc.remoting.invoker.annotation.RpcReference;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -6,11 +6,11 @@ import com.byit.enums.DagCheckEnum; ...@@ -6,11 +6,11 @@ import com.byit.enums.DagCheckEnum;
import com.byit.enums.FlowPropertyEnum; import com.byit.enums.FlowPropertyEnum;
import com.byit.enums.NodePropertyEnum; import com.byit.enums.NodePropertyEnum;
import com.byit.enums.ScheduleEnum; import com.byit.enums.ScheduleEnum;
import com.byit.dto.PluginBaseNode; import com.byit.dto.plugin.PluginBaseNode;
import com.byit.dto.PluginFlow; import com.byit.dto.plugin.PluginFlow;
import com.byit.dto.PluginNode; import com.byit.dto.plugin.PluginNode;
import com.byit.dto.PluginPackage; import com.byit.dto.plugin.PluginPackage;
import com.byit.enums.PluginNodeTypeEnum; import com.byit.enums.plugin.PluginNodeTypeEnum;
import com.byit.job.utils.CronExpression; import com.byit.job.utils.CronExpression;
import com.byit.job.utils.CurrentUserUtils; import com.byit.job.utils.CurrentUserUtils;
import com.byit.job.utils.PlaceholderUtils; import com.byit.job.utils.PlaceholderUtils;
......
...@@ -63,10 +63,9 @@ ...@@ -63,10 +63,9 @@
<groupId>myth-job</groupId> <groupId>myth-job</groupId>
<artifactId>byit-myth-rpc</artifactId> <artifactId>byit-myth-rpc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>myth-job</groupId> <groupId>myth-job</groupId>
<artifactId>myth-exector-plugin</artifactId> <artifactId>byit-myth-dto</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
......
package com.byit.enums; package com.byit.enums;
import com.byit.job.enums.IEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
/** /**
......
package com.byit.service; package com.byit.service;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.dto.ScriptDto; import com.byit.dto.executor.ScriptDto;
/** /**
* @author huanfu * @author huanfu
......
...@@ -3,11 +3,10 @@ package com.byit.service.impl; ...@@ -3,11 +3,10 @@ package com.byit.service.impl;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPObject; import com.byit.dto.web.ResponseResult;
import com.byit.enums.FlowPropertyEnum; import com.byit.enums.FlowPropertyEnum;
import com.byit.enums.NodePropertyEnum; import com.byit.enums.NodePropertyEnum;
import com.byit.job.utils.CronExpression; import com.byit.job.utils.CronExpression;
import com.byit.job.vo.ResponseResult;
import com.byit.mapper.*; import com.byit.mapper.*;
import com.byit.model.Flow; import com.byit.model.Flow;
import com.byit.model.JobTaskRunLog; import com.byit.model.JobTaskRunLog;
......
package com.byit.service.impl; package com.byit.service.impl;
import com.byit.executor.api.ScriptExecutorService; import com.byit.executor.api.ScriptExecutorService;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.dto.ScriptDto; import com.byit.dto.executor.ScriptDto;
import com.byit.rpc.remoting.invoker.annotation.RpcReference; import com.byit.rpc.remoting.invoker.annotation.RpcReference;
import com.byit.service.RunScriptService; import com.byit.service.RunScriptService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
...@@ -4,9 +4,9 @@ import cn.hutool.http.HttpUtil; ...@@ -4,9 +4,9 @@ import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.conf.MythJobAutoConfigure; import com.byit.conf.MythJobAutoConfigure;
import com.byit.enums.NodePropertyEnum; import com.byit.enums.NodePropertyEnum;
import com.byit.job.dto.AdminSenPluginDto; import com.byit.dto.executor.AdminSenPluginDto;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.enums.PluginEnum; import com.byit.enums.PluginEnum;
import com.byit.job.exceptions.PluginException; import com.byit.job.exceptions.PluginException;
import com.byit.job.utils.IpUtil; import com.byit.job.utils.IpUtil;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
......
...@@ -4,9 +4,9 @@ import com.byit.conf.MythJobAutoConfigure; ...@@ -4,9 +4,9 @@ import com.byit.conf.MythJobAutoConfigure;
import com.byit.enums.EmailEnum; import com.byit.enums.EmailEnum;
import com.byit.enums.NodePropertyEnum; import com.byit.enums.NodePropertyEnum;
import com.byit.enums.NodeRunStatusPropertyEnum; import com.byit.enums.NodeRunStatusPropertyEnum;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.dto.ScriptDto; import com.byit.dto.executor.ScriptDto;
import com.byit.job.enums.JobResultEnum; import com.byit.enums.JobResultEnum;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.JobTaskSchedule; import com.byit.model.JobTaskSchedule;
import com.byit.model.RunRecording; import com.byit.model.RunRecording;
......
package com.byit.thread; package com.byit.thread;
import cn.hutool.core.date.DateUtil; import com.byit.dto.executor.JobRunResultDto;
import com.byit.job.dto.JobRunResultDto;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.service.impl.JobTaskRunLogServiceImpl; import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.util.SpringUtil; import com.byit.util.SpringUtil;
......
...@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; ...@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.byit.enums.RunRecordingEnum; import com.byit.enums.RunRecordingEnum;
import com.byit.filesystem.FileSystem; import com.byit.filesystem.FileSystem;
import com.byit.job.enums.JobResultEnum; import com.byit.enums.JobResultEnum;
import com.byit.job.exceptions.BusinessException; import com.byit.job.exceptions.BusinessException;
import com.byit.model.EmailAlarm; import com.byit.model.EmailAlarm;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
......
...@@ -3,7 +3,7 @@ package com.byit.thread.helper; ...@@ -3,7 +3,7 @@ package com.byit.thread.helper;
import com.byit.enums.NodeRunStatusPropertyEnum; import com.byit.enums.NodeRunStatusPropertyEnum;
import com.byit.enums.RunRecordingEnum; import com.byit.enums.RunRecordingEnum;
import com.byit.event.EndFlowEvent; import com.byit.event.EndFlowEvent;
import com.byit.job.enums.JobResultEnum; import com.byit.enums.JobResultEnum;
import com.byit.job.exceptions.BusinessException; import com.byit.job.exceptions.BusinessException;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.RunRecording; import com.byit.model.RunRecording;
......
package com.byit.thread.helper; package com.byit.thread.helper;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.byit.enums.NodeTypeEnum; import com.byit.enums.NodeTypeEnum;
import com.byit.job.WorkRoulette; import com.byit.job.WorkRoulette;
import com.byit.job.dto.ScriptParamAndPlaceholderDto;
import com.byit.job.enums.PlaceholderEnum;
import com.byit.job.utils.DateUtil;
import com.byit.job.utils.PlaceholderUtils; import com.byit.job.utils.PlaceholderUtils;
import com.byit.model.JobTaskRunLogWithBLOBs; import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.JobTaskSchedule; import com.byit.model.JobTaskSchedule;
...@@ -21,9 +17,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -21,9 +17,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 排期表操作 * 排期表操作
......
package com.byit.util; package com.byit.util;
import com.byit.dto.PluginBaseNode; import com.byit.dto.plugin.PluginBaseNode;
import com.byit.enums.DagCheckEnum; import com.byit.enums.DagCheckEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
...@@ -2,7 +2,7 @@ package com.byit.util; ...@@ -2,7 +2,7 @@ package com.byit.util;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.vo.ResponseResult; import com.byit.dto.web.ResponseResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.util.HashMap; import java.util.HashMap;
......
package com.byit.util; package com.byit.util;
import com.byit.job.dto.PluginBeanJobInfo; import com.byit.dto.executor.PluginBeanJobInfo;
import com.byit.model.JobTask; import com.byit.model.JobTask;
import java.util.UUID; import java.util.UUID;
......
...@@ -69,6 +69,12 @@ ...@@ -69,6 +69,12 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>myth-job</groupId>
<artifactId>byit-myth-dto</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
package com.byit.job.exceptions; package com.byit.job.exceptions;
import com.byit.job.enums.IEnum; import com.byit.enums.IEnum;
/** /**
* @program: byit-myth-job->BusinessException * @program: byit-myth-job->BusinessException
......
package com.byit.job.exceptions; package com.byit.job.exceptions;
import com.byit.job.enums.IEnum; import com.byit.enums.IEnum;
/** /**
* @program: byit-myth-job->IException * @program: byit-myth-job->IException
......
package com.byit.job.exceptions; package com.byit.job.exceptions;
import com.byit.job.enums.PluginEnum; import com.byit.enums.PluginEnum;
/** /**
* @program: byit-myth-job->PluginException * @program: byit-myth-job->PluginException
......
package com.byit.job.utils; package com.byit.job.utils;
import com.byit.job.dto.UserInfo; import com.byit.dto.common.UserInfo;
import com.byit.utils.ValidationUtil; import com.byit.utils.ValidationUtil;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
......
...@@ -3,9 +3,9 @@ package com.byit.job.utils; ...@@ -3,9 +3,9 @@ package com.byit.job.utils;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.AdminSenPluginDto; import com.byit.dto.executor.AdminSenPluginDto;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.enums.PluginEnum; import com.byit.enums.PluginEnum;
import com.byit.job.exceptions.PluginException; import com.byit.job.exceptions.PluginException;
import com.byit.rpc.remoting.invoker.route.RpcLoadBalance; import com.byit.rpc.remoting.invoker.route.RpcLoadBalance;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
...@@ -2,14 +2,13 @@ package com.byit.job.utils; ...@@ -2,14 +2,13 @@ package com.byit.job.utils;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.ScriptParamAndPlaceholderDto; import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.job.enums.PlaceholderEnum; import com.byit.enums.PlaceholderEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
......
package com.byit.job.utils; package com.byit.job.utils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.UserInfo; import com.byit.dto.common.UserInfo;
import com.byit.utils.ValidationUtil; import com.byit.utils.ValidationUtil;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>byit-myth-core</artifactId>
<groupId>myth-job</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>byit-myth-dto</artifactId>
</project>
\ No newline at end of file
package com.byit.job.dto; package com.byit.dto.executor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
package com.byit.job.dto; package com.byit.dto.executor;
import com.byit.job.vo.ReturnResult; import com.byit.dto.web.ReturnResult;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
package com.byit.job.dto; package com.byit.dto.executor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
package com.byit.dto; package com.byit.dto.plugin;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
package com.byit.dto; package com.byit.dto.plugin;
import com.alibaba.fastjson.JSON;
import com.byit.annotation.annotationselector.NotNull;
import com.byit.job.dto.ScriptParamAndPlaceholderDto;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -59,13 +56,5 @@ public class PluginNode extends PluginBaseNode implements Serializable { ...@@ -59,13 +56,5 @@ public class PluginNode extends PluginBaseNode implements Serializable {
*/ */
private PluginNodeConfig config; private PluginNodeConfig config;
/**
* 脚本运行参数信息
* @param scriptParam 脚本
*/
public void setScriptParam(@NotNull ScriptParamAndPlaceholderDto scriptParam){
this.runParam = JSON.toJSONString(scriptParam);
}
private static final long serialVersionUID = 2L; private static final long serialVersionUID = 2L;
} }
package com.byit.job.vo; package com.byit.dto.web;
import com.byit.job.enums.IEnum; import com.byit.enums.IEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
package com.byit.job.vo; package com.byit.dto.web;
import com.byit.job.enums.JobResultEnum; import com.byit.enums.JobResultEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
package com.byit.job.enums; package com.byit.enums;
/** /**
* @program: byit-myth-job->IEnum * @program: byit-myth-job->IEnum
......
package com.byit.job.enums; package com.byit.enums;
/** /**
* 任务执行接执行的结果码值 * 任务执行接执行的结果码值
......
package com.byit.enums; package com.byit.enums.plugin;
/** /**
* @description: 节点的类型枚举 * @description: 节点的类型枚举
......
package com.byit.executor.handler.impl; package com.byit.executor.handler.impl;
import com.byit.dto.web.ReturnResult;
import com.byit.executor.handler.BaseJobHandler; import com.byit.executor.handler.BaseJobHandler;
import com.byit.executor.handler.interfaces.IJobHandler; import com.byit.executor.handler.interfaces.IJobHandler;
import com.byit.job.vo.ReturnResult;
/** /**
* @program: byit-myth-job->GlueJobHandler * @program: byit-myth-job->GlueJobHandler
......
package com.byit.executor.handler.impl; package com.byit.executor.handler.impl;
import com.byit.job.enums.GlueTypeEnum; import com.byit.dto.web.ReturnResult;
import com.byit.enums.GlueTypeEnum;
import com.byit.executor.handler.BaseJobHandler; import com.byit.executor.handler.BaseJobHandler;
import com.byit.job.vo.ReturnResult;
/** /**
* @program: byit-myth-job->ScriptJobHandler * @program: byit-myth-job->ScriptJobHandler
......
package com.byit.executor.handler.interfaces; package com.byit.executor.handler.interfaces;
import com.byit.job.vo.ReturnResult;
import com.byit.dto.web.ReturnResult;
/** /**
* @program: byit-myth-job->IJobHandler * @program: byit-myth-job->IJobHandler
......
package com.byit.web.advice; package com.byit.web.advice;
import com.byit.dto.web.ResponseResult;
import com.byit.enums.IEnum;
import com.byit.exception.DataValidationException; import com.byit.exception.DataValidationException;
import com.byit.job.enums.IEnum;
import com.byit.job.exceptions.IException; import com.byit.job.exceptions.IException;
import com.byit.job.vo.ResponseResult;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
......
package com.byit.web.advice; package com.byit.web.advice;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.vo.ResponseResult; import com.byit.dto.web.ResponseResult;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpRequest;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<module>myth-executor-core</module> <module>myth-executor-core</module>
<module>myth-core-common</module> <module>myth-core-common</module>
<module>myth-web-core</module> <module>myth-web-core</module>
<module>myth-dto-core</module>
</modules> </modules>
<dependencies> <dependencies>
......
...@@ -20,5 +20,11 @@ ...@@ -20,5 +20,11 @@
<groupId>myth-job</groupId> <groupId>myth-job</groupId>
<artifactId>myth-executor-core</artifactId> <artifactId>myth-executor-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>myth-job</groupId>
<artifactId>byit-myth-dto</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
package com.byit.executor.api; package com.byit.executor.api;
import com.byit.job.dto.DispatchResponseDto;
import com.byit.job.dto.ScriptDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.dto.executor.ScriptDto;
/** /**
* Python等脚本的执行器服务类 * Python等脚本的执行器服务类
......
package com.byit.plugin.api; package com.byit.plugin.api;
import com.byit.job.dto.PluginBeanJobInfo;
import com.byit.dto.executor.PluginBeanJobInfo;
/** /**
* @program: byit-myth-job->JobOperating * @program: byit-myth-job->JobOperating
......
package com.byit.rpc; package com.byit.rpc;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.AdminSenPluginDto; import com.byit.dto.executor.AdminSenPluginDto;
import com.byit.job.dto.DispatchResponseDto; import com.byit.dto.executor.DispatchResponseDto;
import com.byit.job.enums.JobResultEnum; import com.byit.enums.JobResultEnum;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
......
package com.byit.rpc; package com.byit.rpc;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.AdminSenPluginDto; import com.byit.dto.executor.AdminSenPluginDto;
import com.byit.job.dto.JobRunResultDto; import com.byit.dto.executor.JobRunResultDto;
import com.byit.job.enums.JobResultEnum; import com.byit.dto.web.ReturnResult;
import com.byit.enums.JobResultEnum;
import com.byit.executor.handler.interfaces.IJobHandler; import com.byit.executor.handler.interfaces.IJobHandler;
import com.byit.job.vo.ReturnResult;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
...@@ -2,9 +2,8 @@ package com.byit.utils; ...@@ -2,9 +2,8 @@ package com.byit.utils;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.PluginBeanJobInfo; import com.byit.dto.executor.PluginBeanJobInfo;
import com.byit.dto.PluginPackage; import com.byit.dto.plugin.PluginPackage;
import com.byit.job.enums.PluginEnum;
import com.byit.executor.handler.interfaces.IJobHandler; import com.byit.executor.handler.interfaces.IJobHandler;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.byit.service; package com.byit.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.dto.executor.DispatchResponseDto;
import com.byit.dto.executor.JobRunResultDto;
import com.byit.dto.executor.ScriptDto;
import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.executor.api.ScriptExecutorService; import com.byit.executor.api.ScriptExecutorService;
import com.byit.executor.jobExecutor.process.MythJobProcess; import com.byit.executor.jobExecutor.process.MythJobProcess;
import com.byit.executor.jobExecutor.process.ProcessFailureException; import com.byit.executor.jobExecutor.process.ProcessFailureException;
import com.byit.filesystem.FileSystem; import com.byit.filesystem.FileSystem;
import com.byit.job.dto.DispatchResponseDto; import com.byit.enums.JobResultEnum;
import com.byit.job.dto.JobRunResultDto;
import com.byit.job.dto.ScriptDto;
import com.byit.job.dto.ScriptParamAndPlaceholderDto;
import com.byit.job.enums.JobResultEnum;
import com.byit.job.utils.PlaceholderUtils; import com.byit.job.utils.PlaceholderUtils;
import com.byit.job.vo.ReturnResult; import com.byit.dto.web.ReturnResult;
import com.byit.pool.RunThreadPool; import com.byit.pool.RunThreadPool;
import com.byit.rpc.remoting.provider.annotation.RpcService; import com.byit.rpc.remoting.provider.annotation.RpcService;
import com.byit.utils.ServiceInfoUtil; import com.byit.utils.ServiceInfoUtil;
......
...@@ -2,13 +2,9 @@ package com.byit.demo.client.controller; ...@@ -2,13 +2,9 @@ package com.byit.demo.client.controller;
import com.byit.demo.client.api.DemoService; import com.byit.demo.client.api.DemoService;
import com.byit.demo.client.api.dto.UserDTO; import com.byit.demo.client.api.dto.UserDTO;
import com.byit.dto.executor.DispatchResponseDto;
import com.byit.executor.api.ScriptExecutorService; import com.byit.executor.api.ScriptExecutorService;
import com.byit.job.dto.DispatchResponseDto;
import com.byit.job.dto.ScriptDto;
import com.byit.job.enums.JobResultEnum;
import com.byit.rpc.remoting.invoker.annotation.RpcReference; import com.byit.rpc.remoting.invoker.annotation.RpcReference;
import com.byit.rpc.remoting.invoker.route.LoadBalance;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.ScriptParamAndPlaceholderDto; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.plugin.*; import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.dto.plugin.*;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
import java.util.*; import java.util.*;
...@@ -248,7 +249,7 @@ public class AddComplexPy { ...@@ -248,7 +249,7 @@ public class AddComplexPy {
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("name","皇甫科星"); map.put("name","皇甫科星");
scriptParamAndPlaceholderDto.setPlaceholder(map); scriptParamAndPlaceholderDto.setPlaceholder(map);
pluginNode.setScriptParam(scriptParamAndPlaceholderDto); pluginNode.setRunParam(JSON.toJSONString(scriptParamAndPlaceholderDto));
} }
......
package com.byit.job; package com.byit.job;
import com.byit.annotations.JobHandler; import com.byit.annotations.JobHandler;
import com.byit.job.handler.BaseJobHandler; import com.byit.dto.web.ReturnResult;
import com.byit.job.vo.ReturnResult; import com.byit.executor.handler.BaseJobHandler;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
package com.byit.job; package com.byit.job;
import com.byit.annotations.JobHandler; import com.byit.annotations.JobHandler;
import com.byit.job.handler.BaseJobHandler; import com.byit.dto.web.ReturnResult;
import com.byit.job.vo.ReturnResult; import com.byit.executor.handler.BaseJobHandler;
/** /**
* @program: byit-myth-job->DemoJob * @program: byit-myth-job->DemoJob
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.PluginBeanJobInfo;
import com.byit.launcher.JobRunServerLauncher; import com.byit.launcher.JobRunServerLauncher;
import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.utils.JobUtils;
import java.io.IOException; import java.io.IOException;
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.ScriptParamAndPlaceholderDto; import com.alibaba.fastjson.JSON;
import com.byit.job.dto.plugin.*; import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.dto.plugin.*;
import com.byit.rpc.remoting.invoker.route.LoadBalance; import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
...@@ -75,7 +76,7 @@ public class ScriptAddFlow { ...@@ -75,7 +76,7 @@ public class ScriptAddFlow {
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("name","皇甫科星"); map.put("name","皇甫科星");
scriptParamAndPlaceholderDto.setPlaceholder(map); scriptParamAndPlaceholderDto.setPlaceholder(map);
pluginNode2.setScriptParam(scriptParamAndPlaceholderDto); pluginNode2.setRunParam(JSON.toJSONString(scriptParamAndPlaceholderDto));
pluginNode2.setRunCommand("python ${biz_file}"); pluginNode2.setRunCommand("python ${biz_file}");
pluginNodeConfig2.setFailedRetryCount(2); pluginNodeConfig2.setFailedRetryCount(2);
......
package com.byit.job; package com.byit.job;
import com.byit.annotations.JobHandler; import com.byit.annotations.JobHandler;
import com.byit.job.handler.BaseJobHandler; import com.byit.dto.web.ReturnResult;
import com.byit.job.vo.ReturnResult; import com.byit.executor.handler.BaseJobHandler;
@JobHandler("start") @JobHandler("start")
public class StartNode extends BaseJobHandler { public class StartNode extends BaseJobHandler {
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.plugin.*; import com.byit.dto.plugin.*;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.plugin.*; import com.byit.dto.plugin.*;
import com.byit.rpc.remoting.invoker.route.LoadBalance; import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
......
package com.byit.job; package com.byit.job;
import com.byit.job.dto.plugin.*; import com.byit.dto.plugin.*;
import com.byit.rpc.remoting.invoker.route.LoadBalance; import com.byit.rpc.remoting.invoker.route.LoadBalance;
import com.byit.utils.JobUtils; import com.byit.utils.JobUtils;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment