修改获取类目参数接口代理URL

api.py

@@ -46,7 +46,7 @@ class GenerateABogusRequest(BaseModel):
 
 class GetSchemaRequest(BaseModel):
     headers: dict
-    proxies: dict
+    proxy_url: str
     category_id: str
 
 

common.py

@@ -10,10 +10,9 @@ import requests
 from errors import *
 
 
-def setup_proxy(addr, port, username, password):
+def setup_proxy(proxy_url):
     session = requests.Session()
     # 配置 SOCKS5 代理 + 远程 DNS 解析
-    proxy_url = f"socks5h://{username}:{password}@{addr}:{port}"
     session.proxies = {
         "http": proxy_url,
         "https": proxy_url

login.py

@@ -70,7 +70,8 @@ def login(account, password, headers, proxies):
     port = proxies['port']
     username = proxies['username']
     proxies_password = proxies['password']
-    session = setup_proxy(addr, int(port), username, proxies_password)
+    proxy_url = f"socks5h://{username}:{proxies_password}@{addr}:{port}"
+    session = setup_proxy(proxy_url)
     encrypt_params = encryptParams(account, password)
     login_params = {
         'fp': encrypt_params['fp'],

main.py

@@ -169,7 +169,8 @@ async def createTemplate(cookies, template_params, proxies):
     port = proxies['port']
     username = proxies['username']
     proxies_password = proxies['password']
-    session = setup_proxy(addr, int(port), username, proxies_password)
+    proxy_url = f"socks5h://{username}:{proxies_password}@{addr}:{port}"
+    session = setup_proxy(proxy_url)
     params = {
         'appid': '1',
         'aid': '4272',

task_worker.py

@@ -197,7 +197,7 @@ def execute_generate_a_bogus(params:str | dict,data: dict,ua: str):
         }
 
 @shared_task(name='get_schema')
-def execute_get_schema(headers: dict, proxies: dict, category_id: str):
+def execute_get_schema(headers: dict, proxy_url: str, category_id: str):
     """获取类目参数"""
     try:
         params = {
@@ -224,11 +224,7 @@ def execute_get_schema(headers: dict, proxies: dict, category_id: str):
                 'error_type': ''
             }
         params['a_bogus'] = res['data']
-        addr = proxies['addr']
-        port = proxies['port']
-        username = proxies['username']
-        proxies_password = proxies['password']
-        session = setup_proxy(addr, int(port), username, proxies_password)
+        session = setup_proxy(proxy_url)
         response = session.post(url, params=params, headers=headers, json=json_data)
         if response.text and response.json().get('code') == 0:
             result = response.json().get('data', {})

upload_video.py

@@ -523,7 +523,8 @@ class Upload:
         port = proxies['port']
         username = proxies['username']
         proxies_password = proxies['password']
-        session = setup_proxy(addr, int(port), username, proxies_password)
+        proxy_url = f"socks5h://{username}:{proxies_password}@{addr}:{port}"
+        session = setup_proxy(proxy_url)
         self.session = session
         self.file_size = os.path.getsize(self.file_path_)
         logger.info("开始获取上传token")