From 5d7ae8d632db988c679f8e7cfcb1c8f74ad7907f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Mon, 24 Jul 2023 18:19:13 +0800 Subject: [PATCH] fix: file upload --- app/http/controllers/plugins/mysql57/mysql57_controller.go | 7 +------ app/http/controllers/plugins/mysql80/mysql80_controller.go | 7 +------ config/app.go | 2 ++ config/filesystems.go | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/http/controllers/plugins/mysql57/mysql57_controller.go b/app/http/controllers/plugins/mysql57/mysql57_controller.go index aea71f01..074d239f 100644 --- a/app/http/controllers/plugins/mysql57/mysql57_controller.go +++ b/app/http/controllers/plugins/mysql57/mysql57_controller.go @@ -479,10 +479,6 @@ func (c *Mysql57Controller) UploadBackup(ctx http.Context) { return } - // TODO 框架 Bug ? 下面会 panic - controllers.Error(ctx, http.StatusBadRequest, "暂不支持") - return - file, err := ctx.Request().File("file") if err != nil { controllers.Error(ctx, http.StatusBadRequest, "上传文件失败") @@ -495,8 +491,7 @@ func (c *Mysql57Controller) UploadBackup(ctx http.Context) { } name := file.GetClientOriginalName() - extension := file.GetClientOriginalExtension() - _, err = file.Store(backupPath + "/" + name + "." + extension) + _, err = file.StoreAs(backupPath, name) if err != nil { controllers.Error(ctx, http.StatusBadRequest, "上传文件失败") return diff --git a/app/http/controllers/plugins/mysql80/mysql80_controller.go b/app/http/controllers/plugins/mysql80/mysql80_controller.go index 618cc2bf..1954c1a2 100644 --- a/app/http/controllers/plugins/mysql80/mysql80_controller.go +++ b/app/http/controllers/plugins/mysql80/mysql80_controller.go @@ -479,10 +479,6 @@ func (c *Mysql80Controller) UploadBackup(ctx http.Context) { return } - // TODO 框架 Bug ? 下面会 panic - controllers.Error(ctx, http.StatusBadRequest, "暂不支持") - return - file, err := ctx.Request().File("file") if err != nil { controllers.Error(ctx, http.StatusBadRequest, "上传文件失败") @@ -495,8 +491,7 @@ func (c *Mysql80Controller) UploadBackup(ctx http.Context) { } name := file.GetClientOriginalName() - extension := file.GetClientOriginalExtension() - _, err = file.Store(backupPath + "/" + name + "." + extension) + _, err = file.StoreAs(backupPath, name) if err != nil { controllers.Error(ctx, http.StatusBadRequest, "上传文件失败") return diff --git a/config/app.go b/config/app.go index 3ba44ba5..7cbe5bbe 100644 --- a/config/app.go +++ b/config/app.go @@ -9,6 +9,7 @@ import ( "github.com/goravel/framework/database" "github.com/goravel/framework/event" "github.com/goravel/framework/facades" + "github.com/goravel/framework/filesystem" "github.com/goravel/framework/hash" "github.com/goravel/framework/http" "github.com/goravel/framework/log" @@ -77,6 +78,7 @@ func init() { &auth.ServiceProvider{}, &hash.ServiceProvider{}, &crypt.ServiceProvider{}, + &filesystem.ServiceProvider{}, &validation.ServiceProvider{}, &providers.AppServiceProvider{}, &providers.AuthServiceProvider{}, diff --git a/config/filesystems.go b/config/filesystems.go index 97d397ff..8e974dd2 100644 --- a/config/filesystems.go +++ b/config/filesystems.go @@ -24,7 +24,7 @@ func init() { "disks": map[string]any{ "local": map[string]any{ "driver": "local", - "root": "storage/app", + "root": "/", "url": "http://localhost/", }, },