a

backend/config_manager.py

@@ -100,27 +100,6 @@ class ConfigManager:
                 logger.info(f"已自动转换Redis URL为TLS格式: {redis_url}")
             
             # 解析Redis URL
-<<<<<<< Current (Your changes)
-            if redis_url.startswith('rediss://') or redis_use_tls:
-                # TLS连接
-                import ssl
-                ssl_context = ssl.create_default_context()
-                self._redis_client = redis.from_url(
-                    redis_url,
-                    username=redis_username,
-                    password=redis_password,
-                    ssl=ssl_context,
-                    decode_responses=True
-                )
-            else:
-                # 普通连接
-                self._redis_client = redis.from_url(
-                    redis_url,
-                    username=redis_username,
-                    password=redis_password,
-                    decode_responses=True
-                )
-=======
             # redis-py的同步客户端也支持通过ssl_cert_reqs等参数配置TLS
             # 当URL是rediss://时，会自动启用SSL
             connection_kwargs = {
@@ -155,7 +134,6 @@ class ConfigManager:
                 redis_url,
                 **connection_kwargs
             )
->>>>>>> Incoming (Background Agent changes)
             
             # 测试连接
             self._redis_client.ping()