diff --git a/.gitignore b/.gitignore index 1a3f1739f..e31375c1e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ docs/_build *.pyc *.log .tox +/SPEC.md +/.claude/settings.json diff --git a/README.md b/README.md index 0eb8a7157..64a387e60 100644 --- a/README.md +++ b/README.md @@ -219,6 +219,7 @@ PROXY_FETCHER = [ | 免费代理库 | ✔ | ☆ | * | [地址](http://ip.jiangxianli.com/) | [`freeProxy09`](/fetcher/proxyFetcher.py#L143) | | 89代理 | ✔ | ☆ | * | [地址](https://www.89ip.cn/) | [`freeProxy10`](/fetcher/proxyFetcher.py#L154) | | 稻壳代理 | ✔ | ★★ | *** | [地址](https://www.docip.ne) | [`freeProxy11`](/fetcher/proxyFetcher.py#L164) | + | 谷德代理 | ✔ | ★★ | *** | [地址](https://www.goodips.com) | [`freeProxy12`](/fetcher/proxyFetcher.py#L174) | 如果还有其他好的免费代理网站, 可以在提交在[issues](https://github.com/jhao104/proxy_pool/issues/71), 下次更新时会考虑在项目中支持。 diff --git a/fetcher/proxyFetcher.py b/fetcher/proxyFetcher.py index cfc37f928..17a65bc2a 100644 --- a/fetcher/proxyFetcher.py +++ b/fetcher/proxyFetcher.py @@ -170,6 +170,17 @@ def freeProxy11(): except Exception as e: print(e) + @staticmethod + def freeProxy12(): + """ 谷德代理 https://www.goodips.com/ """ + url = "https://www.goodips.com/" + tree = WebRequest().get(url, verify=False).tree + for item in tree.xpath("//div[@class='table-list']"): + ip = "".join(item.xpath("./ul/li[1]/text()")).strip() + port = "".join(item.xpath("./ul/li[2]/text()")).strip() + if ip and port: + yield "%s:%s" % (ip, port) + # @staticmethod # def wallProxy01(): # """ @@ -235,7 +246,7 @@ def freeProxy11(): if __name__ == '__main__': p = ProxyFetcher() - for _ in p.freeProxy06(): + for _ in p.freeProxy12(): print(_) # http://nntime.com/proxy-list-01.htm diff --git a/requirements.txt b/requirements.txt index 53dc129b7..ab2fdbc49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,9 @@ -requests==2.20.0 +requests==2.30.0 gunicorn==19.9.0 lxml==4.9.2 redis==3.5.3 APScheduler==3.10.0;python_version>="3.10" APScheduler==3.2.0;python_version<"3.10" -click==8.0.1;python_version>"3.6" -click==7.0;python_version<="3.6" -Flask==2.1.1;python_version>"3.6" -Flask==1.0;python_version<="3.6" -werkzeug==2.1.0;python_version>"3.6" -werkzeug==0.15.5;python_version<="3.6" +click==8.0.1 +Flask==2.1.1 +werkzeug==2.1.0 diff --git a/setting.py b/setting.py index 9bab8475c..f6ed89c8a 100644 --- a/setting.py +++ b/setting.py @@ -55,7 +55,8 @@ "freeProxy08", "freeProxy09", "freeProxy10", - "freeProxy11" + "freeProxy11", + "freeProxy12", ] # ############# proxy validator #################