From d3a8ef5966a33d604a6e5914be6668c3d4ec0e32 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Tue, 19 Nov 2019 21:46:53 +0800
Subject: [PATCH] fix get user by uid

---
 api/app.py               | 2 +-
 api/lib/perm/acl/user.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/app.py b/api/app.py
index 068a978..95d6059 100644
--- a/api/app.py
+++ b/api/app.py
@@ -34,7 +34,7 @@ API_PACKAGE = "api"
 @login_manager.user_loader
 def load_user(user_id):
     """Load user by ID."""
-    return User.get_by_id(int(user_id))
+    return User.get_by(uid=int(user_id), first=True, to_dict=False)
 
 
 class ReverseProxy(object):
diff --git a/api/lib/perm/acl/user.py b/api/lib/perm/acl/user.py
index fd152db..78396ff 100644
--- a/api/lib/perm/acl/user.py
+++ b/api/lib/perm/acl/user.py
@@ -44,7 +44,7 @@ class UserCRUD(object):
 
     @staticmethod
     def update(uid, **kwargs):
-        user = User.get_by_id(uid) or abort(404, "User <{0}> does not exist".format(uid))
+        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(404, "User <{0}> does not exist".format(uid))
 
         UserCache.clean(uid)
 
@@ -59,7 +59,7 @@ class UserCRUD(object):
 
     @classmethod
     def delete(cls, uid):
-        user = User.get_by_id(uid) or abort(404, "User <{0}> does not exist".format(uid))
+        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(404, "User <{0}> does not exist".format(uid))
 
         UserCache.clean(user)