From 79f7d0edc88f70997a77cd1bc6374d04c873c804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=87=E8=96=87=E5=AE=89?= Date: Sun, 18 Jan 2026 10:01:03 +0800 Subject: [PATCH] a --- trading_system/config.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/trading_system/config.py b/trading_system/config.py index 5b5b18d..fece9a1 100644 --- a/trading_system/config.py +++ b/trading_system/config.py @@ -168,10 +168,7 @@ def _get_trading_config(): """获取交易配置（支持动态重载，优先从Redis读取最新值）""" if _config_manager: # 从Redis重新加载配置（轻量级，只从Redis读取，不查数据库） -<<<<<<< Current (Your changes) -======= # 注意：如果Redis不可用或没有数据，reload_from_redis()会保持现有缓存，不会触发数据库加载 ->>>>>>> Incoming (Background Agent changes) _config_manager.reload_from_redis() return _config_manager.get_trading_config() # 回退到默认配置