更新密码

services/knowoapi/controllers/user.go

@@ -97,11 +97,15 @@ func (a *UserController) PutChange() {
 		badRequest(a.Ctx, err)
 		return
 	}
-	_, err := a.Service.ModifyPassword(a.Token.getRecorID(a.Ctx), req.OldPass, req.NewPass)
+	b, err := a.Service.ModifyPassword(a.Token.getRecorID(a.Ctx), req.OldPass, req.NewPass)
 	if err != nil {
 		server.Log.Error(err)
 		responseError(a.Ctx, ErrDatabase, err.Error())
 		return
 	}
+	if !b {
+		responseError(a.Ctx, ErrNormal, "原密码不正确")
+		return
+	}
 	done(a.Ctx, "修改成功")
 }

services/knowoapi/model/user.go

@@ -71,12 +71,18 @@ func (a *User) UpdatePassword(userid uint, oldpass, newpass string) (bool, error
 	err := a.db.Model(user).Where(map[string]interface{}{
 		"id":        userid,
 		"user_pass": oldpass,
-	}).Update("user_pass", newpass).Count(&count).Error
+	}).Count(&count).Error
+	//.Update("user_pass", newpass).Error
 	if err != nil {
 		return false, err
 	}
 	if count > 0 {
-		return true, nil
+		err = a.db.Model(user).Update("user_pass", newpass).Error
+		if err != nil {
+			return false, err
+		}
+	} else {
+		return false, nil
 	}
 	return false, nil
 }