From 65380695f2cf33b5e29faa299e978bdc751a1151 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 20 Jun 2021 00:43:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8=EF=BC=9A=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_user.go | 14 +++++++------- app/admin/service/sys_user.go | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index af2ed3c..14a13b3 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -48,7 +48,7 @@ func (e SysUser) GetPage(c *gin.Context) { list := make([]models.SysUser, 0) var count int64 - err = s.GetSysUserPage(&req, p, &list, &count) + err = s.GetPage(&req, p, &list, &count) if err != nil { e.Error(500, err, "查询失败") return @@ -81,7 +81,7 @@ func (e SysUser) Get(c *gin.Context) { var object models.SysUser //数据权限检查 p := actions.GetPermissionFromContext(c) - err = s.GetSysUser(&req, p, &object) + err = s.Get(&req, p, &object) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "查询失败") return @@ -113,7 +113,7 @@ func (e SysUser) Insert(c *gin.Context) { } // 设置创建人 req.SetCreateBy(user.GetUserId(c)) - err = s.InsertSysUser(&req) + err = s.Insert(&req) if err != nil { e.Logger.Error(err) e.Error(500, err, err.Error()) @@ -151,7 +151,7 @@ func (e SysUser) Update(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - err = s.UpdateSysUser(&req, p) + err = s.Update(&req, p) if err != nil { e.Logger.Error(err) return @@ -186,7 +186,7 @@ func (e SysUser) Delete(c *gin.Context) { // 数据权限检查 p := actions.GetPermissionFromContext(c) - err = s.RemoveSysUser(&req, p) + err = s.Remove(&req, p) if err != nil { e.Logger.Error(err) return @@ -233,7 +233,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) { req.UserId = p.UserId req.Avatar = "/" + filPath - err = s.UpdateSysUser(&req, p) + err = s.Update(&req, p) if err != nil { e.Logger.Error(err) return @@ -430,7 +430,7 @@ func (e SysUser) GetInfo(c *gin.Context) { } sysUser := models.SysUser{} req.Id = user.GetUserId(c) - err = s.GetSysUser(&req, p, &sysUser) + err = s.Get(&req, p, &sysUser) if err != nil { e.Error(http.StatusUnauthorized, err, "登录失败") return diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index c70c0a0..8cc0bf8 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -18,8 +18,8 @@ type SysUser struct { service.Service } -// GetSysUserPage 获取SysUser列表 -func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error { +// GetPage 获取SysUser列表 +func (e *SysUser) GetPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error { var err error var data models.SysUser @@ -38,8 +38,8 @@ func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission return nil } -// GetSysUser 获取SysUser对象 -func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error { +// Get 获取SysUser对象 +func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error { var data models.SysUser err := e.Orm.Model(&data).Debug(). @@ -59,8 +59,8 @@ func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, mode return nil } -// InsertSysUser 创建SysUser对象 -func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error { +// Insert 创建SysUser对象 +func (e *SysUser) Insert(c *dto.SysUserControl) error { var err error var data models.SysUser var i int64 @@ -83,8 +83,8 @@ func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error { return nil } -// UpdateSysUser 修改SysUser对象 -func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission) error { +// Update 修改SysUser对象 +func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error { var err error var model models.SysUser db := e.Orm.Scopes( @@ -154,8 +154,8 @@ func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPerm return nil } -// RemoveSysUser 删除SysUser -func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error { +// Remove 删除SysUser +func (e *SysUser) Remove(c *dto.SysUserById, p *actions.DataPermission) error { var err error var data models.SysUser