From c47c8b0f36d5a82b7da2acddcb57e3161258c39d Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:06:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#3171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs https://github.com/1Panel-dev/1Panel/issues/3020 --- backend/app/service/recycle_bin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/app/service/recycle_bin.go b/backend/app/service/recycle_bin.go index 0c58807d0..291ee17b4 100644 --- a/backend/app/service/recycle_bin.go +++ b/backend/app/service/recycle_bin.go @@ -104,7 +104,7 @@ func (r RecycleBinService) Create(create request.RecycleBinCreate) error { } rName := fmt.Sprintf("_1p_%s%s_p_%d_%d", "file", rNamePre, size, deleteTime.Unix()) - return op.Rename(create.SourcePath, path.Join(clashDir, rName)) + return op.Mv(create.SourcePath, path.Join(clashDir, rName)) } func (r RecycleBinService) Reduce(reduce request.RecycleBinReduce) error { @@ -125,7 +125,7 @@ func (r RecycleBinService) Reduce(reduce request.RecycleBinReduce) error { return err } } - return op.Rename(filePath, recycleBinDTO.SourcePath) + return op.Mv(filePath, recycleBinDTO.SourcePath) } func (r RecycleBinService) Clear() error { @@ -140,7 +140,7 @@ func (r RecycleBinService) Clear() error { continue } newDir := path.Join(p.Mountpoint, "1panel_clash") - if err := op.Rename(dir, newDir); err != nil { + if err := op.Mv(dir, newDir); err != nil { return err } go func() {