Merge branch '1.3.x' into github-dev

This commit is contained in:
wenjianzhang committed 2021-05-08 17:21:35 +08:00
commit 1c046d9ddd
5 files changed
+16 -15

No files matched your search

+3 -4
View File
@@ -1,9 +1,10 @@
package apis
import (
"net/http"
"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/pkg"
@@ -19,13 +20,11 @@ type Api struct {
func (e Api) SetContext(c *gin.Context) {
e.Context = c
}
// GetLogger 获取上下文提供的日志
func (e Api) GetLogger() *logger.Logger {
e.Logger = api.GetRequestLogger(e.Context)
return e.Logger
return api.GetRequestLogger(e.Context)
}
func (e Api) Bind(d interface{}, bindings ...binding.Binding) error {
+1 -1
View File
@@ -22,7 +22,7 @@ func (s *ObjectById) Bind(ctx *gin.Context) error {
return err
}
if ctx.Request.Method == http.MethodDelete {
err = ctx.ShouldBind(&s.Ids)
err = ctx.ShouldBind(&s)
if err != nil {
log.Warnf("ShouldBind error: %s", err.Error())
return err