lesscode-flask 0.1.53__tar.gz → 0.1.55__tar.gz

{lesscode-flask-0.1.53 → lesscode_flask-0.1.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.53
+Version: 0.1.55
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.1.53 → lesscode_flask-0.1.55}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.53'
+__version__ = '0.1.55'
 
 import functools
 import logging

{lesscode-flask-0.1.53 → lesscode_flask-0.1.55}/lesscode_flask/model/user.py

@@ -33,7 +33,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
 
     def __init__(self, id="AnonymousUserId", username="AnonymousUser", display_name="匿名用户", phone_no: str = None,
                  email: str = None,
-                 type: int = 0, account_status: str = None, permissions=[], permissions_url=[], client_id: str = None,
+                 type: int = 0, account_status: str = None, permissions=[], permissions_url=[],roleIds=[], client_id: str = None,
                  sub: str = None):
         # '账号id',
         self.id = id
@@ -59,7 +59,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         # 权限集合(url)
         self.permissions_url = permissions_url
         # # 角色集合
-        # self.roleIds = roleIds
+        self.roleIds = roleIds
 
     #
     @property
@@ -116,7 +116,9 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             "client_id": self.client_id,
             "sub": self.sub if self.sub else "",
             "permissions": json.dumps(self.permissions),
-            "permissions_url": json.dumps(self.permissions_url)
+            "permissions_url": json.dumps(self.permissions_url),
+            "roleIds": json.dumps(self.roleIds)
+
         }
 
     @staticmethod
@@ -131,9 +133,18 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         permissions = user_data.get("permissions", [])
         if isinstance(permissions, str):
             user.permissions = json.loads(permissions)
+        else:
+            user.permissions = permissions
         permissions_url = user_data.get("permissions_url", [])
         if isinstance(permissions_url, str):
             user.permissions_url = json.loads(permissions_url)
+        else:
+            user.permissions_url = permissions_url
+        roleIds = user_data.get("roleIds", [])
+        if isinstance(roleIds, str):
+            user.roleIds = json.loads(roleIds)
+        else:
+            user.roleIds = roleIds
         return user
 
     @staticmethod
@@ -174,7 +185,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
                     display_name=unquote(user_dict["display_name"]),
                     phone_no=user_dict["phone_no"],
                     permissions=user_dict.get("permissions", []),
-                    # roleIds=user_dict["roleIds"],
+                    roleIds=user_dict["roleIds"],
                     client_id=user_dict["client_id"]
                 )
                 return user

{lesscode-flask-0.1.53 → lesscode_flask-0.1.55}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.53
+Version: 0.1.55
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy