diff --git a/controllers/app_controller.go b/controllers/app_controller.go index d3e7144..d69af6f 100644 --- a/controllers/app_controller.go +++ b/controllers/app_controller.go @@ -13,7 +13,6 @@ func GetApps(c *gin.Context) { var ( tokenInfo *model.TokenInfo ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) if tokenInfo = checkToken(c); tokenInfo == nil { return } @@ -39,8 +38,7 @@ func AddApp(c *gin.Context) { err error param = &AddAppParam{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, Desc: err.Error(), @@ -69,8 +67,7 @@ func DelApp(c *gin.Context) { AppID int `json:"app_id" form:"app_id" binding:"required"` }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, Desc: err.Error(), diff --git a/controllers/print_controller.go b/controllers/print_controller.go index be088de..e375857 100644 --- a/controllers/print_controller.go +++ b/controllers/print_controller.go @@ -1,7 +1,6 @@ package controllers import ( - "git.rosy.net.cn/jx-print/globals" "git.rosy.net.cn/jx-print/model" "git.rosy.net.cn/jx-print/services" "git.rosy.net.cn/jx-print/utils" @@ -19,8 +18,7 @@ func AddPrinters(c *gin.Context) { }{} printInfos []*model.PrintInfo ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } @@ -55,8 +53,7 @@ func GetPrinters(c *gin.Context) { PageSize int `json:"page_size" form:"page_size" binding:"required"` }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } @@ -83,8 +80,7 @@ func DelPrinters(c *gin.Context) { }{} printNos []string ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } @@ -118,8 +114,7 @@ func UpdatePrinter(c *gin.Context) { Volume int `json:"volume" form:"volume"` //音量大小 }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } @@ -147,8 +142,7 @@ func TestPrint(c *gin.Context) { Content string `json:"content" form:"content"` //打印内容 }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } @@ -179,8 +173,7 @@ func GetPrintMessages(c *gin.Context) { PageSize int `json:"page_size" form:"page_size"` }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(¶m); err != nil { + if err = c.ShouldBind(¶m); err != nil { buildErrJson(c, err) return } diff --git a/controllers/user_controller.go b/controllers/user_controller.go index 5870702..ea4a2f1 100644 --- a/controllers/user_controller.go +++ b/controllers/user_controller.go @@ -12,7 +12,6 @@ import ( //刷新验证码 POST func RefreshCode(c *gin.Context) { - globals.SugarLogger.Debugf("RefreshCode, ip: %v", c.ClientIP()) utils.Captcha(c, 4) } @@ -28,7 +27,6 @@ func RegisterUser(c *gin.Context) { err error user = &UserParam{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, "", c.ClientIP()) if err = c.ShouldBind(&user); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, @@ -60,7 +58,6 @@ func Login(c *gin.Context) { err error user = &UserParam{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, "", c.ClientIP()) if err = c.ShouldBind(&user); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, @@ -91,7 +88,6 @@ func GetTokenInfo(c *gin.Context) { var ( tokenInfo *model.TokenInfo ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) if tokenInfo = checkToken(c); tokenInfo == nil { return } @@ -108,7 +104,6 @@ func Logout(c *gin.Context) { var ( tokenInfo *model.TokenInfo ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) if tokenInfo = checkToken(c); tokenInfo == nil { return } @@ -129,8 +124,7 @@ func UpdateUser(c *gin.Context) { Payload string `json:"payload" form:"payload" binding:"required"` //user 的json格式数据 }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(&user); err != nil { + if err = c.ShouldBind(&user); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, Desc: err.Error(), @@ -152,7 +146,6 @@ func UpdateUser(c *gin.Context) { //获取菜单,文档 GET func GetMenus(c *gin.Context) { - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) if !callFunc(c, func() (retVal interface{}, errCode string, err error) { retVal, err = services.GetMenus(c) return retVal, "", err @@ -170,8 +163,7 @@ func GetMenuDetail(c *gin.Context) { ID int `json:"id" form:"id" binding:"required"` //菜单的ID }{} ) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP()) - if err = c.Bind(&user); err != nil { + if err = c.ShouldBind(&user); err != nil { c.JSON(http.StatusOK, &CallBack{ Code: model.ErrCodeNormal, Desc: err.Error(), diff --git a/main.go b/main.go index 52cd57e..25899cb 100644 --- a/main.go +++ b/main.go @@ -46,7 +46,7 @@ func main() { func middleware() gin.HandlerFunc { return func(c *gin.Context) { data, _ := ioutil.ReadAll(c.Request.Body) - globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, string(data), c.ClientIP()) + globals.SugarLogger.Debugf("Begin API :%s, params: %v, ip: %s, method %s", c.Request.URL, string(data), c.ClientIP(), c.Request.Method) c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data)) } }