From 0d35030f6d3e2ef2774dc4d607ce9fae6b2d6158 Mon Sep 17 00:00:00 2001
From: Franklin-F <dewujie64@gmail.com>
Date: Sun, 18 May 2025 22:59:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20traffic=5Fsegment?=
 =?UTF-8?q?=20=E7=9A=84=E7=94=9F=E6=88=90=E8=8C=83=E5=9B=B4=E4=BB=A5?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=9B=B4=E5=90=88=E7=90=86=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=20fetch=5Fproxies3=20=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py               |  1 +
 multi_proxy_refill.py | 49 ++++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/main.py b/main.py
index 87501df..394afb5 100644
--- a/main.py
+++ b/main.py
@@ -186,6 +186,7 @@ def gettoken():
         'sec-ch-ua-mobile': '?0',
         'sec-ch-ua-platform': '"Windows"',
     }
+
     u = uuid.uuid4()
     uuid_with_dash = str(u)
     uuid_no_dash = u.hex
diff --git a/multi_proxy_refill.py b/multi_proxy_refill.py
index d6f1f37..5331ccb 100644
--- a/multi_proxy_refill.py
+++ b/multi_proxy_refill.py
@@ -4,6 +4,7 @@
 import time
 import sys
 import argparse
+from urllib.parse import quote
 import redis
 import requests
 from requests import RequestException
@@ -23,11 +24,6 @@ LOW_WATERMARK = 200
 REFILL_BATCH = 1000
 SLEEP_INTERVAL = 10
 
-# 第三方 API 参数
-PROXY_API_URL = "http://api.proxy.roxlabs.io/getProxyIp"
-ACCESS_ID = "2207189"
-SIGN = "10099426b05c7119e9c4dbd6a7a0aa4e"
-
 db = DB.DBVidcon()
 
 def fetch_proxies3(region_code, n):
@@ -55,17 +51,36 @@ def fetch_proxies(region_code, n):
     """
     从第三方一次性请求 n 条代理，返回格式化列表
     """
+    headers = {
+        "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+        "accept-language": "zh-CN,zh;q=0.9",
+        "priority": "u=0, i",
+        "sec-ch-ua": "\"Chromium\";v=\"136\", \"Microsoft Edge\";v=\"136\", \"Not.A/Brand\";v=\"99\"",
+        "sec-ch-ua-mobile": "?0",
+        "sec-ch-ua-platform": "\"Windows\"",
+        "sec-fetch-dest": "document",
+        "sec-fetch-mode": "navigate",
+        "sec-fetch-site": "none",
+        "sec-fetch-user": "?1",
+        "upgrade-insecure-requests": "1",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0"
+    }
+    url = "https://www.kookeey.com/pickdynamicips"
     params = {
-        "num": n,
-        "return_type": "json",
-        "lb": "4",
-        "sb": "",
-        "flow": "1",
-        "regions": region_code,
-        "protocol": "http"
+        "auth": "pwd",
+        "format": "1",
+        "n": n,
+        "p": "http",
+        "gate": "hk",
+        "g": region_code,
+        "r": "0",
+        "type": "json",
+        "sign": "10099426b05c7119e9c4dbd6a7a0aa4e",
+        "accessid": "2207189",
+        "dl": ","
     }
     try:
-        resp = requests.get(PROXY_API_URL, params=params, timeout=10)
+        resp = requests.get(url,headers=headers, params=params, timeout=10)
         resp.raise_for_status()
         data = resp.json()
     except (RequestException, ValueError):
@@ -79,12 +94,12 @@ def fetch_proxies(region_code, n):
 
     result = []
     for item in arr:
-        # user = quote(item["username"], safe="")
-        # pwd  = quote(item["password"], safe="")
+        user = quote(item["username"], safe="")
+        pwd  = quote(item["password"], safe="")
         ip = item["ip"]
         port = item["port"]
-        # result.append(f"http://{user}:{pwd}@{ip}:{port}")
-        result.append(f"http://{ip}:{port}")
+        result.append(f"http://{user}:{pwd}@{ip}:{port}")
+        # result.append(f"http://{ip}:{port}")
 
     return result