From da16b4af7a00fde7a70a353249443185c5fb61d2 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Sun, 30 May 2021 22:17:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=F0=9F=90=9B=20query=20built=20from=20**?= =?UTF-8?q?**=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/sys_china_area_data.go | 10 +++++++--- app/admin/service/sys_config.go | 11 ++++++----- app/admin/service/sys_dept.go | 13 ++++--------- app/admin/service/sys_dict_data.go | 10 ++++------ app/admin/service/sys_dict_type.go | 10 ++++------ app/admin/service/sys_file_dir.go | 7 ++++--- app/admin/service/sys_file_info.go | 9 ++++++--- app/admin/service/sys_login_log.go | 5 ++--- app/admin/service/sys_menu.go | 5 ++--- app/admin/service/sys_opera_log.go | 10 ++++++---- app/admin/service/sys_post.go | 2 +- app/admin/service/sys_role.go | 4 ++-- app/admin/service/sys_user.go | 8 ++++---- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/app/admin/service/sys_china_area_data.go b/app/admin/service/sys_china_area_data.go index 2ff6aa6d..94753d2e 100644 --- a/app/admin/service/sys_china_area_data.go +++ b/app/admin/service/sys_china_area_data.go @@ -2,6 +2,7 @@ package service import ( "errors" + common "go-admin/common/models" "gorm.io/gorm" @@ -71,10 +72,13 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData // UpdateSysChinaAreaData 修改SysChinaAreaData对象 func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error { - db := e.Orm.Model(c). + db := e.Orm.Model(&models.SysChinaAreaData{ + Model: common.Model{ + Id: c.GetId().(int), + }}). Scopes( actions.Permission(c.TableName(), p), - ).Where(c.GetId()).Updates(c) + ).Updates(c) if err := db.Error; err != nil { e.Log.Errorf("Service UpdateSysChinaAreaData error: %s", err) return err @@ -103,4 +107,4 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p return errors.New("无权删除该数据") } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 8674e8c9..a79ead18 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -5,6 +5,7 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" + common "go-admin/common/models" "go-admin/common/service" "gorm.io/gorm" ) @@ -84,8 +85,9 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { var err error - db := e.Orm.Model(c). - Where(c.GetId()).Updates(c) + db := e.Orm.Model(&system.SysConfig{Model: common.Model{ + Id: c.GetId().(int), + }}).Updates(c) err = db.Error if err != nil { e.Log.Errorf("Service UpdateSysConfig error:%s", err) @@ -103,8 +105,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e var err error var data system.SysConfig - db := e.Orm.Model(&data). - Where(d.Ids).Delete(c) + db := e.Orm.Model(&data).Delete(c, d.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Service RemoveSysConfig error:%s", err) @@ -129,4 +130,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index a92335fb..3971957c 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -4,7 +4,6 @@ import ( "errors" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "gorm.io/gorm" "go-admin/app/admin/models/system" @@ -85,9 +84,9 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error { // UpdateSysDept 修改SysDept对象 func (e *SysDept) UpdateSysDept(c *system.SysDept) error { var err error - var data system.SysDept - - db := e.Orm.Model(&data). + db := e.Orm.Model(&system.SysDept{ + DeptId: c.GetId().(int), + }). Where(c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) @@ -97,9 +96,6 @@ func (e *SysDept) UpdateSysDept(c *system.SysDept) error { return errors.New("无权更新该数据") } - //参数1:是要修改的数据 - //参数2:是修改的数据 - return nil } @@ -108,8 +104,7 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { var err error var data system.SysDept - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(&data) + db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 92179020..0effb4c9 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -71,10 +71,9 @@ func (e *SysDictData) Insert(model *system.SysDictData) error { // Update 修改对象 func (e *SysDictData) Update(c *system.SysDictData) error { var err error - var data system.SysDictData - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + db := e.Orm.Model(&system.SysDictData{ + DictCode: c.GetId().(int), + }).Updates(c) if db.Error != nil { e.Log.Errorf("db error: %s", err) return err @@ -91,8 +90,7 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro var err error var data system.SysDictData - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + db := e.Orm.Model(&data).Delete(c, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index c242df2c..4ba27426 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -71,10 +71,9 @@ func (e *SysDictType) Insert(model *system.SysDictType) error { // Update 修改对象 func (e *SysDictType) Update(c *system.SysDictType) error { var err error - var data system.SysDictType - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + db := e.Orm.Model(&system.SysDictType{ + ID: c.GetId().(int), + }).Updates(c) if db.Error != nil { e.Log.Errorf("db error: %s", err) return err @@ -91,8 +90,7 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro var err error var data system.SysDictType - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(c) + db := e.Orm.Model(&data).Delete(c, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_file_dir.go b/app/admin/service/sys_file_dir.go index 541eec50..84ff87a3 100644 --- a/app/admin/service/sys_file_dir.go +++ b/app/admin/service/sys_file_dir.go @@ -3,6 +3,7 @@ package service import ( "errors" "fmt" + "go-admin/app/admin/models/system" "gorm.io/gorm" @@ -91,10 +92,10 @@ func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataP var err error data, _ := c.GenerateM() - db := e.Orm. + db := e.Orm.Model(&system.SysRole{RoleId: c.GetId().(int)}). Scopes( actions.Permission(data.TableName(), p), - ).Where(c.ID).Updates(data) + ).Updates(data) if db.Error != nil { e.Log.Errorf("db error: %s", err) return err @@ -113,7 +114,7 @@ func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPerm db := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), - ).Where(d.Id).Delete(&data) + ).Delete(&data, d.Id) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_file_info.go b/app/admin/service/sys_file_info.go index d72db34c..cb7c1962 100644 --- a/app/admin/service/sys_file_info.go +++ b/app/admin/service/sys_file_info.go @@ -2,6 +2,7 @@ package service import ( "errors" + common "go-admin/common/models" "gorm.io/gorm" @@ -89,10 +90,12 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.Da e.Log.Errorf("db error: %s", err) return err } - err = e.Orm.Debug().Model(&data). + err = e.Orm.Debug().Model(&models.SysFileInfo{Model: common.Model{ + Id: c.ID, + }}). Scopes( actions.Permission(data.TableName(), p), - ).Where("id = ?", c.ID).Updates(&data).Error + ).Updates(&data).Error if err != nil { e.Log.Errorf("db error: %s", err) return err @@ -112,7 +115,7 @@ func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataP db := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), - ).Where(d.GetId()).Delete(&data) + ).Delete(&data, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index 800a1f1d..d231c02e 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -75,7 +75,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { var data system.SysLoginLog db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + Where("id = ?", c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -92,8 +92,7 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR var err error var data system.SysLoginLog - db := e.Orm.Model(&data). - Where(d.Ids).Delete(c) + db := e.Orm.Model(&data).Delete(c, d.Ids) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 40422dec..13ffe0af 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -107,7 +107,7 @@ func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { var data system.SysMenu db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + Where("menu_id = ?", c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -124,8 +124,7 @@ func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { var err error var data system.SysMenu - db := e.Orm.Model(&data). - Where(d.GetId()).Delete(&data) + db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index cb81586b..8ab32921 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -5,6 +5,7 @@ import ( "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" + common "go-admin/common/models" "go-admin/common/service" "gorm.io/gorm" ) @@ -68,8 +69,9 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { var err error - db := e.Orm.Model(c). - Where(c.GetId()).Updates(c) + db := e.Orm.Model(&system.SysOperaLog{Model: common.Model{ + Id: c.GetId().(int), + }}).Updates(c) if err = db.Error; err != nil { e.Log.Errorf("Service UpdateSysOperaLog error:%s", err.Error()) return err @@ -86,7 +88,7 @@ func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { var err error var data system.SysOperaLog - db := e.Orm.Model(&data).Where(d.Ids).Delete(&data) + db := e.Orm.Model(&data).Delete(&data, d.Ids) if err = db.Error; err != nil { e.Log.Errorf("Service RemoveSysOperaLog error:%s", err.Error()) return err @@ -95,4 +97,4 @@ func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { return errors.New("无权删除该数据") } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index 7d3fe289..e879db4e 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -74,7 +74,7 @@ func (e *SysPost) UpdateSysPost(c *system.SysPost) error { var data system.SysPost db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + Where("post_id = ?", c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index fedff993..ce9c87c1 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -104,7 +104,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { } }() db := tx.Model(&c). - Where(c.GetId()).Updates(c) + Where(" role_id = ?", c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error:%s", err) return err @@ -221,4 +221,4 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { } } return err -} \ No newline at end of file +} diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index 8681a291..d485e086 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -83,7 +83,7 @@ func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission db := e.Orm.Model(c). Scopes( actions.Permission(c.TableName(), p), - ).Where(c.GetId()).Updates(c) + ).Where("user_id = ?", c.GetId()).Updates(c) if db.Error != nil { e.Log.Errorf("db error: %s", err) return err @@ -103,7 +103,7 @@ func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *action db := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), - ).Where(d.GetId()).Delete(c) + ).Delete(c, d.GetId()) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) @@ -128,7 +128,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a err = e.Orm.Model(c). Scopes( actions.Permission(c.TableName(), p), - ).Where(id).Select("UserId", "Password", "Salt").First(c).Error + ).Where("user_id = ?", id).Select("UserId", "Password", "Salt").First(c).Error if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return errors.New("无权更新该数据") @@ -148,7 +148,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a return err } c.Password = newPassword - db := e.Orm.Model(c).Where(id).Select("Password", "Salt").Updates(c) + db := e.Orm.Model(c).Where("user_id = ?", id).Select("Password", "Salt").Updates(c) if err = db.Error; err != nil { e.Log.Errorf("db error: %s", err) return err From 2cb81654a6ad39a4bd19ce131071398ecda19215 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Mon, 31 May 2021 14:43:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20:bug:=20=E4=BF=AE=E5=A4=8Dqueue=20red?= =?UTF-8?q?is=E6=A8=A1=E5=BC=8F=E9=98=BF=E9=87=8C=E4=BA=91=E4=B8=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/api/server.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/api/server.go b/cmd/api/server.go index 48b13d67..af3f211b 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -82,6 +82,9 @@ func setup() { log.Fatalf("queue setup error, %s\n", err.Error()) } sdk.Runtime.SetQueueAdapter(queueAdapter) + defer func() { + go queueAdapter.Run() + }() } //7. 设置分布式锁 From b5bfece9f1cd658adc7b58ea5fb673cdabf55ce8 Mon Sep 17 00:00:00 2001 From: ninstein Date: Mon, 31 May 2021 21:12:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=20bugfix:=E5=BF=85=E5=A1=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/v4/vue.go.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/v4/vue.go.template b/template/v4/vue.go.template index c7847672..93389cd2 100644 --- a/template/v4/vue.go.template +++ b/template/v4/vue.go.template @@ -294,8 +294,7 @@ // 表单校验 rules: { {{- range .Columns -}} - {{- $x := .IsQuery -}} - {{- if ($x) -}} + {{- if eq .IsRequired "1" -}} {{.JsonField}}: [ {required: true, message: '{{.ColumnComment}}不能为空', trigger: 'blur'} From c0f920d43c8c3cd5a2a51a2c69820567df78d8c6 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 1 Jun 2021 00:17:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=F0=9F=90=9B=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=A7=A6=E5=8F=91=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=85=B3=E9=97=AD?= =?UTF-8?q?(#432)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_job/sys_job.go | 2 +- app/admin/service/sys_job.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/admin/apis/sys_job/sys_job.go b/app/admin/apis/sys_job/sys_job.go index c0667ddd..424d468f 100644 --- a/app/admin/apis/sys_job/sys_job.go +++ b/app/admin/apis/sys_job/sys_job.go @@ -24,7 +24,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) { return } var v dto.GeneralDelDto - err = c.Bind(&v) + err = c.BindUri(&v) if err != nil { log.Warnf("参数验证错误, error: %s", err) e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") diff --git a/app/admin/service/sys_job.go b/app/admin/service/sys_job.go index dde262d7..b49679ba 100644 --- a/app/admin/service/sys_job.go +++ b/app/admin/service/sys_job.go @@ -19,8 +19,7 @@ type SysJob struct { func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error { var err error var data models.SysJob - data.JobId = c.Id - err = e.Orm.Table(data.TableName()).First(&data).Error + err = e.Orm.Table(data.TableName()).First(&data, c.Id).Error if err != nil { e.Log.Errorf("db error: %s", err) return err From 277129e83055224eff30136cea837790484237bd Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Tue, 1 Jun 2021 07:34:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?docs=F0=9F=93=9D=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/global/adm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/global/adm.go b/common/global/adm.go index 49d2bf9b..af5c5a1c 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin Version Info - Version = "1.3.8" + Version = "1.3.9" ) var (