From 8b8359b08f81dcecfe54c821b28c1eef817643ac Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sun, 22 Aug 2021 18:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtask.sh=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/task.sh                  | 12 ++++++------
 src/pages/crontab/logModal.tsx |  7 ++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/shell/task.sh b/shell/task.sh
index 36b123da..d08f4b96 100755
--- a/shell/task.sh
+++ b/shell/task.sh
@@ -93,7 +93,7 @@ run_normal() {
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    eval echo -e "## 开始执行... $begin_time\n" $cmd
+    eval echo -e "\#\# 开始执行... $begin_time\n" $cmd
     eval cat $task_error_log_path $cmd
 
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -105,7 +105,7 @@ run_normal() {
     [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    eval echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" $cmd
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
@@ -129,7 +129,7 @@ run_concurrent() {
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    eval echo -e "## 开始执行... $begin_time\n" $cmd
+    eval echo -e "\#\# 开始执行... $begin_time\n" $cmd
     eval cat $task_error_log_path $cmd
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
     eval . $file_task_before $cmd 2>&1
@@ -154,7 +154,7 @@ run_concurrent() {
     [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    eval echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" $cmd
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 运行其他命令
@@ -169,7 +169,7 @@ run_else() {
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
-    eval echo -e "## 开始执行... $begin_time\n" $cmd
+    eval echo -e "\#\# 开始执行... $begin_time\n" $cmd
     eval cat $task_error_log_path $cmd
 
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -181,7 +181,7 @@ run_else() {
     [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
-    eval echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" $cmd
+    eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
 }
 
 ## 命令检测
diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx
index 9ed12e03..ef5a0c29 100644
--- a/src/pages/crontab/logModal.tsx
+++ b/src/pages/crontab/logModal.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Modal, message, Input, Form, Statistic } from 'antd';
+import { Modal, message, Input, Form, Statistic, Button } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import {
@@ -118,6 +118,11 @@ const CronLogModal = ({
       forceRender
       onOk={() => cancel()}
       onCancel={() => cancel()}
+      footer={[
+        <Button type="primary" onClick={() => cancel()}>
+          知道了
+        </Button>,
+      ]}
     >
       {!loading && value && (
         <pre