diff --git a/README.md b/README.md index bfccf3a..4395921 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# 0.1.4 +- 修复自动化bug # 0.1.3 - 修复脚本bug # 0.1.2 diff --git a/spider/main.py b/spider/main.py index f7a76ac..911a9ef 100644 --- a/spider/main.py +++ b/spider/main.py @@ -99,6 +99,12 @@ class Auto: logger.debug("刷新网页") self.tab.refresh() self.tab.wait(1.5) + bol = self.tab.ele( + 't:div@text():ERR_SOCKS_CONNECTION_FAILED', timeout=1) + if bol: + logger.debug("刷新网页") + self.tab.refresh() + self.tab.wait(1.5) html = self.tab.url logger.debug(f"当前URL: {html}") if 'https://veritaconnect.ca/canadianbreadsettlement/en-us' == html: @@ -151,6 +157,12 @@ class Auto: logger.debug("刷新网页") self.tab.refresh() self.tab.wait(1.5) + bol = self.tab.ele( + 't:div@text():ERR_SOCKS_CONNECTION_FAILED', timeout=1) + if bol: + logger.debug("刷新网页") + self.tab.refresh() + self.tab.wait(1.5) bol = self.tab.ele( 't:h1@text()=Sorry, you have been blocked', timeout=1) if bol: @@ -460,6 +472,12 @@ class Auto: logger.debug("刷新网页") self.tab.refresh() self.tab.wait(1.5) + bol = self.tab.ele( + 't:div@text():ERR_SOCKS_CONNECTION_FAILED', timeout=1) + if bol: + logger.debug("刷新网页") + self.tab.refresh() + self.tab.wait(1.5) bol = self.solve_cloudflare() if not bol: logger.debug("Cloudflare验证失败.") @@ -497,9 +515,9 @@ def get_random_proxy() -> list[str] | None: """ proxy_list = [ "us.novproxy.io:1000:zhiyu111-region-CA:zhiyu111", - "us.novproxy.io:1000:zhiyu111-region-US:zhiyu111", - "us.novproxy.io:1000:zhiyu222-region-CA:zhiyu222", "us.novproxy.io:1000:zhiyu222-region-US:zhiyu222", + "us.novproxy.io:1000:zhiyu333-region-CA:zhiyu333", + "us.novproxy.io:1000:zhiyu444-region-US:zhiyu444", ] try: return random.choice(proxy_list).split(':') @@ -515,9 +533,9 @@ def get_all_proxies() -> list[list[str]]: """ proxy_list = [ "us.novproxy.io:1000:zhiyu111-region-CA:zhiyu111", - "us.novproxy.io:1000:zhiyu111-region-US:zhiyu111", - "us.novproxy.io:1000:zhiyu222-region-CA:zhiyu222", "us.novproxy.io:1000:zhiyu222-region-US:zhiyu222", + "us.novproxy.io:1000:zhiyu333-region-CA:zhiyu333", + "us.novproxy.io:1000:zhiyu444-region-US:zhiyu444", ] return [p.split(":") for p in proxy_list]