From 1d055d5ffc33b57c21cc2c930df3952fc06cde6b Mon Sep 17 00:00:00 2001
From: haoyanbin <605649647@qq.com>
Date: Mon, 24 Jan 2022 14:49:08 +0800
Subject: [PATCH] Reset
---
app/operate/apis/org_user.go | 49 ++++++++++++++++-------------
app/operate/router/org_user.go | 2 +-
app/operate/service/dto/org_user.go | 6 ++--
3 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/app/operate/apis/org_user.go b/app/operate/apis/org_user.go
index 40a0be6..2aac450 100755
--- a/app/operate/apis/org_user.go
+++ b/app/operate/apis/org_user.go
@@ -276,29 +276,34 @@ func (e OrgUser) UpdateStatus(c *gin.Context) {
// @Router /api/v1/org-user/pwd/reset [put]
// @Security Bearer
func (e OrgUser) ResetPwd(c *gin.Context) {
- // s := service.OrgUser{}
+ s := service.OrgUser{}
req := dto.ResetPwdReq{}
fmt.Println(req)
- // err := e.MakeContext(c).
- // MakeOrm().
- // Bind(&req, binding.JSON).
- // MakeService(&s.Service).
- // Errors
- // if err != nil {
- // e.Logger.Error(err)
- // e.Error(500, err, err.Error())
- // return
- // }
- //
- // req.SetUpdateBy(user.GetUserId(c))
- //
- // //鏁版嵁鏉冮檺妫€鏌�
- // p := actions.GetPermissionFromContext(c)
- //
- // err = s.ResetPwd(&req, p)
- // if err != nil {
- // e.Logger.Error(err)
- // return
- // }
+ err := e.MakeContext(c).
+ MakeOrm().
+ Bind(&req, binding.JSON).
+ MakeService(&s.Service).
+ Errors
+ if err != nil {
+ e.Logger.Error(err)
+ e.Error(500, err, err.Error())
+ return
+ }
+
+ req.SetUpdateBy(user.GetUserId(c))
+
+ //鏁版嵁鏉冮檺妫€鏌�
+ p := actions.GetPermissionFromContext(c)
+
+ reqUpdate := dto.OrgUserUpdateReq{}
+ reqUpdate.UserId = req.UserId
+ reqUpdate.Password = "123456"
+ reqUpdate.UpdateBy = user.GetUserId(c)
+
+ err = s.Update(&reqUpdate, p)
+ if err != nil {
+ e.Logger.Error(err)
+ return
+ }
e.OK("", "鏇存柊鎴愬姛")
}
diff --git a/app/operate/router/org_user.go b/app/operate/router/org_user.go
index c54c765..07d5200 100755
--- a/app/operate/router/org_user.go
+++ b/app/operate/router/org_user.go
@@ -22,11 +22,11 @@ func registerOrgUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
r.POST("", api.Insert)
r.PUT("/:userId", api.Update)
r.DELETE("", api.Delete)
+ r.PUT("/reset", api.ResetPwd)
}
user := v1.Group("/org-user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
{
- user.PUT("/pwd/reset", api.ResetPwd)
user.PUT("/status", api.UpdateStatus)
}
}
diff --git a/app/operate/service/dto/org_user.go b/app/operate/service/dto/org_user.go
index 09c45f5..203fbff 100755
--- a/app/operate/service/dto/org_user.go
+++ b/app/operate/service/dto/org_user.go
@@ -60,6 +60,7 @@ type OrgUserUpdateReq struct {
NickName string `json:"nickName" comment:"濮撳悕"`
NickNameEn string `json:"nickNameEn" comment:"濮撳悕"`
Username string `json:"username" comment:"璐﹀彿"`
+ Password string `json:"password" comment:"瀵嗙爜"`
Status string `json:"status" comment:"鐘舵€�" default:"2"`
common.ControlBy
}
@@ -71,8 +72,7 @@ type OrgUserUpdateStatusReq struct {
}
type ResetPwdReq struct {
- UserId int `json:"userId" comment:""` //
- Status string `json:"status" comment:"鐘舵€� 1 绂昏亴 2 鍦ㄨ亴"` //鐘舵€� 1 绂昏亴 2 鍦ㄨ亴
+ UserId int `json:"userId" comment:""` //
common.ControlBy
}
@@ -81,9 +81,9 @@ func (s *OrgUserUpdateReq) Generate(model *models.SysUser) {
model.NickName = s.NickName
model.NickNameEn = s.NickNameEn
model.Username = s.Username
+ model.Password = Pwd(s.Password)
model.RoleId, _ = strconv.Atoi(s.RoleId)
model.Status = s.Status
- model.Password = Pwd("123456")
}
func (s *OrgUserUpdateReq) GetId() interface{} {
--
2.18.1