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
78dccf3b
Commit
78dccf3b
authored
Jul 16, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决不传递日志节点id的eBUG
parent
423633fa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
ApiFlowServiceImpl.java
...c/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
+4
-2
JavaTaskJobTask.java
...min-core/src/main/java/com/byit/task/JavaTaskJobTask.java
+1
-0
MythJobProcess.java
...server/src/main/java/com/byit/process/MythJobProcess.java
+2
-3
No files found.
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
View file @
78dccf3b
...
...
@@ -3,6 +3,7 @@ package com.byit.service.impl;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.date.DateUnit
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.lang.ConsistentHash
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.byit.dto.StatisticsConditionDto
;
...
...
@@ -24,6 +25,7 @@ import com.byit.util.IDGenerationStrategy;
import
com.byit.util.lock.RedissLockUtil
;
import
com.byit.utils.ValidationUtil
;
import
com.google.common.base.Joiner
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -35,6 +37,7 @@ import javax.annotation.Resource;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.stream.Collectors
;
import
static
com
.
alibaba
.
fastjson
.
serializer
.
SerializerFeature
.
WriteClassName
;
...
...
@@ -267,7 +270,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
if
(
PluginNodeTypeEnum
.
FLOW
.
getCode
().
equals
(
pluginNode
.
getType
())){
PluginFlow
pluginFlow
=
(
PluginFlow
)
pluginNode
;
//TODO 这段逻辑我不确定需要和明雷对接
pluginFlow
.
getConfig
().
setFlowCron
(
flow
.
getFlowCron
());
//如果是内嵌工作流先保存工作流信息
Flow
innerFlow
=
saveFlow
(
pluginFlow
,
flow
.
getWorkspaceId
(),
true
);
...
...
@@ -1557,5 +1559,5 @@ public class ApiFlowServiceImpl implements ApiFlowService {
jobTaskMapper
.
startByRunId
(
runId
);
});
}
}
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaTaskJobTask.java
View file @
78dccf3b
...
...
@@ -56,6 +56,7 @@ public class JavaTaskJobTask implements TimerTask {
communicationParam
.
setBody
(
javaTask
.
getParam
());
request
.
setParam
(
communicationParam
);
request
.
setExtension
(
logId
+
""
);
request
.
setJobName
(
javaTask
.
getTaskName
());
JobTaskRunLogWithBLOBs
log
=
new
JobTaskRunLogWithBLOBs
();
log
.
setLogId
(
logId
);
...
...
byit-myth-executor/myth-executor-server/src/main/java/com/byit/process/MythJobProcess.java
View file @
78dccf3b
...
...
@@ -9,10 +9,9 @@ import lombok.SneakyThrows;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.io.*
;
import
java.lang.reflect.Field
;
import
java.nio.channels.FileChannel
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
...
...
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