public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

结构调整添加cmd

Browse Source
This commit is contained in:
zhangwenjian
2020-04-18 10:06:44 +08:00
parent f2829bfd98
commit a2f4c00246
72 changed files with 838 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apis/tools/dbcolumns.go
+6 -6
View File
@@ -3,8 +3,8 @@ package tools
import (
"github.com/gin-gonic/gin"
"go-admin/models/tools"
"go-admin/pkg"
"go-admin/pkg/app"
tools2 "go-admin/tools"
"go-admin/tools/app"
"net/http"
)
@@ -23,17 +23,17 @@ func GetDBColumnList(c *gin.Context) {
var pageIndex = 1
if size := c.Request.FormValue("pageSize"); size != "" {
pageSize = pkg.StrToInt(err, size)
pageSize = tools2.StrToInt(err, size)
}
if index := c.Request.FormValue("pageIndex"); index != "" {
pageIndex = pkg.StrToInt(err, index)
pageIndex = tools2.StrToInt(err, index)
}
data.TableName = c.Request.FormValue("tableName")
pkg.Assert(data.TableName=="","table name cannot be empty！",500)
tools2.Assert(data.TableName=="","table name cannot be empty！",500)
result, count, err := data.GetPage(pageSize, pageIndex)
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
mp["list"] = result
apis/tools/dbtables.go
+7 -7
View File
@@ -2,10 +2,10 @@ package tools
import (
"github.com/gin-gonic/gin"
"go-admin/config"
"go-admin/models/tools"
"go-admin/pkg"
"go-admin/pkg/app"
tools2 "go-admin/tools"
"go-admin/tools/app"
config2 "go-admin/tools/config"
"net/http"
)
@@ -23,23 +23,23 @@ func GetDBTableList(c *gin.Context) {
var err error
var pageSize = 10
var pageIndex = 1
if config.DatabaseConfig.Dbtype=="sqlite3"{
if config2.DatabaseConfig.Dbtype=="sqlite3"{
res.Msg="对不起，sqlite3 暂不支持代码生成！"
c.JSON(http.StatusOK, res.ReturnError(500))
return
}
if size := c.Request.FormValue("pageSize"); size != "" {
pageSize = pkg.StrToInt(err, size)
pageSize = tools2.StrToInt(err, size)
}
if index := c.Request.FormValue("pageIndex"); index != "" {
pageIndex = pkg.StrToInt(err, index)
pageIndex = tools2.StrToInt(err, index)
}
data.TableName = c.Request.FormValue("tableName")
result, count, err := data.GetPage(pageSize, pageIndex)
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
mp["list"] = result
apis/tools/gen.go
+6 -7
View File
@@ -4,22 +4,21 @@ import (
"bytes"
"github.com/gin-gonic/gin"
"go-admin/models/tools"
"go-admin/pkg"
"go-admin/pkg/app"
"go-admin/pkg/utils"
tools2 "go-admin/tools"
"go-admin/tools/app"
"net/http"
"text/template"
)
func Preview(c *gin.Context) {
table := tools.SysTables{}
id, err := utils.StringToInt(c.Param("tableId"))
pkg.HasError(err, "", -1)
id, err := tools2.StringToInt(c.Param("tableId"))
tools2.HasError(err, "", -1)
table.TableId = id
t1, err := template.ParseFiles("template/model.go.template")
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
t2, err := template.ParseFiles("template/api.go.template")
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
tab, _ := table.Get()
var b1 bytes.Buffer
err = t1.Execute(&b1, tab)
apis/tools/systables.go
+15 -16
View File
@@ -3,9 +3,8 @@ package tools
import (
"github.com/gin-gonic/gin"
"go-admin/models/tools"
"go-admin/pkg"
"go-admin/pkg/app"
"go-admin/pkg/utils"
tools2 "go-admin/tools"
"go-admin/tools/app"
"net/http"
"strings"
)
@@ -25,16 +24,16 @@ func GetSysTableList(c *gin.Context) {
var pageIndex = 1
if size := c.Request.FormValue("pageSize"); size != "" {
pageSize = pkg.StrToInt(err, size)
pageSize = tools2.StrToInt(err, size)
}
if index := c.Request.FormValue("pageIndex"); index != "" {
pageIndex = pkg.StrToInt(err, index)
pageIndex = tools2.StrToInt(err, index)
}
data.TableName = c.Request.FormValue("tableName")
result, count, err := data.GetPage(pageSize, pageIndex)
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
var mp = make(map[string]interface{}, 3)
mp["list"] = result
@@ -57,9 +56,9 @@ func GetSysTableList(c *gin.Context) {
// @Security
func GetSysTables(c *gin.Context) {
var data tools.SysTables
data.TableId, _ = utils.StringToInt(c.Param("tableId"))
data.TableId, _ = tools2.StringToInt(c.Param("tableId"))
result, err := data.Get()
pkg.HasError(err, "抱歉未找到相关信息", -1)
tools2.HasError(err, "抱歉未找到相关信息", -1)
var res app.Response
res.Data = result
@@ -85,7 +84,7 @@ func InsertSysTable(c *gin.Context) {
var dbTable tools.DBTables
var dbColumn tools.DBColumns
data.TableName = c.Request.FormValue("tables")
data.CreateBy = utils.GetUserIdStr(c)
data.CreateBy = tools2.GetUserIdStr(c)
dbTable.TableName = data.TableName
dbtable, err := dbTable.Get()
@@ -103,7 +102,7 @@ func InsertSysTable(c *gin.Context) {
data.Crud = true
dbcolumn, err := dbColumn.GetList()
data.CreateBy = utils.GetUserIdStr(c)
data.CreateBy = tools2.GetUserIdStr(c)
data.TableComment = dbtable.TableComment
if dbtable.TableComment == "" {
data.TableComment = data.ClassName
@@ -163,7 +162,7 @@ func InsertSysTable(c *gin.Context) {
}
result, err := data.Create()
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
var res app.Response
res.Data = result
@@ -185,10 +184,10 @@ func InsertSysTable(c *gin.Context) {
func UpdateSysTable(c *gin.Context) {
var data tools.SysTables
err := c.Bind(&data)
pkg.HasError(err, "数据解析失败", -1)
data.UpdateBy = utils.GetUserIdStr(c)
tools2.HasError(err, "数据解析失败", -1)
data.UpdateBy = tools2.GetUserIdStr(c)
result, err := data.Update()
pkg.HasError(err, "", -1)
tools2.HasError(err, "", -1)
var res app.Response
res.Data = result
@@ -205,10 +204,10 @@ func UpdateSysTable(c *gin.Context) {
// @Router /api/v1/sys/tables/info/{tableId} [delete]
func DeleteSysTables(c *gin.Context) {
var data tools.SysTables
id, err := utils.StringToInt(c.Param("tableId"))
id, err := tools2.StringToInt(c.Param("tableId"))
data.TableId = id
_, err = data.Delete()
pkg.HasError(err, "删除失败", 500)
tools2.HasError(err, "删除失败", 500)
var res app.Response
res.Msg = "删除成功"
c.JSON(http.StatusOK, res.ReturnOK())