修复flask alchemy应用结束自动关闭session会出错的问题

Signed-off-by: guoyanfeng <guo.yanfeng@dataeveryday.com>

Author: guoyanfeng

CHANGES.md

@@ -8,6 +8,7 @@
 #### Changed 
 - 修复fastapi alchemy中如果默认的连接失败ping操作也会失败的问题
 - 更改flask alchemy中如果ping操作默认key的类型值
+- 修复flask alchemy应用结束自动关闭session会出错的问题
 
 
 ###[1.0.3b1~1.0.3b3] - 2020-12-8

fessql/dbalchemy/flask_alchemy.py

@@ -6,7 +6,7 @@
 @software: PyCharm
 @time: 18-12-25 下午4:58
 """
-
+import threading
 from collections import MutableMapping, MutableSequence
 from contextlib import contextmanager
 from typing import Dict, Generator, List, Union
@@ -90,6 +90,7 @@ def __init__(self, app=None, *, username: str = "root", passwd: str = None, host
         self.dialect: str = dialect
         self.msg_zh: str = ""
         self.scoped_sessions: Dict[str, scoped_session] = {}  # 主要保存其他scope session
+        self.registry = threading.local()  # 当前线程注册bind key
 
         # 这里要用重写的BaseQuery, 根据BaseQuery的规则,Model中的query_class也需要重新指定为子类model,
         # 但是从Model的初始化看,如果Model的query_class为None的话还是会设置为和Query一致，符合要求
@@ -156,8 +157,8 @@ def init_app(self, app, username: str = None, passwd: str = None, host: str = No
 
         @app.teardown_appcontext
         def _shutdown_other_session(response_or_exc):
-            for _, session_ in self.scoped_sessions.items():
-                session_.remove()
+            for bind_key in getattr(self.registry, "bind_keys", set()):
+                self.scoped_sessions[bind_key].remove()
             return response_or_exc
 
     def get_engine(self, app=None, bind=None):
@@ -233,6 +234,10 @@ def gen_session(self, bind_key: str, session_options: Dict = None) -> Session:
             session = self.scoped_sessions[bind_key]()
             session.bind_key = bind_key  # 设置bind key
             session = self.ping_session(session)  # 校验重连,保证可用
+            # 加入当前线程bindkey,用于自动关闭处理
+            if hasattr(self.registry, "bind_keys") is False:
+                self.registry.bind_keys = set()
+            self.registry.bind_keys.add(bind_key)
 
         return session
 
@@ -449,6 +454,7 @@ class CustomBaseQuery(BaseQuery):
     目前是改造如果limit传递为0，则返回所有的数据，这样业务代码中就不用更改了
     """
 
+    # noinspection DuplicatedCode
     def paginate(self, page: int = 1, per_page: int = 20, max_per_page: int = None,
                  primary_order: bool = True) -> Pagination:
         """Returns ``per_page`` items from page ``page``.