From 0d23f8a96249a2073a3baaf72c26da164338eef8 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sat, 26 Mar 2022 00:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=8E=B7=E5=8F=96=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/cron.ts | 15 +++++++++++++++
 sample/tool.ts        |  6 +++++-
 shell/task.sh         | 16 ++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/back/services/cron.ts b/back/services/cron.ts
index 4e180843..3c2af6ab 100644
--- a/back/services/cron.ts
+++ b/back/services/cron.ts
@@ -353,6 +353,21 @@ export default class CronService {
       return [];
     }
 
+    if (doc.log_path) {
+      const relativeDir = `${doc.log_path.replace(/\/[^\/]\..*/, '')}`;
+      const dir = `${config.logPath}${relativeDir}`;
+      if (existsSync(dir)) {
+        let files = await promises.readdir(dir);
+        return files
+          .map((x) => ({
+            filename: x,
+            directory: relativeDir,
+            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+          }))
+          .sort((a, b) => b.time - a.time);
+      }
+    }
+
     const [, commandStr, url] = doc.command.split(/ +/);
     let logPath = this.getKey(commandStr);
     const isQlCommand = doc.command.startsWith('ql ');
diff --git a/sample/tool.ts b/sample/tool.ts
index bf3703d2..2adc3067 100644
--- a/sample/tool.ts
+++ b/sample/tool.ts
@@ -14,7 +14,11 @@ const uploadToken = putPolicy.uploadToken(mac);
 const localFile = 'src/version.ts';
 const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
 const formUploader = new qiniu.form_up.FormUploader(config);
-const putExtra = new qiniu.form_up.PutExtra('', '', 'text/plain');
+const putExtra = new qiniu.form_up.PutExtra(
+  '',
+  '',
+  'text/plain; charset=utf-8',
+);
 const key = 'version.ts';
 // 文件上传
 formUploader.putFile(
diff --git a/shell/task.sh b/shell/task.sh
index 4473b42d..00dfae9d 100755
--- a/shell/task.sh
+++ b/shell/task.sh
@@ -89,9 +89,9 @@ run_normal() {
     log_dir_tmp_path="${first_param%%/*}"
     log_dir_tmp_path="${log_dir_tmp_path##*/}"
     [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$log_dir"
 
@@ -151,9 +151,9 @@ run_concurrent() {
     log_dir_tmp_path="${first_param%%/*}"
     log_dir_tmp_path="${log_dir_tmp_path##*/}"
     [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir
 
@@ -213,9 +213,9 @@ run_designated() {
     log_dir_tmp_path="${file_param%%/*}"
     log_dir_tmp_path="${log_dir_tmp_path##*/}"
     [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir
 
@@ -269,9 +269,9 @@ run_else() {
     log_dir_tmp_path="${file_param%%/*}"
     log_dir_tmp_path="${log_dir_tmp_path##*/}"
     [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
+    log_dir="${log_dir_tmp%%.*}"
     log_path="$log_dir/$log_time.log"
-    cmd="&>> $log_path"
+    cmd="&>> $dir_log/$log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir