Merge pull request #76 from wenjianzhang/v1.0.0_fixbug

V1.0.0 fixbug
This commit is contained in:
wenjianzhang authored and GitHub committed 2020-05-12 23:54:46 +08:00
commit 4343cbefba
5 files changed
+21 -14

No files matched your search

+18 -10
View File
@@ -81,10 +81,26 @@ func GetSysTables(c *gin.Context) {
// @Router /api/v1/sys/tables/info [post]
// @Security Bearer
func InsertSysTable(c *gin.Context) {
tablesList := strings.Split(c.Request.FormValue("tables"), ",")
for i := 0; i < len(tablesList); i++ {
data, err := genTableInit(tablesList, i, c)
_, err = data.Create()
tools2.HasError(err, "", -1)
}
var res app.Response
res.Msg = "添加成功!"
c.JSON(http.StatusOK, res.ReturnOK())
}
func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, error) {
var data tools.SysTables
var dbTable tools.DBTables
var dbColumn tools.DBColumns
data.TBName = c.Request.FormValue("tables")
data.TBName = tablesList[i]
data.CreateBy = tools2.GetUserIdStr(c)
dbTable.TableName = data.TBName
@@ -161,15 +177,7 @@ func InsertSysTable(c *gin.Context) {
data.Columns = append(data.Columns, column)
}
result, err := data.Create()
tools2.HasError(err, "", -1)
var res app.Response
res.Data = result
res.Msg = "添加成功!"
c.JSON(http.StatusOK, res.ReturnOK())
return data, err
}
// @Summary 修改表结构
-1
View File
@@ -1,7 +1,6 @@
settings:
application:
mode: dev # dev开发环境 test测试环境 prod线上环境
demomsg: "谢谢您的参与,但为了大家更好的体验,所以本次提交就算了吧!\U0001F600\U0001F600\U0001F600"
host: 0.0.0.0
name: testApp
port: 8000
+1 -2
View File
@@ -10,10 +10,9 @@ import (
func AuthInit() (*jwt.GinJWTMiddleware, error) {
return jwt.New(&jwt.GinJWTMiddleware{
Realm: "test zone",
Key: []byte("secret key"),
Key: []byte(config.ApplicationConfig.JwtSecret),
Timeout: time.Hour,
MaxRefresh: time.Hour,
IdentityKey: config.ApplicationConfig.JwtSecret,
PayloadFunc: handler.PayloadFunc,
IdentityHandler: handler.IdentityHandler,
Authenticator: handler.Authenticator,
+1
View File
@@ -20,6 +20,7 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
var doc []DBTables
table := orm.Eloquent.Select("*").Table("information_schema.tables")
table = table.Where("TABLE_NAME not in (select table_name from "+config2.DatabaseConfig.Name+".sys_tables) ")
table = table.Where("table_schema= ? ", config2.DatabaseConfig.Name)
if e.TableName != "" {
+1 -1
View File
@@ -144,7 +144,7 @@ func (e *SysTables) Delete() (success bool, err error) {
}
func (e *SysTables) BatchDelete(id []int) (Result bool, err error) {
if err = orm.Eloquent.Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil {
if err = orm.Eloquent.Unscoped().Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil {
return
}
Result = true