diff --git a/.gitignore b/.gitignore index b6cf066..c54aa5c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,5 @@ package.json package-lock.json webpack.config.js .svn - -go_build_main_go.exe \ No newline at end of file +/public/uploads/temp +go_build_main_go.exe diff --git a/app/controller/upload.go b/app/controller/upload.go index 2558063..c1fbc00 100644 --- a/app/controller/upload.go +++ b/app/controller/upload.go @@ -9,6 +9,7 @@ package controller import ( "github.com/gin-gonic/gin" "gitlab.52pay.top/go/easygoadmin/app/service" + "gitlab.52pay.top/go/easygoadmin/library/cfg" "gitlab.52pay.top/go/easygoadmin/utils" "gitlab.52pay.top/go/easygoadmin/utils/common" "net/http" @@ -20,6 +21,15 @@ var Upload = new(uploadCtl) type uploadCtl struct{} func (u *uploadCtl) UploadImage(ctx *gin.Context) { + config := cfg.Instance() + if config.EasyGoAdmin.Storage == "mongodb" { + u.UploadImage2Db(ctx) + } else { + u.UploadImage2Local(ctx) + } +} + +func (u *uploadCtl) UploadImage2Local(ctx *gin.Context) { // 调用上传方法 result, err := service.Upload.UploadImage(ctx) if err != nil { diff --git a/app/widget/upload.go b/app/widget/upload.go index 4b974cd..65fccb0 100644 --- a/app/widget/upload.go +++ b/app/widget/upload.go @@ -118,7 +118,7 @@ layui.use(['upload','croppers'],function(){ ,saveH:` + cropArr[1] + ` ,mark:` + cropRateStr + ` //选取比例 ,area:['750px','500px'] //弹窗宽度 - ,url: "/upload/uploadImage2Db/` + name + `" + ,url: "/upload/uploadImage/` + name + `" ,done: function(url){ //上传完毕回调 $('#` + name + `').val(url); diff --git a/library/cfg/cfg.go b/library/cfg/cfg.go index ca70eb1..8b5222d 100644 --- a/library/cfg/cfg.go +++ b/library/cfg/cfg.go @@ -84,4 +84,5 @@ type easygoadmin struct { Debug bool Image string Uploads string + Storage string } diff --git a/router/router.go b/router/router.go index f19fbd3..3e0f6f4 100644 --- a/router/router.go +++ b/router/router.go @@ -49,15 +49,16 @@ func init() { // 设置静态资源路由 router.Static("/resource", "./public/resource") + router.Static("/temp", "./public/uploads/temp") router.StaticFile("/favicon.ico", "./public/resource/images/favicon.ico") /* 文件上传 */ upload := router.Group("upload") { // 上传图片 - upload.POST("/uploadImage", controller.Upload.UploadImage) + upload.POST("/uploadImage/:typ", controller.Upload.UploadImage) // 上传图片,存到mongoDb - upload.POST("/uploadImage2Db/:typ", controller.Upload.UploadImage2Db) + //upload.POST("/uploadImage2Db/:typ", controller.Upload.UploadImage2Db) } /* mongodb图片 */