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

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

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

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

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

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

@@ -57,11 +57,12 @@ class BaseService:
                     item.create_user_id = "AnonymousUserId"
                 if hasattr(item, "create_user_name"):
                     item.create_user_name = "匿名用户"
-        db.session.execute(
-            self.model.__table__.insert(),
-            items
-        )
-        db.session.commit()
+        if items:
+            db.session.execute(
+                self.model.__table__.insert(),
+                items
+            )
+            db.session.commit()
         return items
 
     def update_item(self, id: str, item: dict):

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

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

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

@@ -7,7 +7,6 @@ from datetime import datetime
 
 from logging.handlers import TimedRotatingFileHandler
 
-import httpx
 import redis
 from flask import current_app
 from flask_login import LoginManager
@@ -18,7 +17,8 @@ from lesscode_flask.log.access_log_handler import AccessLogHandler
 from lesscode_flask.model.user import AnonymousUser, User
 from lesscode_flask.service.authentication_service import get_token_user, get_api_user, get_gateway_user
 from lesscode_flask.utils.swagger.swagger_template import split_doc
-from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, replace_symbol, get_params_type, get_sample_data
+from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, replace_symbol, get_params_type, \
+    get_sample_data
 
 
 def setup_logging(app):
@@ -211,10 +211,10 @@ def setup_resource_register(app):
                     "description": param_desc_dict[arg] if param_desc_dict.get(arg) else f"Path parameter {arg}",
                 }
                 if param.default is inspect.Parameter.empty:
-                    param_info["required"] = True
+                    param_info["required"] = 1
                     param_info["example"] = get_sample_data(param.annotation.__name__)
                 else:
-                    param_info["required"] = False
+                    param_info["required"] = 0
                     param_info["default"] = param.default
                     param_info["example"] = param.default
                 parameters.append(param_info)
@@ -227,7 +227,6 @@ def setup_resource_register(app):
         # 提取查询参数和表单参数
         sig = inspect.signature(view_func)
 
-        required = []
         for arg, param in sig.parameters.items():
             param_info = {
                 "name": param.name,
@@ -237,14 +236,12 @@ def setup_resource_register(app):
             }
             # 如果默认值是空，则是必填参数
             if param.default is inspect.Parameter.empty:
-                if (not_allow_list and arg not in not_allow_list) or not not_allow_list:
-                    required.append(arg)
 
                 param_info["example"] = get_sample_data(param.annotation.__name__)
-                param_info["required"] = True
+                param_info["required"] = 1
             else:
                 param_info["default"] = param.default
-                param_info["required"] = False
+                param_info["required"] = 0
                 if param.default is not None:
                     param_info["example"] = param.default
                 else:
@@ -266,7 +263,7 @@ def setup_resource_register(app):
             param_list.append({
                 "name": arg,
                 "in": "path",
-                "required": True,
+                "required": 1,
                 "description": param_desc_dict[arg] if param_desc_dict.get(arg) else f"Path parameter {arg}",
                 "example": "",
                 "default": "",
@@ -300,7 +297,8 @@ def setup_resource_register(app):
             "is_deleted": 0,
             "create_user_id": "-",
             "create_user_name": "-",
-            "create_time": str(datetime.now())
+            "create_time": str(datetime.now()),
+            "param_list": param_list
         }
         return resource
 
@@ -308,17 +306,19 @@ def setup_resource_register(app):
         resource_list = []
         url_rules_dict = {}
         for blueprint_name, blueprint in app.blueprints.items():
+            group_key = f'{blueprint_name}|{blueprint.url_prefix}'
             if blueprint.url_prefix not in ["/swagger-ui"]:
-                url_rules_dict[blueprint_name] = []
+                url_rules_dict[group_key] = []
                 # 遍历全局 URL 规则
                 for rule in app.url_map.iter_rules():
                     # 筛选出属于当前蓝图的规则
                     if rule.endpoint.startswith(f"{blueprint_name}."):
-                        url_rules_dict[blueprint_name].append(rule)
+                        url_rules_dict[group_key].append(rule)
 
         for parent_resource in url_rules_dict:
             symbol = uuid.uuid1().hex
-            resource = package_resource(label=parent_resource, symbol=symbol, access=0, type=0)
+            label, url = parent_resource.split("|")
+            resource = package_resource(label=label, symbol=symbol, url=url, access=0, type=0)
             resource["children"] = []
 
             for child_resource in url_rules_dict[parent_resource]:
@@ -351,6 +351,10 @@ def setup_resource_register(app):
                     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)
+        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(**{"timeout": None}) as session:
             try:
                 res = session.request("post", url=current_app.config.get(

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

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