From be8b24575b6aceeddc3d3665bfdbe98a5786b641 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:18:49 +0800 Subject: [PATCH] a --- backend/config_manager.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/config_manager.py b/backend/config_manager.py index 85bf502..52cd64f 100644 --- a/backend/config_manager.py +++ b/backend/config_manager.py @@ -77,8 +77,6 @@ class ConfigManager: redis_username = os.getenv('REDIS_USERNAME', None) redis_password = os.getenv('REDIS_PASSWORD', None) -<<<<<<< Current (Your changes) -======= # 验证URL格式 if not redis_url or not isinstance(redis_url, str): logger.warning(f"Redis URL无效: {redis_url}，使用默认值") @@ -101,7 +99,6 @@ class ConfigManager: redis_url = f"rediss://{redis_url}" logger.info(f"已自动转换Redis URL为TLS格式: {redis_url}") ->>>>>>> Incoming (Background Agent changes) # 解析Redis URL if redis_url.startswith('rediss://') or redis_use_tls: # TLS连接