refactor🎨: 改造升级用户管理模块
This commit is contained in:
1 parent
602ff26988
commit
c05cb63bc7
4 files changed
+218
-55
No files matched your search
+109
-41
@@ -1,6 +1,7 @@
|
||||
package apis
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"go-admin/app/admin/models"
|
||||
"net/http"
|
||||
|
||||
@@ -29,11 +30,11 @@ type SysUser struct {
|
||||
// @Router /api/v1/sysUser [get]
|
||||
// @Security Bearer
|
||||
func (e SysUser) GetSysUserList(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserSearch)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserSearch{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req, binding.Form).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -48,7 +49,7 @@ func (e SysUser) GetSysUserList(c *gin.Context) {
|
||||
list := make([]models.SysUser, 0)
|
||||
var count int64
|
||||
|
||||
err = s.GetSysUserPage(req, p, &list, &count)
|
||||
err = s.GetSysUserPage(&req, p, &list, &count)
|
||||
if err != nil {
|
||||
e.Error(http.StatusInternalServerError, err, "查询失败")
|
||||
return
|
||||
@@ -66,11 +67,11 @@ func (e SysUser) GetSysUserList(c *gin.Context) {
|
||||
// @Router /api/v1/sysUser/{userId} [get]
|
||||
// @Security Bearer
|
||||
func (e SysUser) GetSysUser(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserById)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserById{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req, nil).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -78,18 +79,14 @@ func (e SysUser) GetSysUser(c *gin.Context) {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
var object models.SysUser
|
||||
|
||||
//数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
err = s.GetSysUser(req, p, &object)
|
||||
err = s.GetSysUser(&req, p, &object)
|
||||
if err != nil {
|
||||
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
|
||||
return
|
||||
}
|
||||
|
||||
e.OK(object, "查看成功")
|
||||
}
|
||||
|
||||
@@ -104,11 +101,11 @@ func (e SysUser) GetSysUser(c *gin.Context) {
|
||||
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
|
||||
// @Router /api/v1/sysUser [post]
|
||||
func (e SysUser) InsertSysUser(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserControl)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserControl{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req, binding.JSON).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -116,14 +113,12 @@ func (e SysUser) InsertSysUser(c *gin.Context) {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
// 设置创建人
|
||||
req.SetCreateBy(user.GetUserId(c))
|
||||
|
||||
err = s.InsertSysUser(req)
|
||||
err = s.InsertSysUser(&req)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
e.Error(http.StatusInternalServerError, err, "创建失败")
|
||||
e.Error(http.StatusInternalServerError, err, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
@@ -141,11 +136,11 @@ func (e SysUser) InsertSysUser(c *gin.Context) {
|
||||
// @Success 200 {string} string "{"code": -1, "message": "修改失败"}"
|
||||
// @Router /api/v1/sysuser/{userId} [put]
|
||||
func (e SysUser) UpdateSysUser(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserControl)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserControl{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req, binding.JSON, nil).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -159,7 +154,7 @@ func (e SysUser) UpdateSysUser(c *gin.Context) {
|
||||
//数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
err = s.UpdateSysUser(req, p)
|
||||
err = s.UpdateSysUser(&req, p)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
@@ -176,11 +171,11 @@ func (e SysUser) UpdateSysUser(c *gin.Context) {
|
||||
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
|
||||
// @Router /api/v1/sysuser/{userId} [delete]
|
||||
func (e SysUser) DeleteSysUser(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserById)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserById{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req, binding.JSON, nil).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -195,7 +190,7 @@ func (e SysUser) DeleteSysUser(c *gin.Context) {
|
||||
// 数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
err = s.RemoveSysUser(req, p)
|
||||
err = s.RemoveSysUser(&req, p)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
@@ -214,7 +209,7 @@ func (e SysUser) DeleteSysUser(c *gin.Context) {
|
||||
// @Router /api/v1/user/avatar [post]
|
||||
func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
|
||||
s := service.SysUser{}
|
||||
req := new(dto.SysUserControl)
|
||||
req := dto.SysUserControl{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
MakeService(&s.Service).
|
||||
@@ -226,7 +221,6 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
|
||||
}
|
||||
// 数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
form, _ := c.MultipartForm()
|
||||
files := form.File["upload[]"]
|
||||
guid := uuid.New().String()
|
||||
@@ -244,7 +238,7 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
|
||||
req.UserId = p.UserId
|
||||
req.Avatar = "/" + filPath
|
||||
|
||||
err = s.UpdateSysUser(req, p)
|
||||
err = s.UpdateSysUser(&req, p)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
@@ -252,7 +246,81 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
|
||||
e.OK(filPath, "修改成功")
|
||||
}
|
||||
|
||||
// SysUserUpdatePwd
|
||||
// UpdateSysUserStatus 修改用户状态
|
||||
// @Summary 修改用户状态
|
||||
// @Description 获取JSON
|
||||
// @Tags 用户
|
||||
// @Accept application/json
|
||||
// @Product application/json
|
||||
// @Param data body dto.UpdateSysUserStatusReq true "body"
|
||||
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
|
||||
// @Success 200 {string} string "{"code": -1, "message": "修改失败"}"
|
||||
// @Router /api/v1/user/status [put]
|
||||
func (e SysUser) UpdateSysUserStatus(c *gin.Context) {
|
||||
s := service.SysUser{}
|
||||
req := dto.UpdateSysUserStatusReq{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(&req).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
e.Error(http.StatusInternalServerError, err, err.Error())
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
req.SetUpdateBy(user.GetUserId(c))
|
||||
|
||||
//数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
err = s.UpdateSysUserStatus(&req, p)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
e.OK(req.GetId(), "更新成功")
|
||||
}
|
||||
|
||||
// ResetSysUserPwd 重置用户密码
|
||||
// @Summary 重置用户密码
|
||||
// @Description 获取JSON
|
||||
// @Tags 用户
|
||||
// @Accept application/json
|
||||
// @Product application/json
|
||||
// @Param data body dto.ResetSysUserPwdReq true "body"
|
||||
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
|
||||
// @Success 200 {string} string "{"code": -1, "message": "修改失败"}"
|
||||
// @Router /api/v1/user/pwd/reset [put]
|
||||
func (e SysUser) ResetSysUserPwd(c *gin.Context) {
|
||||
s := service.SysUser{}
|
||||
req := dto.ResetSysUserPwdReq{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(&req).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
e.Error(http.StatusInternalServerError, err, err.Error())
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
req.SetUpdateBy(user.GetUserId(c))
|
||||
|
||||
//数据权限检查
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
err = s.ResetSysUserPwd(&req, p)
|
||||
if err != nil {
|
||||
e.Logger.Error(err)
|
||||
return
|
||||
}
|
||||
e.OK(req.GetId(), "更新成功")
|
||||
}
|
||||
|
||||
// UpdateSysUserPwd
|
||||
// @Summary 重置密码
|
||||
// @Description 获取JSON
|
||||
// @Tags 用户
|
||||
@@ -262,12 +330,12 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
|
||||
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
|
||||
// @Router /api/v1/user/pwd [post]
|
||||
// @Security Bearer
|
||||
func (e SysUser) SysUserUpdatePwd(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.PassWord)
|
||||
func (e SysUser) UpdateSysUserPwd(c *gin.Context) {
|
||||
s := service.SysUser{}
|
||||
req := dto.PassWord{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
Bind(req).
|
||||
Bind(&req).
|
||||
MakeService(&s.Service).
|
||||
Errors
|
||||
if err != nil {
|
||||
@@ -296,8 +364,8 @@ func (e SysUser) SysUserUpdatePwd(c *gin.Context) {
|
||||
// @Router /api/v1/user/profile [get]
|
||||
// @Security Bearer
|
||||
func (e SysUser) GetSysUserProfile(c *gin.Context) {
|
||||
s := new(service.SysUser)
|
||||
req := new(dto.SysUserById)
|
||||
s := service.SysUser{}
|
||||
req := dto.SysUserById{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
MakeService(&s.Service).
|
||||
@@ -313,7 +381,7 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) {
|
||||
user := new(models.SysUser)
|
||||
roles := make([]models.SysRole, 0)
|
||||
posts := make([]models.SysPost, 0)
|
||||
err = s.GetSysUserProfile(req, user, &roles, &posts)
|
||||
err = s.GetSysUserProfile(&req, user, &roles, &posts)
|
||||
if err != nil {
|
||||
e.Logger.Errorf("get user profile error, %s", err.Error())
|
||||
e.Error(http.StatusInternalServerError, err, "获取用户信息失败")
|
||||
@@ -327,8 +395,8 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e SysUser) GetInfo(c *gin.Context) {
|
||||
req := new(dto.SysUserById)
|
||||
s := new(service.SysUser)
|
||||
req := dto.SysUserById{}
|
||||
s := service.SysUser{}
|
||||
err := e.MakeContext(c).
|
||||
MakeOrm().
|
||||
MakeService(&s.Service).
|
||||
@@ -369,7 +437,7 @@ func (e SysUser) GetInfo(c *gin.Context) {
|
||||
|
||||
req.Id = user.GetUserId(c)
|
||||
|
||||
err = s.GetSysUser(req, p, &sysUser)
|
||||
err = s.GetSysUser(&req, p, &sysUser)
|
||||
if err != nil {
|
||||
e.Error(http.StatusUnauthorized, err, "登录失败")
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user