lesscode-flask 0.0.49__tar.gz → 0.0.50__tar.gz

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/PKG-INFO

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

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.49'
+__version__ = '0.0.50'
 
 import functools
 import logging

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask/service/base_service.py

@@ -4,8 +4,7 @@ from flask_login import current_user
 
 from lesscode_flask.db import db
 from lesscode_flask.model.base_model import BaseModel
-from lesscode_flask.utils.helpers import serialize_result_to_dict, parameter_validation, alchemy_result_to_dict, \
-    format_page_index
+from lesscode_flask.utils.helpers import result_to_dict, parameter_validation, format_page_index
 
 logger = logging.getLogger(__name__)
 
@@ -89,7 +88,7 @@ class BaseService:
         :return:
         """
         query = self.model.query
-        return serialize_result_to_dict(query.get(id))
+        return result_to_dict(query.get(id))
 
     # def get_one(self, filters: list, select_columns: list = None, ):
     def get_one(self, select_columns: list = None, order_columns: list = None, filters: list = None):
@@ -123,7 +122,7 @@ class BaseService:
             query = query.offset(offset).limit(size)
         if select_columns:
             query = query.with_entities(*select_columns)
-        data = alchemy_result_to_dict(query.all())
+        data = result_to_dict(query.all())
         return data
 
     def delete_item(self, id: str):
@@ -165,10 +164,11 @@ class BaseService:
         total = pagination.total
         has_prev = pagination.has_prev
         has_next = pagination.has_next
-        if select_columns:
-            data = alchemy_result_to_dict(items)
-        else:
-            data = serialize_result_to_dict(items)
+        data = result_to_dict(items)
+        # if select_columns:
+        #     data = alchemy_result_to_dict(items)
+        # else:
+        #     data = serialize_result_to_dict(items)
         format_page_index(data, page_num, page_size)
         result = {"dataSource": data, "total": total,
                   "has_prev": has_prev,

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask/setting/__init__.py

@@ -109,5 +109,5 @@ class BaseConfig:
         # "pool_block": False
     }
     # 资源注册相关
-    REGISTER_ENABLE = False
+    REGISTER_ENABLE = True
     REGISTER_SERVER = "http://127.0.0.1:8976"

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask/setup/__init__.py

@@ -305,25 +305,22 @@ def setup_resource_register(app):
         return resource
 
     if current_app.config.get("REGISTER_ENABLE", False) and current_app.config.get("REGISTER_SERVER"):
-        resource_dict = {
-            "parent_resource": [],
-            "resource": []
-        }
+        resource_list = []
         url_rules_dict = {}
         for blueprint_name, blueprint in app.blueprints.items():
             if blueprint.url_prefix not in ["/swagger-ui"]:
-                group_key = f"{blueprint_name}|{blueprint.url_prefix}"
-                url_rules_dict[group_key] = []
+                url_rules_dict[blueprint_name] = []
                 # 遍历全局 URL 规则
                 for rule in app.url_map.iter_rules():
                     # 筛选出属于当前蓝图的规则
                     if rule.endpoint.startswith(f"{blueprint_name}."):
-                        url_rules_dict[group_key].append(rule)
+                        url_rules_dict[blueprint_name].append(rule)
 
         for parent_resource in url_rules_dict:
             symbol = uuid.uuid1().hex
-            resource_dict["parent_resource"].append(
-                package_resource(label=parent_resource, symbol=symbol, access=0, type=0))
+            resource = package_resource(label=parent_resource, symbol=symbol, access=0, type=0)
+            resource["children"] = []
+
             for child_resource in url_rules_dict[parent_resource]:
                 view_func = app.view_functions[child_resource.endpoint]
                 if view_func.__doc__:
@@ -350,15 +347,15 @@ def setup_resource_register(app):
                         child_resource, view_func, param_desc_dict)
                 else:
                     param_list = []
-                resource_dict["resource"].append(
+                resource["children"].append(
                     package_resource(label="", symbol=child_resource.rule, access=1, type=2, url=child_resource.rule,
                                      description=description, param_list=param_list))
-
+            resource_list.append(resource)
         with httpx.Client(**{"timeout": None}) as session:
             try:
                 res = session.request("post", url=current_app.config.get(
                     "REGISTER_SERVER") + "/icp/authResource/resource_register", json={
-                    "resource_dict": resource_dict
+                    "resource_list": resource_list
                 })
                 return res
             except Exception as e:

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask/utils/helpers.py

@@ -12,40 +12,57 @@ class app_config:
         return current_app.config.get(key, default)
 
 
-def serialize_result_to_dict(result):
+def result_to_dict(result):
     """
-    结果对象序列化为字典
+    将结果对象或SQLAlchemy查询结果转换为字典
     :param result:
     :return:
     """
     if isinstance(result, list):
-        return [serialize_result_to_dict(r) for r in result]
-    if not hasattr(result, "__dict__"):
-        return result
-    return {k: v for k, v in result.__dict__.items() if not k.startswith('_')}
+        return [result_to_dict(r) for r in result]
 
+    if hasattr(result, "_fields"):
+        key_list = list(result._fields)
+        return dict(zip(key_list, result))
 
-def alchemy_result_to_dict(result):
-    """
-    alchemy 指定字段查询后返回的数据解析为字典
-    :param result:
-    :return:
-    """
-    data_list = []
-    if not result:
-        return result
-    if isinstance(result, list):
-        key_list = list(result[0]._fields)
-        for d in result:
-            dict_data = dict(zip(key_list, d))
-            data_list.append(dict_data)
-        return data_list
-    else:
-        if result:
-            key_list = list(result._fields)
-            return dict(zip(key_list, result))
-        else:
-            return {}
+    if hasattr(result, "__dict__"):
+        return {k: v for k, v in result.__dict__.items() if not k.startswith('_')}
+    return result
+
+# def serialize_result_to_dict(result):
+#     """
+#     结果对象序列化为字典
+#     :param result:
+#     :return:
+#     """
+#     if isinstance(result, list):
+#         return [serialize_result_to_dict(r) for r in result]
+#     if not hasattr(result, "__dict__"):
+#         return result
+#     return {k: v for k, v in result.__dict__.items() if not k.startswith('_')}
+#
+#
+# def alchemy_result_to_dict(result):
+#     """
+#     alchemy 指定字段查询后返回的数据解析为字典
+#     :param result:
+#     :return:
+#     """
+#     data_list = []
+#     if not result:
+#         return result
+#     if isinstance(result, list):
+#         key_list = list(result[0]._fields)
+#         for d in result:
+#             dict_data = dict(zip(key_list, d))
+#             data_list.append(dict_data)
+#         return data_list
+#     else:
+#         if result:
+#             key_list = list(result._fields)
+#             return dict(zip(key_list, result))
+#         else:
+#             return {}
 
 
 def generate_uuid():

{lesscode_flask-0.0.49 → lesscode_flask-0.0.50}/lesscode_flask.egg-info/PKG-INFO

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