From 1b417d75a8e24e5ec9fd29e9b75ee53049f3b79e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 17:13:14 +0800
Subject: [PATCH] 跨域问题
---
app/models/user_model.py | 4 ++--
app/service/ragflow.py | 18 ++++++++++++------
app/service/dialog.py | 5 +++++
main.py | 11 ++++++++++-
4 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index 9d6acdb..e51ae00 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -1,6 +1,6 @@
from datetime import datetime
-# from cryptography.fernet import Fernet
+from cryptography.fernet import Fernet
from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime
from sqlalchemy.orm import relationship, backref
@@ -18,7 +18,7 @@
user_group_table = Table('user_group', Base.metadata
, Column('user_id', Integer, ForeignKey('user.id', ondelete='CASCADE'))
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE')))
-# cipher_suite = Fernet(settings.PASSWORD_KEY.encode("utf-8"))
+cipher_suite = Fernet(settings.PASSWORD_KEY.encode("utf-8"))
class UserModel(Base):
diff --git a/app/service/dialog.py b/app/service/dialog.py
index bcca339..3af1363 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
from app.api.user import user_list
from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel
from app.models.user_model import UserModel
@@ -27,6 +29,9 @@
session_id = data.get("id")
if not session_id:
logger.error("鏇存柊鍥炶瘽璁板綍澶辫触锛亄}".format(data))
+
+ data["create_date"] = datetime.strptime(data["create_date"], '%a, %d %b %Y %H:%M:%S %Z')
+ data["update_date"] = datetime.strptime(data["update_date"], '%a, %d %b %Y %H:%M:%S %Z')
if is_new:
try:
data["tenant_id"] = user_id
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 769631d..03e92ea 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -3,7 +3,7 @@
from fastapi import HTTPException
from starlette import status
-from Log import logger
+# from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -193,27 +193,33 @@
async def set_user_password(self, token: str, password: str, new_password: str) -> str:
# print("password:", password)
# print("new_password:", new_password)
+ headers = {
+ 'Content-Type': 'application/json',
+ 'Authorization': token
+ }
password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
new_password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(new_password)
url = f"{self.base_url}/v1/user/setting"
- headers = {"Authorization": token}
+ # headers = {"Authorization": token}
data = {"password": password, "new_password":new_password}
async with httpx.AsyncClient(timeout=60) as client:
response = await client.post(url, headers=headers, data=data)
+ print(response.text)
data = self._handle_response(response)
- logger.info("set_user_password:{}".format(data))
+ print(data)
+ # logger.info("set_user_password:{}".format(data))
return data
if __name__ == "__main__":
async def a():
a = RagflowService("http://192.168.20.119:11080")
- b = await a.get_knowledge_list("625e1f24a26811ef8f940242ac130006", 1,
- 10)
+ b = await a.set_user_password("IjYwYjg1MTFjYTY1NTExZWY4ODZlMDI0MmFjMTMwMDA2Ig.ZzxUxQ.8rIH2HifXNWtkNsnODv6XFHjGVU", "123456",
+ "000000")
print(b)
import asyncio
- # 鍦ㄥ悓姝ヤ唬鐮佷腑鍚姩寮傛涓诲嚱鏁�
+
asyncio.run(a())
diff --git a/main.py b/main.py
index 7f45394..2af3a01 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,8 @@
from contextlib import asynccontextmanager
# from apscheduler.schedulers.background import BackgroundScheduler
from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
from app.api.auth import router as auth_router
from app.api.canvas import canvas_router
from app.api.chat import router as chat_router
@@ -40,7 +42,14 @@
lifespan=lifespan
)
-
+# 璁剧疆 CORS 涓棿浠�
+app.add_middleware(
+ CORSMiddleware,
+ allow_origins=["*"], # 鍏佽鎵�鏈夊煙鍚嶈法鍩熻闂�
+ allow_credentials=True,
+ allow_methods=["*"], # 鍏佽鎵�鏈夋柟娉�
+ allow_headers=["*"], # 鍏佽鎵�鏈夊ご閮�
+)
# 鍒涘缓璋冨害鍣�
# scheduler = BackgroundScheduler()
# scheduler.add_job(sync_resource, 'interval', minutes=1, id="sync_resource_data")
--
Gitblit v1.8.0