From 4ac3350920fc09822ba30a76721257bba68d1f3a Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Thu, 15 Jul 2021 00:53:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/sys_user.go    | 10 +++++-----
 app/admin/service/sys_user.go | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go
index a8636ee4..16fcff1a 100644
--- a/app/admin/apis/sys_user.go
+++ b/app/admin/apis/sys_user.go
@@ -237,7 +237,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 	req.UserId = p.UserId
 	req.Avatar = "/" + filPath
 
-	err = s.UpdateSysUserAvatar(&req, p)
+	err = s.UpdateAvatar(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -274,7 +274,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.UpdateSysUserStatus(&req, p)
+	err = s.UpdateStatus(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -311,7 +311,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.ResetSysUserPwd(&req, p)
+	err = s.ResetPwd(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -346,7 +346,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.UpdateSysUserPwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
+	err = s.UpdatePwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
 	if err != nil {
 		e.Logger.Error(err)
 		e.Error(http.StatusForbidden, err, "密码修改失败")
@@ -380,7 +380,7 @@ func (e SysUser) GetProfile(c *gin.Context) {
 	sysUser := models.SysUser{}
 	roles := make([]models.SysRole, 0)
 	posts := make([]models.SysPost, 0)
-	err = s.GetSysUserProfile(&req, &sysUser, &roles, &posts)
+	err = s.GetProfile(&req, &sysUser, &roles, &posts)
 	if err != nil {
 		e.Logger.Errorf("get user profile error, %s", err.Error())
 		e.Error(500, err, "获取用户信息失败")
diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go
index 2392c237..3a1e2975 100644
--- a/app/admin/service/sys_user.go
+++ b/app/admin/service/sys_user.go
@@ -107,8 +107,8 @@ func (e *SysUser) Update(c *dto.SysUserUpdateReq, p *actions.DataPermission) err
 	return nil
 }
 
-// UpdateSysUserAvatar 更新用户头像
-func (e *SysUser) UpdateSysUserAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
+// UpdateAvatar 更新用户头像
+func (e *SysUser) UpdateAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -131,8 +131,8 @@ func (e *SysUser) UpdateSysUserAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.
 	return nil
 }
 
-// UpdateSysUserStatus 更新用户状态
-func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
+// UpdateStatus 更新用户状态
+func (e *SysUser) UpdateStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -155,8 +155,8 @@ func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.
 	return nil
 }
 
-// ResetSysUserPwd 重置用户密码
-func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
+// ResetPwd 重置用户密码
+func (e *SysUser) ResetPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -197,8 +197,8 @@ func (e *SysUser) Remove(c *dto.SysUserById, p *actions.DataPermission) error {
 	return nil
 }
 
-// UpdateSysUserPwd 修改SysUser对象密码
-func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *actions.DataPermission) error {
+// UpdatePwd 修改SysUser对象密码
+func (e *SysUser) UpdatePwd(id int, oldPassword, newPassword string, p *actions.DataPermission) error {
 	var err error
 
 	if newPassword == "" {
@@ -243,7 +243,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 	return nil
 }
 
-func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
+func (e *SysUser) GetProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
 	err := e.Orm.Preload("Dept").First(user, c.GetId()).Error
 	if err != nil {
 		return err