lesscode-flask 0.0.77__tar.gz → 0.0.79__tar.gz

{lesscode_flask-0.0.77 → lesscode_flask-0.0.79}/PKG-INFO

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

{lesscode_flask-0.0.77 → lesscode_flask-0.0.79}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.77'
+__version__ = '0.0.79'
 
 import functools
 import logging

{lesscode_flask-0.0.77 → lesscode_flask-0.0.79}/lesscode_flask/model/user.py

@@ -1,5 +1,6 @@
 from functools import reduce
 from importlib import import_module
+import json
 
 # from flask_login import AnonymousUserMixin, UserMixin
 try:
@@ -28,7 +29,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
     """
 
     def __init__(self, id, username: str = None, display_name: str = None, phone_no: str = None, email: str = None,
-                 org_id: str = None, account_status: str = None, permissions=None, roleIds=None, client_id: str = None):
+                 type: int = 0, account_status: str = None, permissions=[], client_id: str = None):
         # '账号id',
         self.id = id
         # 用户名
@@ -39,34 +40,38 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         self.phone_no = phone_no
         #  邮箱
         self.email = email
-        # 组织机构id',
-        self.org_id = org_id
+        # 用户类型 0：匿名用户，1：普通用户，2：API用户，3:客户端用户
+        self.type = type
+        # # 组织机构id',
+        # self.org_id = org_id
         # '1正常（激活）；2未激活（管理员新增，首次登录需要改密码）； 3锁定（登录错误次数超限，锁定时长可配置）； 4休眠（长期未登录（字段，时长可配置），定时） 5禁用-账号失效；
         self.account_status = account_status
         # 当前用户登录成功的客户端id'
         self.client_id = client_id
         # 权限集合
         self.permissions = permissions
-        # 角色集合
-        self.roleIds = roleIds
-
-    @staticmethod
-    def is_api_user():
-        return False
-
-    @staticmethod
-    def is_anonymous_user():
-        return False
+        # # 角色集合
+        # self.roleIds = roleIds
+
+    #
+    #
+    # @staticmethod
+    # def is_api_user():
+    #     return False
+    #
+    # @staticmethod
+    # def is_anonymous_user():
+    #     return False
 
     def __str__(self):
         return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
-                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
-                f"account_status={self.account_status},permissions={self.permissions})")
+                f"display_name={self.display_name},email={self.email},type={self.type},"
+                f"account_status={self.account_status},permissions={self.permissions},client_id={self.client_id})")
 
     def __repr__(self):
         return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
-                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
-                f"account_status={self.account_status},permissions={self.permissions})")
+                f"display_name={self.display_name},email={self.email},type={self.type},"
+                f"account_status={self.account_status},permissions={self.permissions},client_id={self.client_id})")
 
     def to_dict(self):
         return {
@@ -75,11 +80,15 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             "display_name": self.display_name,
             "phone_no": self.phone_no,
             "email": self.email if self.email else "",
-            "org_id": self.org_id if self.org_id else "",
+            "type": self.type if self.type else "",
             "account_status": self.account_status,
-            "permissions": ",".join(self.permissions)
+            "permissions": json.dumps(self.permissions)
         }
-
+    @staticmethod
+    def to_user(user_data):
+        if not isinstance(user_data, dict):
+            user_data = user_data.__dict__
+        return  User(id=user_data.get("id"), username=user_data.get("username",""), display_name=user_data.get("display_name",""),phone_no=user_data.get("phone_no",""),email=user_data.get("email",""),type=user_data.get("type",0),account_status=user_data.get("account_status",1),permissions=user_data.get("permissions",[]),client_id=user_data.get("client_id",""))
 
 class AnonymousUser(User):
     """
@@ -89,14 +98,14 @@ class AnonymousUser(User):
     def __init__(self, permissions=None):
         super(AnonymousUser, self).__init__("AnonymousUserId", "AnonymousUser", "匿名用户", "-", "-", None, 1,
                                             permissions)
-
-    @staticmethod
-    def is_api_user():
-        return False
-
-    @staticmethod
-    def is_anonymous_user():
-        return True
+    #
+    # @staticmethod
+    # def is_api_user():
+    #     return False
+    #
+    # @staticmethod
+    # def is_anonymous_user():
+    #     return True
 
 
 class ApiUser(User):

{lesscode_flask-0.0.77 → lesscode_flask-0.0.79}/lesscode_flask.egg-info/PKG-INFO

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