From d961b5e9290edef3bee5cd6adc4a636af209c1e7 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期四, 09 一月 2025 18:52:21 +0800 Subject: [PATCH] tmp --- app/models/token_model.py | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/models/token_model.py b/app/models/token_model.py index febe111..7ad0e01 100644 --- a/app/models/token_model.py +++ b/app/models/token_model.py @@ -1,13 +1,12 @@ from datetime import datetime from typing import Type -from sqlalchemy import Column, Integer, DateTime, Text +from sqlalchemy import Column, Integer, DateTime, Text, String from sqlalchemy.orm import Session -from Log import logger from app.config.const import RAGFLOW +# from Log import logger from app.models.base_model import Base -from app.service.auth import UserAppDao class TokenModel(Base): @@ -67,16 +66,19 @@ if db_token: # 璁板綍瀛樺湪锛岃繘琛屾洿鏂� db_token.token = access_token - for k, v in token.items(): - setattr(db_token, k.replace("app", "token"), v) + db_token.ragflow_token = token.get(RAGFLOW, "") + # db_token.token = access_token + # for k, v in token.items(): + # setattr(db_token, k.replace("app", "token"), v) else: # 璁板綍涓嶅瓨鍦紝杩涜鎻掑叆 db_token = TokenModel( user_id=user_id, token=access_token, + ragflow_token = token.get(RAGFLOW, "") ) - for k, v in token.items(): - setattr(db_token, k.replace("app", "token"), v) + # for k, v in token.items(): + # setattr(db_token, k.replace("app", "token"), v) db.add(db_token) # 鎻愪氦浜嬪姟 @@ -84,14 +86,17 @@ db.refresh(db_token) except Exception as e: - logger.error(e) + # logger.error(e) # 寮傚父澶勭悊 db.rollback() # 鍥炴粴浜嬪姟 -async def get_token(db: Session, user_id: int): - res = {i.app_type.replace("app", "token"): i.access_token for i in await UserAppDao(db).get_user_datas(user_id)} - if not res: - token = db.query(TokenModel).filter_by(user_id=user_id).first() - res = {"ragflow_token": token.ragflow_token, "bisheng_token": token.bisheng_token} - return res + +class ApiTokenModel(Base): + __tablename__ = "chat_api_tokens" + id = Column(String(32), primary_key=True) + app_id = Column(String(32), index=True) + type = Column(String(16)) + token = Column(String(255)) + created_at = Column(DateTime, default=datetime.now()) + last_used_at = Column(DateTime, default=datetime.now()) -- Gitblit v1.8.0