diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index de448333..06063438 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -21,7 +21,7 @@ type Gen struct { apis.Api } -func (e *Gen) Preview(c *gin.Context) { +func (e Gen) Preview(c *gin.Context) { e.Context = c log := e.GetLogger() table := tools.SysTables{} @@ -109,7 +109,7 @@ func (e *Gen) Preview(c *gin.Context) { e.OK(mp, "") } -func (e *Gen) GenCode(c *gin.Context) { +func (e Gen) GenCode(c *gin.Context) { e.Context = c log := e.GetLogger() table := tools.SysTables{} @@ -139,7 +139,7 @@ func (e *Gen) GenCode(c *gin.Context) { e.OK("", "Code generated successfully！") } -func (e *Gen) GenApiToFile(c *gin.Context) { +func (e Gen) GenApiToFile(c *gin.Context) { e.Context = c log := e.GetLogger() table := tools.SysTables{} @@ -164,7 +164,7 @@ func (e *Gen) GenApiToFile(c *gin.Context) { e.OK("", "Code generated successfully！") } -func (e *Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { +func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { e.Context = c log := e.GetLogger() @@ -249,7 +249,7 @@ func (e *Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { } -func (e *Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { +func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { e.Context = c log := e.GetLogger() @@ -272,7 +272,7 @@ func (e *Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { } -func (e *Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { +func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { log := api.GetRequestLogger(c) basePath := "template/v4/" routerFile := basePath + "actions/router_check_role.go.template" @@ -336,7 +336,7 @@ func (e *Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go") } -func (e *Gen) GenMenuAndApi(c *gin.Context) { +func (e Gen) GenMenuAndApi(c *gin.Context) { log := api.GetRequestLogger(c) table := tools.SysTables{} @@ -578,4 +578,4 @@ func (e *Gen) GenMenuAndApi(c *gin.Context) { ADelete.MenuId, err = ADelete.Create(db) e.OK("", "数据生成成功！") -} +} \ No newline at end of file diff --git a/app/admin/models/gorm/data.go b/app/admin/models/gorm/data.go deleted file mode 100644 index 5f60479a..00000000 --- a/app/admin/models/gorm/data.go +++ /dev/null @@ -1,87 +0,0 @@ -package gorm - -import ( - "go-admin/app/admin/models/system" - "gorm.io/gorm" -) - -func InitData(db *gorm.DB) { - - list := []system.CasbinRule{ - {"p", "admin", "/api/v1/menulist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/menu", "POST", "", "", ""}, - {"p", "admin", "/api/v1/dict/databytype/", "GET", "", "", ""}, - {"p", "admin", "/api/v1/menu", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/menu/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/sysUserList", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysUser/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysUser/", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysUser", "POST", "", "", ""}, - {"p", "admin", "/api/v1/sysUser", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/sysUser/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/user/profile", "GET", "", "", ""}, - {"p", "admin", "/api/v1/rolelist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/role/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/role", "POST", "", "", ""}, - {"p", "admin", "/api/v1/role", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/role/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/configList", "GET", "", "", ""}, - {"p", "admin", "/api/v1/config/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/config", "POST", "", "", ""}, - {"p", "admin", "/api/v1/config", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/config/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/menurole", "GET", "", "", ""}, - {"p", "admin", "/api/v1/roleMenuTreeselect/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/menuTreeselect", "GET", "", "", ""}, - {"p", "admin", "/api/v1/rolemenu", "GET", "", "", ""}, - {"p", "admin", "/api/v1/rolemenu", "POST", "", "", ""}, - {"p", "admin", "/api/v1/rolemenu/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/deptList", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dept/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dept", "POST", "", "", ""}, - {"p", "admin", "/api/v1/dept", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/dept/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/dict/datalist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dict/data/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dict/databytype/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dict/data", "POST", "", "", ""}, - {"p", "admin", "/api/v1/dict/data/", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/dict/data/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/dict/typelist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dict/type/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/dict/type", "POST", "", "", ""}, - {"p", "admin", "/api/v1/dict/type", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/dict/type/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/postlist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/post/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/post", "POST", "", "", ""}, - {"p", "admin", "/api/v1/post", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/post/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/menu/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/menuids", "GET", "", "", ""}, - {"p", "admin", "/api/v1/loginloglist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/loginlog/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/operloglist", "GET", "", "", ""}, - {"p", "admin", "/api/v1/getinfo", "GET", "", "", ""}, - {"p", "admin", "/api/v1/roledatascope", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/roleDeptTreeselect/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/deptTree", "GET", "", "", ""}, - {"p", "admin", "/api/v1/configKey/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/logout", "POST", "", "", ""}, - {"p", "admin", "/api/v1/user/avatar", "POST", "", "", ""}, - {"p", "admin", "/api/v1/user/pwd", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/dict/typeoptionselect", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysjobList", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysjob/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/sysjob", "POST", "", "", ""}, - {"p", "admin", "/api/v1/sysjob", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/sysjob/:id", "DELETE", "", "", ""}, - {"p", "admin", "/api/v1/syssettingList", "GET", "", "", ""}, - {"p", "admin", "/api/v1/syssetting/:id", "GET", "", "", ""}, - {"p", "admin", "/api/v1/syssetting", "POST", "", "", ""}, - {"p", "admin", "/api/v1/syssetting", "PUT", "", "", ""}, - {"p", "admin", "/api/v1/syssetting/:id", "DELETE", "", "", ""}, - } - - db.Table("sys_casbin_rule").Create(list) -} diff --git a/app/admin/models/syscategory.go b/app/admin/models/sys_category.go similarity index 100% rename from app/admin/models/syscategory.go rename to app/admin/models/sys_category.go diff --git a/app/admin/models/syschinaareadata.go b/app/admin/models/sys_china_area_data.go similarity index 100% rename from app/admin/models/syschinaareadata.go rename to app/admin/models/sys_china_area_data.go diff --git a/app/admin/models/syscontent.go b/app/admin/models/sys_content.go similarity index 100% rename from app/admin/models/syscontent.go rename to app/admin/models/sys_content.go diff --git a/app/admin/models/sysjob.go b/app/admin/models/sys_job.go similarity index 100% rename from app/admin/models/sysjob.go rename to app/admin/models/sys_job.go diff --git a/app/admin/models/system/casbinrule.go b/app/admin/models/system/casbin_rule.go similarity index 100% rename from app/admin/models/system/casbinrule.go rename to app/admin/models/system/casbin_rule.go diff --git a/app/admin/router/syschinaareadata.go b/app/admin/router/sys_china_area_data.go similarity index 100% rename from app/admin/router/syschinaareadata.go rename to app/admin/router/sys_china_area_data.go diff --git a/app/admin/service/syschinaareadata.go b/app/admin/service/sys_china_area_data.go similarity index 77% rename from app/admin/service/syschinaareadata.go rename to app/admin/service/sys_china_area_data.go index 5c7fa68c..2ff6aa6d 100644 --- a/app/admin/service/syschinaareadata.go +++ b/app/admin/service/sys_china_area_data.go @@ -18,10 +18,9 @@ type SysChinaAreaData struct { // GetSysChinaAreaDataPage 获取SysChinaAreaData列表 func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error { - var err error var data models.SysChinaAreaData - err = e.Orm.Model(&data). + err := e.Orm.Model(&data). Scopes( cDto.MakeCondition(c.GetNeedSearch()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), @@ -30,7 +29,7 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service GetSysChinaAreaDataPage error:%s", err) return err } return nil @@ -38,22 +37,20 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch // GetSysChinaAreaData 获取SysChinaAreaData对象 func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error { - var err error var data models.SysChinaAreaData - db := e.Orm.Model(&data). + err := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), ). - First(model, d.GetId()) - err = db.Error + First(model, d.GetId()).Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") e.Log.Errorf("db error:%s", err) return err } - if db.Error != nil { - e.Log.Errorf("db error:%s", err) + if err != nil { + e.Log.Errorf("Service GetSysChinaAreaData error:%s", err) return err } return nil @@ -61,13 +58,12 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a // InsertSysChinaAreaData 创建SysChinaAreaData对象 func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error { - var err error var data models.SysChinaAreaData - err = e.Orm.Model(&data). + err := e.Orm.Model(&data). Create(model).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service InsertSysChinaAreaData error:%s", err) return err } return nil @@ -75,41 +71,36 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData // UpdateSysChinaAreaData 修改SysChinaAreaData对象 func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error { - var err error - var data models.SysChinaAreaData - - db := e.Orm.Model(&data). + db := e.Orm.Model(c). Scopes( - actions.Permission(data.TableName(), p), + actions.Permission(c.TableName(), p), ).Where(c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf("db error:%s", err) + if err := db.Error; err != nil { + e.Log.Errorf("Service UpdateSysChinaAreaData error: %s", err) return err } if db.RowsAffected == 0 { return errors.New("无权更新该数据") - } return nil } // RemoveSysChinaAreaData 删除SysChinaAreaData func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error { - var err error + var data models.SysChinaAreaData db := e.Orm.Model(&data). Scopes( actions.Permission(data.TableName(), p), ).Delete(&data, d.GetId()) - if db.Error != nil { - err = db.Error - e.Log.Errorf("Delete error: %s", err) + + if err := db.Error; err != nil { + e.Log.Errorf("Service RemoveSysChinaAreaData error: %s", err) return err } if db.RowsAffected == 0 { - err = errors.New("无权删除该数据") - return err + 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 c4d1756c..2cf60a17 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -26,7 +26,7 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service GetSysConfigPage error:%s", err) return err } return nil @@ -42,7 +42,7 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.Sys ). Find(list).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service GetSysConfigByKey error:%s", err) return err } return nil @@ -50,19 +50,17 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.Sys // GetSysConfig 获取SysConfig对象 func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { - var err error var data system.SysConfig - db := e.Orm.Model(&data). - First(model, d.GetId()) - err = db.Error + err := e.Orm.Model(&data). + First(model, d.GetId()).Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service GetSysConfigPage error:%s", err) return err } - if db.Error != nil { - e.Log.Errorf("db error:%s", err) + if err != nil { + e.Log.Errorf("Service GetSysConfig error:%s", err) return err } return nil @@ -76,7 +74,7 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { err = e.Orm.Model(&data). Create(model).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service InsertSysConfig error:%s", err) return err } return nil @@ -85,12 +83,12 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { // UpdateSysConfig 修改SysConfig对象 func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { var err error - var data system.SysConfig - db := e.Orm.Model(&data). + db := e.Orm.Model(c). Where(c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf("db error:%s", err) + err = db.Error + if err != nil { + e.Log.Errorf("Service UpdateSysConfig error:%s", err) return err } if db.RowsAffected == 0 { @@ -109,7 +107,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e Where(d.GetId()).Delete(c) if db.Error != nil { err = db.Error - e.Log.Errorf("Delete error: %s", err) + e.Log.Errorf("Service RemoveSysConfig error:%s", err) return err } if db.RowsAffected == 0 { @@ -126,9 +124,9 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { data.ConfigKey = c.ConfigKey err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error if err != nil { - e.Log.Errorf("db error:%s", err) + e.Log.Errorf("Service GetSysConfigByKEY error:%s", err) return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index 5dccf3ca..cb81586b 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -26,7 +26,7 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste Find(list).Limit(-1).Offset(-1). Count(count).Error if err != nil { - e.Log.Errorf(" db error:%s", err) + e.Log.Errorf("Service GetSysOperaLogPage error:%s", err.Error()) return err } return nil @@ -34,19 +34,17 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste // GetSysOperaLog 获取SysOperaLog对象 func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error { - var err error var data system.SysOperaLog - db := e.Orm.Model(&data). - First(model, d.GetId()) - err = db.Error + err := e.Orm.Model(&data). + First(model, d.GetId()).Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { err = errors.New("查看对象不存在或无权查看") - e.Log.Errorf(" db error:%s", err) + e.Log.Errorf("Service GetSysOperaLog error:%s", err.Error()) return err } - if db.Error != nil { - e.Log.Errorf(" db error:%s", err) + if err != nil { + e.Log.Errorf("Service GetSysOperaLog error:%s", err.Error()) return err } return nil @@ -60,7 +58,7 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { err = e.Orm.Model(&data). Create(model).Error if err != nil { - e.Log.Errorf(" db error:%s", err) + e.Log.Errorf("Service InsertSysOperaLog error:%s", err.Error()) return err } return nil @@ -69,12 +67,11 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { // UpdateSysOperaLog 修改SysOperaLog对象 func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { var err error - var data system.SysOperaLog - db := e.Orm.Model(&data). + db := e.Orm.Model(c). Where(c.GetId()).Updates(c) - if db.Error != nil { - e.Log.Errorf(" db error:%s", err) + if err = db.Error; err != nil { + e.Log.Errorf("Service UpdateSysOperaLog error:%s", err.Error()) return err } if db.RowsAffected == 0 { @@ -90,14 +87,12 @@ func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { var data system.SysOperaLog db := e.Orm.Model(&data).Where(d.Ids).Delete(&data) - if db.Error != nil { - err = db.Error - e.Log.Errorf(" Delete error: %s", err) + if err = db.Error; err != nil { + e.Log.Errorf("Service RemoveSysOperaLog error:%s", err.Error()) return err } if db.RowsAffected == 0 { - err = errors.New("无权删除该数据") - return err + return errors.New("无权删除该数据") } return nil -} +} \ No newline at end of file