diff --git a/backend/apps/chat/task/llm.py b/backend/apps/chat/task/llm.py index ae3f718e..5b4517da 100644 --- a/backend/apps/chat/task/llm.py +++ b/backend/apps/chat/task/llm.py @@ -22,7 +22,6 @@ from apps.chat.models.chat_model import ChatQuestion, ChatRecord, Chat from apps.datasource.crud.datasource import get_table_schema from apps.datasource.models.datasource import CoreDatasource from apps.db.db import exec_sql -from apps.system.crud.user import get_user_info from common.core.config import settings from common.core.deps import SessionDep, CurrentUser @@ -70,8 +69,7 @@ class LLMService: if ds: chat_question.db_schema = get_table_schema(session=self.session, ds=ds) - db_user = get_user_info(session=self.session, user_id=current_user.id) - chat_question.lang = db_user.language + chat_question.lang = current_user.language self.ds = CoreDatasource(**ds.model_dump()) if ds else None self.chat_question = chat_question diff --git a/backend/apps/system/api/user.py b/backend/apps/system/api/user.py index 9ee8bf01..7bd6aae5 100644 --- a/backend/apps/system/api/user.py +++ b/backend/apps/system/api/user.py @@ -1,19 +1,18 @@ from fastapi import APIRouter -from apps.system.crud.user import get_db_user, get_user_info +from apps.system.crud.user import get_db_user from apps.system.models.user import UserModel from apps.system.schemas.system_schema import PwdEditor, UserCreator, UserEditor, UserGrid, UserLanguage from common.core.deps import CurrentUser, SessionDep from common.core.pagination import Paginator from common.core.schemas import PaginatedResponse, PaginationParams from common.core.security import md5pwd, verify_md5pwd -from common.utils.time import get_timestamp router = APIRouter(tags=["user"], prefix="/user") @router.get("/info") async def user_info(session: SessionDep, current_user: CurrentUser): - db_user = get_user_info(session=session, user_id=current_user.id) + db_user = get_db_user(session=session, user_id=current_user.id) if not db_user: return {"message": "User not found"} db_user.password = None diff --git a/frontend/src/components/layout/Person.vue b/frontend/src/components/layout/Person.vue index 5f94f89d..b629f897 100644 --- a/frontend/src/components/layout/Person.vue +++ b/frontend/src/components/layout/Person.vue @@ -1,5 +1,5 @@