From 57067907d32b2c3a7b58657c4eff59e3fb5e0b70 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Mon, 10 May 2021 17:25:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor=F0=9F=8E=A8=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/router/sys_config.go | 4 ++-- app/admin/service/dto/sys_config.go | 4 ++-- app/admin/service/sys_config.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go index 9b90da7..8b3541c 100644 --- a/app/admin/router/sys_config.go +++ b/app/admin/router/sys_config.go @@ -21,7 +21,7 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd r.GET("/:id", api.GetSysConfig) r.POST("", api.InsertSysConfig) r.PUT("/:id", api.UpdateSysConfig) - r.DELETE("/:id", api.DeleteSysConfig) + r.DELETE("", api.DeleteSysConfig) } r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc()) @@ -34,4 +34,4 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd r2.GET("", api.GetSysConfigBySysApp) } -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index be49845..d87ec95 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -97,7 +97,7 @@ func (s *SysConfigById) Generate() *SysConfigById { } func (s *SysConfigById) GetId() interface{} { - return s.Id + return s.Ids } func (s *SysConfigById) Bind(ctx *gin.Context) error { @@ -116,4 +116,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error { func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { return &system.SysConfig{}, nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 2cf60a1..8674e8c 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -104,7 +104,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e var data system.SysConfig db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + Where(d.Ids).Delete(c) if db.Error != nil { err = db.Error e.Log.Errorf("Service RemoveSysConfig error:%s", err) From 3a4bfe915bc1612d944c2e2de0795f730cf63318 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Thu, 13 May 2021 09:18:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=E2=9C=A8=20gen=E4=B8=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/tools/systables.go | 7 +++---- app/admin/models/tools/syscolumns.go | 8 ++++---- app/admin/models/tools/systables.go | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index 9e95d83..9a1ad61 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -6,7 +6,6 @@ import ( "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "gorm.io/gorm" @@ -188,7 +187,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool var dbTable tools.DBTables var dbColumn tools.DBColumns data.TBName = tablesList[i] - data.CreateBy = user.GetUserIdStr(c) + data.CreateBy = 0 dbTable.TableName = data.TBName dbtable, err := dbTable.Get(tx) @@ -210,7 +209,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool data.Crud = true dbcolumn, err := dbColumn.GetList(tx) - data.CreateBy = user.GetUserIdStr(c) + data.CreateBy = 0 data.TableComment = dbtable.TableComment if dbtable.TableComment == "" { data.TableComment = data.ClassName @@ -310,7 +309,7 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) { return } - data.UpdateBy = user.GetUserIdStr(c) + data.UpdateBy = 0 result, err := data.Update(db) if err != nil { log.Errorf("Update error, %s", err.Error()) diff --git a/app/admin/models/tools/syscolumns.go b/app/admin/models/tools/syscolumns.go index da969a6..c7539e0 100644 --- a/app/admin/models/tools/syscolumns.go +++ b/app/admin/models/tools/syscolumns.go @@ -41,8 +41,8 @@ type SysColumns struct { FkCol []SysColumns `gorm:"-" json:"fkCol"` FkLabelId string `gorm:"" json:"fkLabelId"` FkLabelName string `gorm:"size:255;" json:"fkLabelName"` - CreateBy string `gorm:"column:create_by;size:128;" json:"createBy"` - UpdateBy string `gorm:"column:update_By;size:128;" json:"updateBy"` + CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` + UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` models.BaseModel } @@ -66,7 +66,7 @@ func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) { func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) { var doc SysColumns - e.CreateBy = "1" + e.CreateBy = 0 result := tx.Table("sys_columns").Create(&e) if result.Error != nil { err := result.Error @@ -83,7 +83,7 @@ func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) { //参数1:是要修改的数据 //参数2:是修改的数据 - e.UpdateBy = "1" + e.UpdateBy = 0 if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil { return } diff --git a/app/admin/models/tools/systables.go b/app/admin/models/tools/systables.go index bc1d3a0..39c9aa5 100644 --- a/app/admin/models/tools/systables.go +++ b/app/admin/models/tools/systables.go @@ -34,8 +34,8 @@ type SysTables struct { IsLogicalDelete string `gorm:"size:1;" json:"isLogicalDelete"` LogicalDelete bool `gorm:"size:1;" json:"logicalDelete"` LogicalDeleteColumn string `gorm:"size:128;" json:"logicalDeleteColumn"` - CreateBy string `gorm:"size:128;" json:"createBy"` - UpdateBy string `gorm:"size:128;" json:"updateBy"` + CreateBy int `gorm:"size:128;" json:"createBy"` + UpdateBy int `gorm:"size:128;" json:"updateBy"` DataScope string `gorm:"-" json:"dataScope"` Params Params `gorm:"-" json:"params"` Columns []SysColumns `gorm:"-" json:"columns"` @@ -134,7 +134,7 @@ func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) { func (e *SysTables) Create(tx *gorm.DB) (SysTables, error) { var doc SysTables - e.CreateBy = "1" + e.CreateBy = 0 result := tx.Table("sys_tables").Create(&e) if result.Error != nil { err := result.Error @@ -157,7 +157,7 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) { //参数1:是要修改的数据 //参数2:是修改的数据 - e.UpdateBy="1" + e.UpdateBy = 0 if err = tx.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil { return }