feat ✨ 优化api写法

This commit is contained in:
linwenxiang committed 2021-04-27 10:06:22 +08:00
1 parent 5957fb280c
commit 13ff9d9e63
38 files changed
+777 -672

No files matched your search

+61 -52
View File
@@ -28,10 +28,11 @@ type SysUser struct {
// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
// @Router /api/v1/sysUser [get]
// @Security Bearer
func (e *SysUser) GetSysUserList(c *gin.Context) {
log := e.GetLogger(c)
func (e SysUser) GetSysUserList(c *gin.Context) {
e.Context = c
log := e.GetLogger()
d := new(dto.SysUserSearch)
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -43,7 +44,7 @@ func (e *SysUser) GetSysUserList(c *gin.Context) {
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -57,11 +58,11 @@ func (e *SysUser) GetSysUserList(c *gin.Context) {
serviceStudent.Orm = db
err = serviceStudent.GetSysUserPage(req, p, &list, &count)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "查询失败")
e.Error(http.StatusInternalServerError, err, "查询失败")
return
}
e.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
}
// @Summary 获取用户
@@ -71,10 +72,11 @@ func (e *SysUser) GetSysUserList(c *gin.Context) {
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/sysUser/{userId} [get]
// @Security Bearer
func (e *SysUser) GetSysUser(c *gin.Context) {
log := e.GetLogger(c)
func (e SysUser) GetSysUser(c *gin.Context) {
e.Context = c
log := e.GetLogger()
control := new(dto.SysUserById)
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -84,7 +86,7 @@ func (e *SysUser) GetSysUser(c *gin.Context) {
req := control.Generate()
err = req.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object system.SysUser
@@ -97,11 +99,11 @@ func (e *SysUser) GetSysUser(c *gin.Context) {
serviceSysUser.Orm = db
err = serviceSysUser.GetSysUser(req, p, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return
}
e.OK(c, object, "查看成功")
e.OK(object, "查看成功")
}
// @Summary 创建用户
@@ -113,10 +115,11 @@ func (e *SysUser) GetSysUser(c *gin.Context) {
// @Success 200 {string} string "{"code": 200, "message": "添加成功"}"
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
// @Router /api/v1/sysUser [post]
func (e *SysUser) InsertSysUser(c *gin.Context) {
log := e.GetLogger(c)
func (e SysUser) InsertSysUser(c *gin.Context) {
e.Context = c
log := e.GetLogger()
control := new(dto.SysUserControl)
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -126,13 +129,13 @@ func (e *SysUser) InsertSysUser(c *gin.Context) {
req := control.Generate()
err = req.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
// 设置创建人
@@ -144,11 +147,11 @@ func (e *SysUser) InsertSysUser(c *gin.Context) {
err = serviceSysUser.InsertSysUser(object)
if err != nil {
log.Error(err)
e.Error(c, http.StatusInternalServerError, err, "创建失败")
e.Error(http.StatusInternalServerError, err, "创建失败")
return
}
e.OK(c, object.GetId(), "创建成功")
e.OK(object.GetId(), "创建成功")
}
// @Summary 修改用户数据
@@ -160,11 +163,12 @@ func (e *SysUser) InsertSysUser(c *gin.Context) {
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Success 200 {string} string "{"code": -1, "message": "修改失败"}"
// @Router /api/v1/sysuser/{userId} [put]
func (e *SysUser) UpdateSysUser(c *gin.Context) {
func (e SysUser) UpdateSysUser(c *gin.Context) {
control := new(dto.SysUserControl)
log := e.GetLogger(c)
db, err := e.GetOrm(c)
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -174,13 +178,13 @@ func (e *SysUser) UpdateSysUser(c *gin.Context) {
//更新操作
err = req.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(user.GetUserId(c))
@@ -196,7 +200,7 @@ func (e *SysUser) UpdateSysUser(c *gin.Context) {
log.Error(err)
return
}
e.OK(c, object.GetId(), "更新成功")
e.OK(object.GetId(), "更新成功")
}
// @Summary 删除用户数据
@@ -206,11 +210,12 @@ func (e *SysUser) UpdateSysUser(c *gin.Context) {
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/sysuser/{userId} [delete]
func (e *SysUser) DeleteSysUser(c *gin.Context) {
log := e.GetLogger(c)
func (e SysUser) DeleteSysUser(c *gin.Context) {
e.Context = c
log := e.GetLogger()
control := new(dto.SysUserById)
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -221,13 +226,13 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) {
err = req.Bind(c)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
@@ -245,7 +250,7 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) {
log.Error(err)
return
}
e.OK(c, object.GetId(), "删除成功")
e.OK(object.GetId(), "删除成功")
}
// @Summary 修改头像
@@ -256,9 +261,10 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) {
// @Success 200 {string} string "{"code": 200, "message": "添加成功"}"
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
// @Router /api/v1/user/avatar [post]
func (e *SysUser) InsetSysUserAvatar(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -277,7 +283,7 @@ func (e *SysUser) InsetSysUserAvatar(c *gin.Context) {
err = c.SaveUploadedFile(file, filPath)
if err != nil {
log.Errorf("save file error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "")
e.Error(http.StatusInternalServerError, err, "")
return
}
}
@@ -294,7 +300,7 @@ func (e *SysUser) InsetSysUserAvatar(c *gin.Context) {
log.Error(err)
return
}
e.OK(c, filPath, "修改成功")
e.OK(filPath, "修改成功")
}
// @Summary 重置密码
@@ -306,9 +312,10 @@ 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) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
func (e SysUser) SysUserUpdatePwd(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -318,7 +325,7 @@ func (e *SysUser) SysUserUpdatePwd(c *gin.Context) {
err = c.Bind(&pwd)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
@@ -331,10 +338,10 @@ func (e *SysUser) SysUserUpdatePwd(c *gin.Context) {
err = serviceSysUser.UpdateSysUserPwd(user.GetUserId(c), pwd.OldPassword, pwd.NewPassword, p)
if err != nil {
log.Error(err)
e.Error(c, http.StatusForbidden, err, "密码修改失败")
e.Error(http.StatusForbidden, err, "密码修改失败")
return
}
e.OK(c, nil, "密码修改成功")
e.OK(nil, "密码修改成功")
}
// @Summary 获取个人中心用户
@@ -343,9 +350,10 @@ func (e *SysUser) SysUserUpdatePwd(c *gin.Context) {
// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/user/profile [get]
// @Security Bearer
func (e *SysUser) GetSysUserProfile(c *gin.Context) {
log := e.GetLogger(c)
db, err := e.GetOrm(c)
func (e SysUser) GetSysUserProfile(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -361,10 +369,10 @@ func (e *SysUser) GetSysUserProfile(c *gin.Context) {
err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts)
if err != nil {
log.Errorf("get user profile error, %s", err.Error())
e.Error(c, http.StatusInternalServerError, err, "获取用户信息失败")
e.Error(http.StatusInternalServerError, err, "获取用户信息失败")
return
}
e.OK(c, gin.H{
e.OK(gin.H{
"user": user,
"roles": roles,
"posts": posts,
@@ -402,10 +410,11 @@ func (e *SysUser) GetSysUserProfile(c *gin.Context) {
//})
}
func (e *SysUser) GetInfo(c *gin.Context) {
log := e.GetLogger(c)
func (e SysUser) GetInfo(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm(c)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
@@ -445,7 +454,7 @@ func (e *SysUser) GetInfo(c *gin.Context) {
serviceSysUser.Orm = db
err = serviceSysUser.GetSysUser(req, p, &sysUser)
if err != nil {
e.Error(c, http.StatusUnauthorized, err, "登录失败")
e.Error(http.StatusUnauthorized, err, "登录失败")
return
}
@@ -459,5 +468,5 @@ func (e *SysUser) GetInfo(c *gin.Context) {
mp["userId"] = sysUser.UserId
mp["deptId"] = sysUser.DeptId
mp["name"] = sysUser.NickName
e.OK(c, mp, "")
e.OK(mp, "")
}