From a9bf419a2fceca3cc8ab77c819c16c81dd9533ed Mon Sep 17 00:00:00 2001
From: lgb <353856593@qq.com>
Date: Thu, 1 Aug 2024 10:56:55 +0800
Subject: [PATCH] backup show stdout and stderr

---
 app/Repositories/ToolRepository.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Repositories/ToolRepository.php b/app/Repositories/ToolRepository.php
index 69de55ba..4f339c0b 100644
--- a/app/Repositories/ToolRepository.php
+++ b/app/Repositories/ToolRepository.php
@@ -39,7 +39,7 @@ class ToolRepository extends BaseRepository
                 $command .= " --exclude=$dirName/$item";
             }
             $command .= sprintf(
-                ' -czf %s -C %s %s',
+                ' -czf %s -C %s %s 2>&1',
                 $filename, dirname($webRoot), $dirName
             );
             $result = exec($command, $output, $result_code);
@@ -90,7 +90,7 @@ class ToolRepository extends BaseRepository
         $config = config("database.connections.$connectionName");
         $filename = sprintf('%s/%s.database.%s.sql', sys_get_temp_dir(), basename(base_path()), date('Ymd.His'));
         $command = sprintf(
-            'mysqldump --user=%s --password=%s --host=%s --port=%s --single-transaction --no-create-db %s >> %s',
+            'mysqldump --user=%s --password=%s --host=%s --port=%s --single-transaction --no-create-db %s >> %s 2>&1',
             $config['username'], $config['password'], $config['host'], $config['port'], $config['database'], $filename,
         );
         $result = exec($command, $output, $result_code);
@@ -118,7 +118,7 @@ class ToolRepository extends BaseRepository
         if (command_exists('tar') && ($method === 'tar' || $method === null)) {
             $filename = $baseFilename . ".tar.gz";
             $command = sprintf(
-                'tar -czf %s -C %s %s -C %s %s',
+                'tar -czf %s -C %s %s -C %s %s 2>&1',
                 $filename,
                 dirname($backupWeb['filename']), basename($backupWeb['filename']),
                 dirname($backupDatabase['filename']), basename($backupDatabase['filename'])