1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-17 21:08:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决 zip 压缩在某些情况下失败的问题 (#2809)

Browse source
This commit is contained in:
zhengkunwang 2023-11-05 21:43:32 +08:00 • committed by GitHub
parent 9d1757dba6
commit cd5658adab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/utils/files/file_op.go
View file

@ -304,6 +304,14 @@ func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error {
return nil return nil
} }
func (f FileOp) Mv(oldPath, dstPath string) error {
cmdStr := fmt.Sprintf("mv %s %s", oldPath, dstPath)
if err := cmd.ExecCmd(cmdStr); err != nil {
return err
}
return nil
}
func (f FileOp) Copy(src, dst string) error { func (f FileOp) Copy(src, dst string) error {
if src = path.Clean("/" + src); src == "" { if src = path.Clean("/" + src); src == "" {
return os.ErrNotExist return os.ErrNotExist

2
backend/utils/files/zip.go
View file

@ -39,5 +39,5 @@ func (z ZipArchiver) Compress(sourcePaths []string, dstFile string) error {
if err := cmd.ExecCmdWithDir(cmdStr, baseDir); err != nil { if err := cmd.ExecCmdWithDir(cmdStr, baseDir); err != nil {
return err return err
} }
return op.Rename(tmpFile, dstFile) return op.Mv(tmpFile, dstFile)
} }