lesscode-py 0.4.25__tar.gz → 0.4.26__tar.gz

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/PKG-INFO

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

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.4.25"
+__version__ = "0.4.26"

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/web/base_handler.py

@@ -8,6 +8,7 @@ import time
 import traceback
 import types
 import uuid
+from concurrent.futures import ThreadPoolExecutor
 from contextlib import contextmanager
 from datetime import datetime
 from threading import Thread
@@ -32,6 +33,14 @@ from lesscode.web.router_mapping import RouterMapping
 from lesscode.web.status_code import StatusCode
 
 
+def set_current_request(request):
+    """将当前请求对象绑定到线程局部存储"""
+    options.request_ctx.request = request
+
+
+executor = ThreadPoolExecutor()
+
+
 class BaseHandler(RequestHandler):
     """
     BaseHandler 类继承自RequestHandler 用于公共基础功能实现，所有均使用此类为基类，只有使用此类的Handler 会被自动加载
@@ -57,6 +66,13 @@ class BaseHandler(RequestHandler):
             if getattr(method, "__http_method__", None):
                 self.command_map[method.__name__] = method
 
+    def prepare(self):
+        """
+        钩子方法：所有请求处理前自动执行
+        在这里统一绑定请求上下文，无需在每个接口里手动设置
+        """
+        set_current_request(self.request)
+
     def methods(self):
         return (list(filter(
             lambda m: not m.startswith("__") and not m.startswith("_") and callable(getattr(self, m)) and
@@ -69,7 +85,7 @@ class BaseHandler(RequestHandler):
         :param request:
         :return:
         """
-        pass
+        set_current_request(self.request)
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         """
@@ -183,6 +199,11 @@ class BaseHandler(RequestHandler):
         self.process_request(self.request)
         await self.request_handler()
 
+    def transmit_sync_request_ctx(self, func):
+        set_current_request(self.request)
+        data = func()
+        return data
+
     async def request_handler(self):
         # 通过url路径获取对应的处理方法
         res = [item for item in RouterMapping.instance().handlerMapping
@@ -317,7 +338,8 @@ class BaseHandler(RequestHandler):
                         func = lambda: common_cache(handler_method, options.global_cache_ex, **params_dict)
                     else:
                         func = lambda: handler_method(**params_dict)
-                    data = await IOLoop.current().run_in_executor(None, func)
+                        # data = await IOLoop.current().run_in_executor(None, func)
+                    data = await IOLoop.current().run_in_executor(None, self.transmit_sync_request_ctx, func)
                 self.end_time = int(round(time.time() * 1000))
                 self.set_header("Api-Time", f"{self.end_time - self.start_time}ms")
                 self.process_response(data)

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/web/base_server_send_event_handler.py

@@ -12,6 +12,11 @@ from lesscode.web.response_result import ResponseResult
 from lesscode.web.status_code import StatusCode
 
 
+def set_current_request(request):
+    """将当前请求对象绑定到线程局部存储"""
+    options.request_ctx.request = request
+
+
 class BaseServerSentEventHandler(RequestHandler):
     def data_received(self, chunk: bytes) -> Optional[Awaitable[None]]:
         pass
@@ -20,6 +25,13 @@ class BaseServerSentEventHandler(RequestHandler):
         super(BaseServerSentEventHandler, self).__init__(*args, **kwargs)
         self.set_header('Content-Type', 'text/event-stream')
 
+    def prepare(self):
+        """
+        钩子方法：所有请求处理前自动执行
+        在这里统一绑定请求上下文，无需在每个接口里手动设置
+        """
+        set_current_request(self.request)
+
     def get_request_arguments(self):
         _arguments = dict()
         query_arguments = self.request.query_arguments or dict()

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/web/base_websocket_handler.py

@@ -1,14 +1,28 @@
 import json
 import logging
 import time
-from typing import Union, Optional, Awaitable
+from typing import Union
 
+from tornado.options import options
 from tornado.websocket import WebSocketHandler
 
 from lesscode.utils.json import JSONEncoder
 
 
+def set_current_request(request):
+    """将当前请求对象绑定到线程局部存储"""
+    options.request_ctx.request = request
+
+
 class BaseWebSocketHandler(WebSocketHandler):
+
+    def prepare(self):
+        """
+        钩子方法：所有请求处理前自动执行
+        在这里统一绑定请求上下文，无需在每个接口里手动设置
+        """
+        set_current_request(self.request)
+
     def check_origin(self, origin):
         """重写同源检查 解决跨域问题"""
         return True

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/web/native_handler.py

@@ -3,6 +3,7 @@ import json
 import traceback
 from typing import Optional, Awaitable, Union
 
+from tornado.options import options
 from tornado.web import RequestHandler
 
 from lesscode.utils.es_log.record_log import es_record_log
@@ -12,8 +13,18 @@ from lesscode.web.response_result import ResponseResult
 from lesscode.web.status_code import StatusCode
 
 
+def set_current_request(request):
+    """将当前请求对象绑定到线程局部存储"""
+    options.request_ctx.request = request
+
+
 class NativeHandler(RequestHandler):
     def prepare(self):
+        """
+               钩子方法：所有请求处理前自动执行
+               在这里统一绑定请求上下文，无需在每个接口里手动设置
+        """
+        set_current_request(self.request)
         self.process_request(self.request)
 
     def process_request(self, request):

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode/web/web_server.py

@@ -5,6 +5,7 @@ import logging
 import os
 import platform
 import sys
+import threading
 import traceback
 from types import FunctionType
 from typing import Optional
@@ -72,6 +73,7 @@ define("resource_register_enable", default=False, type=bool, help="资源注册
 define("outside_screen_port", default=80, type=int, help="资源注册开关")
 define("custom_current_user_switch", default=False, type=bool, help="自定义用户开关")
 define("custom_current_user_func", default=None, type=FunctionType, help="自定义用户方法函数")
+define("request_ctx", default=threading.local(), type=threading.local, help="用于存储请求上下文的线程局部存储容器")
 # 日志初始化配置，配置文件中可修改设置
 options.logging = "DEBUG"
 options.log_rotate_mode = "time"

{lesscode-py-0.4.25 → lesscode_py-0.4.26}/lesscode_py.egg-info/PKG-INFO

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