From 5f6310f5d66277aba7e9351bfad8c1d51b08a9fe Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 30 Jul 2025 17:34:09 +0800
Subject: [PATCH] fix httpx proxy

---
 app/utils/http.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/utils/http.py b/app/utils/http.py
index c16663d6..75161976 100644
--- a/app/utils/http.py
+++ b/app/utils/http.py
@@ -563,7 +563,7 @@ class AsyncRequestUtils:
         :param content_type: 请求的Content-Type，默认为 "application/x-www-form-urlencoded; charset=UTF-8"
         :param accept_type: Accept头部信息，默认为 "application/json"
         """
-        self._proxies = proxies
+        self._proxies = self._convert_proxies_for_httpx(proxies)
         self._client = client
         self._timeout = timeout or 20
         if not content_type:
@@ -593,6 +593,30 @@ class AsyncRequestUtils:
         else:
             self._cookies = None
 
+    @staticmethod
+    def _convert_proxies_for_httpx(proxies: dict) -> Optional[str]:
+        """
+        将requests格式的代理配置转换为httpx兼容的格式
+        
+        :param proxies: requests格式的代理配置 {"http": "http://proxy:port", "https": "http://proxy:port"}
+        :return: httpx兼容的代理字符串或None
+        """
+        if not proxies:
+            return None
+        
+        # 如果已经是字符串格式，直接返回
+        if isinstance(proxies, str):
+            return proxies
+        
+        # 如果是字典格式，提取http或https代理
+        if isinstance(proxies, dict):
+            # 优先使用https代理，如果没有则使用http代理
+            proxy_url = proxies.get("https") or proxies.get("http")
+            if proxy_url:
+                return proxy_url
+        
+        return None
+
     @asynccontextmanager
     async def response_manager(self, method: str, url: str, **kwargs):
         """