feat ✨ 优化api写法

This commit is contained in:
linwenxiang committed 2021-04-27 10:06:22 +08:00
1 parent 5957fb280c
commit 13ff9d9e63
38 files changed
+777 -672

No files matched your search

+5 -4
View File
@@ -19,7 +19,8 @@ import (
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/db/columns/page [get]
func (e *Gen) GetDBColumnList(c *gin.Context) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
var data tools.DBColumns
var err error
var pageSize = 10
@@ -36,7 +37,7 @@ func (e *Gen) GetDBColumnList(c *gin.Context) {
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -45,8 +46,8 @@ func (e *Gen) GetDBColumnList(c *gin.Context) {
result, count, err := data.GetPage(db, pageSize, pageIndex)
if err != nil {
log.Errorf("GetPage error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
e.PageOK(result, count, pageIndex, pageSize, "查询成功")
}
+6 -5
View File
@@ -26,11 +26,12 @@ func (e *Gen) GetDBTableList(c *gin.Context) {
var err error
var pageSize = 10
var pageIndex = 1
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" {
err = errors.New("对不起,sqlite3 或 postgres 不支持代码生成!")
log.Warn(err)
e.Error(c, 403, err, "")
e.Error(403, err, "")
//c.JSON(http.StatusOK, res.ReturnError(500))
return
}
@@ -46,7 +47,7 @@ func (e *Gen) GetDBTableList(c *gin.Context) {
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -54,8 +55,8 @@ func (e *Gen) GetDBTableList(c *gin.Context) {
result, count, err := data.GetPage(db, pageSize, pageIndex)
if err != nil {
log.Errorf("GetPage error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
e.PageOK(result, count, pageIndex, pageSize, "查询成功")
}
+41 -36
View File
@@ -22,62 +22,63 @@ type Gen struct {
}
func (e *Gen) Preview(c *gin.Context) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
table := tools.SysTables{}
id, err := pkg.StringToInt(c.Param("tableId"))
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
table.TableId = id
t1, err := template.ParseFiles("template/v4/model.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t3, err := template.ParseFiles("template/v4/js.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t4, err := template.ParseFiles("template/v4/vue.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t6, err := template.ParseFiles("template/v4/dto.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -105,23 +106,24 @@ func (e *Gen) Preview(c *gin.Context) {
mp["template/router.go.template"] = b5.String()
mp["template/dto.go.template"] = b6.String()
mp["template/service.go.template"] = b7.String()
e.OK(c, mp, "")
e.OK(mp, "")
}
func (e *Gen) GenCodeV3(c *gin.Context) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
table := tools.SysTables{}
id, err := pkg.StringToInt(c.Param("tableId"))
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -134,23 +136,24 @@ func (e *Gen) GenCodeV3(c *gin.Context) {
e.NOActionsGenV3(c, tab)
}
e.OK(c, "", "Code generated successfully!")
e.OK("", "Code generated successfully!")
}
func (e *Gen) GenApiToFile(c *gin.Context) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
table := tools.SysTables{}
id, err := pkg.StringToInt(c.Param("tableId"))
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -158,11 +161,12 @@ func (e *Gen) GenApiToFile(c *gin.Context) {
tab, _ := table.Get(db)
e.genApiToFile(c, tab)
e.OK(c, "", "Code generated successfully!")
e.OK("", "Code generated successfully!")
}
func (e *Gen) NOActionsGenV3(c *gin.Context, tab tools.SysTables) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
basePath := "template/v4/"
routerFile := basePath + "no_actions/router_check_role.go.template"
@@ -174,43 +178,43 @@ func (e *Gen) NOActionsGenV3(c *gin.Context, tab tools.SysTables) {
t1, err := template.ParseFiles(basePath + "model.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t3, err := template.ParseFiles(routerFile)
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t4, err := template.ParseFiles(basePath + "js.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t5, err := template.ParseFiles(basePath + "vue.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t6, err := template.ParseFiles(basePath + "dto.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
@@ -246,14 +250,15 @@ func (e *Gen) NOActionsGenV3(c *gin.Context, tab tools.SysTables) {
}
func (e *Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
basePath := "template/"
t1, err := template.ParseFiles(basePath + "api_migrate.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
i := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
@@ -279,31 +284,31 @@ func (e *Gen) ActionsGenV3(c *gin.Context, tab tools.SysTables) {
t1, err := template.ParseFiles(basePath + "model.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t3, err := template.ParseFiles(routerFile)
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t4, err := template.ParseFiles(basePath + "js.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t5, err := template.ParseFiles(basePath + "vue.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
t6, err := template.ParseFiles(basePath + "dto.go.template")
if err != nil {
log.Error(err)
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
@@ -342,7 +347,7 @@ func (e *Gen) GenMenuAndApi(c *gin.Context) {
db, err := pkg.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -572,5 +577,5 @@ func (e *Gen) GenMenuAndApi(c *gin.Context) {
ADelete.UpdatedAt = timeNow
ADelete.MenuId, err = ADelete.Create(db)
e.OK(c, "", "数据生成成功!")
e.OK("", "数据生成成功!")
}
+43 -36
View File
@@ -27,7 +27,8 @@ type SysTable struct {
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/sys/tables/page [get]
func (e *SysTable) GetSysTableList(c *gin.Context) {
log := e.GetLogger(c)
e.Context = c
log := e.GetLogger()
var data tools.SysTables
var err error
var pageSize = 10
@@ -41,10 +42,10 @@ func (e *SysTable) GetSysTableList(c *gin.Context) {
pageIndex, err = pkg.StringToInt(index)
}
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -53,10 +54,10 @@ func (e *SysTable) GetSysTableList(c *gin.Context) {
result, count, err := data.GetPage(db, pageSize, pageIndex)
if err != nil {
log.Errorf("GetPage error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
e.PageOK(result, count, pageIndex, pageSize, "查询成功")
}
// @Summary 获取配置
@@ -67,11 +68,12 @@ func (e *SysTable) GetSysTableList(c *gin.Context) {
// @Router /api/v1/sys/tables/info/{tableId} [get]
// @Security Bearer
func (e *SysTable) GetSysTables(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -80,22 +82,23 @@ func (e *SysTable) GetSysTables(c *gin.Context) {
result, err := data.Get(db)
if err != nil {
log.Errorf("Get error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
mp := make(map[string]interface{})
mp["list"] = result.Columns
mp["info"] = result
e.OK(c, mp, "")
e.OK(mp, "")
}
func (e *SysTable) GetSysTablesInfo(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -106,24 +109,25 @@ func (e *SysTable) GetSysTablesInfo(c *gin.Context) {
result, err := data.Get(db)
if err != nil {
log.Errorf("Get error, %s", err.Error())
e.Error(c, 500, err, "抱歉未找到相关信息")
e.Error(500, err, "抱歉未找到相关信息")
return
}
mp := make(map[string]interface{})
mp["list"] = result.Columns
mp["info"] = result
e.OK(c, mp, "")
e.OK(mp, "")
//res.Data = mp
//c.JSON(http.StatusOK, res.ReturnOK())
}
func (e *SysTable) GetSysTablesTree(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -131,11 +135,11 @@ func (e *SysTable) GetSysTablesTree(c *gin.Context) {
result, err := data.GetTree(db)
if err != nil {
log.Errorf("GetTree error, %s", err.Error())
e.Error(c, 500, err, "抱歉未找到相关信息")
e.Error(500, err, "抱歉未找到相关信息")
return
}
e.OK(c, result, "")
e.OK(result, "")
}
// @Summary 添加表结构
@@ -149,11 +153,12 @@ func (e *SysTable) GetSysTablesTree(c *gin.Context) {
// @Router /api/v1/sys/tables/info [post]
// @Security Bearer
func (e *SysTable) InsertSysTable(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -163,18 +168,18 @@ func (e *SysTable) InsertSysTable(c *gin.Context) {
data, err := genTableInit(db, tablesList, i, c)
if err != nil {
log.Errorf("genTableInit error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
_, err = data.Create(db)
if err != nil {
log.Errorf("Create error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
}
e.OK(c, nil, "添加成功")
e.OK(nil, "添加成功")
}
@@ -296,11 +301,12 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) {
err := c.Bind(&data)
pkg.HasError(err, "数据解析失败", 500)
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -308,10 +314,10 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) {
result, err := data.Update(db)
if err != nil {
log.Errorf("Update error, %s", err.Error())
e.Error(c, 500, err, "")
e.Error(500, err, "")
return
}
e.OK(c, result, "修改成功")
e.OK(result, "修改成功")
}
// @Summary 删除表结构
@@ -322,11 +328,12 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/sys/tables/info/{tableId} [delete]
func (e *SysTable) DeleteSysTables(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
@@ -335,8 +342,8 @@ func (e *SysTable) DeleteSysTables(c *gin.Context) {
_, err = data.BatchDelete(db, IDS)
if err != nil {
log.Errorf("BatchDelete error, %s", err.Error())
e.Error(c, 500, err, "删除失败")
e.Error(500, err, "删除失败")
return
}
e.OK(c, nil, "删除成功")
e.OK(nil, "删除成功")
}