public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

调整log代码，兼容zap扩展支持fields

Browse Source
This commit is contained in:
linwenxiang
2021-03-05 15:13:36 +08:00
parent 39dd1ee6f8
commit 75711922b4
47 changed files with 267 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/dto/sys_category.go
+8 -8
View File
@@ -2,11 +2,11 @@ package dto
import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/apis"
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
)
type SysCategorySearch struct {
@@ -21,10 +21,10 @@ func (m *SysCategorySearch) GetNeedSearch() interface{} {
}
func (m *SysCategorySearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -49,15 +49,15 @@ type SysCategoryControl struct {
}
func (s *SysCategoryControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -93,4 +93,4 @@ func (s *SysCategoryById) Generate() dto.Control {
func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) {
return &models.SysCategory{}, nil
}
}
app/admin/service/dto/sys_config.go
+11 -12
View File
@@ -4,11 +4,10 @@ import (
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/apis"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
)
// SysConfigSearch 列表或者搜索使用结构体
@@ -25,10 +24,10 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} {
// Bind 映射上下文中的结构体数据
func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -45,20 +44,20 @@ type SysConfigControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysConfigControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
@@ -97,19 +96,19 @@ func (s *SysConfigById) GetId() interface{} {
}
func (s *SysConfigById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
return &system.SysConfig{}, nil
}
}
app/admin/service/dto/sys_content.go
+7 -7
View File
@@ -2,11 +2,11 @@ package dto
import (
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/apis"
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
)
type SysContentSearch struct {
@@ -18,10 +18,10 @@ func (m *SysContentSearch) GetNeedSearch() interface{} {
}
func (m *SysContentSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -43,15 +43,15 @@ type SysContentControl struct {
}
func (s *SysContentControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_dept.go
+12 -11
View File
@@ -2,12 +2,13 @@ package dto
import (
"encoding/json"
"go-admin/common/apis"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
"go-admin/tools"
)
// SysConfigSearch 列表或者搜索使用结构体
@@ -30,10 +31,10 @@ func (m *SysDeptSearch) GetNeedSearch() interface{} {
// Bind 映射上下文中的结构体数据
func (m *SysDeptSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -53,20 +54,20 @@ type SysDeptControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysDeptControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
@@ -108,15 +109,15 @@ func (s *SysDeptById) GetId() interface{} {
}
func (s *SysDeptById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_dict_data.go
+8 -8
View File
@@ -1,14 +1,14 @@
package dto
import (
"github.com/gin-gonic/gin"
"go-admin/common/apis"
"net/http"
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/gin-gonic/gin"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
)
type SysDictDataSearch struct {
@@ -25,10 +25,10 @@ func (m *SysDictDataSearch) GetNeedSearch() interface{} {
}
func (m *SysDictDataSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -53,15 +53,15 @@ type SysDictDataControl struct {
}
func (s *SysDictDataControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_dict_type.go
+7 -8
View File
@@ -2,12 +2,11 @@ package dto
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/models/system"
"go-admin/common/apis"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
)
type SysDictTypeSearch struct {
@@ -23,10 +22,10 @@ func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
}
func (m *SysDictTypeSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -49,15 +48,15 @@ type SysDictTypeControl struct {
}
func (s *SysDictTypeControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_file_dir.go
+9 -10
View File
@@ -1,13 +1,12 @@
package dto
import (
log "github.com/go-admin-team/go-admin-core/logger"
"github.com/gin-gonic/gin"
"go-admin/common/apis"
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
"github.com/gin-gonic/gin"
)
type SysFileDirSearch struct {
@@ -25,10 +24,10 @@ func (m *SysFileDirSearch) GetNeedSearch() interface{} {
}
func (m *SysFileDirSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -49,15 +48,15 @@ type SysFileDirControl struct {
}
func (s *SysFileDirControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -97,4 +96,4 @@ func (s *SysFileDirById) Generate() dto.Control {
func (s *SysFileDirById) GenerateM() (common.ActiveRecord, error) {
return &models.SysFileDir{}, nil
}
}
app/admin/service/dto/sys_job.go
+3 -2
View File
@@ -2,8 +2,8 @@ package dto
import (
"github.com/gin-gonic/gin"
"go-admin/common/apis"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
@@ -24,9 +24,10 @@ func (m *SysJobSearch) GetNeedSearch() interface{} {
}
func (m *SysJobSearch) Bind(ctx *gin.Context) error {
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", err)
log.Errorf("Bind error: %s", err)
}
return err
}
app/admin/service/dto/sys_login_log.go
+13 -13
View File
@@ -1,14 +1,14 @@
package dto
import (
"go-admin/common/apis"
"time"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
"time"
)
type SysLoginLogSearch struct {
@@ -24,10 +24,10 @@ func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
}
func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -47,15 +47,15 @@ type SysLoginLogControl struct {
}
func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -90,15 +90,15 @@ func (s *SysLoginLogById) GetId() interface{} {
}
func (s *SysLoginLogById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(&s.Ids)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -110,4 +110,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById {
func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) {
return &system.SysLoginLog{}, nil
}
}
app/admin/service/dto/sys_menu.go
+12 -11
View File
@@ -2,12 +2,13 @@ package dto
import (
"encoding/json"
"go-admin/common/apis"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
"go-admin/tools"
)
// SysMenuSearch 列表或者搜索使用结构体
@@ -29,10 +30,10 @@ func (m *SysMenuSearch) GetNeedSearch() interface{} {
// Bind 映射上下文中的结构体数据
func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -59,20 +60,20 @@ type SysMenuControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysMenuControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
@@ -121,15 +122,15 @@ func (s *SysMenuById) GetId() interface{} {
}
func (s *SysMenuById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_opera_log.go
+13 -13
View File
@@ -1,14 +1,14 @@
package dto
import (
"go-admin/common/apis"
"time"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/tools"
"time"
)
type SysOperaLogSearch struct {
@@ -26,10 +26,10 @@ func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
}
func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -57,15 +57,15 @@ type SysOperaLogControl struct {
}
func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -112,19 +112,19 @@ func (s *SysOperaLogById) GetId() interface{} {
}
func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(&s.Ids)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysOperaLogById) SetUpdateBy(id int) {
}
}
app/admin/service/dto/sys_post.go
+12 -11
View File
@@ -2,12 +2,13 @@ package dto
import (
"encoding/json"
"go-admin/common/apis"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
"go-admin/tools"
)
// SysPostSearch 列表或者搜索使用结构体
@@ -27,10 +28,10 @@ func (m *SysPostSearch) GetNeedSearch() interface{} {
// Bind 映射上下文中的结构体数据
func (m *SysPostSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -47,20 +48,20 @@ type SysPostControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysPostControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
@@ -99,15 +100,15 @@ func (s *SysPostById) GetId() interface{} {
}
func (s *SysPostById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_role.go
+9 -8
View File
@@ -2,12 +2,13 @@ package dto
import (
"encoding/json"
"go-admin/common/apis"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
"go-admin/tools"
)
// SysRoleSearch 列表或者搜索使用结构体
@@ -31,10 +32,10 @@ func (m *SysRoleSearch) GetNeedSearch() interface{} {
// Bind 映射上下文中的结构体数据
func (m *SysRoleSearch) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -55,20 +56,20 @@ type SysRoleControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysRoleControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
err = ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
app/admin/service/dto/sys_setting.go
+10 -9
View File
@@ -2,10 +2,11 @@ package dto
import (
"encoding/json"
"go-admin/common/apis"
"github.com/gin-gonic/gin"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/app/admin/models"
"go-admin/tools"
)
// SysConfigControl 增、改使用的结构体
@@ -17,23 +18,23 @@ type SysSettingControl struct {
// Bind 映射上下文中的结构体数据
func (s *SysSettingControl) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(s)
if err != nil {
log.Errorf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Errorf("ShouldBind error: %s", err.Error())
return err
}
err = ctx.ShouldBindUri(s)
if err != nil {
log.Errorf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Errorf("ShouldBindUri error: %s", err.Error())
return err
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
@@ -69,15 +70,15 @@ func (s *SysSettingById) GetId() interface{} {
}
func (s *SysSettingById) Bind(ctx *gin.Context) error {
msgID := tools.GenerateMsgIDFromContext(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
app/admin/service/dto/sys_user.go
+4 -4
View File
@@ -2,11 +2,11 @@ package dto
import (
"github.com/gin-gonic/gin"
"go-admin/common/apis"
"go-admin/app/admin/models/system"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/pkg/logger"
)
type SysUserSearch struct {
@@ -28,7 +28,7 @@ func (m *SysUserSearch) GetNeedSearch() interface{} {
}
func (m *SysUserSearch) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
@@ -58,10 +58,10 @@ type SysUserControl struct {
}
func (s *SysUserControl) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
//err := ctx.ShouldBindUri(s)
//if err != nil {
// log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
// log.Debugf("ShouldBindUri error: %s", err.Error())
// return err
//}
err := ctx.ShouldBind(s)
app/admin/service/dto/syschinaareadata.go
+4 -4
View File
@@ -1,6 +1,7 @@
package dto
import (
"go-admin/common/apis"
"time"
"github.com/gin-gonic/gin"
@@ -8,7 +9,6 @@ import (
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
"go-admin/pkg/logger"
)
type SysChinaAreaDataSearch struct {
@@ -22,7 +22,7 @@ func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
}
func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
@@ -40,7 +40,7 @@ type SysChinaAreaDataControl struct {
}
func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -83,7 +83,7 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
}
func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
app/admin/service/dto/wf_classify.go
+6 -8
View File
@@ -2,9 +2,7 @@ package dto
import (
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
//"gorm.io/gorm"
"go-admin/common/apis"
"go-admin/app/admin/models"
"go-admin/common/dto"
@@ -21,7 +19,7 @@ func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
}
func (m *WfProcessClassifySearch) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
@@ -36,7 +34,7 @@ type WfProcessClassifyControl struct {
}
func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -44,7 +42,7 @@ func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %#v", err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
@@ -75,7 +73,7 @@ func (s *WfProcessClassifyById) GetId() interface{} {
}
func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
log := logger.GetRequestLogger(ctx)
log := apis.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -83,7 +81,7 @@ func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %#v", err.Error())
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}