diff --git a/apis/tools/gen.go b/apis/tools/gen.go index 55b84b9..ec5a07e 100644 --- a/apis/tools/gen.go +++ b/apis/tools/gen.go @@ -122,7 +122,7 @@ func GenCode(c *gin.Context) { tools2.FileCreate(b3, "./router/"+tab.PackageName+".go") tools2.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+".js") tools2.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/index.vue") - tools2.FileCreate(b5, "./dto/"+tab.PackageName+".go") + tools2.FileCreate(b6, "./dto/"+tab.PackageName+".go") helper := tools2.ReplaceHelper{ Root: "./router/router.go", diff --git a/template/api.go.template b/template/api.go.template index 766a0e7..86ac976 100644 --- a/template/api.go.template +++ b/template/api.go.template @@ -64,7 +64,7 @@ func Insert{{.ClassName}}(c *gin.Context) { func Update{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} - err := c.BindWith(&data, binding.JSON) + err := c.ShouldBindJSON(&data) tools.HasError(err, "数据解析失败", -1) data.UpdateBy = tools.GetUserIdStr(c) result, err := data.Update(data.{{.PkGoField}}) diff --git a/template/model.go.template b/template/model.go.template index a7bf67c..e2e0bab 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -80,43 +80,43 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int, v interface{}) ([] if err != nil { return nil, 0, err } - var count int + var count int64 if err := table.Scopes(tools.Paginate(pageSize, pageIndex)).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - return doc, count, nil + return doc, int(count), nil } // 更新{{.ClassName}} func (e *{{.ClassName}}) Update(id int) (update {{.ClassName}}, err error) { -if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} = ?", id).First(&update).Error; err != nil { -return -} + if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} = ?", id).First(&update).Error; err != nil { + return + } -//参数1:是要修改的数据 -//参数2:是修改的数据 -if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { -return -} -return + //参数1:是要修改的数据 + //参数2:是修改的数据 + if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { + return + } + return } // 删除{{.ClassName}} func (e *{{.ClassName}}) Delete(id int) (success bool, err error) { -if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} = ?", id).Delete(&{{.ClassName}}{}).Error; err != nil { -success = false -return -} -success = true -return + if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} = ?", id).Delete(&{{.ClassName}}{}).Error; err != nil { + success = false + return + } + success = true + return } //批量删除 func (e *{{.ClassName}}) BatchDelete(id []int) (Result bool, err error) { -if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} in (?)", id).Delete(&{{.ClassName}}{}).Error; err != nil { -return -} -Result = true -return + if err = orm.Eloquent.Table(e.TableName()).Where("{{.PkColumn}} in (?)", id).Delete(&{{.ClassName}}{}).Error; err != nil { + return + } + Result = true + return }