报告生成增加

app/api/auth.py

@@ -125,14 +125,16 @@ async def login_v2(login_data: LoginData, db: Session = Depends(get_db), pdb: As
             continue
         try:
             name = login_data.username
+            email = ""
             app_password = login_data.password
             user_app = await UserAppDao(db).get_data_by_id(user.id, app["id"])
             if user_app:
                 name  = user_app.username
+                email  = user_app.email
                 app_password = user_app.decrypted_password(user_app.password)
             else:
                 await update_user_info(db, user.id)
-            token = await service.login(name, app_password)
+            token = await service.login(name, app_password,email=email)
             token_dict[app["id"]] = token
         except Exception as e:
             return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")

app/config/env_conf/config.yaml

@@ -2,7 +2,7 @@ secret_key: your-secret-key
 sgb_base_url: http://192.168.20.119:13001
 sgb_websocket_url: ws://192.168.20.119:13001
 fwr_base_url: http://192.168.20.119:11080
-database_url: mysql+pymysql://root:infini_rag_flow@192.168.20.119:5455/rag_basic
+database_url: mysql+pymysql://root:rag_gateway@192.168.20.117:23306/rag_gateway
 sgb_db_url: mysql+pymysql://root:1234@192.168.20.119:13306/bisheng
 fwr_db_url: mysql+pymysql://root:infini_rag_flow@192.168.20.119:15455/rag_flow
 PUBLIC_KEY: |
@@ -17,7 +17,7 @@ basic_base_url: http://192.168.20.231:8000
 basic_paper_url: http://192.168.20.231:8000
 dify_base_url: http://192.168.20.116
 dify_api_token: app-YmOAMDsPpDDlqryMHnc9TzTO
-postgresql_database_url: postgresql+asyncpg://kong:kongpass@192.168.20.119:5432/kong
+postgresql_database_url: postgresql+asyncpg://kong:kongpass@192.168.20.117:5432/kong
 dify_workflow_clean: app-OpF0drPu0XcgqcekQpT4FA8a
 dify_workflow_report: app-0MAkdFWqh9zxwmU69O0BFU1s
 dify_database_url: postgresql+psycopg2://postgres:difyai123456@192.168.20.116:15432/dify

app/config/env_conf/resource.json

@@ -22,7 +22,7 @@
         "created_at": "23/12/2024 09:50:31",
         "updated_at": "23/12/2024 09:50:31",
         "name": "智能体详情",
-        "url": "/intelligent/detail",
+        "url": "DifyDetail",
         "path": "/intelligent/detail",
         "perms": "system:intelligent:detail",
         "description": "",
@@ -32,10 +32,27 @@
         "canbdeeleted": null,
         "resource_type_id": "3",
         "resource_id": "1eed48e2-d510-42f2-9495-bc299bae237b",
-        "status": "2",
+        "status": "1",
+        "hidden": 0
+      },
+      {
+        "id": "21e90633-bb76-4419-8925-c20b9ccd33f1",
+        "created_at": "23/12/2024 09:50:31",
+        "updated_at": "23/12/2024 09:50:31",
+        "name": "知识库详情",
+        "url": "KnowledgeDetail",
+        "path": "/knowledge/detail",
+        "perms": "system:knowledge:detail",
+        "description": "",
+        "icon": "",
+        "seq": 0,
+        "target": null,
+        "canbdeeleted": null,
+        "resource_type_id": "3",
+        "resource_id": "1eed48e2-d510-42f2-9495-bc299bae237b",
+        "status": "1",
         "hidden": 0
       },
-
       {
         "id": "3750795c-404b-488b-8080-89c037b4a187",
         "created_at": "18/12/2024 19:20:09",

app/service/difyService.py

@@ -72,9 +72,9 @@ class DifyService:
             # print(response.text)
             return self._handle_response(response)
 
-    async def login(self, username: str, password: str, remember_me=True, invite_token:str="") -> str:
+    async def login(self, username: str, password: str, remember_me=True, invite_token:str="", email="") -> str:
         # password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
-        data = {"email": f"{username}@basic.com", "password": password, "remember_me": remember_me, "invite_token": invite_token,
+        data = {"email":email if email else f"{username}@basic.com", "password": password, "remember_me": remember_me, "invite_token": invite_token,
          "language": "zh-Hans"}
 
         async with httpx.AsyncClient() as client:

app/service/ragflow.py

@@ -48,13 +48,13 @@ class RagflowService:
                 raise Exception(f"Ragflow registration failed: {response.text}")
             return self._handle_response(response)
 
-    async def login(self, username: str, password: str) -> str:
+    async def login(self, username: str, password: str, email="") -> str:
         password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
         async with httpx.AsyncClient() as client:
             response = await client.post(
                 f"{self.base_url}/v1/user/login",
                 headers={'Content-Type': 'application/json'},
-                json={"email": f"{username}@example.com", "password": password}
+                json={"email": email if email else f"{username}@example.com", "password": password}
             )
             if response.status_code != 200:
                 raise Exception(f"Ragflow login failed: {response.text}")