Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
17812597
Commit
17812597
authored
Mar 17, 2020
by
guo_minglei@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补批代码修改
parent
fbe3a910
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
121 additions
and
93 deletions
+121
-93
pom.xml
byit-myth-admin/pom.xml
+6
-0
ApiFlowService.java
...-admin/src/main/java/com/byit/service/ApiFlowService.java
+1
-1
ApiFlowServiceImpl.java
...c/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
+5
-5
ApiNodeServiceImpl.java
...c/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
+1
-0
pom.xml
byit-myth-core/myth-admin-core/pom.xml
+3
-2
JavaBeanJobTask.java
...min-core/src/main/java/com/byit/task/JavaBeanJobTask.java
+2
-2
ApiFlowDagCheck.java
...min-core/src/main/java/com/byit/util/ApiFlowDagCheck.java
+1
-1
pom.xml
byit-myth-core/myth-core-common/pom.xml
+5
-4
PluginEnum.java
...e-common/src/main/java/com/byit/job/enums/PluginEnum.java
+1
-3
PluginException.java
...rc/main/java/com/byit/job/exceptions/PluginException.java
+7
-8
IpUtil.java
...-core-common/src/main/java/com/byit/job/utils/IpUtil.java
+2
-3
pom.xml
byit-myth-core/myth-executor-core/pom.xml
+4
-5
BaseJobHandler.java
...c/main/java/com/byit/executor/handler/BaseJobHandler.java
+2
-2
GlueJobHandler.java
...n/java/com/byit/executor/handler/impl/GlueJobHandler.java
+3
-3
ScriptJobHandler.java
...java/com/byit/executor/handler/impl/ScriptJobHandler.java
+2
-2
IJobHandler.java
...ava/com/byit/executor/handler/interfaces/IJobHandler.java
+1
-1
pom.xml
byit-myth-core/myth-web-core/pom.xml
+27
-0
ExceptionHandle.java
...re/src/main/java/com/byit/web/advice/ExceptionHandle.java
+1
-1
ResponseAdvice.java
...ore/src/main/java/com/byit/web/advice/ResponseAdvice.java
+1
-1
pom.xml
byit-myth-core/pom.xml
+1
-0
pom.xml
byit-myth-executor/myth-executor-plugin/pom.xml
+4
-10
PluginBaseNode.java
...tor-plugin/src/main/java/com/byit/dto/PluginBaseNode.java
+1
-1
PluginFlow.java
...xecutor-plugin/src/main/java/com/byit/dto/PluginFlow.java
+1
-1
PluginFlowConfig.java
...r-plugin/src/main/java/com/byit/dto/PluginFlowConfig.java
+1
-1
PluginNode.java
...xecutor-plugin/src/main/java/com/byit/dto/PluginNode.java
+1
-1
PluginNodeConfig.java
...r-plugin/src/main/java/com/byit/dto/PluginNodeConfig.java
+1
-1
PluginPackage.java
...utor-plugin/src/main/java/com/byit/dto/PluginPackage.java
+1
-1
PluginNodeTypeEnum.java
...ugin/src/main/java/com/byit/enums/PluginNodeTypeEnum.java
+1
-1
RunJobThread.java
...cutor-plugin/src/main/java/com/byit/rpc/RunJobThread.java
+1
-1
JarRunScanProject.java
...plugin/src/main/java/com/byit/scan/JarRunScanProject.java
+1
-1
LocalFolderRunScanProject.java
...rc/main/java/com/byit/scan/LocalFolderRunScanProject.java
+1
-1
ScanRootPackage.java
...r-plugin/src/main/java/com/byit/scan/ScanRootPackage.java
+1
-1
IScanProject.java
...plugin/src/main/java/com/byit/scan/base/IScanProject.java
+0
-2
JobUtils.java
...xecutor-plugin/src/main/java/com/byit/utils/JobUtils.java
+24
-26
pom.xml
byit-myth-executor/myth-executor-server/pom.xml
+6
-0
No files found.
byit-myth-admin/pom.xml
View file @
17812597
...
@@ -51,6 +51,12 @@
...
@@ -51,6 +51,12 @@
<artifactId>
myth-executor-api
</artifactId>
<artifactId>
myth-executor-api
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-web-core
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java
View file @
17812597
package
com
.
byit
.
service
;
package
com
.
byit
.
service
;
import
com.byit.
job.dto.plugin
.PluginFlow
;
import
com.byit.
dto
.PluginFlow
;
import
com.byit.model.RunRecording
;
import
com.byit.model.RunRecording
;
import
com.byit.model.vo.RunRecordingVo
;
import
com.byit.model.vo.RunRecordingVo
;
...
...
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
View file @
17812597
...
@@ -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.
job.dto.plugin
.PluginBaseNode
;
import
com.byit.
dto
.PluginBaseNode
;
import
com.byit.
job.dto.plugin
.PluginFlow
;
import
com.byit.
dto
.PluginFlow
;
import
com.byit.
job.dto.plugin
.PluginNode
;
import
com.byit.
dto
.PluginNode
;
import
com.byit.
job.dto.plugin
.PluginPackage
;
import
com.byit.
dto
.PluginPackage
;
import
com.byit.
job.enums.plugin
.PluginNodeTypeEnum
;
import
com.byit.
enums
.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
;
...
...
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
View file @
17812597
...
@@ -28,6 +28,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
...
@@ -28,6 +28,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
String
jobType
=
jsonObject
.
getString
(
"jobType"
);
String
jobType
=
jsonObject
.
getString
(
"jobType"
);
ValidationUtil
.
dataNotBank
(
jobType
,
"节点类型不允许为空!"
);
ValidationUtil
.
dataNotBank
(
jobType
,
"节点类型不允许为空!"
);
JobTaskSchedule
schedule
=
new
JobTaskSchedule
();
JobTaskSchedule
schedule
=
new
JobTaskSchedule
();
return
null
;
return
null
;
}
}
}
}
byit-myth-core/myth-admin-core/pom.xml
View file @
17812597
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
<artifactId>
netty-all
</artifactId>
<artifactId>
netty-all
</artifactId>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
myth-job
</groupId>
<groupId>
myth-job
</groupId>
<artifactId>
myth-executor-api
</artifactId>
<artifactId>
myth-executor-api
</artifactId>
...
@@ -67,7 +66,9 @@
...
@@ -67,7 +66,9 @@
<dependency>
<dependency>
<groupId>
myth-job
</groupId>
<groupId>
myth-job
</groupId>
<artifactId>
myth-executor-api
</artifactId>
<artifactId>
myth-exector-plugin
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<scope>
compile
</scope>
</dependency>
</dependency>
</dependencies>
</dependencies>
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaBeanJobTask.java
View file @
17812597
...
@@ -6,8 +6,8 @@ import com.byit.conf.MythJobAutoConfigure;
...
@@ -6,8 +6,8 @@ import com.byit.conf.MythJobAutoConfigure;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.DispatchResponseDto
;
import
com.byit.job.dto.DispatchResponseDto
;
import
com.byit.job.enums.
plugin.
PluginEnum
;
import
com.byit.job.enums.PluginEnum
;
import
com.byit.job.exceptions.
plugin.
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
;
import
com.byit.model.JobTaskSchedule
;
import
com.byit.model.JobTaskSchedule
;
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/util/ApiFlowDagCheck.java
View file @
17812597
package
com
.
byit
.
util
;
package
com
.
byit
.
util
;
import
com.byit.dto.PluginBaseNode
;
import
com.byit.enums.DagCheckEnum
;
import
com.byit.enums.DagCheckEnum
;
import
com.byit.job.dto.plugin.PluginBaseNode
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
java.util.*
;
import
java.util.*
;
...
...
byit-myth-core/myth-core-common/pom.xml
View file @
17812597
...
@@ -55,10 +55,6 @@
...
@@ -55,10 +55,6 @@
<artifactId>
byit-validation-starter
</artifactId>
<artifactId>
byit-validation-starter
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>
io.jsonwebtoken
</groupId>
<groupId>
io.jsonwebtoken
</groupId>
...
@@ -69,6 +65,10 @@
...
@@ -69,6 +65,10 @@
<groupId>
javax.servlet
</groupId>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<artifactId>
javax.servlet-api
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
\ No newline at end of file
byit-myth-core/myth-core-common/src/main/java/com/byit/job/enums/
plugin/
PluginEnum.java
→
byit-myth-core/myth-core-common/src/main/java/com/byit/job/enums/PluginEnum.java
View file @
17812597
package
com
.
byit
.
job
.
enums
.
plugin
;
package
com
.
byit
.
job
.
enums
;
import
com.byit.job.enums.IEnum
;
/**
/**
* 插件枚举
* 插件枚举
...
...
byit-myth-core/myth-core-common/src/main/java/com/byit/job/exceptions/
plugin/
PluginException.java
→
byit-myth-core/myth-core-common/src/main/java/com/byit/job/exceptions/PluginException.java
View file @
17812597
package
com
.
byit
.
job
.
exceptions
.
plugin
;
package
com
.
byit
.
job
.
exceptions
;
import
com.byit.job.enums.IEnum
;
import
com.byit.job.enums.PluginEnum
;
import
com.byit.job.exceptions.IException
;
/**
/**
* @program: byit-myth-job->PluginException
* @program: byit-myth-job->PluginException
...
@@ -10,19 +9,19 @@ import com.byit.job.exceptions.IException;
...
@@ -10,19 +9,19 @@ import com.byit.job.exceptions.IException;
* @date: 2019/11/27 14:37
* @date: 2019/11/27 14:37
**/
**/
public
class
PluginException
extends
RuntimeException
implements
IException
{
public
class
PluginException
extends
RuntimeException
implements
IException
{
private
IEnum
i
Enum
;
private
PluginEnum
plugin
Enum
;
public
PluginException
()
{
public
PluginException
()
{
}
}
public
<
E
extends
I
Enum
>
PluginException
(
E
e
){
public
<
E
extends
Plugin
Enum
>
PluginException
(
E
e
){
super
(
e
.
getMsg
());
super
(
e
.
getMsg
());
this
.
i
Enum
=
e
;
this
.
plugin
Enum
=
e
;
}
}
@Override
@Override
public
I
Enum
getIEnum
()
{
public
Plugin
Enum
getIEnum
()
{
return
this
.
i
Enum
;
return
this
.
plugin
Enum
;
}
}
}
}
byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/IpUtil.java
View file @
17812597
...
@@ -3,11 +3,10 @@ package com.byit.job.utils;
...
@@ -3,11 +3,10 @@ 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.alibaba.fastjson.JSONObject
;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.DispatchResponseDto
;
import
com.byit.job.dto.DispatchResponseDto
;
import
com.byit.job.enums.
plugin.
PluginEnum
;
import
com.byit.job.enums.PluginEnum
;
import
com.byit.job.exceptions.
plugin.
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
;
...
...
byit-myth-core/myth-executor-core/pom.xml
View file @
17812597
...
@@ -27,11 +27,6 @@
...
@@ -27,11 +27,6 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-core-common
</artifactId>
</dependency>
<dependency>
<groupId>
commons-io
</groupId>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
<artifactId>
commons-io
</artifactId>
<version>
2.6
</version>
<version>
2.6
</version>
...
@@ -61,6 +56,10 @@
...
@@ -61,6 +56,10 @@
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-autoconfigure
</artifactId>
<artifactId>
spring-boot-autoconfigure
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-core-common
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
byit-myth-core/myth-
core-common/src/main/java/com/byit/job
/handler/BaseJobHandler.java
→
byit-myth-core/myth-
executor-core/src/main/java/com/byit/executor
/handler/BaseJobHandler.java
View file @
17812597
package
com
.
byit
.
job
.
handler
;
package
com
.
byit
.
executor
.
handler
;
import
com.byit.
job
.handler.interfaces.IJobHandler
;
import
com.byit.
executor
.handler.interfaces.IJobHandler
;
/**
/**
* @program: byit-myth-job->AbsIJobHandler
* @program: byit-myth-job->AbsIJobHandler
...
...
byit-myth-core/myth-
core-common/src/main/java/com/byit/job
/handler/impl/GlueJobHandler.java
→
byit-myth-core/myth-
executor-core/src/main/java/com/byit/executor
/handler/impl/GlueJobHandler.java
View file @
17812597
package
com
.
byit
.
job
.
handler
.
impl
;
package
com
.
byit
.
executor
.
handler
.
impl
;
import
com.byit.
job
.handler.BaseJobHandler
;
import
com.byit.
executor
.handler.BaseJobHandler
;
import
com.byit.
job
.handler.interfaces.IJobHandler
;
import
com.byit.
executor
.handler.interfaces.IJobHandler
;
import
com.byit.job.vo.ReturnResult
;
import
com.byit.job.vo.ReturnResult
;
/**
/**
...
...
byit-myth-core/myth-
core-common/src/main/java/com/byit/job
/handler/impl/ScriptJobHandler.java
→
byit-myth-core/myth-
executor-core/src/main/java/com/byit/executor
/handler/impl/ScriptJobHandler.java
View file @
17812597
package
com
.
byit
.
job
.
handler
.
impl
;
package
com
.
byit
.
executor
.
handler
.
impl
;
import
com.byit.job.enums.GlueTypeEnum
;
import
com.byit.job.enums.GlueTypeEnum
;
import
com.byit.
job
.handler.BaseJobHandler
;
import
com.byit.
executor
.handler.BaseJobHandler
;
import
com.byit.job.vo.ReturnResult
;
import
com.byit.job.vo.ReturnResult
;
/**
/**
...
...
byit-myth-core/myth-
core-common/src/main/java/com/byit/job
/handler/interfaces/IJobHandler.java
→
byit-myth-core/myth-
executor-core/src/main/java/com/byit/executor
/handler/interfaces/IJobHandler.java
View file @
17812597
package
com
.
byit
.
job
.
handler
.
interfaces
;
package
com
.
byit
.
executor
.
handler
.
interfaces
;
import
com.byit.job.vo.ReturnResult
;
import
com.byit.job.vo.ReturnResult
;
...
...
byit-myth-core/myth-web-core/pom.xml
0 → 100644
View file @
17812597
<?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>
myth-web-core
</artifactId>
<dependencies>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-core-common
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-webmvc
</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
byit-myth-core/myth-
core-common/src/main/java/com/byit/jo
b/advice/ExceptionHandle.java
→
byit-myth-core/myth-
web-core/src/main/java/com/byit/we
b/advice/ExceptionHandle.java
View file @
17812597
package
com
.
byit
.
jo
b
.
advice
;
package
com
.
byit
.
we
b
.
advice
;
import
com.byit.exception.DataValidationException
;
import
com.byit.exception.DataValidationException
;
import
com.byit.job.enums.IEnum
;
import
com.byit.job.enums.IEnum
;
...
...
byit-myth-core/myth-
core-common/src/main/java/com/byit/jo
b/advice/ResponseAdvice.java
→
byit-myth-core/myth-
web-core/src/main/java/com/byit/we
b/advice/ResponseAdvice.java
View file @
17812597
package
com
.
byit
.
jo
b
.
advice
;
package
com
.
byit
.
we
b
.
advice
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.byit.job.vo.ResponseResult
;
import
com.byit.job.vo.ResponseResult
;
...
...
byit-myth-core/pom.xml
View file @
17812597
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<module>
myth-admin-core
</module>
<module>
myth-admin-core
</module>
<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>
</modules>
</modules>
<dependencies>
<dependencies>
...
...
byit-myth-executor/myth-executor-plugin/pom.xml
View file @
17812597
...
@@ -16,21 +16,11 @@
...
@@ -16,21 +16,11 @@
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-executor-api
</artifactId>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<artifactId>
fastjson
</artifactId>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-core-common
</artifactId>
</dependency>
<dependency>
<groupId>
io.netty
</groupId>
<groupId>
io.netty
</groupId>
<artifactId>
netty-all
</artifactId>
<artifactId>
netty-all
</artifactId>
</dependency>
</dependency>
...
@@ -49,6 +39,10 @@
...
@@ -49,6 +39,10 @@
<groupId>
org.slf4j
</groupId>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-log4j12
</artifactId>
<artifactId>
slf4j-log4j12
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-executor-core
</artifactId>
</dependency>
</dependencies>
</dependencies>
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginBaseNode.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginBaseNode.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
lombok.Data
;
import
lombok.Data
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginFlow.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginFlow.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
lombok.*
;
import
lombok.*
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginFlowConfig.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginFlowConfig.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Builder
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginNode.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginNode.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.byit.annotation.annotationselector.NotNull
;
import
com.byit.annotation.annotationselector.NotNull
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginNodeConfig.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginNodeConfig.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
lombok.Data
;
import
lombok.Data
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/dto/plugin
/PluginPackage.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/dto
/PluginPackage.java
View file @
17812597
package
com
.
byit
.
job
.
dto
.
plugin
;
package
com
.
byit
.
dto
;
import
lombok.Data
;
import
lombok.Data
;
...
...
byit-myth-
core/myth-core-common/src/main/java/com/byit/job/enums/plugin
/PluginNodeTypeEnum.java
→
byit-myth-
executor/myth-executor-plugin/src/main/java/com/byit/enums
/PluginNodeTypeEnum.java
View file @
17812597
package
com
.
byit
.
job
.
enums
.
plugin
;
package
com
.
byit
.
enums
;
/**
/**
* @description: 节点的类型枚举
* @description: 节点的类型枚举
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/rpc/RunJobThread.java
View file @
17812597
...
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
...
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.AdminSenPluginDto
;
import
com.byit.job.dto.JobRunResultDto
;
import
com.byit.job.dto.JobRunResultDto
;
import
com.byit.job.enums.JobResultEnum
;
import
com.byit.job.enums.JobResultEnum
;
import
com.byit.
job
.handler.interfaces.IJobHandler
;
import
com.byit.
executor
.handler.interfaces.IJobHandler
;
import
com.byit.job.vo.ReturnResult
;
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
;
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/scan/JarRunScanProject.java
View file @
17812597
package
com
.
byit
.
scan
;
package
com
.
byit
.
scan
;
import
com.byit.annotations.JobHandler
;
import
com.byit.annotations.JobHandler
;
import
com.byit.
job
.handler.interfaces.IJobHandler
;
import
com.byit.
executor
.handler.interfaces.IJobHandler
;
import
com.byit.scan.base.IScanProject
;
import
com.byit.scan.base.IScanProject
;
import
com.byit.utils.JobUtils
;
import
com.byit.utils.JobUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/scan/LocalFolderRunScanProject.java
View file @
17812597
package
com
.
byit
.
scan
;
package
com
.
byit
.
scan
;
import
com.byit.annotations.JobHandler
;
import
com.byit.annotations.JobHandler
;
import
com.byit.
job
.handler.interfaces.IJobHandler
;
import
com.byit.
executor
.handler.interfaces.IJobHandler
;
import
com.byit.scan.base.IScanProject
;
import
com.byit.scan.base.IScanProject
;
import
com.byit.utils.JobUtils
;
import
com.byit.utils.JobUtils
;
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/scan/ScanRootPackage.java
View file @
17812597
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
package com.byit.scan;
package com.byit.scan;
import com.byit.annotations.JobHandler;
import com.byit.annotations.JobHandler;
import com.byit.
job
.handler.interfaces.IJobHandler;
import com.byit.
executor
.handler.interfaces.IJobHandler;
import com.byit.utils.JobUtils;
import com.byit.utils.JobUtils;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.slf4j.Slf4j;
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/scan/base/IScanProject.java
View file @
17812597
package
com
.
byit
.
scan
.
base
;
package
com
.
byit
.
scan
.
base
;
import
java.io.IOException
;
import
java.util.List
;
/**
/**
* @program: byit-myth-job->IScanProject
* @program: byit-myth-job->IScanProject
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java
View file @
17812597
...
@@ -3,12 +3,10 @@ package com.byit.utils;
...
@@ -3,12 +3,10 @@ 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.job.dto.PluginBeanJobInfo
;
import
com.byit.job.dto.plugin.PluginPackage
;
import
com.byit.dto.PluginPackage
;
import
com.byit.job.enums.plugin.PluginEnum
;
import
com.byit.job.enums.PluginEnum
;
import
com.byit.job.exceptions.plugin.PluginException
;
import
com.byit.executor.handler.interfaces.IJobHandler
;
import
com.byit.job.handler.interfaces.IJobHandler
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
java.io.UnsupportedEncodingException
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLDecoder
;
import
java.net.URLDecoder
;
...
@@ -26,7 +24,7 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
...
@@ -26,7 +24,7 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
**/
**/
@Slf4j
@Slf4j
public
class
JobUtils
{
public
class
JobUtils
{
private
static
final
String
REQUEST_PREFIX
=
"http://"
;
private
static
String
REQUEST_URL
;
private
static
final
String
REQUEST_ADD_JOB_RESOURCES_SUFFIX
=
"/job/addJob"
;
private
static
final
String
REQUEST_ADD_JOB_RESOURCES_SUFFIX
=
"/job/addJob"
;
/**
/**
* 发布工作流
* 发布工作流
...
@@ -76,7 +74,6 @@ public class JobUtils {
...
@@ -76,7 +74,6 @@ public class JobUtils {
* 手动置为成功
* 手动置为成功
*/
*/
private
static
final
String
REQUEST_FLOW_MAKESUCCESS
=
"/api/flow/madeSuccess"
;
private
static
final
String
REQUEST_FLOW_MAKESUCCESS
=
"/api/flow/madeSuccess"
;
private
static
final
String
SERVER_PORT
=
"8998"
;
/**
/**
* 当前项目运行环境 jar file
* 当前项目运行环境 jar file
*/
*/
...
@@ -87,6 +84,10 @@ public class JobUtils {
...
@@ -87,6 +84,10 @@ public class JobUtils {
*/
*/
public
static
final
Map
<
String
,
Class
<?
extends
IJobHandler
>>
jobCache
=
new
ConcurrentHashMap
<>();
public
static
final
Map
<
String
,
Class
<?
extends
IJobHandler
>>
jobCache
=
new
ConcurrentHashMap
<>();
public
static
void
setRequestUrl
(
String
requestUrl
){
REQUEST_URL
=
requestUrl
;
}
/**
/**
* 添加一个任务节点
* 添加一个任务节点
* @param pluginBeanJobInfo 任务节点的详尽配置
* @param pluginBeanJobInfo 任务节点的详尽配置
...
@@ -94,14 +95,8 @@ public class JobUtils {
...
@@ -94,14 +95,8 @@ public class JobUtils {
*/
*/
public
static
String
addJob
(
PluginBeanJobInfo
pluginBeanJobInfo
){
public
static
String
addJob
(
PluginBeanJobInfo
pluginBeanJobInfo
){
log
.
info
(
"---------------开始添加一个任务,jobHandelName:{}---------------------"
,
pluginBeanJobInfo
.
getJobHandelName
());
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
);
}
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
requestHost
+
":"
+
requestPort
+
REQUEST_ADD_JOB_RESOURCES_SUFFIX
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_ADD_JOB_RESOURCES_SUFFIX
;
//发送请求 添加任务
//发送请求 添加任务
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
JSON
.
toJSONString
(
pluginBeanJobInfo
));
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
JSON
.
toJSONString
(
pluginBeanJobInfo
));
log
.
info
(
"--------------------添加任务完成,添加结果为:{}------------------------"
,
addRequestResult
);
log
.
info
(
"--------------------添加任务完成,添加结果为:{}------------------------"
,
addRequestResult
);
...
@@ -117,7 +112,7 @@ public class JobUtils {
...
@@ -117,7 +112,7 @@ public class JobUtils {
log
.
info
(
"---------------开始发布工作流,flowName:{}---------------------"
,
pluginPackage
.
getFlow
().
getName
());
log
.
info
(
"---------------开始发布工作流,flowName:{}---------------------"
,
pluginPackage
.
getFlow
().
getName
());
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_PUBLISH
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_PUBLISH
;
//发送请求 添加任务
//发送请求 添加任务
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
"param="
+
JSON
.
toJSONString
(
pluginPackage
,
WriteClassName
));
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
"param="
+
JSON
.
toJSONString
(
pluginPackage
,
WriteClassName
));
//String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginPackage, WriteClassName))
//String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginPackage, WriteClassName))
...
@@ -133,7 +128,7 @@ public class JobUtils {
...
@@ -133,7 +128,7 @@ public class JobUtils {
*/
*/
public
static
String
startFlow
(
String
flowName
,
String
workspaceName
){
public
static
String
startFlow
(
String
flowName
,
String
workspaceName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_START
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_START
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -151,7 +146,7 @@ public class JobUtils {
...
@@ -151,7 +146,7 @@ public class JobUtils {
*/
*/
public
static
String
stopFlow
(
String
flowName
,
String
workspaceName
){
public
static
String
stopFlow
(
String
flowName
,
String
workspaceName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_STOP
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_STOP
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -170,7 +165,7 @@ public class JobUtils {
...
@@ -170,7 +165,7 @@ public class JobUtils {
*/
*/
public
static
String
deleteFlow
(
String
flowName
,
String
workspaceName
){
public
static
String
deleteFlow
(
String
flowName
,
String
workspaceName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_DELETE
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_DELETE
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -188,7 +183,7 @@ public class JobUtils {
...
@@ -188,7 +183,7 @@ public class JobUtils {
*/
*/
public
static
String
repealSchedule
(
String
flowName
,
String
workspaceName
){
public
static
String
repealSchedule
(
String
flowName
,
String
workspaceName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_REPEAL
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_REPEAL
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -204,7 +199,7 @@ public class JobUtils {
...
@@ -204,7 +199,7 @@ public class JobUtils {
*/
*/
public
static
String
startSchedule
(
String
runId
){
public
static
String
startSchedule
(
String
runId
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_REREPEAL
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_REREPEAL
;
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
//发送请求 添加任务
//发送请求 添加任务
...
@@ -222,7 +217,7 @@ public class JobUtils {
...
@@ -222,7 +217,7 @@ public class JobUtils {
*/
*/
public
static
String
killJob
(
String
runId
,
String
flowName
,
String
nodeName
){
public
static
String
killJob
(
String
runId
,
String
flowName
,
String
nodeName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_KILL_JOB
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_KILL_JOB
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"flowName"
,
flowName
);
map
.
put
(
"flowName"
,
flowName
);
...
@@ -240,7 +235,7 @@ public class JobUtils {
...
@@ -240,7 +235,7 @@ public class JobUtils {
*/
*/
public
static
String
killFlow
(
String
runId
){
public
static
String
killFlow
(
String
runId
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_KILL_FLOW
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_KILL_FLOW
;
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
2
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>(
2
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
//发送请求 添加任务
//发送请求 添加任务
...
@@ -260,7 +255,7 @@ public class JobUtils {
...
@@ -260,7 +255,7 @@ public class JobUtils {
*/
*/
public
static
String
reRunJob
(
String
runId
,
String
runState
,
String
workspaceName
,
String
flowName
,
String
nodeName
){
public
static
String
reRunJob
(
String
runId
,
String
runState
,
String
workspaceName
,
String
flowName
,
String
nodeName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_RERUNJOB
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_RERUNJOB
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runState"
,
runState
);
map
.
put
(
"runState"
,
runState
);
...
@@ -283,7 +278,7 @@ public class JobUtils {
...
@@ -283,7 +278,7 @@ public class JobUtils {
*/
*/
public
static
String
reRunFlow
(
String
runId
,
String
workspaceName
,
String
flowName
){
public
static
String
reRunFlow
(
String
runId
,
String
workspaceName
,
String
flowName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_RERUNFLOW
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_RERUNFLOW
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -304,7 +299,7 @@ public class JobUtils {
...
@@ -304,7 +299,7 @@ public class JobUtils {
*/
*/
public
static
String
makeSuccess
(
String
runId
,
String
workspaceName
,
String
flowName
,
String
nodeName
){
public
static
String
makeSuccess
(
String
runId
,
String
workspaceName
,
String
flowName
,
String
nodeName
){
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_FLOW_MAKESUCCESS
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_FLOW_MAKESUCCESS
;
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
Map
<
String
,
String
>
map
=
new
HashMap
<>(
5
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"runId"
,
runId
);
map
.
put
(
"workspaceName"
,
workspaceName
);
map
.
put
(
"workspaceName"
,
workspaceName
);
...
@@ -325,13 +320,16 @@ public class JobUtils {
...
@@ -325,13 +320,16 @@ public class JobUtils {
log
.
info
(
"---------------开始创建工作空间,workspaceName:{}---------------------"
,
workspaceName
);
log
.
info
(
"---------------开始创建工作空间,workspaceName:{}---------------------"
,
workspaceName
);
//请求的路径
//请求的路径
String
requestUrl
=
REQUEST_
PREFIX
+
"127.0.0.1"
+
":"
+
SERVER_PORT
+
REQUEST_WORKSPACE_ADD
;
String
requestUrl
=
REQUEST_
URL
+
REQUEST_WORKSPACE_ADD
;
//发送请求 添加任务
//发送请求 添加任务
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
"workspaceName="
+
workspaceName
);
String
addRequestResult
=
HttpUtil
.
post
(
requestUrl
,
"workspaceName="
+
workspaceName
);
log
.
info
(
"--------------------创建工作空间接口调用成功,结果为:{}------------------------"
,
addRequestResult
);
log
.
info
(
"--------------------创建工作空间接口调用成功,结果为:{}------------------------"
,
addRequestResult
);
return
addRequestResult
;
return
addRequestResult
;
}
}
private
static
void
checkRequestUrl
(){
}
/**
/**
* 判断当前的运行环境是什么 jar : table of Contents(目录)
* 判断当前的运行环境是什么 jar : table of Contents(目录)
...
...
byit-myth-executor/myth-executor-server/pom.xml
View file @
17812597
...
@@ -39,6 +39,12 @@
...
@@ -39,6 +39,12 @@
<version>
1.0-SNAPSHOT
</version>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<groupId>
myth-job
</groupId>
<artifactId>
myth-web-core
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment