feat : 修改文件上传

1Panel-dev · Jun 15, 2022 · 374b69a · 374b69a
1 parent d2924c5
commit 374b69a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/pkg/util/podtool/copytopod.go b/pkg/util/podtool/copytopod.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strings"
 )
 
 func (p *PodTool) CopyToContainer(destPath string) error {
@@ -26,18 +25,17 @@ func (p *PodTool) CopyToContainer(destPath string) error {
 	var stderr bytes.Buffer
 	p.ExecConfig.Stderr = &stderr
 	err := p.Exec(Exec)
+	var stdout bytes.Buffer
+	p.ExecConfig.Stdout = &stdout
 	if err != nil {
-		return fmt.Errorf(err.Error(), stderr)
-	}
-	if len(stderr.Bytes()) != 0 {
-		for _, line := range strings.Split(stderr.String(), "\n") {
-			if len(strings.TrimSpace(line)) == 0 {
-				continue
-			}
-			if !strings.Contains(strings.ToLower(line), "removing") {
-				return fmt.Errorf(line)
-			}
+		result := ""
+		if len(stdout.Bytes()) != 0 {
+			result = stdout.String()
 		}
+		if len(stderr.Bytes()) != 0 {
+			result = stderr.String()
+		}
+		return fmt.Errorf(err.Error(), result)
 	}
 	return nil
 }
@@ -77,16 +75,6 @@ func (p *PodTool) CopyToPod(srcPath, destPath string) error {
 		}
 		return fmt.Errorf(err.Error(), result)
 	}
-	if len(stderr.Bytes()) != 0 {
-		for _, line := range strings.Split(stderr.String(), "\n") {
-			if len(strings.TrimSpace(line)) == 0 {
-				continue
-			}
-			if !strings.Contains(strings.ToLower(line), "removing") {
-				return fmt.Errorf(line)
-			}
-		}
-	}
 	return nil
 }
 

diff --git a/web/dashboard/src/business/workloads/pods/podfilebrowser/index.vue b/web/dashboard/src/business/workloads/pods/podfilebrowser/index.vue
@@ -136,7 +136,7 @@
         <div slot="tip" class="el-upload__tip">{{ $t("business.pod.upload_tip") }}</div>
       </el-upload>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="openUpload=false" :disabled="loading">{{ $t("commons.button.cancel") }}</el-button>
+        <el-button @click="handleUploadClose" :disabled="loading">{{ $t("commons.button.cancel") }}</el-button>
         <el-button type="primary" @click="upload" :loading="loading">{{ $t("commons.button.confirm") }}</el-button>
       </span>
     </el-dialog>