From 20bbed188fd7833d14801dc202fa3cdbb085ca2b Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期五, 20 十二月 2024 11:51:34 +0800
Subject: [PATCH] 优化excel合并脚本
---
app/models/token_model.py | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/app/models/token_model.py b/app/models/token_model.py
index febe111..736720c 100644
--- a/app/models/token_model.py
+++ b/app/models/token_model.py
@@ -4,10 +4,9 @@
from sqlalchemy import Column, Integer, DateTime, Text
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,9 @@
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
+
--
Gitblit v1.8.0