From 75cd2f374ad30feaa9f410419a35c4a5b30a8eb8 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Tue, 11 May 2021 18:49:41 +0800 Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8=20gen=E6=A8=A1=E5=9D=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=92=8C=E8=B7=AF=E5=BE=84=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/tools/gen.go | 132 ++++++++++++------------------ app/admin/apis/tools/systables.go | 7 +- 2 files changed, 58 insertions(+), 81 deletions(-) diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index b811003..2f4c52a 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -4,6 +4,7 @@ import ( "bytes" "net/http" "strconv" + "strings" "text/template" "time" @@ -223,7 +224,7 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName) + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -239,13 +240,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { err = t6.Execute(&b6, tab) var b7 bytes.Buffer err = t7.Execute(&b7, tab) - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go") - pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.BusinessName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go") - pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.BusinessName+".go") + pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") + pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go") + pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") + pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") + pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") + pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") + pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go") } @@ -317,7 +318,7 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName) + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -330,11 +331,11 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { var b6 bytes.Buffer err = t6.Execute(&b6, tab) - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go") + pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") + pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") + pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") + pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") + pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") } func (e Gen) GenMenuAndApi(c *gin.Context) { @@ -356,10 +357,10 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { table.TableId = id tab, _ := table.Get(db) Mmenu := models.Menu{} - Mmenu.MenuName = tab.TBName + "Manage" + //Mmenu.MenuName = Mmenu.Title = tab.TableComment Mmenu.Icon = "pass" - Mmenu.Path = "/" + tab.TBName + Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1) Mmenu.MenuType = "M" Mmenu.Action = "无" Mmenu.ParentId = 0 @@ -375,16 +376,16 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Mmenu.MenuId, err = Mmenu.Create(db) Cmenu := models.Menu{} - Cmenu.MenuName = tab.TBName + Cmenu.MenuName = tab.ClassName + "Manage" Cmenu.Title = tab.TableComment Cmenu.Icon = "pass" Cmenu.Path = tab.TBName Cmenu.MenuType = "C" Cmenu.Action = "无" - Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list" + Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list" Cmenu.ParentId = Mmenu.MenuId Cmenu.NoCache = false - Cmenu.Component = "/" + tab.BusinessName + "/index" + Cmenu.Component = "/" + tab.ModuleFrontName + "/index" Cmenu.Sort = 0 Cmenu.Visible = "0" Cmenu.IsFrame = "0" @@ -401,7 +402,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MList.Path = tab.TBName MList.MenuType = "F" MList.Action = "无" - MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query" + MList.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":query" MList.ParentId = Cmenu.MenuId MList.NoCache = false MList.Sort = 0 @@ -420,7 +421,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MCreate.Path = tab.TBName MCreate.MenuType = "F" MCreate.Action = "无" - MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add" + MCreate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":add" MCreate.ParentId = Cmenu.MenuId MCreate.NoCache = false MCreate.Sort = 0 @@ -439,7 +440,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MUpdate.Path = tab.TBName MUpdate.MenuType = "F" MUpdate.Action = "无" - MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit" + MUpdate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":edit" MUpdate.ParentId = Cmenu.MenuId MUpdate.NoCache = false MUpdate.Sort = 0 @@ -458,7 +459,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MDelete.Path = tab.TBName MDelete.MenuType = "F" MDelete.Action = "无" - MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove" + MDelete.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":remove" MDelete.ParentId = Cmenu.MenuId MDelete.NoCache = false MDelete.Sort = 0 @@ -489,95 +490,70 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Amenu.UpdatedAt = timeNow Amenu.MenuId, err = Amenu.Create(db) - AList := models.Menu{} - AList.MenuName = "" + AList := models.SysApi{} + AList.Name = "" AList.Title = "分页获取" + tab.TableComment - AList.Icon = "bug" - AList.Path = "/api/v1/" + tab.ModuleName - AList.MenuType = "A" + AList.Path = "/api/v1/" + tab.ModuleFrontName AList.Action = "GET" AList.ParentId = Amenu.MenuId - AList.NoCache = false AList.Sort = 0 - AList.Visible = "1" - AList.IsFrame = "0" - AList.CreateBy = "1" - AList.UpdateBy = "1" + AList.CreateBy = 1 + AList.UpdateBy = 1 AList.CreatedAt = timeNow AList.UpdatedAt = timeNow - AList.MenuId, err = AList.Create(db) + AList.Id, err = AList.Create(db) - AGet := models.Menu{} - AGet.MenuName = "" + AGet := models.SysApi{} + AList.Name = "" AGet.Title = "根据id获取" + tab.TableComment - AGet.Icon = "bug" - AGet.Path = "/api/v1/" + tab.ModuleName + "/:id" - AGet.MenuType = "A" + AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" AGet.Action = "GET" AGet.ParentId = Amenu.MenuId - AGet.NoCache = false AGet.Sort = 0 - AGet.Visible = "1" - AGet.IsFrame = "0" - AGet.CreateBy = "1" - AGet.UpdateBy = "1" + AGet.CreateBy = 1 + AGet.UpdateBy = 1 AGet.CreatedAt = timeNow AGet.UpdatedAt = timeNow - AGet.MenuId, err = AGet.Create(db) + AGet.Id, err = AGet.Create(db) - ACreate := models.Menu{} - ACreate.MenuName = "" + ACreate := models.SysApi{} + AList.Name = "" ACreate.Title = "创建" + tab.TableComment - ACreate.Icon = "bug" - ACreate.Path = "/api/v1/" + tab.ModuleName - ACreate.MenuType = "A" + ACreate.Path = "/api/v1/" + tab.ModuleFrontName ACreate.Action = "POST" ACreate.ParentId = Amenu.MenuId - ACreate.NoCache = false ACreate.Sort = 0 - ACreate.Visible = "1" - ACreate.IsFrame = "0" - ACreate.CreateBy = "1" - ACreate.UpdateBy = "1" + ACreate.CreateBy = 1 + ACreate.UpdateBy = 1 ACreate.CreatedAt = timeNow ACreate.UpdatedAt = timeNow - ACreate.MenuId, err = ACreate.Create(db) + ACreate.Id, err = ACreate.Create(db) - AUpdate := models.Menu{} - AUpdate.MenuName = "" + AUpdate := models.SysApi{} + AList.Name = "" AUpdate.Title = "修改" + tab.TableComment - AUpdate.Icon = "bug" - AUpdate.Path = "/api/v1/" + tab.ModuleName + "/:id" - AUpdate.MenuType = "A" + AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" AUpdate.Action = "PUT" AUpdate.ParentId = Amenu.MenuId - AUpdate.NoCache = false AUpdate.Sort = 0 - AUpdate.Visible = "1" - AUpdate.IsFrame = "0" - AUpdate.CreateBy = "1" - AUpdate.UpdateBy = "1" + AUpdate.CreateBy = 1 + AUpdate.UpdateBy = 1 AUpdate.CreatedAt = timeNow AUpdate.UpdatedAt = timeNow - AUpdate.MenuId, err = AUpdate.Create(db) + AUpdate.Id, err = AUpdate.Create(db) - ADelete := models.Menu{} - ADelete.MenuName = "" + ADelete := models.SysApi{} + AList.Name = "" ADelete.Title = "删除" + tab.TableComment - ADelete.Icon = "bug" - ADelete.Path = "/api/v1/" + tab.ModuleName - ADelete.MenuType = "A" + ADelete.Path = "/api/v1/" + tab.ModuleFrontName ADelete.Action = "DELETE" ADelete.ParentId = Amenu.MenuId - ADelete.NoCache = false ADelete.Sort = 0 - ADelete.Visible = "1" - ADelete.IsFrame = "0" - ADelete.CreateBy = "1" - ADelete.UpdateBy = "1" + ADelete.CreateBy = 1 + ADelete.UpdateBy = 1 ADelete.CreatedAt = timeNow ADelete.UpdatedAt = timeNow - ADelete.MenuId, err = ADelete.Create(db) + ADelete.Id, err = ADelete.Create(db) e.OK("", "数据生成成功!") } diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index c0f4dfd..9df198e 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -189,7 +189,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool var dbTable tools.DBTables var dbColumn tools.DBColumns data.TBName = tablesList[i] - data.CreateBy = user.GetUserIdStr(c) + data.CreateBy = user.GetUserId(c) dbTable.TableName = data.TBName dbtable, err := dbTable.Get(tx) @@ -206,12 +206,13 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool //data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend) data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend) } + data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-") data.PackageName = "admin" data.TplCategory = "crud" data.Crud = true dbcolumn, err := dbColumn.GetList(tx) - data.CreateBy = user.GetUserIdStr(c) + data.CreateBy = user.GetUserId(c) data.TableComment = dbtable.TableComment if dbtable.TableComment == "" { data.TableComment = data.ClassName @@ -311,7 +312,7 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) { return } - data.UpdateBy = user.GetUserIdStr(c) + data.UpdateBy = user.GetUserId(c) result, err := data.Update(db) if err != nil { log.Errorf("Update error, %s", err.Error())