Prechádzať zdrojové kódy

新增DEMO测试数据

xubo 1 rok pred
rodič
commit
27fecc7ab3
2 zmenil súbory, kde vykonal 13 pridanie a 21 odobranie
  1. 10 15
      app.py
  2. 3 6
      tools/utils.py

+ 10 - 15
app.py

@@ -657,13 +657,9 @@ def process_running_manual(max_threads, pocket_url):
 
         threads = []
         for account in account_list:
-            proxy_generator = get_proxy_from_file("proxy_list.txt")
-            single_proxy = None
-            while True:
-                single_proxy = next(proxy_generator)
-                print(f"当前账号: {account}, 当前代理:{single_proxy}")
-                loggerKit.info(f"当前账号: {account}, 当前代理:{single_proxy}")
-                break
+            single_proxy = get_proxy_from_file("proxy_list.txt")
+            print(f"当前账号: {account}, 当前代理:{single_proxy}")
+            loggerKit.info(f"当前账号: {account}, 当前代理:{single_proxy}")
 
             thread = threading.Thread(target=process_account,
                                       args=(pocket_url, account.strip(), single_proxy))
@@ -692,7 +688,10 @@ def login_account(max_threads, accounts_path, pocket_url):
 
     threads = []
     for account in account_list:
-        single_proxy, random_index = get_random_proxy_at_redis(100)
+        single_proxy = get_proxy_from_file("proxy_list.txt")
+        print(f"当前账号: {account}, 当前代理:{single_proxy}")
+        loggerKit.info(f"当前账号: {account}, 当前代理:{single_proxy}")
+
         thread = threading.Thread(target=save_account_info,
                                   args=(account.strip(), "panyue666", pocket_url, single_proxy))
         threads.append(thread)
@@ -741,13 +740,9 @@ def run_threading_order(max_threads, account_path, url):
 
             threads = []
             for account in account_list:
-                proxy_generator = get_proxy_from_file("proxy_list.txt")
-                single_proxy = None
-                while True:
-                    single_proxy = next(proxy_generator)
-                    print(f"当前账号: {account}, 当前代理:{single_proxy}")
-                    loggerKit.info(f"当前账号: {account}, 当前代理:{single_proxy}")
-                    break
+                single_proxy = get_proxy_from_file("proxy_list.txt")
+                print(f"当前账号: {account}, 当前代理:{single_proxy}")
+                loggerKit.info(f"当前账号: {account}, 当前代理:{single_proxy}")
 
                 thread = threading.Thread(target=get_ticket_order,
                                           args=(account, "panyue666", url, single_proxy))

+ 3 - 6
tools/utils.py

@@ -267,12 +267,9 @@ def get_proxy_from_file(file_path):
         proxies = f.readlines()
         # 去除换行符
         proxies = [proxy.strip() for proxy in proxies]
-        # 使用循环逐行读取
-        for i, proxy in enumerate(proxies):
-            yield proxy
-            # 如果读到最后一行,则从第一行循环读取
-            if i == len(proxies) - 1:
-                i = -1
+        # 随机选择一个代理
+        proxy = random.choice(proxies)
+        return proxy
 
 
 def process_account(account_number):