diff --git a/pkg/cluster/routes/routes.go b/pkg/cluster/routes/routes.go index 47dc870..535db9a 100644 --- a/pkg/cluster/routes/routes.go +++ b/pkg/cluster/routes/routes.go @@ -190,8 +190,7 @@ func SlaveFileListRoute(srcPath string, recursive bool) string { query := url.Values{} query.Set("recursive", strconv.FormatBool(recursive)) query.Set("path", srcPath) - route, _ := url.Parse(constants.APIPrefixSlave + fmt.Sprintf("%s?%s", base, query.Encode())) - return route.String() + return fmt.Sprintf("%s?%s", base, query.Encode()) } func SlaveThumbUrl(base *url.URL, srcPath, ext string) *url.URL { diff --git a/pkg/filemanager/driver/remote/client.go b/pkg/filemanager/driver/remote/client.go index 7cf94c4..2c8e6b4 100644 --- a/pkg/filemanager/driver/remote/client.go +++ b/pkg/filemanager/driver/remote/client.go @@ -245,7 +245,7 @@ func (c *remoteClient) List(ctx context.Context, path string, recursive bool) ([ } if resp.Code != 0 { - return nil, fmt.Errorf(resp.Error) + return nil, serializer.NewErrorFromResponse(resp) } var objects []fs.PhysicalObject diff --git a/pkg/filemanager/manager/recycle.go b/pkg/filemanager/manager/recycle.go index 6301486..1024a6c 100644 --- a/pkg/filemanager/manager/recycle.go +++ b/pkg/filemanager/manager/recycle.go @@ -225,10 +225,12 @@ func (m *manager) RecycleEntities(ctx context.Context, force bool, entityIDs ... }), func(entity fs.Entity, index int) string { return entity.Source() }) - res, err := d.Delete(ctx, toBeDeletedSrc...) - if err != nil { - for _, src := range res { - ae.Add(strconv.Itoa(mapSrcToId[src]), err) + if len(toBeDeletedSrc) > 0 { + res, err := d.Delete(ctx, toBeDeletedSrc...) + if err != nil { + for _, src := range res { + ae.Add(strconv.Itoa(mapSrcToId[src]), err) + } } } diff --git a/routers/router.go b/routers/router.go index f117b8c..953c1e5 100644 --- a/routers/router.go +++ b/routers/router.go @@ -129,9 +129,6 @@ func initSlaveRouter(dep dependency.Dep) *gin.Engine { // v4.POST("ping/aria2", controllers.AdminTestAria2) initSlaveFileRouter(v4) - // 列出文件 - v4.POST("list", controllers.SlaveList) - // 离线下载 download := v4.Group("download") { diff --git a/service/explorer/slave.go b/service/explorer/slave.go index 67fafc7..dc35683 100644 --- a/service/explorer/slave.go +++ b/service/explorer/slave.go @@ -248,8 +248,8 @@ func (service *SlaveDeleteFileService) Delete(c *gin.Context) ([]string, error) type ( SlaveListParamCtx struct{} SlaveListService struct { - Path string `uri:"path" binding:"required"` - Recursive bool `uri:"recursive"` + Path string `form:"path" binding:"required"` + Recursive bool `form:"recursive"` } )