调整整体架构写法

调整db用法
调整日志用法
调整模版
This commit is contained in:
linwenxiang committed 2021-03-04 23:45:16 +08:00
1 parent 734a48dbb8
commit e2952fa393
137 files changed
+3638 -3544

No files matched your search

+10 -1
View File
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/models/tools"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools/app"
)
@@ -19,6 +20,7 @@ import (
// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/db/columns/page [get]
func GetDBColumnList(c *gin.Context) {
log := logger.GetRequestLogger(c)
var data tools.DBColumns
var err error
var pageSize = 10
@@ -32,9 +34,16 @@ func GetDBColumnList(c *gin.Context) {
pageIndex, err = tools2.StringToInt(index)
}
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
data.TableName = c.Request.FormValue("tableName")
tools2.Assert(data.TableName == "", "table name cannot be empty!", 500)
result, count, err := data.GetPage(pageSize, pageIndex)
result, count, err := data.GetPage(db, pageSize, pageIndex)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
+10 -1
View File
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/models/tools"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
@@ -25,6 +26,7 @@ func GetDBTableList(c *gin.Context) {
var err error
var pageSize = 10
var pageIndex = 1
log := logger.GetRequestLogger(c)
if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" {
res.Msg = "对不起,sqlite3 或 postgres 不支持代码生成!"
c.JSON(http.StatusOK, res.ReturnError(500))
@@ -39,8 +41,15 @@ func GetDBTableList(c *gin.Context) {
pageIndex, err = tools2.StringToInt(index)
}
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
data.TableName = c.Request.FormValue("tableName")
result, count, err := data.GetPage(pageSize, pageIndex)
result, count, err := data.GetPage(db, pageSize, pageIndex)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
+43 -15
View File
@@ -9,12 +9,14 @@ import (
"go-admin/app/admin/models"
"go-admin/app/admin/models/tools"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/config"
)
func Preview(c *gin.Context) {
log := logger.GetRequestLogger(c)
table := tools.SysTables{}
id, err := tools2.StringToInt(c.Param("tableId"))
tools2.HasError(err, "", -1)
@@ -31,7 +33,15 @@ func Preview(c *gin.Context) {
tools2.HasError(err, "", -1)
t6, err := template.ParseFiles("template/v3/dto.go.template")
tools2.HasError(err, "", -1)
tab, _ := table.Get()
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
tab, _ := table.Get(db)
var b1 bytes.Buffer
err = t1.Execute(&b1, tab)
var b2 bytes.Buffer
@@ -59,11 +69,20 @@ func Preview(c *gin.Context) {
}
func GenCodeV3(c *gin.Context) {
log := logger.GetRequestLogger(c)
table := tools.SysTables{}
id, err := tools2.StringToInt(c.Param("tableId"))
tools2.HasError(err, "", -1)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
table.TableId = id
tab, _ := table.Get()
tab, _ := table.Get(db)
if tab.IsActions == 1 {
ActionsGenV3(tab)
@@ -173,13 +192,22 @@ func ActionsGenV3(tab tools.SysTables) {
}
func GenMenuAndApi(c *gin.Context) {
log := logger.GetRequestLogger(c)
table := tools.SysTables{}
timeNow := tools2.GetCurrentTime()
id, err := tools2.StringToInt(c.Param("tableId"))
tools2.HasError(err, "", -1)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
table.TableId = id
tab, _ := table.Get()
tab, _ := table.Get(db)
Mmenu := models.Menu{}
Mmenu.MenuName = tab.TBName + "Manage"
Mmenu.Title = tab.TableComment
@@ -197,7 +225,7 @@ func GenMenuAndApi(c *gin.Context) {
Mmenu.UpdateBy = "1"
Mmenu.CreatedAt = timeNow
Mmenu.UpdatedAt = timeNow
Mmenu.MenuId, err = Mmenu.Create()
Mmenu.MenuId, err = Mmenu.Create(db)
Cmenu := models.Menu{}
Cmenu.MenuName = tab.TBName
@@ -217,7 +245,7 @@ func GenMenuAndApi(c *gin.Context) {
Cmenu.UpdateBy = "1"
Cmenu.CreatedAt = timeNow
Cmenu.UpdatedAt = timeNow
Cmenu.MenuId, err = Cmenu.Create()
Cmenu.MenuId, err = Cmenu.Create(db)
MList := models.Menu{}
MList.MenuName = ""
@@ -236,7 +264,7 @@ func GenMenuAndApi(c *gin.Context) {
MList.UpdateBy = "1"
MList.CreatedAt = timeNow
MList.UpdatedAt = timeNow
MList.MenuId, err = MList.Create()
MList.MenuId, err = MList.Create(db)
MCreate := models.Menu{}
MCreate.MenuName = ""
@@ -255,7 +283,7 @@ func GenMenuAndApi(c *gin.Context) {
MCreate.UpdateBy = "1"
MCreate.CreatedAt = timeNow
MCreate.UpdatedAt = timeNow
MCreate.MenuId, err = MCreate.Create()
MCreate.MenuId, err = MCreate.Create(db)
MUpdate := models.Menu{}
MUpdate.MenuName = ""
@@ -274,7 +302,7 @@ func GenMenuAndApi(c *gin.Context) {
MUpdate.UpdateBy = "1"
MUpdate.CreatedAt = timeNow
MUpdate.UpdatedAt = timeNow
MUpdate.MenuId, err = MUpdate.Create()
MUpdate.MenuId, err = MUpdate.Create(db)
MDelete := models.Menu{}
MDelete.MenuName = ""
@@ -293,7 +321,7 @@ func GenMenuAndApi(c *gin.Context) {
MDelete.UpdateBy = "1"
MDelete.CreatedAt = timeNow
MDelete.UpdatedAt = timeNow
MDelete.MenuId, err = MDelete.Create()
MDelete.MenuId, err = MDelete.Create(db)
var InterfaceId = 63
Amenu := models.Menu{}
@@ -312,7 +340,7 @@ func GenMenuAndApi(c *gin.Context) {
Amenu.UpdateBy = "1"
Amenu.CreatedAt = timeNow
Amenu.UpdatedAt = timeNow
Amenu.MenuId, err = Amenu.Create()
Amenu.MenuId, err = Amenu.Create(db)
AList := models.Menu{}
AList.MenuName = ""
@@ -330,7 +358,7 @@ func GenMenuAndApi(c *gin.Context) {
AList.UpdateBy = "1"
AList.CreatedAt = timeNow
AList.UpdatedAt = timeNow
AList.MenuId, err = AList.Create()
AList.MenuId, err = AList.Create(db)
AGet := models.Menu{}
AGet.MenuName = ""
@@ -348,7 +376,7 @@ func GenMenuAndApi(c *gin.Context) {
AGet.UpdateBy = "1"
AGet.CreatedAt = timeNow
AGet.UpdatedAt = timeNow
AGet.MenuId, err = AGet.Create()
AGet.MenuId, err = AGet.Create(db)
ACreate := models.Menu{}
ACreate.MenuName = ""
@@ -366,7 +394,7 @@ func GenMenuAndApi(c *gin.Context) {
ACreate.UpdateBy = "1"
ACreate.CreatedAt = timeNow
ACreate.UpdatedAt = timeNow
ACreate.MenuId, err = ACreate.Create()
ACreate.MenuId, err = ACreate.Create(db)
AUpdate := models.Menu{}
AUpdate.MenuName = ""
@@ -384,7 +412,7 @@ func GenMenuAndApi(c *gin.Context) {
AUpdate.UpdateBy = "1"
AUpdate.CreatedAt = timeNow
AUpdate.UpdatedAt = timeNow
AUpdate.MenuId, err = AUpdate.Create()
AUpdate.MenuId, err = AUpdate.Create(db)
ADelete := models.Menu{}
ADelete.MenuName = ""
@@ -402,7 +430,7 @@ func GenMenuAndApi(c *gin.Context) {
ADelete.UpdateBy = "1"
ADelete.CreatedAt = timeNow
ADelete.UpdatedAt = timeNow
ADelete.MenuId, err = ADelete.Create()
ADelete.MenuId, err = ADelete.Create(db)
app.OK(c, "", "数据生成成功!")
}
+69 -11
View File
@@ -1,6 +1,8 @@
package tools
import (
"go-admin/pkg/logger"
"gorm.io/gorm"
"net/http"
"strings"
@@ -20,6 +22,7 @@ import (
// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/sys/tables/page [get]
func GetSysTableList(c *gin.Context) {
log := logger.GetRequestLogger(c)
var data tools.SysTables
var err error
var pageSize = 10
@@ -33,9 +36,16 @@ func GetSysTableList(c *gin.Context) {
pageIndex, err = tools2.StringToInt(index)
}
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
data.TBName = c.Request.FormValue("tableName")
data.TableComment = c.Request.FormValue("tableComment")
result, count, err := data.GetPage(pageSize, pageIndex)
result, count, err := data.GetPage(db, pageSize, pageIndex)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
@@ -58,9 +68,17 @@ func GetSysTableList(c *gin.Context) {
// @Router /api/v1/sys/tables/info/{tableId} [get]
// @Security Bearer
func GetSysTables(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
var data tools.SysTables
data.TableId, _ = tools2.StringToInt(c.Param("tableId"))
result, err := data.Get()
result, err := data.Get(db)
tools2.HasError(err, "抱歉未找到相关信息", -1)
var res app.Response
@@ -73,11 +91,19 @@ func GetSysTables(c *gin.Context) {
}
func GetSysTablesInfo(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
var data tools.SysTables
if c.Request.FormValue("tableName") != "" {
data.TBName = c.Request.FormValue("tableName")
}
result, err := data.Get()
result, err := data.Get(db)
tools2.HasError(err, "抱歉未找到相关信息", -1)
var res app.Response
@@ -90,8 +116,16 @@ func GetSysTablesInfo(c *gin.Context) {
}
func GetSysTablesTree(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
var data tools.SysTables
result, err := data.GetTree()
result, err := data.GetTree(db)
tools2.HasError(err, "抱歉未找到相关信息", -1)
var res app.Response
@@ -110,13 +144,20 @@ func GetSysTablesTree(c *gin.Context) {
// @Router /api/v1/sys/tables/info [post]
// @Security Bearer
func InsertSysTable(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
tablesList := strings.Split(c.Request.FormValue("tables"), ",")
for i := 0; i < len(tablesList); i++ {
data, err := genTableInit(tablesList, i, c)
data, err := genTableInit(db, tablesList, i, c)
_, err = data.Create()
_, err = data.Create(db)
tools2.HasError(err, "", -1)
}
var res app.Response
@@ -125,7 +166,7 @@ func InsertSysTable(c *gin.Context) {
}
func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, error) {
func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tools.SysTables, error) {
var data tools.SysTables
var dbTable tools.DBTables
var dbColumn tools.DBColumns
@@ -133,7 +174,7 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
data.CreateBy = tools2.GetUserIdStr(c)
dbTable.TableName = data.TBName
dbtable, err := dbTable.Get()
dbtable, err := dbTable.Get(tx)
dbColumn.TableName = data.TBName
tablenamelist := strings.Split(dbColumn.TableName, "_")
@@ -148,7 +189,7 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
data.TplCategory = "crud"
data.Crud = true
dbcolumn, err := dbColumn.GetList()
dbcolumn, err := dbColumn.GetList(tx)
data.CreateBy = tools2.GetUserIdStr(c)
data.TableComment = dbtable.TableComment
if dbtable.TableComment == "" {
@@ -241,8 +282,17 @@ func UpdateSysTable(c *gin.Context) {
var data tools.SysTables
err := c.Bind(&data)
tools2.HasError(err, "数据解析失败", 500)
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
data.UpdateBy = tools2.GetUserIdStr(c)
result, err := data.Update()
result, err := data.Update(db)
tools2.HasError(err, "", -1)
var res app.Response
@@ -259,9 +309,17 @@ func UpdateSysTable(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/sys/tables/info/{tableId} [delete]
func DeleteSysTables(c *gin.Context) {
log := logger.GetRequestLogger(c)
db, err := tools2.GetOrm(c)
if err != nil {
log.Errorf("get db connection error, %s", err.Error())
app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return
}
var data tools.SysTables
IDS := tools2.IdsStrToIdsIntGroup("tableId", c)
_, err := data.BatchDelete(IDS)
_, err = data.BatchDelete(db, IDS)
tools2.HasError(err, "删除失败", 500)
var res app.Response
res.Msg = "删除成功"