Commit 78dccf3b by huangfusuper

解决不传递日志节点id的eBUG

parent 423633fa
...@@ -3,6 +3,7 @@ package com.byit.service.impl; ...@@ -3,6 +3,7 @@ package com.byit.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.ConsistentHash;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.byit.dto.StatisticsConditionDto; import com.byit.dto.StatisticsConditionDto;
...@@ -24,6 +25,7 @@ import com.byit.util.IDGenerationStrategy; ...@@ -24,6 +25,7 @@ import com.byit.util.IDGenerationStrategy;
import com.byit.util.lock.RedissLockUtil; import com.byit.util.lock.RedissLockUtil;
import com.byit.utils.ValidationUtil; import com.byit.utils.ValidationUtil;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -35,6 +37,7 @@ import javax.annotation.Resource; ...@@ -35,6 +37,7 @@ import javax.annotation.Resource;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName; import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
...@@ -267,7 +270,6 @@ public class ApiFlowServiceImpl implements ApiFlowService { ...@@ -267,7 +270,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
if (PluginNodeTypeEnum.FLOW.getCode().equals(pluginNode.getType())){ if (PluginNodeTypeEnum.FLOW.getCode().equals(pluginNode.getType())){
PluginFlow pluginFlow = (PluginFlow) pluginNode; PluginFlow pluginFlow = (PluginFlow) pluginNode;
//TODO 这段逻辑我不确定需要和明雷对接
pluginFlow.getConfig().setFlowCron(flow.getFlowCron()); pluginFlow.getConfig().setFlowCron(flow.getFlowCron());
//如果是内嵌工作流先保存工作流信息 //如果是内嵌工作流先保存工作流信息
Flow innerFlow = saveFlow(pluginFlow, flow.getWorkspaceId(), true); Flow innerFlow = saveFlow(pluginFlow, flow.getWorkspaceId(), true);
...@@ -1557,5 +1559,5 @@ public class ApiFlowServiceImpl implements ApiFlowService { ...@@ -1557,5 +1559,5 @@ public class ApiFlowServiceImpl implements ApiFlowService {
jobTaskMapper.startByRunId(runId); jobTaskMapper.startByRunId(runId);
}); });
} }
} }
...@@ -56,6 +56,7 @@ public class JavaTaskJobTask implements TimerTask { ...@@ -56,6 +56,7 @@ public class JavaTaskJobTask implements TimerTask {
communicationParam.setBody(javaTask.getParam()); communicationParam.setBody(javaTask.getParam());
request.setParam(communicationParam); request.setParam(communicationParam);
request.setExtension(logId+"");
request.setJobName(javaTask.getTaskName()); request.setJobName(javaTask.getTaskName());
JobTaskRunLogWithBLOBs log = new JobTaskRunLogWithBLOBs(); JobTaskRunLogWithBLOBs log = new JobTaskRunLogWithBLOBs();
log.setLogId(logId); log.setLogId(logId);
......
...@@ -9,10 +9,9 @@ import lombok.SneakyThrows; ...@@ -9,10 +9,9 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import java.io.File; import java.io.*;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.channels.FileChannel;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
......
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