Commit c1733714 by huangfusuper

解决参数不替换的BUG

parent e1a1ebb6
...@@ -5,6 +5,7 @@ import cn.hutool.core.io.IoUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.io.file.FileWriter;
import cn.hutool.core.util.ZipUtil; import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.byit.dto.executor.RunParamWrapped;
import com.byit.dto.executor.ScriptDto; import com.byit.dto.executor.ScriptDto;
import com.byit.dto.executor.ScriptParamAndPlaceholderDto; import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
import com.byit.enums.SourceType; import com.byit.enums.SourceType;
...@@ -53,7 +54,8 @@ public class CommandAndScriptProcessingMachine implements ProcessingMachine { ...@@ -53,7 +54,8 @@ public class CommandAndScriptProcessingMachine implements ProcessingMachine {
String param = scriptDto.getParam(); String param = scriptDto.getParam();
ScriptParamAndPlaceholderDto paramAndPlaceholderDto = null; ScriptParamAndPlaceholderDto paramAndPlaceholderDto = null;
if (StringUtils.isNotBlank(param)) { if (StringUtils.isNotBlank(param)) {
paramAndPlaceholderDto = JSON.parseObject(param, ScriptParamAndPlaceholderDto.class); RunParamWrapped runParamWrapped = JSON.parseObject(param, RunParamWrapped.class);
paramAndPlaceholderDto = JSON.parseObject(runParamWrapped.getPrivateParam(), ScriptParamAndPlaceholderDto.class);
} }
//判断是否需要拉取文件服务器的文件,包含biz_file的条件下会对这个字段进行替换 //判断是否需要拉取文件服务器的文件,包含biz_file的条件下会对这个字段进行替换
if (StringUtils.isNoneBlank(scriptDto.getRemotePath())) { if (StringUtils.isNoneBlank(scriptDto.getRemotePath())) {
......
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