From 9f3181b8f3b497edb131b8c8b4a1c104d50660db Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:30:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A7=A3=E5=8E=8B=EF=BC=8C=E4=BF=9D=E7=95=99=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20(#5509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/5474
---
 backend/utils/files/file_op.go                | 22 +++++--------------
 frontend/src/components/log-file/index.vue    |  5 ++++-
 .../src/views/website/runtime/php/index.vue   |  4 +++-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/backend/utils/files/file_op.go b/backend/utils/files/file_op.go
index 236465a1d..913a65d37 100644
--- a/backend/utils/files/file_op.go
+++ b/backend/utils/files/file_op.go
@@ -611,25 +611,15 @@ func (f FileOp) decompressWithSDK(srcFile string, dst string, cType CompressType
 }
 
 func (f FileOp) Decompress(srcFile string, dst string, cType CompressType, secret string) error {
-	if err := f.decompressWithSDK(srcFile, dst, cType); err != nil {
-		if cType == Tar || cType == Zip || cType == TarGz {
-			if secret != "" {
-				shellArchiver, err := NewShellArchiver(TarGz)
-				if err != nil {
-					return err
-				}
-				return shellArchiver.Extract(srcFile, dst, secret)
-			} else {
-				shellArchiver, err := NewShellArchiver(cType)
-				if err != nil {
-					return err
-				}
-				return shellArchiver.Extract(srcFile, dst, secret)
+	if cType == Tar || cType == Zip || cType == TarGz {
+		shellArchiver, err := NewShellArchiver(cType)
+		if err == nil {
+			if err = shellArchiver.Extract(srcFile, dst, secret); err == nil {
+				return nil
 			}
 		}
-		return err
 	}
-	return nil
+	return f.decompressWithSDK(srcFile, dst, cType)
 }
 
 func ZipFile(files []archiver.File, dst afero.File) error {
diff --git a/frontend/src/components/log-file/index.vue b/frontend/src/components/log-file/index.vue
index c95d7c3f2..ae927e4cd 100644
--- a/frontend/src/components/log-file/index.vue
+++ b/frontend/src/components/log-file/index.vue
@@ -119,6 +119,9 @@ const getContent = (pre: boolean) => {
     readReq.id = props.config.id;
     readReq.type = props.config.type;
     readReq.name = props.config.name;
+    if (readReq.page < 1) {
+        readReq.page = 1;
+    }
     ReadByLine(readReq).then((res) => {
         if (!end.value && res.data.end) {
             lastContent.value = content.value;
@@ -178,7 +181,7 @@ const changeTail = (fromOutSide: boolean) => {
     if (tailLog.value) {
         timer = setInterval(() => {
             getContent(false);
-        }, 1000 * 2);
+        }, 1000 * 3);
     } else {
         onCloseLog();
     }
diff --git a/frontend/src/views/website/runtime/php/index.vue b/frontend/src/views/website/runtime/php/index.vue
index d1530f341..98ed307cd 100644
--- a/frontend/src/views/website/runtime/php/index.vue
+++ b/frontend/src/views/website/runtime/php/index.vue
@@ -72,7 +72,9 @@
                     </el-table-column>
                     <el-table-column :label="$t('website.log')" prop="">
                         <template #default="{ row }">
-                            <el-button @click="openLog(row)" link type="primary">{{ $t('website.check') }}</el-button>
+                            <el-button @click="openLog(row)" link type="primary" :disabled="row.resource == 'local'">
+                                {{ $t('website.check') }}
+                            </el-button>
                         </template>
                     </el-table-column>
                     <el-table-column