github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: panic while decompress files / Cannot edit policy

pull/247/head
HFO4 2020-03-11 09:34:29 +08:00
parent 45ec4b3f8b
commit b6e1e04ce0
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 69b78898d3e507ac4307cde2e173c11a2e912cb8 Subproject commit d46074216363ac62a66a02284f2a791b79a392cd

2
models/policy.go
View File

@ -222,7 +222,7 @@ func (policy *Policy) GetUploadURL() string {
case "cos": case "cos":
return policy.Server return policy.Server
case "upyun": case "upyun":
return "http://v0.api.upyun.com/" + policy.BucketName return "https://v0.api.upyun.com/" + policy.BucketName
default: default:
controller, _ = url.Parse("") controller, _ = url.Parse("")
} }

1
pkg/task/decompress.go
View File

@ -78,7 +78,6 @@ func (job *DecompressTask) Do() {
job.SetErrorMsg("无法创建文件系统", err) job.SetErrorMsg("无法创建文件系统", err)
return return
} }
defer fs.Recycle()
job.TaskModel.SetProgress(DecompressingProgress) job.TaskModel.SetProgress(DecompressingProgress)
err = fs.Decompress(context.Background(), job.TaskProps.Src, job.TaskProps.Dst) err = fs.Decompress(context.Background(), job.TaskProps.Src, job.TaskProps.Dst)

2
routers/controllers/admin.go
View File

@ -25,8 +25,10 @@ func AdminSummary(c *gin.Context) {
func AdminNews(c *gin.Context) { func AdminNews(c *gin.Context) {
r := request.HTTPClient{} 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) res := r.Request("GET", "https://forum.cloudreve.org/api/discussions?include=startUser%2ClastUser%2CstartPost%2Ctags&filter%5Bq%5D=%20tag%3Anotice&sort=-startTime&", nil)
if res.Err == nil {
io.Copy(c.Writer, res.Response.Body) io.Copy(c.Writer, res.Response.Body)
} }
}
// AdminChangeSetting 获取站点设定项 // AdminChangeSetting 获取站点设定项
func AdminChangeSetting(c *gin.Context) { func AdminChangeSetting(c *gin.Context) {