refactor🎨:格式化函数名称
This commit is contained in:
1 parent
a6116ede02
commit
65380695f2
2 files changed
+17
-17
No files matched your search
@@ -48,7 +48,7 @@ func (e SysUser) GetPage(c *gin.Context) {
|
|||||||
list := make([]models.SysUser, 0)
|
list := make([]models.SysUser, 0)
|
||||||
var count int64
|
var count int64
|
||||||
|
|
||||||
err = s.GetSysUserPage(&req, p, &list, &count)
|
err = s.GetPage(&req, p, &list, &count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Error(500, err, "查询失败")
|
e.Error(500, err, "查询失败")
|
||||||
return
|
return
|
||||||
@@ -81,7 +81,7 @@ func (e SysUser) Get(c *gin.Context) {
|
|||||||
var object models.SysUser
|
var object models.SysUser
|
||||||
//数据权限检查
|
//数据权限检查
|
||||||
p := actions.GetPermissionFromContext(c)
|
p := actions.GetPermissionFromContext(c)
|
||||||
err = s.GetSysUser(&req, p, &object)
|
err = s.Get(&req, p, &object)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
|
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
|
||||||
return
|
return
|
||||||
@@ -113,7 +113,7 @@ func (e SysUser) Insert(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
// 设置创建人
|
// 设置创建人
|
||||||
req.SetCreateBy(user.GetUserId(c))
|
req.SetCreateBy(user.GetUserId(c))
|
||||||
err = s.InsertSysUser(&req)
|
err = s.Insert(&req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, err.Error())
|
e.Error(500, err, err.Error())
|
||||||
@@ -151,7 +151,7 @@ func (e SysUser) Update(c *gin.Context) {
|
|||||||
//数据权限检查
|
//数据权限检查
|
||||||
p := actions.GetPermissionFromContext(c)
|
p := actions.GetPermissionFromContext(c)
|
||||||
|
|
||||||
err = s.UpdateSysUser(&req, p)
|
err = s.Update(&req, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
return
|
return
|
||||||
@@ -186,7 +186,7 @@ func (e SysUser) Delete(c *gin.Context) {
|
|||||||
// 数据权限检查
|
// 数据权限检查
|
||||||
p := actions.GetPermissionFromContext(c)
|
p := actions.GetPermissionFromContext(c)
|
||||||
|
|
||||||
err = s.RemoveSysUser(&req, p)
|
err = s.Remove(&req, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
return
|
return
|
||||||
@@ -233,7 +233,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
|
|||||||
req.UserId = p.UserId
|
req.UserId = p.UserId
|
||||||
req.Avatar = "/" + filPath
|
req.Avatar = "/" + filPath
|
||||||
|
|
||||||
err = s.UpdateSysUser(&req, p)
|
err = s.Update(&req, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
return
|
return
|
||||||
@@ -430,7 +430,7 @@ func (e SysUser) GetInfo(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
sysUser := models.SysUser{}
|
sysUser := models.SysUser{}
|
||||||
req.Id = user.GetUserId(c)
|
req.Id = user.GetUserId(c)
|
||||||
err = s.GetSysUser(&req, p, &sysUser)
|
err = s.Get(&req, p, &sysUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Error(http.StatusUnauthorized, err, "登录失败")
|
e.Error(http.StatusUnauthorized, err, "登录失败")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ type SysUser struct {
|
|||||||
service.Service
|
service.Service
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSysUserPage 获取SysUser列表
|
// GetPage 获取SysUser列表
|
||||||
func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
|
func (e *SysUser) GetPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
|
||||||
var err error
|
var err error
|
||||||
var data models.SysUser
|
var data models.SysUser
|
||||||
|
|
||||||
@@ -38,8 +38,8 @@ func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSysUser 获取SysUser对象
|
// Get 获取SysUser对象
|
||||||
func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
|
func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
|
||||||
var data models.SysUser
|
var data models.SysUser
|
||||||
|
|
||||||
err := e.Orm.Model(&data).Debug().
|
err := e.Orm.Model(&data).Debug().
|
||||||
@@ -59,8 +59,8 @@ func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, mode
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// InsertSysUser 创建SysUser对象
|
// Insert 创建SysUser对象
|
||||||
func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
|
func (e *SysUser) Insert(c *dto.SysUserControl) error {
|
||||||
var err error
|
var err error
|
||||||
var data models.SysUser
|
var data models.SysUser
|
||||||
var i int64
|
var i int64
|
||||||
@@ -83,8 +83,8 @@ func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateSysUser 修改SysUser对象
|
// Update 修改SysUser对象
|
||||||
func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission) error {
|
func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error {
|
||||||
var err error
|
var err error
|
||||||
var model models.SysUser
|
var model models.SysUser
|
||||||
db := e.Orm.Scopes(
|
db := e.Orm.Scopes(
|
||||||
@@ -154,8 +154,8 @@ func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPerm
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveSysUser 删除SysUser
|
// Remove 删除SysUser
|
||||||
func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error {
|
func (e *SysUser) Remove(c *dto.SysUserById, p *actions.DataPermission) error {
|
||||||
var err error
|
var err error
|
||||||
var data models.SysUser
|
var data models.SysUser
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user