From 8a471e1db76e197deabb339b5f3341ef91e4c856 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Thu, 11 Mar 2021 22:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=89=88=E4=B8=8D?= =?UTF-8?q?=E5=85=BC=E5=AE=B9actions=E6=A8=A1=E5=BC=8F=E7=94=9F=E6=88=90?= =?UTF-8?q?=20=E8=BF=81=E7=A7=BB=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version/1615447091566_migrate.go | 11 ++++---- common/dto/generate.go | 6 ++++ .../v4/actions/router_check_role.go.template | 4 +-- template/v4/dto.go.template | 28 +++++++++++++++---- template/v4/no_actions/apis.go.template | 10 +++---- 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/cmd/migrate/migration/version/1615447091566_migrate.go b/cmd/migrate/migration/version/1615447091566_migrate.go index 961a851..a2cc5f7 100644 --- a/cmd/migrate/migration/version/1615447091566_migrate.go +++ b/cmd/migrate/migration/version/1615447091566_migrate.go @@ -1,6 +1,7 @@ package version import ( + "fmt" "gorm.io/gorm" "runtime" @@ -16,19 +17,19 @@ func init() { func _1615447091566Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - // TODO: 这里开始写入要变更的内容 + // TODO: 这里开始写入要变更的内容 - // TODO: 例如 修改表字段 使用过程中请删除此段代码 + // TODO: 例如 修改表字段 使用过程中请删除此段代码 sql1 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `created_at`, `updated_at`, `deleted_at`) VALUES (522, 'SysContentCreate', '新增', 'form', 'syscontent/create', '/0/498/522', 'C', '', 'syscontent:syscontent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', '1', '1', '2020-11-08 17:00:35.259', '2020-11-12 22:55:50.739', NULL);" err := tx.Exec(sql1).Error if err != nil { - return err + fmt.Println(err) + return nil } - return tx.Create(&common.Migration{ Version: version, }).Error }) -} \ No newline at end of file +} diff --git a/common/dto/generate.go b/common/dto/generate.go index 46d0001..0f54c67 100644 --- a/common/dto/generate.go +++ b/common/dto/generate.go @@ -4,6 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" + + "go-admin/common/apis" ) type ObjectById struct { @@ -13,13 +15,16 @@ type ObjectById struct { func (s *ObjectById) Bind(ctx *gin.Context) error { var err error + log := apis.GetRequestLogger(ctx) err = ctx.ShouldBindUri(s) if err != nil { + log.Warnf("ShouldBindUri error: %s", err.Error()) return err } if ctx.Request.Method == http.MethodDelete { err = ctx.ShouldBind(&s.Ids) if err != nil { + log.Warnf("ShouldBind error: %s", err.Error()) return err } if len(s.Ids) > 0 { @@ -37,6 +42,7 @@ func (s *ObjectById) Bind(ctx *gin.Context) error { func (s *ObjectById) GetId() interface{} { if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) return s.Ids } return s.Id diff --git a/template/v4/actions/router_check_role.go.template b/template/v4/actions/router_check_role.go.template index af8aee2..3c3c069 100644 --- a/template/v4/actions/router_check_role.go.template +++ b/template/v4/actions/router_check_role.go.template @@ -2,12 +2,12 @@ package router import ( "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/{{.PackageName}}/middleware" "go-admin/app/{{.PackageName}}/models" "go-admin/app/{{.PackageName}}/service/dto" "go-admin/common/actions" - jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "go-admin/common/middleware" ) func init() { diff --git a/template/v4/dto.go.template b/template/v4/dto.go.template index aff1deb..dd51b58 100644 --- a/template/v4/dto.go.template +++ b/template/v4/dto.go.template @@ -4,9 +4,9 @@ import ( "github.com/gin-gonic/gin" "go-admin/app/{{.PackageName}}/models" - common "go-admin/common/models" "go-admin/common/dto" "go-admin/common/apis" + common "go-admin/common/models" ) type {{.ClassName}}Search struct { @@ -24,6 +24,11 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} { return *m } +func (m *{{.ClassName}}Search) Generate() dto.Index { + o := *m + return &o +} + func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error { log := apis.GetRequestLogger(ctx) err := ctx.ShouldBind(m) @@ -49,6 +54,11 @@ type {{.ClassName}}Control struct { {{- end }} } +func (s *{{.ClassName}}Control) Generate() dto.Control { + o := *s + return &o +} + func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error { log := apis.GetRequestLogger(ctx) err := ctx.ShouldBindUri(s) @@ -63,7 +73,7 @@ func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error { return err } -func (s *{{.ClassName}}Control) Generate() (*models.{{.ClassName}}, error) { +func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) { return &models.{{.ClassName}}{ {{ range .Columns -}} {{$x := .Pk}} @@ -86,8 +96,7 @@ func (s *{{.ClassName}}Control) GetId() interface{} { } type {{.ClassName}}ById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` + dto.ObjectById } func (s *{{.ClassName}}ById) GetId() interface{} { @@ -114,4 +123,13 @@ func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error { func (s *{{.ClassName}}ById) SetUpdateBy(id int) { -} \ No newline at end of file +} + +func (s *{{.ClassName}}ById) Generate() dto.Control { + o := *s + return &o +} + +func (s *{{.ClassName}}ById) GenerateM() (common.ActiveRecord, error) { + return &models.{{.ClassName}}{}, nil +} diff --git a/template/v4/no_actions/apis.go.template b/template/v4/no_actions/apis.go.template index e0ff7c2..25cfe0b 100644 --- a/template/v4/no_actions/apis.go.template +++ b/template/v4/no_actions/apis.go.template @@ -139,7 +139,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } - object, err := control.Generate() + object, err := control.GenerateM() if err != nil { log.Errorf("generate {{.ClassName}} model error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "模型生成失败") @@ -151,7 +151,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { service{{.ClassName}} := service.{{.ClassName}}{} service{{.ClassName}}.Orm = db service{{.ClassName}}.Log = log - err = service{{.ClassName}}.Insert{{.ClassName}}(object) + err = service{{.ClassName}}.Insert{{.ClassName}}(object.(*(models.{{.ClassName}}))) if err != nil { log.Errorf("Insert {{.ClassName}} error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "创建失败") @@ -188,7 +188,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败") return } - object, err := control.Generate() + object, err := control.GenerateM() if err != nil { log.Errorf("generate {{.ClassName}} model error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "模型生成失败") @@ -202,7 +202,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { service{{.ClassName}} := service.{{.ClassName}}{} service{{.ClassName}}.Orm = db service{{.ClassName}}.Log = log - err = service{{.ClassName}}.Update{{.ClassName}}(object, p) + err = service{{.ClassName}}.Update{{.ClassName}}(object.(*models.{{.ClassName}}), p) if err != nil { log.Errorf("Update {{.ClassName}} error, %s", err.Error()) e.Error(c, http.StatusInternalServerError, err, "更新失败") @@ -254,4 +254,4 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) { return } e.OK(c, control.GetId(), "删除成功") -} \ No newline at end of file +}