修复了User无法登录的bug
This commit is contained in:
@@ -13,7 +13,7 @@ def save_chapter_memory_by_uuid(
|
||||
is_rebuttal: bool,
|
||||
):
|
||||
uuid2username = current_app.extensions["uuid2username"]
|
||||
user_map = current_app.extensions["user_id2UserClass"] # 可复用缓存
|
||||
user_map = current_app.extensions["user_uuid2UserClass"] # 可复用缓存
|
||||
user_data_dir = current_app.config["USER_DATA_DIR"]
|
||||
|
||||
username = uuid2username[user_uuid]
|
||||
|
||||
@@ -8,7 +8,7 @@ from db.user import load_user_from_json
|
||||
|
||||
def _username_from_session() -> str:
|
||||
"""通过 session['user_id'] -> username"""
|
||||
user_uuid = session.get("user_id")
|
||||
user_uuid = session.get("user_uuid")
|
||||
if not user_uuid:
|
||||
return None
|
||||
uuid2username = current_app.extensions["uuid2username"]
|
||||
@@ -16,9 +16,9 @@ def _username_from_session() -> str:
|
||||
|
||||
def get_or_load_current_user():
|
||||
"""
|
||||
返回当前用户对象(如 user_id2UserClass 中没有则从 JSON 载入并缓存)
|
||||
返回当前用户对象(如 user_uuid2UserClass 中没有则从 JSON 载入并缓存)
|
||||
"""
|
||||
user_uuid = session.get("user_id")
|
||||
user_uuid = session.get("user_uuid")
|
||||
if not user_uuid:
|
||||
return None
|
||||
|
||||
@@ -26,7 +26,7 @@ def get_or_load_current_user():
|
||||
if not username:
|
||||
return None
|
||||
|
||||
user_map = current_app.extensions["user_id2UserClass"]
|
||||
user_map = current_app.extensions["user_uuid2UserClass"]
|
||||
if user_uuid not in user_map:
|
||||
user_map[user_uuid] = load_user_from_json(
|
||||
username, user_data_dir=current_app.config["USER_DATA_DIR"]
|
||||
|
||||
Reference in New Issue
Block a user