Merge pull request #745 from jhao104/develop

jhao104 · May 15, 2023 · 49907bf · 49907bf
2 parents 258ca93 + f814448
commit 49907bf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -205,18 +205,19 @@ PROXY_FETCHER = [
 
    目前实现的采集免费代理网站有(排名不分先后, 下面仅是对其发布的免费代理情况, 付费代理测评可以参考[这里](https://zhuanlan.zhihu.com/p/33576641)): 
 
-  |   代理名称   |  状态  |  更新速度 |  可用率  |  地址 |    代码   |
-  | ---------   |  ---- | --------  | ------  | ----- |   ------- |
-  | 站大爷     |  ✔    |     ★     |   **     | [地址](https://www.zdaye.com/)    | [`freeProxy01`](/fetcher/proxyFetcher.py#L28) |
-  | 66代理     |  ✔    |     ★     |   *     | [地址](http://www.66ip.cn/)         | [`freeProxy02`](/fetcher/proxyFetcher.py#L50) |
+  |   代理名称   |  状态  |  更新速度 |  可用率  |  地址 | 代码                                             |
+  | ---------   |  ---- | --------  | ------  | ----- |------------------------------------------------|
+  | 站大爷     |  ✔    |     ★     |   **     | [地址](https://www.zdaye.com/)    | [`freeProxy01`](/fetcher/proxyFetcher.py#L28)  |
+  | 66代理     |  ✔    |     ★     |   *     | [地址](http://www.66ip.cn/)         | [`freeProxy02`](/fetcher/proxyFetcher.py#L50)  |
   | 开心代理     |   ✔   |     ★     |   *     | [地址](http://www.kxdaili.com/)     | [`freeProxy03`](/fetcher/proxyFetcher.py#L63)  |
-  | FreeProxyList |   ✔  |    ★     |   *    | [地址](https://www.freeproxylists.net/zh/) | [`freeProxy04`](/fetcher/proxyFetcher.py#L74) |
+  | FreeProxyList |   ✔  |    ★     |   *    | [地址](https://www.freeproxylists.net/zh/) | [`freeProxy04`](/fetcher/proxyFetcher.py#L74)  |
   | 快代理       |  ✔    |     ★     |   *     | [地址](https://www.kuaidaili.com/)  | [`freeProxy05`](/fetcher/proxyFetcher.py#L92)  |
-  | FateZero    |  ✔    |    ★★    |   *     | [地址](http://proxylist.fatezero.org) | [`freeProxy06`](/fetcher/proxyFetcher.py#L111) |
-  | 云代理       |  ✔    |     ★     |   *     | [地址](http://www.ip3366.net/)      | [`freeProxy07`](/fetcher/proxyFetcher.py#L124) |
-  | 小幻代理     |  ✔    |     ★★    |    *    | [地址](https://ip.ihuan.me/)        | [`freeProxy08`](/fetcher/proxyFetcher.py#L134) |
-  | 免费代理库   |  ✔    |      ☆     |    *    | [地址](http://ip.jiangxianli.com/)   | [`freeProxy09`](/fetcher/proxyFetcher.py#L144) |
-  | 89代理      |  ✔    |      ☆     |   *     | [地址](https://www.89ip.cn/)         | [`freeProxy10`](/fetcher/proxyFetcher.py#L155) |
+  | FateZero   |  ✔    |    ★★    |   *     | [地址](http://proxylist.fatezero.org) | [`freeProxy06`](/fetcher/proxyFetcher.py#L111) |
+  | 云代理       |  ✔    |    ★     |   *     | [地址](http://www.ip3366.net/)      | [`freeProxy07`](/fetcher/proxyFetcher.py#L124) |
+  | 小幻代理     |  ✔    |    ★★    |    *    | [地址](https://ip.ihuan.me/)        | [`freeProxy08`](/fetcher/proxyFetcher.py#L134) |
+  | 免费代理库   |  ✔    |     ☆     |    *    | [地址](http://ip.jiangxianli.com/)   | [`freeProxy09`](/fetcher/proxyFetcher.py#L144) |
+  | 89代理      |  ✔    |     ☆     |   *     | [地址](https://www.89ip.cn/)         | [`freeProxy10`](/fetcher/proxyFetcher.py#L155) |
+  | 稻壳代理     |  ✔    |     ★★    |   ***   | [地址](https://www.docip.ne)         | [`freeProxy11`](/fetcher/proxyFetcher.py#L165) |
 
 
   如果还有其他好的免费代理网站, 可以在提交在[issues](https://github.com/jhao104/proxy_pool/issues/71), 下次更新时会考虑在项目中支持。

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,6 +7,7 @@ develop
 ------------------
 
 1. 代理格式检查支持需认证的代理格式 `username:password@ip:port` ; (2023-03-10)
+2. 新增代理源 **稻壳代理**; (2023-05-15)
 
 2.4.1 (2022-07-17)
 ------------------

diff --git a/fetcher/proxyFetcher.py b/fetcher/proxyFetcher.py
@@ -161,6 +161,16 @@ def freeProxy10():
         for proxy in proxies:
             yield ':'.join(proxy)
 
+    @staticmethod
+    def freeProxy11():
+        """ 稻壳代理 https://www.docip.net/ """
+        r = WebRequest().get("https://www.docip.net/data/free.json", timeout=10)
+        try:
+            for each in r.json['data']:
+                yield each['ip']
+        except Exception as e:
+            print(e)
+
     # @staticmethod
     # def wallProxy01():
     #     """
@@ -226,7 +236,7 @@ def freeProxy10():
 
 if __name__ == '__main__':
     p = ProxyFetcher()
-    for _ in p.freeProxy09():
+    for _ in p.freeProxy11():
         print(_)
 
 # http://nntime.com/proxy-list-01.htm

diff --git a/setting.py b/setting.py
@@ -54,7 +54,8 @@
     "freeProxy07",
     "freeProxy08",
     "freeProxy09",
-    "freeProxy10"
+    "freeProxy10",
+    "freeProxy11"
 ]
 
 # ############# proxy validator #################