From a25226486811a9cb6728de46e6181f08af8b743f Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 9 May 2020 01:00:56 +0800 Subject: [PATCH 1/5] Remove configuration that is no longer in use --- config/settings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/settings.yml b/config/settings.yml index 90f87ce4..5945e2a9 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,7 +1,6 @@ settings: application: mode: dev # dev开发环境 test测试环境 prod线上环境 - demomsg: "谢谢您的参与，但为了大家更好的体验，所以本次提交就算了吧！\U0001F600\U0001F600\U0001F600" host: 0.0.0.0 name: testApp port: 8000 From 99e038cb35e96bb13e414502fe9beeb2af3af3e2 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 9 May 2020 14:50:03 +0800 Subject: [PATCH 2/5] Fix bulk import data table --- apis/tools/systables.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/apis/tools/systables.go b/apis/tools/systables.go index ef69b9c7..c540d0d1 100644 --- a/apis/tools/systables.go +++ b/apis/tools/systables.go @@ -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 修改表结构 From 429bc5fb18b9ae46619144ffa7a1e3325446a35d Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 9 May 2020 14:50:39 +0800 Subject: [PATCH 3/5] Code generation changed to physical deletion --- models/tools/systables.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/tools/systables.go b/models/tools/systables.go index 78025bce..17f354f3 100644 --- a/models/tools/systables.go +++ b/models/tools/systables.go @@ -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 From 63184fcd0aa64a848d1d95131ab0fb845b9d7040 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 9 May 2020 14:51:54 +0800 Subject: [PATCH 4/5] Code generation import list add imported data table --- models/tools/dbtables.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/tools/dbtables.go b/models/tools/dbtables.go index 08229f32..bd2fea17 100644 --- a/models/tools/dbtables.go +++ b/models/tools/dbtables.go @@ -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 != "" { From f6adb488377be61cad2b8a9a0a5708a73724899a Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 12 May 2020 23:53:51 +0800 Subject: [PATCH 5/5] Fix jwt key --- middleware/auth.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/middleware/auth.go b/middleware/auth.go index a7944fc9..ee08620a 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -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,