修复模版不兼容actions模式生成
迁移重复问题
This commit is contained in:
1 parent
dbf4b36687
commit
8a471e1db7
5 files changed
+42
-17
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
package version
|
package version
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
@@ -16,19 +17,19 @@ func init() {
|
|||||||
func _1615447091566Test(db *gorm.DB, version string) error {
|
func _1615447091566Test(db *gorm.DB, version string) error {
|
||||||
return db.Transaction(func(tx *gorm.DB) 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);"
|
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
|
err := tx.Exec(sql1).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
fmt.Println(err)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return tx.Create(&common.Migration{
|
return tx.Create(&common.Migration{
|
||||||
Version: version,
|
Version: version,
|
||||||
}).Error
|
}).Error
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
|
"go-admin/common/apis"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ObjectById struct {
|
type ObjectById struct {
|
||||||
@@ -13,13 +15,16 @@ type ObjectById struct {
|
|||||||
|
|
||||||
func (s *ObjectById) Bind(ctx *gin.Context) error {
|
func (s *ObjectById) Bind(ctx *gin.Context) error {
|
||||||
var err error
|
var err error
|
||||||
|
log := apis.GetRequestLogger(ctx)
|
||||||
err = ctx.ShouldBindUri(s)
|
err = ctx.ShouldBindUri(s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Warnf("ShouldBindUri error: %s", err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if ctx.Request.Method == http.MethodDelete {
|
if ctx.Request.Method == http.MethodDelete {
|
||||||
err = ctx.ShouldBind(&s.Ids)
|
err = ctx.ShouldBind(&s.Ids)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Warnf("ShouldBind error: %s", err.Error())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(s.Ids) > 0 {
|
if len(s.Ids) > 0 {
|
||||||
@@ -37,6 +42,7 @@ func (s *ObjectById) Bind(ctx *gin.Context) error {
|
|||||||
|
|
||||||
func (s *ObjectById) GetId() interface{} {
|
func (s *ObjectById) GetId() interface{} {
|
||||||
if len(s.Ids) > 0 {
|
if len(s.Ids) > 0 {
|
||||||
|
s.Ids = append(s.Ids, s.Id)
|
||||||
return s.Ids
|
return s.Ids
|
||||||
}
|
}
|
||||||
return s.Id
|
return s.Id
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"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}}/models"
|
||||||
"go-admin/app/{{.PackageName}}/service/dto"
|
"go-admin/app/{{.PackageName}}/service/dto"
|
||||||
"go-admin/common/actions"
|
"go-admin/common/actions"
|
||||||
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
|
"go-admin/common/middleware"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
"go-admin/app/{{.PackageName}}/models"
|
"go-admin/app/{{.PackageName}}/models"
|
||||||
common "go-admin/common/models"
|
|
||||||
"go-admin/common/dto"
|
"go-admin/common/dto"
|
||||||
"go-admin/common/apis"
|
"go-admin/common/apis"
|
||||||
|
common "go-admin/common/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
type {{.ClassName}}Search struct {
|
type {{.ClassName}}Search struct {
|
||||||
@@ -24,6 +24,11 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
|
|||||||
return *m
|
return *m
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *{{.ClassName}}Search) Generate() dto.Index {
|
||||||
|
o := *m
|
||||||
|
return &o
|
||||||
|
}
|
||||||
|
|
||||||
func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
|
func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
|
||||||
log := apis.GetRequestLogger(ctx)
|
log := apis.GetRequestLogger(ctx)
|
||||||
err := ctx.ShouldBind(m)
|
err := ctx.ShouldBind(m)
|
||||||
@@ -49,6 +54,11 @@ type {{.ClassName}}Control struct {
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *{{.ClassName}}Control) Generate() dto.Control {
|
||||||
|
o := *s
|
||||||
|
return &o
|
||||||
|
}
|
||||||
|
|
||||||
func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
|
func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
|
||||||
log := apis.GetRequestLogger(ctx)
|
log := apis.GetRequestLogger(ctx)
|
||||||
err := ctx.ShouldBindUri(s)
|
err := ctx.ShouldBindUri(s)
|
||||||
@@ -63,7 +73,7 @@ func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *{{.ClassName}}Control) Generate() (*models.{{.ClassName}}, error) {
|
func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) {
|
||||||
return &models.{{.ClassName}}{
|
return &models.{{.ClassName}}{
|
||||||
{{ range .Columns -}}
|
{{ range .Columns -}}
|
||||||
{{$x := .Pk}}
|
{{$x := .Pk}}
|
||||||
@@ -86,8 +96,7 @@ func (s *{{.ClassName}}Control) GetId() interface{} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type {{.ClassName}}ById struct {
|
type {{.ClassName}}ById struct {
|
||||||
Id int `uri:"id"`
|
dto.ObjectById
|
||||||
Ids []int `json:"ids"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *{{.ClassName}}ById) GetId() interface{} {
|
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) {
|
func (s *{{.ClassName}}ById) SetUpdateBy(id int) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *{{.ClassName}}ById) Generate() dto.Control {
|
||||||
|
o := *s
|
||||||
|
return &o
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *{{.ClassName}}ById) GenerateM() (common.ActiveRecord, error) {
|
||||||
|
return &models.{{.ClassName}}{}, nil
|
||||||
|
}
|
||||||
@@ -139,7 +139,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
|
|||||||
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
object, err := control.Generate()
|
object, err := control.GenerateM()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
|
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
|
||||||
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
|
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
|
||||||
@@ -151,7 +151,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
|
|||||||
service{{.ClassName}} := service.{{.ClassName}}{}
|
service{{.ClassName}} := service.{{.ClassName}}{}
|
||||||
service{{.ClassName}}.Orm = db
|
service{{.ClassName}}.Orm = db
|
||||||
service{{.ClassName}}.Log = log
|
service{{.ClassName}}.Log = log
|
||||||
err = service{{.ClassName}}.Insert{{.ClassName}}(object)
|
err = service{{.ClassName}}.Insert{{.ClassName}}(object.(*(models.{{.ClassName}})))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Insert {{.ClassName}} error, %s", err.Error())
|
log.Errorf("Insert {{.ClassName}} error, %s", err.Error())
|
||||||
e.Error(c, http.StatusInternalServerError, err, "创建失败")
|
e.Error(c, http.StatusInternalServerError, err, "创建失败")
|
||||||
@@ -188,7 +188,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
|
|||||||
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
object, err := control.Generate()
|
object, err := control.GenerateM()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
|
log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
|
||||||
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
|
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
|
||||||
@@ -202,7 +202,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
|
|||||||
service{{.ClassName}} := service.{{.ClassName}}{}
|
service{{.ClassName}} := service.{{.ClassName}}{}
|
||||||
service{{.ClassName}}.Orm = db
|
service{{.ClassName}}.Orm = db
|
||||||
service{{.ClassName}}.Log = log
|
service{{.ClassName}}.Log = log
|
||||||
err = service{{.ClassName}}.Update{{.ClassName}}(object, p)
|
err = service{{.ClassName}}.Update{{.ClassName}}(object.(*models.{{.ClassName}}), p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Update {{.ClassName}} error, %s", err.Error())
|
log.Errorf("Update {{.ClassName}} error, %s", err.Error())
|
||||||
e.Error(c, http.StatusInternalServerError, err, "更新失败")
|
e.Error(c, http.StatusInternalServerError, err, "更新失败")
|
||||||
@@ -254,4 +254,4 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
e.OK(c, control.GetId(), "删除成功")
|
e.OK(c, control.GetId(), "删除成功")
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user