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 @@
- {{ $t('website.check') }}
+
+ {{ $t('website.check') }}
+