lesscode-flask 0.0.94__tar.gz → 0.0.96__tar.gz

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/PKG-INFO

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

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.94'
+__version__ = '0.0.96'
 
 import functools
 import logging

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/lesscode_flask/app.py

@@ -53,6 +53,7 @@ class Lesscoder(Flask):
         self.register_error_handler(Exception, self.handle_exception)
 
     def preprocess_request(self) -> ft.ResponseReturnValue | None:
+        v =  super(Lesscoder, self).preprocess_request()
         if self.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
             try:
                 flask_login = import_module("flask_login")
@@ -71,13 +72,13 @@ class Lesscoder(Flask):
             if str(access) == "1":  # 需要登录
                 if current_user.is_anonymous_user:
                     # abort(403, "需要登录")
-                    ResponseResult.fail("请登录后访问", status_code="403")
+                    ResponseResult.fail("请登录后访问", status_code="403",http_code="403")
             elif str(access) == "2":  # 需要权限
                 if current_user.is_anonymous_user:
-                    ResponseResult.fail("请登录后访问", status_code="403")
+                    ResponseResult.fail("请登录后访问", status_code="403",http_code="403")
                 if not current_user.has_permission(id):
-                    ResponseResult.fail("请获取授权后访问", status_code="403")
-        return super(Lesscoder, self).preprocess_request()
+                    ResponseResult.fail("请获取授权后访问", status_code="403",http_code="403")
+        return v
 
     def full_dispatch_request(self) -> Response:
         # 生成请求标识
@@ -131,7 +132,7 @@ class Lesscoder(Flask):
                 return result
         try:
             # 判断返回结构是否是json，不是json则不包装
-            json.dumps(result, cls=JSONEncoder)
+            json.dumps(result, cls=JSONEncoder, ensure_ascii=False)
             return ResponseResult(data=result)
         except Exception as e:
             print(e)

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/lesscode_flask/model/user.py

@@ -60,6 +60,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         # self.roleIds = roleIds
 
     #
+    @property
     def is_anonymous_user(self):
         """
         判断是否是匿名用户
@@ -67,6 +68,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         """
         return self.type == 0
 
+    @property
     def is_user(self):
         """
         判断是否是普通用户
@@ -74,6 +76,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         """
         return self.type == 1
 
+    @property
     def is_api_user(self):
         """
         判断是否是API用户
@@ -81,6 +84,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         """
         return self.type == 2
 
+    @property
     def is_client_user(self):
         """
         判断是否是客户端用户
@@ -107,18 +111,27 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             "email": self.email if self.email else "",
             "type": self.type if self.type else "",
             "account_status": self.account_status,
-            "permissions": json.dumps(self.permissions)
+            "client_id": self.client_id,
+            "permissions": json.dumps(self.permissions),
+            "permissions_url": json.dumps(self.permissions_url)
         }
 
     @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", ""),
+        user = 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", []),
+                    account_status=user_data.get("account_status", 1),
                     client_id=user_data.get("client_id", ""))
+        permissions = user_data.get("permissions", [])
+        if isinstance(permissions, str):
+            user.permissions = json.loads(permissions)
+        permissions_url = user_data.get("permissions_url", [])
+        if isinstance(permissions_url, str):
+            user.permissions_url = json.loads(permissions_url)
+        return user
 
     @staticmethod
     def get_user(request):
@@ -188,16 +201,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         # 检查是否获取到了用户数据
         if user_dict:
             # 创建并返回User对象
-            user = User(
-                id=user_dict.get("id"),
-                username=user_dict.get("username"),
-                display_name=user_dict.get("display_name"),
-                phone_no=user_dict.get("phone_no"),
-                email=user_dict.get("email"),
-                permissions=json.loads(user_dict.get("permissions")) if user_dict.get(
-                    "permissions") is not None else [],
-                client_id=user_dict.get("client_id")
-            )
+            user = User.to_user(user_dict)
             return user
         return User()
 
@@ -215,4 +219,3 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             user = User.to_user(user_dict)
             return user
         return User()
-

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/lesscode_flask/utils/request/request.py

@@ -4,12 +4,32 @@ import uuid
 from flask import current_app, abort
 
 
-def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
-                        pack=False, connect_config=None, **kwargs):
+def get_basic_auth(username, password):
+    try:
+        httpx = importlib.import_module("httpx")
+    except ImportError as e:
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    return httpx.BasicAuth(username, password)
+
+
+def sync_common_request_origin(url, method, params=None, data=None, json=None, connect_config=None,
+                               **kwargs):
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = {"timeout": None}
     try:
         httpx = importlib.import_module("httpx")
     except ImportError as e:
         raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    with httpx.Client(**connect_config) as session:
+        try:
+            res = session.request(method.upper(), url=url, params=params, data=data, json=json, **kwargs)
+            return res
+        except Exception as e:
+            raise e
+
+
+def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
+                        pack=False, connect_config=None, **kwargs):
     if not base_url:
         base_url = current_app.config.get("CAPABILITY_PLATFORM_SERVER", "")
     headers = kwargs.get("headers", {})
@@ -19,28 +39,26 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         project_name = current_app.config.get("PROJECT_NAME", "").encode("utf-8")
         headers["Project-Name"] = project_name
     kwargs["headers"] = headers
-    if not connect_config or not isinstance(connect_config, dict):
-        connect_config = {"timeout": None}
-    with httpx.Client(**connect_config) as session:
-        try:
-            res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
-            if result_type == "json":
-                res = res.json()
-                if not pack:
-                    if res.get("status") == "00000":
-                        res = res.get("data")
-                    else:
-                        message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
-                        abort("500", message)
-            elif result_type == "text":
-                res = res.text
-            elif result_type == "origin":
-                return res
-            else:
-                res = res.content
+    try:
+        res = sync_common_request_origin(url=base_url + path, method=method.upper(), params=params, data=data,
+                                         json=json, connect_config=connect_config, **kwargs)
+        if result_type == "json":
+            res = res.json()
+            if not pack:
+                if res.get("status") == "00000":
+                    res = res.get("data")
+                else:
+                    message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
+                    abort("500", message)
+        elif result_type == "text":
+            res = res.text
+        elif result_type == "origin":
             return res
-        except Exception as e:
-            raise e
+        else:
+            res = res.content
+        return res
+    except Exception as e:
+        raise e
 
 
 def sync_get(path, params=None, base_url=None, result_type="json", pack=False, connect_config=None, **kwargs):

{lesscode-flask-0.0.94 → lesscode-flask-0.0.96}/lesscode_flask.egg-info/PKG-INFO

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