From 8460b3f385434c72e2a420900737979051740919 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Tue, 22 Sep 2020 22:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9action=E5=92=8C=E6=A8=A1?= =?UTF-8?q?=E7=89=88=EF=BC=8C=E4=BD=BF=E7=94=A8log=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=8C=E4=BF=AE=E5=A4=8Djob=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B7=B2=E7=BB=8F=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sysjob/sysjob.go | 4 +- app/admin/middleware/db.go | 8 +-- app/admin/service/dto/sysjob.go | 21 ++++---- common/actions/create.go | 62 ++++++++++++----------- common/actions/delete.go | 84 ++++++++++++++++--------------- common/actions/index.go | 71 +++++++++++++------------- common/actions/permission.go | 52 ++++++++----------- common/actions/update.go | 82 ++++++++++++++++-------------- common/actions/view.go | 71 ++++++++++++++------------ common/apis/api.go | 20 ++------ common/dto/generate.go | 23 +++++---- common/log/log.go | 89 ++++++++++----------------------- template/v2/dto.go.template | 17 +++++-- template/vue.go.template | 2 +- tools/app/model.go | 3 +- tools/app/return.go | 8 ++- tools/utils.go | 16 ++++++ 17 files changed, 319 insertions(+), 314 deletions(-) diff --git a/app/admin/apis/sysjob/sysjob.go b/app/admin/apis/sysjob/sysjob.go index 6435ad0..5c6b7ca 100644 --- a/app/admin/apis/sysjob/sysjob.go +++ b/app/admin/apis/sysjob/sysjob.go @@ -22,7 +22,7 @@ type SysJob struct { // RemoveJobForService 调用service实现 func (e *SysJob) RemoveJobForService(c *gin.Context) { - msgID := apis.GenerateMsgIDFromContext(c) + msgID := tools.GenerateMsgIDFromContext(c) db, err := e.GetOrm(c) if err != nil { log.Errorf("msgID[%s] error:%#v", msgID, err) @@ -49,7 +49,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) { // StartJobForService 启动job service实现 func (e *SysJob) StartJobForService(c *gin.Context) { - msgID := apis.GenerateMsgIDFromContext(c) + msgID := tools.GenerateMsgIDFromContext(c) db, err := e.GetOrm(c) if err != nil { log.Errorf("msgID[%s] error:%#v", msgID, err) diff --git a/app/admin/middleware/db.go b/app/admin/middleware/db.go index 0ff1c3b..80da3b4 100644 --- a/app/admin/middleware/db.go +++ b/app/admin/middleware/db.go @@ -3,16 +3,16 @@ package middleware import ( "database/sql" "errors" - "go-admin/common/config" - "go-admin/common/global" - "go-admin/tools" - "gorm.io/gorm/schema" "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/gorm" + "gorm.io/gorm/schema" + "go-admin/common/config" + "go-admin/common/global" "go-admin/common/middleware" + "go-admin/tools" ) var WithContextDb = middleware.WithContextDb diff --git a/app/admin/service/dto/sysjob.go b/app/admin/service/dto/sysjob.go index f80369b..1335cdf 100644 --- a/app/admin/service/dto/sysjob.go +++ b/app/admin/service/dto/sysjob.go @@ -5,7 +5,8 @@ import ( "go-admin/app/admin/models" "go-admin/common/dto" - models2 "go-admin/common/models" + "go-admin/common/log" + common "go-admin/common/models" ) type SysJobSearch struct { @@ -23,7 +24,11 @@ func (m *SysJobSearch) GetNeedSearch() interface{} { } func (m *SysJobSearch) Bind(ctx *gin.Context) error { - return ctx.Bind(m) + err := ctx.Bind(m) + if err != nil { + log.Errorf("MsgID[%s] Bind error: %#v", err) + } + return err } func (m *SysJobSearch) Generate() dto.Index { @@ -31,14 +36,6 @@ func (m *SysJobSearch) Generate() dto.Index { return &o } -func (m *SysJobSearch) GetPageIndex() int { - return m.PageIndex -} - -func (m *SysJobSearch) GetPageSize() int { - return m.PageSize -} - type SysJobControl struct { JobId int `json:"jobId"` JobName string `json:"jobName" validate:"required"` // 名称 @@ -62,7 +59,7 @@ func (s *SysJobControl) Generate() dto.Control { return &cp } -func (s *SysJobControl) GenerateM() (models2.ActiveRecord, error) { +func (s *SysJobControl) GenerateM() (common.ActiveRecord, error) { return &models.SysJob{ JobId: s.JobId, JobName: s.JobName, @@ -91,6 +88,6 @@ func (s *SysJobById) Generate() dto.Control { return &cp } -func (s *SysJobById) GenerateM() (models2.ActiveRecord, error) { +func (s *SysJobById) GenerateM() (common.ActiveRecord, error) { return &models.SysJob{}, nil } diff --git a/common/actions/create.go b/common/actions/create.go index 6b6cd27..4b4a079 100644 --- a/common/actions/create.go +++ b/common/actions/create.go @@ -1,43 +1,49 @@ package actions import ( - "errors" - "github.com/gin-gonic/gin" - dto2 "go-admin/common/dto" - "go-admin/common/models" - "gorm.io/gorm" + "net/http" + "github.com/gin-gonic/gin" + + "go-admin/common/apis" + "go-admin/common/dto" + "go-admin/common/log" + "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" ) // CreateAction 通用新增动作 -func CreateAction(control dto2.Control) gin.HandlerFunc { +func CreateAction(control dto.Control) gin.HandlerFunc { return func(c *gin.Context) { + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) + return + } + + msgID := tools.GenerateMsgIDFromContext(c) + //新增操作 req := control.Generate() - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + err = req.Bind(c) + if err != nil { + app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } - switch idb.(type) { - case *gorm.DB: - //新增操作 - db := idb.(*gorm.DB) - err = req.Bind(c) - tools.HasError(err, "参数验证失败", 422) - var object models.ActiveRecord - object, err = req.GenerateM() - tools.HasError(err, "模型生成失败", 422) - object.SetCreateBy(tools.GetUserIdUint(c)) - err = db.WithContext(c).Create(object).Error - tools.HasError(err, "创建失败", 500) - app.OK(c, object.GetId(), "创建成功") - c.Next() - default: - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + var object models.ActiveRecord + object, err = req.GenerateM() + if err != nil { + app.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return } + object.SetCreateBy(tools.GetUserIdUint(c)) + err = db.WithContext(c).Create(object).Error + if err != nil { + log.Errorf("MsgID[%s] Create error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "创建失败") + return + } + app.OK(c, object.GetId(), "创建成功") + c.Next() } } diff --git a/common/actions/delete.go b/common/actions/delete.go index 777412d..03aef40 100644 --- a/common/actions/delete.go +++ b/common/actions/delete.go @@ -1,55 +1,61 @@ package actions import ( - "errors" - dto2 "go-admin/common/dto" - "go-admin/common/models" - "go-admin/tools/app" + "net/http" "github.com/gin-gonic/gin" - "gorm.io/gorm" + "go-admin/common/apis" + "go-admin/common/dto" + "go-admin/common/log" + "go-admin/common/models" "go-admin/tools" + "go-admin/tools/app" ) // DeleteAction 通用删除动作 -func DeleteAction(control dto2.Control) gin.HandlerFunc { +func DeleteAction(control dto.Control) gin.HandlerFunc { return func(c *gin.Context) { - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) + return } - switch idb.(type) { - case *gorm.DB: - //删除操作 - db := idb.(*gorm.DB) - req := control.Generate() - err = req.Bind(c) - tools.HasError(err, "参数验证失败", 422) - var object models.ActiveRecord - object, err = req.GenerateM() - tools.HasError(err, "模型生成失败", 500) - object.SetUpdateBy(tools.GetUserIdUint(c)) - - //数据权限检查 - p := getPermissionFromContext(c) - - db = db.WithContext(c).Scopes( - Permission(object.TableName(), p), - ).Where(req.GetId()).Delete(object) - tools.HasError(db.Error, "删除失败", 500) - if db.RowsAffected == 0 { - err = errors.New("无权删除该数据") - tools.HasError(err, "", 403) - } - app.OK(c, object.GetId(), "删除成功") - c.Next() - default: - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + msgID := tools.GenerateMsgIDFromContext(c) + //删除操作 + req := control.Generate() + err = req.Bind(c) + if err != nil { + log.Errorf("MsgID[%s] Bind error: %#v", msgID, err) + app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } + var object models.ActiveRecord + object, err = req.GenerateM() + if err != nil { + app.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return + } + + object.SetUpdateBy(tools.GetUserIdUint(c)) + + //数据权限检查 + p := getPermissionFromContext(c) + + db = db.WithContext(c).Scopes( + Permission(object.TableName(), p), + ).Where(req.GetId()).Delete(object) + if db.Error != nil { + log.Errorf("MsgID[%s] Delete error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "删除失败") + return + } + if db.RowsAffected == 0 { + app.Error(c, http.StatusForbidden, nil, "无权删除该数据") + return + } + app.OK(c, object.GetId(), "删除成功") + c.Next() } } diff --git a/common/actions/index.go b/common/actions/index.go index a7febf7..a458953 100644 --- a/common/actions/index.go +++ b/common/actions/index.go @@ -2,55 +2,58 @@ package actions import ( "errors" - dto2 "go-admin/common/dto" - "go-admin/common/models" + "net/http" "github.com/gin-gonic/gin" "gorm.io/gorm" + "go-admin/common/apis" + "go-admin/common/dto" + "go-admin/common/log" + "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" ) // IndexAction 通用查询动作 -func IndexAction(m models.ActiveRecord, d dto2.Index, f func() interface{}) gin.HandlerFunc { +func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.HandlerFunc { return func(c *gin.Context) { + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) + return + } + + msgID := tools.GenerateMsgIDFromContext(c) list := f() object := m.Generate() req := d.Generate() - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) - } var count int64 - switch idb.(type) { - case *gorm.DB: - //查询列表 - db := idb.(*gorm.DB) - err = req.Bind(c) - tools.HasError(err, "参数验证失败", 422) - //数据权限检查 - p := getPermissionFromContext(c) - - err = db.WithContext(c).Model(object). - Scopes( - dto2.MakeCondition(req.GetNeedSearch()), - dto2.Paginate(req.GetPageSize(), req.GetPageIndex()), - Permission(object.TableName(), p), - ). - Find(list).Limit(-1).Offset(-1). - Count(&count).Error - if !errors.Is(err, gorm.ErrRecordNotFound) { - tools.HasError(err, "查询失败", 500) - } - app.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") - c.Next() - default: - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + //查询列表 + err = req.Bind(c) + if err != nil { + app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } + + //数据权限检查 + p := getPermissionFromContext(c) + + err = db.WithContext(c).Model(object). + Scopes( + dto.MakeCondition(req.GetNeedSearch()), + dto.Paginate(req.GetPageSize(), req.GetPageIndex()), + Permission(object.TableName(), p), + ). + Find(list).Limit(-1).Offset(-1). + Count(&count).Error + if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { + log.Errorf("MsgID[%s] Index error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "查询失败") + return + } + app.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") + c.Next() } } diff --git a/common/actions/permission.go b/common/actions/permission.go index 24747a7..0cd6301 100644 --- a/common/actions/permission.go +++ b/common/actions/permission.go @@ -2,12 +2,16 @@ package actions import ( "errors" - "fmt" + "net/http" + "github.com/gin-gonic/gin" - "go-admin/tools/config" "gorm.io/gorm" + "go-admin/common/apis" + "go-admin/common/log" "go-admin/tools" + "go-admin/tools/app" + "go-admin/tools/config" ) type dataPermission struct { @@ -19,36 +23,24 @@ type dataPermission struct { func PermissionAction() gin.HandlerFunc { return func(c *gin.Context) { - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) - } - switch idb.(type) { - case *gorm.DB: - db := idb.(*gorm.DB) - var p = new(dataPermission) - if userId := tools.GetUserIdStr(c); userId != "" { - p, err = newDataPermission(db, userId) - if err != nil { - c.JSON(500, gin.H{ - "code": 500, - "msg": fmt.Sprintf("权限范围鉴定错误, error:%v", err), - }) - c.Abort() - return - } - } - c.Set(PermissionKey, p) - default: - c.JSON(500, gin.H{ - "code": 500, - "msg": "db connect not exist", - }) - c.Abort() + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) return } + + msgID := tools.GenerateMsgIDFromContext(c) + var p = new(dataPermission) + if userId := tools.GetUserIdStr(c); userId != "" { + p, err = newDataPermission(db, userId) + if err != nil { + log.Errorf("MsgID[%s] PermissionAction error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "权限范围鉴定错误") + c.Abort() + return + } + } + c.Set(PermissionKey, p) c.Next() } } diff --git a/common/actions/update.go b/common/actions/update.go index 9a57aef..16c9c2d 100644 --- a/common/actions/update.go +++ b/common/actions/update.go @@ -1,53 +1,59 @@ package actions import ( - "errors" - "github.com/gin-gonic/gin" - dto2 "go-admin/common/dto" - "go-admin/common/models" - "gorm.io/gorm" + "net/http" + "github.com/gin-gonic/gin" + + "go-admin/common/apis" + "go-admin/common/dto" + "go-admin/common/log" + "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" ) // UpdateAction 通用更新动作 -func UpdateAction(control dto2.Control) gin.HandlerFunc { +func UpdateAction(control dto.Control) gin.HandlerFunc { return func(c *gin.Context) { + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) + return + } + + msgID := tools.GenerateMsgIDFromContext(c) req := control.Generate() - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + //更新操作 + err = req.Bind(c) + if err != nil { + app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } - switch idb.(type) { - case *gorm.DB: - //更新操作 - db := idb.(*gorm.DB) - err = req.Bind(c) - tools.HasError(err, "参数验证失败", 422) - var object models.ActiveRecord - object, err = req.GenerateM() - tools.HasError(err, "参数验证失败", 422) - object.SetUpdateBy(tools.GetUserIdUint(c)) - - //数据权限检查 - p := getPermissionFromContext(c) - - db = db.WithContext(c).Scopes( - Permission(object.TableName(), p), - ).Where(req.GetId()).Updates(object) - tools.HasError(db.Error, "更新失败", 500) - if db.RowsAffected == 0 { - err = errors.New("无权更新该数据") - tools.HasError(err, "", 403) - } - app.OK(c, object.GetId(), "更新成功") - c.Next() - default: - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + var object models.ActiveRecord + object, err = req.GenerateM() + if err != nil { + app.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return } + object.SetUpdateBy(tools.GetUserIdUint(c)) + + //数据权限检查 + p := getPermissionFromContext(c) + + db = db.WithContext(c).Scopes( + Permission(object.TableName(), p), + ).Where(req.GetId()).Updates(object) + if db.Error != nil { + log.Errorf("MsgID[%s] Update error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "更新失败") + return + } + if db.RowsAffected == 0 { + app.Error(c, http.StatusForbidden, nil, "无权更新该数据") + return + } + app.OK(c, object.GetId(), "更新成功") + c.Next() } } diff --git a/common/actions/view.go b/common/actions/view.go index 3eb5408..6ada185 100644 --- a/common/actions/view.go +++ b/common/actions/view.go @@ -2,51 +2,60 @@ package actions import ( "errors" + "net/http" "github.com/gin-gonic/gin" "gorm.io/gorm" + "go-admin/common/apis" "go-admin/common/dto" + "go-admin/common/log" "go-admin/common/models" "go-admin/tools" "go-admin/tools/app" ) // ViewAction 通用详情动作 -func ViewAction(control dto.Control) gin.HandlerFunc { +func ViewAction(control dto.Control, params ...interface{}) gin.HandlerFunc { return func(c *gin.Context) { - var err error - idb, exist := c.Get("db") - if !exist { - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + db, err := apis.GetOrm(c) + if err != nil { + log.Error(err) + return } - switch idb.(type) { - case *gorm.DB: - //查看详情 - db := idb.(*gorm.DB) - req := control.Generate() - err = req.Bind(c) - tools.HasError(err, "参数验证失败", 422) - var object models.ActiveRecord - object, err = req.GenerateM() - tools.HasError(err, "模型生成失败", 500) - //数据权限检查 - p := getPermissionFromContext(c) - - err = db.WithContext(c).Scopes( - Permission(object.TableName(), p), - ).Where(req.GetId()).First(object).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - tools.HasError(err, "查看失败", 404) - } - tools.HasError(err, "查看失败", 500) - app.OK(c, object, "查看成功") - c.Next() - default: - err = errors.New("db connect not exist") - tools.HasError(err, "", 500) + msgID := tools.GenerateMsgIDFromContext(c) + //查看详情 + req := control.Generate() + err = req.Bind(c) + if err != nil { + app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") + return } + var object models.ActiveRecord + object, err = req.GenerateM() + if err != nil { + app.Error(c, http.StatusInternalServerError, err, "模型生成失败") + return + } + + //数据权限检查 + p := getPermissionFromContext(c) + + err = db.WithContext(c).Scopes( + Permission(object.TableName(), p), + ).Where(req.GetId()).First(object).Error + + if errors.Is(err, gorm.ErrRecordNotFound) { + app.Error(c, http.StatusNotFound, nil, "查看对象不存在或无权查看") + return + } + if err != nil { + log.Errorf("MsgID[%s] Create error: %#v", msgID, err) + app.Error(c, http.StatusInternalServerError, err, "查看失败") + return + } + app.OK(c, object, "查看成功") + c.Next() } } diff --git a/common/apis/api.go b/common/apis/api.go index c7c3dc2..3df5ad6 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -3,10 +3,11 @@ package apis import ( "errors" "fmt" + "github.com/gin-gonic/gin" - "github.com/google/uuid" - "github.com/spf13/cast" "gorm.io/gorm" + + "go-admin/tools" ) type Api struct { @@ -18,7 +19,7 @@ func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) { // GetOrm 获取orm连接 func GetOrm(c *gin.Context) (*gorm.DB, error) { - msgID := GenerateMsgIDFromContext(c) + msgID := tools.GenerateMsgIDFromContext(c) idb, exist := c.Get("db") if !exist { return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID)) @@ -31,16 +32,3 @@ func GetOrm(c *gin.Context) (*gorm.DB, error) { return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID)) } } - -// GenerateMsgIDFromContext 生成msgID -func GenerateMsgIDFromContext(c *gin.Context) string { - var msgID string - data, ok := c.Get("msgID") - if !ok { - msgID = uuid.New().String() - c.Set("msgID", msgID) - return msgID - } - msgID = cast.ToString(data) - return msgID -} diff --git a/common/dto/generate.go b/common/dto/generate.go index 8193059..d3b9919 100644 --- a/common/dto/generate.go +++ b/common/dto/generate.go @@ -1,14 +1,14 @@ package dto import ( - "encoding/json" - "github.com/gin-gonic/gin" "net/http" + + "github.com/gin-gonic/gin" ) type ObjectById struct { - Id int `uri:"id" validate:"required"` - Ids []json.Number `json:"ids"` + Id int `uri:"id"` + Ids []int `json:"ids"` } func (s *ObjectById) Bind(ctx *gin.Context) error { @@ -26,13 +26,14 @@ func (s *ObjectById) Bind(ctx *gin.Context) error { func (s *ObjectById) GetId() interface{} { if len(s.Ids) > 0 { - ids := make([]int64, 0) - var i int64 - for _, id := range s.Ids { - i, _ = id.Int64() - ids = append(ids, i) - } - return ids + return s.Ids + //ids := make([]int64, 0) + //var i int64 + //for _, id := range s.Ids { + // i, _ = id.Int64() + // ids = append(ids, i) + //} + //return ids } return s.Id } diff --git a/common/log/log.go b/common/log/log.go index d1b9cf8..42e1866 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -2,66 +2,29 @@ package log import "go-admin/logger" -func SetLevel() { - -} - -// Trace trace级日志输出 -func Trace(args ...interface{}) { - logger.Trace(args...) -} - -// Trace trace级日志输出 -func Tracef(format string, args ...interface{}) { - logger.Tracef(format, args...) -} - -// Debug debug级日志输出 -func Debug(args ...interface{}) { - logger.Debug(args...) -} - -// Debugf debug级日志输出 -func Debugf(format string, args ...interface{}) { - logger.Debugf(format, args...) -} - -// Info info级日志输出 -func Info(args ...interface{}) { - logger.Info(args...) -} - -// Infof info级日志输出 -func Infof(format string, args ...interface{}) { - logger.Infof(format, args...) -} - -// Warn warn级日志输出 -func Warn(args ...interface{}) { - logger.Warn(args...) -} - -// Warnf warn级日志输出 -func Warnf(format string, args ...interface{}) { - logger.Warnf(format, args...) -} - -// Error error级日志输出 -func Error(args ...interface{}) { - logger.Error(args...) -} - -// Errorf error级日志输出 -func Errorf(format string, args ...interface{}) { - logger.Errorf(format, args...) -} - -// Fatal fatal级日志输出 -func Fatal(args ...interface{}) { - logger.Fatal(args...) -} - -// Fatalf fatal级日志输出 -func Fatalf(format string, args ...interface{}) { - logger.Fatalf(format, args...) -} +var ( + // Trace trace级日志输出 + Trace = logger.Trace + // Trace trace级日志输出 + Tracef = logger.Tracef + // Debug debug级日志输出 + Debug = logger.Debug + // Debugf debug级日志输出 + Debugf = logger.Debugf + // Info info级日志输出 + Info = logger.Info + // Infof info级日志输出 + Infof = logger.Infof + // Warn warn级日志输出 + Warn = logger.Warn + // Warnf warn级日志输出 + Warnf = logger.Warnf + // Error error级日志输出 + Error = logger.Error + // Errorf error级日志输出 + Errorf = logger.Errorf + // Fatal fatal级日志输出 + Fatal = logger.Fatal + // Fatalf fatal级日志输出 + Fatalf = logger.Fatalf +) diff --git a/template/v2/dto.go.template b/template/v2/dto.go.template index 81974bf..aed2d40 100644 --- a/template/v2/dto.go.template +++ b/template/v2/dto.go.template @@ -6,6 +6,7 @@ import ( "go-admin/app/admin/models" "go-admin/common/dto" + "go-admin/common/log" common "go-admin/common/models" ) @@ -26,7 +27,11 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} { } func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error { - return ctx.Bind(m) + err := ctx.Bind(m) + if err != nil { + log.Errorf("MsgID[%s] Bind error: %#v", err) + } + return err } func (m *{{.ClassName}}Search) Generate() dto.Index { @@ -53,10 +58,16 @@ type {{.ClassName}}Control struct { } func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error { - if err := ctx.BindUri(s); err != nil { + err := ctx.BindUri(s) + if err != nil { + log.Errorf("MsgID[%s] Bind error: %#v", err) return err } - return ctx.Bind(s) + err := ctx.Bind(m) + if err != nil { + log.Errorf("MsgID[%s] Bind error: %#v", err) + } + return err } func (s *{{.ClassName}}Control) Generate() dto.Control { diff --git a/template/vue.go.template b/template/vue.go.template index 0c5d7d1..0aa3a2b 100644 --- a/template/vue.go.template +++ b/template/vue.go.template @@ -451,7 +451,7 @@ }, /** 删除按钮操作 */ handleDelete(row) { - var Ids = row.{{.PkJsonField}} || this.ids + var Ids = (row.{{.PkJsonField}} && [row.{{.PkJsonField}}]) || this.ids if (this.ids.length === 0) { Ids = [Ids] } diff --git a/tools/app/model.go b/tools/app/model.go index 898a16f..0f88de4 100644 --- a/tools/app/model.go +++ b/tools/app/model.go @@ -6,7 +6,8 @@ type Response struct { // 数据集 Data interface{} `json:"data"` // 消息 - Msg string `json:"msg"` + Msg string `json:"msg"` + RequestId string `json:"requestId"` } type Page struct { diff --git a/tools/app/return.go b/tools/app/return.go index ec42926..2e2aded 100644 --- a/tools/app/return.go +++ b/tools/app/return.go @@ -4,15 +4,20 @@ import ( "net/http" "github.com/gin-gonic/gin" + + "go-admin/tools" ) // 失败数据处理 func Error(c *gin.Context, code int, err error, msg string) { var res Response - res.Msg = err.Error() + if err != nil { + res.Msg = err.Error() + } if msg != "" { res.Msg = msg } + res.RequestId = tools.GenerateMsgIDFromContext(c) c.JSON(http.StatusOK, res.ReturnError(code)) } @@ -23,6 +28,7 @@ func OK(c *gin.Context, data interface{}, msg string) { if msg != "" { res.Msg = msg } + res.RequestId = tools.GenerateMsgIDFromContext(c) c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/tools/utils.go b/tools/utils.go index ef77650..7f08558 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -5,6 +5,9 @@ import ( "runtime" "strconv" + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/spf13/cast" "golang.org/x/crypto/bcrypt" ) @@ -57,3 +60,16 @@ func HasError(err error, msg string, code ...int) { panic("CustomError#" + strconv.Itoa(statusCode) + "#" + msg) } } + +// GenerateMsgIDFromContext 生成msgID +func GenerateMsgIDFromContext(c *gin.Context) string { + var msgID string + data, ok := c.Get("msgID") + if !ok { + msgID = uuid.New().String() + c.Set("msgID", msgID) + return msgID + } + msgID = cast.ToString(data) + return msgID +}