refactor🎨: job和代码生成模块调整
This commit is contained in:
1 parent
a8820a0aac
commit
ff5d498c53
2 files changed
+62
-148
No files matched your search
+62
-143
@@ -2,6 +2,8 @@ package tools
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"go-admin/app/admin/service"
|
||||||
|
"go-admin/app/admin/service/dto"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -13,7 +15,6 @@ import (
|
|||||||
"github.com/go-admin-team/go-admin-core/sdk/config"
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
|
|
||||||
"go-admin/app/admin/models"
|
|
||||||
"go-admin/app/admin/models/tools"
|
"go-admin/app/admin/models/tools"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -250,14 +251,20 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
|
func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
|
||||||
e.Context = c
|
err := e.MakeContext(c).
|
||||||
log := e.GetLogger()
|
MakeOrm().
|
||||||
|
Errors
|
||||||
|
if err != nil {
|
||||||
|
e.Logger.Error(err)
|
||||||
|
e.Error(500, err, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
basePath := "template/"
|
basePath := "template/"
|
||||||
|
|
||||||
t1, err := template.ParseFiles(basePath + "api_migrate.template")
|
t1, err := template.ParseFiles(basePath + "api_migrate.template")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -273,8 +280,15 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
|
func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
|
||||||
e.Context = c
|
err := e.MakeContext(c).
|
||||||
log := api.GetRequestLogger(c)
|
MakeOrm().
|
||||||
|
Errors
|
||||||
|
if err != nil {
|
||||||
|
e.Logger.Error(err)
|
||||||
|
e.Error(500, err, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
basePath := "template/v4/"
|
basePath := "template/v4/"
|
||||||
routerFile := basePath + "actions/router_check_role.go.template"
|
routerFile := basePath + "actions/router_check_role.go.template"
|
||||||
|
|
||||||
@@ -284,31 +298,31 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
|
|||||||
|
|
||||||
t1, err := template.ParseFiles(basePath + "model.go.template")
|
t1, err := template.ParseFiles(basePath + "model.go.template")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
t3, err := template.ParseFiles(routerFile)
|
t3, err := template.ParseFiles(routerFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
t4, err := template.ParseFiles(basePath + "js.go.template")
|
t4, err := template.ParseFiles(basePath + "js.go.template")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
t5, err := template.ParseFiles(basePath + "vue.go.template")
|
t5, err := template.ParseFiles(basePath + "vue.go.template")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
t6, err := template.ParseFiles(basePath + "dto.go.template")
|
t6, err := template.ParseFiles(basePath + "dto.go.template")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -338,25 +352,26 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e Gen) GenMenuAndApi(c *gin.Context) {
|
func (e Gen) GenMenuAndApi(c *gin.Context) {
|
||||||
e.Context = c
|
s:=service.SysMenu{}
|
||||||
log := e.GetLogger()
|
err := e.MakeContext(c).
|
||||||
|
MakeOrm().
|
||||||
table := tools.SysTables{}
|
MakeService(&s.Service).
|
||||||
timeNow := pkg.GetCurrentTime()
|
Errors
|
||||||
id, err := pkg.StringToInt(c.Param("tableId"))
|
|
||||||
pkg.HasError(err, "", -1)
|
|
||||||
|
|
||||||
db, err := pkg.GetOrm(c)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("get db connection error, %s", err.Error())
|
e.Logger.Error(err)
|
||||||
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
|
e.Error(500, err, err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
table := tools.SysTables{}
|
||||||
|
id, err := pkg.StringToInt(c.Param("tableId"))
|
||||||
|
pkg.HasError(err, "", -1)
|
||||||
|
|
||||||
|
|
||||||
table.TableId = id
|
table.TableId = id
|
||||||
tab, _ := table.Get(db)
|
tab, _ := table.Get(e.Orm)
|
||||||
Mmenu := models.Menu{}
|
|
||||||
//Mmenu.MenuName =
|
Mmenu := dto.SysMenuControl{}
|
||||||
Mmenu.Title = tab.TableComment
|
Mmenu.Title = tab.TableComment
|
||||||
Mmenu.Icon = "pass"
|
Mmenu.Icon = "pass"
|
||||||
Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1)
|
Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1)
|
||||||
@@ -368,13 +383,10 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
Mmenu.Sort = 0
|
Mmenu.Sort = 0
|
||||||
Mmenu.Visible = "0"
|
Mmenu.Visible = "0"
|
||||||
Mmenu.IsFrame = "0"
|
Mmenu.IsFrame = "0"
|
||||||
Mmenu.CreateBy = "1"
|
Mmenu.CreateBy = 1
|
||||||
Mmenu.UpdateBy = "1"
|
s.Insert(&Mmenu)
|
||||||
Mmenu.CreatedAt = timeNow
|
|
||||||
Mmenu.UpdatedAt = timeNow
|
|
||||||
Mmenu.MenuId, err = Mmenu.Create(db)
|
|
||||||
|
|
||||||
Cmenu := models.Menu{}
|
Cmenu := dto.SysMenuControl{}
|
||||||
Cmenu.MenuName = tab.ClassName + "Manage"
|
Cmenu.MenuName = tab.ClassName + "Manage"
|
||||||
Cmenu.Title = tab.TableComment
|
Cmenu.Title = tab.TableComment
|
||||||
Cmenu.Icon = "pass"
|
Cmenu.Icon = "pass"
|
||||||
@@ -388,13 +400,11 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
Cmenu.Sort = 0
|
Cmenu.Sort = 0
|
||||||
Cmenu.Visible = "0"
|
Cmenu.Visible = "0"
|
||||||
Cmenu.IsFrame = "0"
|
Cmenu.IsFrame = "0"
|
||||||
Cmenu.CreateBy = "1"
|
Cmenu.CreateBy = 1
|
||||||
Cmenu.UpdateBy = "1"
|
Cmenu.UpdateBy = 1
|
||||||
Cmenu.CreatedAt = timeNow
|
s.Insert(&Cmenu)
|
||||||
Cmenu.UpdatedAt = timeNow
|
|
||||||
Cmenu.MenuId, err = Cmenu.Create(db)
|
|
||||||
|
|
||||||
MList := models.Menu{}
|
MList := dto.SysMenuControl{}
|
||||||
MList.MenuName = ""
|
MList.MenuName = ""
|
||||||
MList.Title = "分页获取" + tab.TableComment
|
MList.Title = "分页获取" + tab.TableComment
|
||||||
MList.Icon = ""
|
MList.Icon = ""
|
||||||
@@ -407,13 +417,11 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
MList.Sort = 0
|
MList.Sort = 0
|
||||||
MList.Visible = "0"
|
MList.Visible = "0"
|
||||||
MList.IsFrame = "0"
|
MList.IsFrame = "0"
|
||||||
MList.CreateBy = "1"
|
MList.CreateBy = 1
|
||||||
MList.UpdateBy = "1"
|
MList.UpdateBy = 1
|
||||||
MList.CreatedAt = timeNow
|
s.Insert(&MList)
|
||||||
MList.UpdatedAt = timeNow
|
|
||||||
MList.MenuId, err = MList.Create(db)
|
|
||||||
|
|
||||||
MCreate := models.Menu{}
|
MCreate := dto.SysMenuControl{}
|
||||||
MCreate.MenuName = ""
|
MCreate.MenuName = ""
|
||||||
MCreate.Title = "创建" + tab.TableComment
|
MCreate.Title = "创建" + tab.TableComment
|
||||||
MCreate.Icon = ""
|
MCreate.Icon = ""
|
||||||
@@ -426,13 +434,11 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
MCreate.Sort = 0
|
MCreate.Sort = 0
|
||||||
MCreate.Visible = "0"
|
MCreate.Visible = "0"
|
||||||
MCreate.IsFrame = "0"
|
MCreate.IsFrame = "0"
|
||||||
MCreate.CreateBy = "1"
|
MCreate.CreateBy = 1
|
||||||
MCreate.UpdateBy = "1"
|
MCreate.UpdateBy = 1
|
||||||
MCreate.CreatedAt = timeNow
|
s.Insert(&MCreate)
|
||||||
MCreate.UpdatedAt = timeNow
|
|
||||||
MCreate.MenuId, err = MCreate.Create(db)
|
|
||||||
|
|
||||||
MUpdate := models.Menu{}
|
MUpdate := dto.SysMenuControl{}
|
||||||
MUpdate.MenuName = ""
|
MUpdate.MenuName = ""
|
||||||
MUpdate.Title = "修改" + tab.TableComment
|
MUpdate.Title = "修改" + tab.TableComment
|
||||||
MUpdate.Icon = ""
|
MUpdate.Icon = ""
|
||||||
@@ -445,13 +451,11 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
MUpdate.Sort = 0
|
MUpdate.Sort = 0
|
||||||
MUpdate.Visible = "0"
|
MUpdate.Visible = "0"
|
||||||
MUpdate.IsFrame = "0"
|
MUpdate.IsFrame = "0"
|
||||||
MUpdate.CreateBy = "1"
|
MUpdate.CreateBy = 1
|
||||||
MUpdate.UpdateBy = "1"
|
MUpdate.UpdateBy = 1
|
||||||
MUpdate.CreatedAt = timeNow
|
s.Insert(&MUpdate)
|
||||||
MUpdate.UpdatedAt = timeNow
|
|
||||||
MUpdate.MenuId, err = MUpdate.Create(db)
|
|
||||||
|
|
||||||
MDelete := models.Menu{}
|
MDelete := dto.SysMenuControl{}
|
||||||
MDelete.MenuName = ""
|
MDelete.MenuName = ""
|
||||||
MDelete.Title = "删除" + tab.TableComment
|
MDelete.Title = "删除" + tab.TableComment
|
||||||
MDelete.Icon = ""
|
MDelete.Icon = ""
|
||||||
@@ -464,95 +468,10 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
|
|||||||
MDelete.Sort = 0
|
MDelete.Sort = 0
|
||||||
MDelete.Visible = "0"
|
MDelete.Visible = "0"
|
||||||
MDelete.IsFrame = "0"
|
MDelete.IsFrame = "0"
|
||||||
MDelete.CreateBy = "1"
|
MDelete.CreateBy = 1
|
||||||
MDelete.UpdateBy = "1"
|
MDelete.UpdateBy = 1
|
||||||
MDelete.CreatedAt = timeNow
|
s.Insert(&MDelete)
|
||||||
MDelete.UpdatedAt = timeNow
|
|
||||||
MDelete.MenuId, err = MDelete.Create(db)
|
|
||||||
|
|
||||||
var InterfaceId = 63
|
|
||||||
Amenu := models.Menu{}
|
|
||||||
Amenu.MenuName = tab.TBName
|
|
||||||
Amenu.Title = tab.TableComment
|
|
||||||
Amenu.Icon = "bug"
|
|
||||||
Amenu.Path = tab.TBName
|
|
||||||
Amenu.MenuType = "M"
|
|
||||||
Amenu.Action = "无"
|
|
||||||
Amenu.ParentId = InterfaceId
|
|
||||||
Amenu.NoCache = false
|
|
||||||
Amenu.Sort = 0
|
|
||||||
Amenu.Visible = "1"
|
|
||||||
Amenu.IsFrame = "0"
|
|
||||||
Amenu.CreateBy = "1"
|
|
||||||
Amenu.UpdateBy = "1"
|
|
||||||
Amenu.CreatedAt = timeNow
|
|
||||||
Amenu.UpdatedAt = timeNow
|
|
||||||
Amenu.MenuId, err = Amenu.Create(db)
|
|
||||||
|
|
||||||
//AList := models.SysApi{}
|
|
||||||
//AList.Name = ""
|
|
||||||
//AList.Title = "分页获取" + tab.TableComment
|
|
||||||
//AList.Path = "/api/v1/" + tab.ModuleFrontName
|
|
||||||
//AList.Action = "GET"
|
|
||||||
//AList.ParentId = Amenu.MenuId
|
|
||||||
//AList.Sort = 0
|
|
||||||
//AList.CreateBy = 1
|
|
||||||
//AList.UpdateBy = 1
|
|
||||||
//AList.CreatedAt = timeNow
|
|
||||||
//AList.UpdatedAt = timeNow
|
|
||||||
//AList.Id, err = AList.Create(db)
|
|
||||||
//
|
|
||||||
//AGet := models.SysApi{}
|
|
||||||
//AList.Name = ""
|
|
||||||
//AGet.Title = "根据id获取" + tab.TableComment
|
|
||||||
//AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
|
||||||
//AGet.Action = "GET"
|
|
||||||
//AGet.ParentId = Amenu.MenuId
|
|
||||||
//AGet.Sort = 0
|
|
||||||
//AGet.CreateBy = 1
|
|
||||||
//AGet.UpdateBy = 1
|
|
||||||
//AGet.CreatedAt = timeNow
|
|
||||||
//AGet.UpdatedAt = timeNow
|
|
||||||
//AGet.Id, err = AGet.Create(db)
|
|
||||||
//
|
|
||||||
//ACreate := models.SysApi{}
|
|
||||||
//AList.Name = ""
|
|
||||||
//ACreate.Title = "创建" + tab.TableComment
|
|
||||||
//ACreate.Path = "/api/v1/" + tab.ModuleFrontName
|
|
||||||
//ACreate.Action = "POST"
|
|
||||||
//ACreate.ParentId = Amenu.MenuId
|
|
||||||
//ACreate.Sort = 0
|
|
||||||
//ACreate.CreateBy = 1
|
|
||||||
//ACreate.UpdateBy = 1
|
|
||||||
//ACreate.CreatedAt = timeNow
|
|
||||||
//ACreate.UpdatedAt = timeNow
|
|
||||||
//ACreate.Id, err = ACreate.Create(db)
|
|
||||||
//
|
|
||||||
//AUpdate := models.SysApi{}
|
|
||||||
//AList.Name = ""
|
|
||||||
//AUpdate.Title = "修改" + tab.TableComment
|
|
||||||
//AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id"
|
|
||||||
//AUpdate.Action = "PUT"
|
|
||||||
//AUpdate.ParentId = Amenu.MenuId
|
|
||||||
//AUpdate.Sort = 0
|
|
||||||
//AUpdate.CreateBy = 1
|
|
||||||
//AUpdate.UpdateBy = 1
|
|
||||||
//AUpdate.CreatedAt = timeNow
|
|
||||||
//AUpdate.UpdatedAt = timeNow
|
|
||||||
//AUpdate.Id, err = AUpdate.Create(db)
|
|
||||||
//
|
|
||||||
//ADelete := models.SysApi{}
|
|
||||||
//AList.Name = ""
|
|
||||||
//ADelete.Title = "删除" + tab.TableComment
|
|
||||||
//ADelete.Path = "/api/v1/" + tab.ModuleFrontName
|
|
||||||
//ADelete.Action = "DELETE"
|
|
||||||
//ADelete.ParentId = Amenu.MenuId
|
|
||||||
//ADelete.Sort = 0
|
|
||||||
//ADelete.CreateBy = 1
|
|
||||||
//ADelete.UpdateBy = 1
|
|
||||||
//ADelete.CreatedAt = timeNow
|
|
||||||
//ADelete.UpdatedAt = timeNow
|
|
||||||
//ADelete.Id, err = ADelete.Create(db)
|
|
||||||
|
|
||||||
e.OK("", "数据生成成功!")
|
e.OK("", "数据生成成功!")
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,6 @@ import (
|
|||||||
|
|
||||||
"go-admin/app/admin/models"
|
"go-admin/app/admin/models"
|
||||||
"go-admin/app/admin/router"
|
"go-admin/app/admin/router"
|
||||||
"go-admin/app/jobs"
|
|
||||||
"go-admin/common/database"
|
"go-admin/common/database"
|
||||||
"go-admin/common/global"
|
"go-admin/common/global"
|
||||||
ext "go-admin/config"
|
ext "go-admin/config"
|
||||||
@@ -126,11 +125,7 @@ func run() error {
|
|||||||
Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
|
Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
|
||||||
Handler: sdk.Runtime.GetEngine(),
|
Handler: sdk.Runtime.GetEngine(),
|
||||||
}
|
}
|
||||||
go func() {
|
|
||||||
jobs.InitJob()
|
|
||||||
jobs.Setup(sdk.Runtime.GetDb())
|
|
||||||
|
|
||||||
}()
|
|
||||||
if apiCheck {
|
if apiCheck {
|
||||||
var routers = sdk.Runtime.GetRouter()
|
var routers = sdk.Runtime.GetRouter()
|
||||||
q := sdk.Runtime.GetMemoryQueue("")
|
q := sdk.Runtime.GetMemoryQueue("")
|
||||||
|
|||||||
Reference in new issue
Block a user