diff --git a/DB.py b/DB.py index b33a165..8c02fb3 100644 --- a/DB.py +++ b/DB.py @@ -252,12 +252,11 @@ class DBVidcon: self.cursor.close() self.conn.close() - def get_proxy(self, region_name: str) -> str: + def get_proxy(self, region_code: str) -> str: """ 从 Redis 队列 proxy_queue: 弹出一个代理并返回。 如果队列为空,阻塞 """ - region_code = self.get_proxy_parameter(region_name) proxy = "" while True: key = f"proxy_queue:{region_code}" diff --git a/main.py b/main.py index b2fb401..6485991 100644 --- a/main.py +++ b/main.py @@ -694,8 +694,9 @@ def integrate_data(): else: for index, (payload, kitem) in enumerate(keywords): try: + proxiesdict = db.get_proxy_agent_dict() global Gproxies - Gproxies = kitem['rn'] + Gproxies = proxiesdict[kitem['rn']] v_list = get_searchInfo(kitem['keyword']) if not v_list: