From b6e1e04ce0b8b374fb7b2c9c73fc2ce9c0003829 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Wed, 11 Mar 2020 09:34:29 +0800 Subject: [PATCH] Fix: panic while decompress files / Cannot edit policy --- assets | 2 +- models/policy.go | 2 +- pkg/task/decompress.go | 1 - routers/controllers/admin.go | 4 +++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/assets b/assets index 69b7889..d460742 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 69b78898d3e507ac4307cde2e173c11a2e912cb8 +Subproject commit d46074216363ac62a66a02284f2a791b79a392cd diff --git a/models/policy.go b/models/policy.go index ea04035..c92d2dc 100644 --- a/models/policy.go +++ b/models/policy.go @@ -222,7 +222,7 @@ func (policy *Policy) GetUploadURL() string { case "cos": return policy.Server case "upyun": - return "http://v0.api.upyun.com/" + policy.BucketName + return "https://v0.api.upyun.com/" + policy.BucketName default: controller, _ = url.Parse("") } diff --git a/pkg/task/decompress.go b/pkg/task/decompress.go index 66ab864..ab98fde 100644 --- a/pkg/task/decompress.go +++ b/pkg/task/decompress.go @@ -78,7 +78,6 @@ func (job *DecompressTask) Do() { job.SetErrorMsg("无法创建文件系统", err) return } - defer fs.Recycle() job.TaskModel.SetProgress(DecompressingProgress) err = fs.Decompress(context.Background(), job.TaskProps.Src, job.TaskProps.Dst) diff --git a/routers/controllers/admin.go b/routers/controllers/admin.go index 7d94a9f..1b89a7b 100644 --- a/routers/controllers/admin.go +++ b/routers/controllers/admin.go @@ -25,7 +25,9 @@ func AdminSummary(c *gin.Context) { func AdminNews(c *gin.Context) { r := request.HTTPClient{} res := r.Request("GET", "https://forum.cloudreve.org/api/discussions?include=startUser%2ClastUser%2CstartPost%2Ctags&filter%5Bq%5D=%20tag%3Anotice&sort=-startTime&", nil) - io.Copy(c.Writer, res.Response.Body) + if res.Err == nil { + io.Copy(c.Writer, res.Response.Body) + } } // AdminChangeSetting 获取站点设定项