调整整体架构写法

调整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"
"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)