diff --git a/back/services/cron.ts b/back/services/cron.ts index 8ce2774f..8471df21 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -420,7 +420,7 @@ export default class CronService { ); cp.stderr.on('data', (data) => { if (logFileExist) { - fs.appendFileSync(`${absolutePath}`, `${data}`); + fs.appendFileSync(`${absolutePath}`, `${data.toString()}`); } }); cp.on('error', (err) => { diff --git a/shell/task.sh b/shell/task.sh index 11001d46..9e523980 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -156,7 +156,7 @@ handle_task_after() { local end_timestamp=$(date "+%s") local diff_time=$(($end_timestamp - $begin_timestamp)) [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time" - eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd + eval echo -e "\\\n\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd } ## 正常运行单个脚本,$1:传入参数 @@ -284,7 +284,9 @@ run_else() { fi shift - eval $timeoutCmd $which_program "$file_param" "$@" $cmd + + local params=$(echo "$@" | sed 's/ /\" \"/g') + eval $timeoutCmd $which_program $file_param \"$params\" $cmd handle_task_after "$@" }