From 947cf0d625accd92edf1a5a832b12c2debddfd38 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 09 五月 2025 14:39:23 +0800
Subject: [PATCH] 配置参数优化
---
app/config/config.py | 17 +++++++----------
app/config/env_conf/config.yaml | 17 +----------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/app/config/config.py b/app/config/config.py
index 6e29333..2e56510 100644
--- a/app/config/config.py
+++ b/app/config/config.py
@@ -26,16 +26,13 @@
dify_database_url: str = ''
def __init__(self, **kwargs):
# 鏇挎崲閰嶇疆涓殑IP鍦板潃
- # host_ip = os.getenv('HOST_IP', '127.0.0.1')
- # kwargs['sgb_base_url'] = kwargs.get('sgb_base_url', '').replace('127.0.0.1', host_ip)
- # kwargs['sgb_websocket_url'] = kwargs.get('sgb_websocket_url', '').replace('127.0.0.1', host_ip)
- # kwargs['fwr_base_url'] = kwargs.get('fwr_base_url', '').replace('127.0.0.1', host_ip)
- # kwargs['sgb_db_url'] = kwargs.get('sgb_db_url', '').replace('127.0.0.1', host_ip)
- # kwargs['fwr_db_url'] = kwargs.get('fwr_db_url', '').replace('127.0.0.1', host_ip)
- # kwargs['dify_base_url'] = kwargs.get('dify_base_url', '').replace('127.0.0.1', host_ip)
- # kwargs['basic_base_url'] = kwargs.get('basic_base_url', '').replace('127.0.0.1', host_ip)
- # kwargs['dify_database_url'] = kwargs.get('dify_database_url', '').replace('127.0.0.1', host_ip)
- # Check if all required fields are provided and set them
+ host_ip = kwargs.get('host_ip', '127.0.0.1')
+ kwargs['fwr_base_url'] = f"http://{host_ip}:11080"
+ kwargs['database_url'] = f"mysql+pymysql://root:infini_rag_flow@{host_ip}:5455/rag_basic"
+ kwargs['fwr_db_url'] = f"mysql+pymysql://root:infini_rag_flow@{host_ip}:15455/rag_flow"
+ kwargs['dify_base_url'] = f"http://{host_ip}:13002"
+ kwargs['postgresql_database_url'] = f"postgresql+asyncpg://kong:kongpass@{host_ip}:5432/kong"
+ kwargs['dify_database_url'] = f"postgresql+psycopg2://postgres:difyai123456@192.168.20.119:15432/dify"
for field in self.__annotations__.keys():
if field not in kwargs:
raise ValueError(f"Missing setting: {field}")
diff --git a/app/config/env_conf/config.yaml b/app/config/env_conf/config.yaml
index df88451..62e9952 100644
--- a/app/config/env_conf/config.yaml
+++ b/app/config/env_conf/config.yaml
@@ -1,26 +1,11 @@
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
-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
+host_ip: 192.168.20.119
PUBLIC_KEY: |
-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq9XTUSeYr2+N1h3Afl/z8Dse/2yD0ZGrKwx+EEEcdsBLca9Ynmx3nIB5obmLlSfmskLpBo0UACBmB5rEjBp2Q2f3AG3Hjd4B+gNCG6BDaawuDlgANIhGnaTLrIqWrrcm4EMzJOnAOI1fgzJRsOOUEfaS318Eq9OVO3apEyCCt0lOQK6PuksduOjVxtltDav+guVAA068NrPYmRNabVKRNLJpL8w4D44sfth5RvZ3q9t+6RTArpEtc5sh5ChzvqPOzKGMXW83C95TxmXqpbK6olN4RevSfVjEAgCydH6HN6OhtOQEcnrU97r9H0iZOWwbw3pVrZiUkuRD1R56Wzs2wIDAQAB
-----END PUBLIC KEY-----
PRIVATE_KEY: str
-fetch_sgb_agent: 鎶ュ憡鐢熸垚,鏂囨。鏅鸿兘
-fetch_fwr_agent: 鐭ヨ瘑闂瓟,鏅鸿兘闂瓟
PASSWORD_KEY: VKinqB-8XMrwCLLrcf_PyHyo12_4PVKvWzaHjNFions=
-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.119:13002
-dify_api_token: app-YmOAMDsPpDDlqryMHnc9TzTO
-postgresql_database_url: postgresql+asyncpg://kong:kongpass@192.168.20.119:5432/kong
-dify_workflow_clean: app-OpF0drPu0XcgqcekQpT4FA8a
-dify_workflow_report: app-0MAkdFWqh9zxwmU69O0BFU1s
-dify_database_url: postgresql+psycopg2://postgres:difyai123456@192.168.20.119:15432/dify
--
Gitblit v1.8.0