From 6222765e20f39afc647d3c27fa791423f17f03aa Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Sat, 8 May 2021 16:50:51 +0800 Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_config.go | 18 ++++++++---------- app/admin/service/dto/sys_config.go | 16 ++++++++-------- app/admin/service/sys_config.go | 4 ++-- app/other/apis/file.go | 13 ++++++------- common/apis/api.go | 25 ++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 30 deletions(-) diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go index f16310d..65feb25 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -1,6 +1,7 @@ package apis import ( + "github.com/gin-gonic/gin/binding" "net/http" "github.com/gin-gonic/gin" @@ -25,9 +26,9 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { log.Error(err) return } - + err = e.Bind(d, binding.Query) //查询列表 - err = d.Bind(c) + //err = d.Bind(c) if err != nil { log.Errorf("参数验证失败, error:%s", err) e.Error(500, err, "参数验证失败") @@ -58,7 +59,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { log.Error(err) return } - err = d.Bind(c) + err = e.Bind(d, binding.Query) if err != nil { log.Errorf("参数验证失败, error:%s", err) e.Error(500, err, "参数验证失败") @@ -98,6 +99,7 @@ func (e SysConfig) GetSysConfig(c *gin.Context) { return } //查看详情 + err = e.Bind(control) err = control.Bind(c) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") @@ -132,7 +134,7 @@ func (e SysConfig) InsertSysConfig(c *gin.Context) { } //新增操作 - err = control.Bind(c) + err = e.Bind(control, binding.JSON) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") log.Errorf("Orm获取失败, error:%s", err) @@ -175,7 +177,7 @@ func (e SysConfig) UpdateSysConfig(c *gin.Context) { } //更新操作 - err = control.Bind(c) + err = e.Bind(control, binding.JSON) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") @@ -216,19 +218,16 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) { } //删除操作 - err = control.Bind(c) + err = e.Bind(control, binding.JSON) if err != nil { log.Errorf("Bind error: %s", err) e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") - log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") return } object, err := control.GenerateM() if err != nil { e.Error(http.StatusInternalServerError, err, "模型生成失败") log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") return } @@ -242,7 +241,6 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) { if err != nil { e.Error(http.StatusUnprocessableEntity, err, "删除失败") log.Errorf("Orm获取失败, error:%s", err) - e.Error(500, err, "Orm获取失败") return } e.OK(object.GetId(), "删除成功") diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index be49845..f5bd85f 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -26,14 +26,14 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} { } // Bind 映射上下文中的结构体数据 -func (m *SysConfigSearch) Bind(ctx *gin.Context) error { - log := api.GetRequestLogger(ctx) - err := ctx.ShouldBind(m) - if err != nil { - log.Debugf("ShouldBind error: %s", err.Error()) - } - return err -} +//func (m *SysConfigSearch) Bind(ctx *gin.Context) error { +// log := api.GetRequestLogger(ctx) +// err := ctx.ShouldBind(m) +// if err != nil { +// log.Debugf("ShouldBind error: %s", err.Error()) +// } +// return err +//} // SysConfigControl 增、改使用的结构体 type SysConfigControl struct { diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 2cf60a1..73e23e4 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -104,7 +104,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e var data system.SysConfig db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + Where(d.Ids).Delete(c) if db.Error != nil { err = db.Error e.Log.Errorf("Service RemoveSysConfig error:%s", err) @@ -129,4 +129,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { } return nil -} \ No newline at end of file +} diff --git a/app/other/apis/file.go b/app/other/apis/file.go index 84fa7e7..76e40e2 100644 --- a/app/other/apis/file.go +++ b/app/other/apis/file.go @@ -30,6 +30,7 @@ type File struct { apis.Api } +// UploadFile 上传图片 // @Summary 上传图片 // @Description 获取JSON // @Tags 公共接口 @@ -40,31 +41,29 @@ type File struct { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/public/uploadFile [post] func (e File) UploadFile(c *gin.Context) { - e.Context = c - + e.SetContext(c) tag, _ := c.GetPostForm("type") - urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host) + urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host) var fileResponse FileResponse if tag == "" { e.Error(500, nil, "缺少标识") - //app.Error(c, 200, errors.New(""), "缺少标识") return } else { switch tag { case "1": // 单图 var done bool - fileResponse, done = e.singleFile(c, fileResponse, urlPerfix) + fileResponse, done = e.singleFile(c, fileResponse, urlPrefix) if done { return } e.OK(fileResponse, "上传成功") return case "2": // 多图 - multipartFile := e.multipleFile(c, urlPerfix) + multipartFile := e.multipleFile(c, urlPrefix) e.OK(multipartFile, "上传成功") return case "3": // base64 - fileResponse = e.baseImg(c, fileResponse, urlPerfix) + fileResponse = e.baseImg(c, fileResponse, urlPrefix) e.OK(fileResponse, "上传成功") } } diff --git a/common/apis/api.go b/common/apis/api.go index c85ef68..055433a 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -2,10 +2,10 @@ package apis import ( "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" "net/http" "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg/response" @@ -19,11 +19,12 @@ type Api struct { func (e Api) SetContext(c *gin.Context) { e.Context = c - e.Logger = api.GetRequestLogger(c) + } // GetLogger 获取上下文提供的日志 func (e Api) GetLogger() *logger.Logger { + e.Logger = api.GetRequestLogger(e.Context) return e.Logger } @@ -33,6 +34,24 @@ func (e Api) Bind(d interface{}, bindings ...binding.Binding) error { switch bindings[i] { case binding.JSON: err = e.Context.ShouldBindWith(d, binding.JSON) + case binding.XML: + err = e.Context.ShouldBindWith(d, binding.XML) + case binding.Form: + err = e.Context.ShouldBindWith(d, binding.Form) + case binding.Query: + err = e.Context.ShouldBindWith(d, binding.Query) + case binding.FormPost: + err = e.Context.ShouldBindWith(d, binding.FormPost) + case binding.FormMultipart: + err = e.Context.ShouldBindWith(d, binding.FormMultipart) + case binding.ProtoBuf: + err = e.Context.ShouldBindWith(d, binding.ProtoBuf) + case binding.MsgPack: + err = e.Context.ShouldBindWith(d, binding.MsgPack) + case binding.YAML: + err = e.Context.ShouldBindWith(d, binding.YAML) + case binding.Header: + err = e.Context.ShouldBindWith(d, binding.Header) default: err = e.Context.ShouldBindUri(d) } @@ -71,4 +90,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, // Custom 兼容函数 func (e Api) Custom(data gin.H) { response.Custum(e.Context, data) -} \ No newline at end of file +}