Merge pull request #347 from jhao104/develop

Develop

Dockerfile

@@ -1,10 +1,19 @@
 FROM python:3.6
-ENV DEBIAN_FRONTEND noninteractive
+
+MAINTAINER jhao104 <j_hao104@163.com>
+
 ENV TZ Asia/Shanghai
+
 WORKDIR /usr/src/app
+
 COPY ./requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
+
+RUN pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/
+
 COPY . .
+
 EXPOSE 5010
-WORKDIR /usr/src/app/
-CMD [ "python", "Run/main.py" ]
+
+WORKDIR /usr/src/app/cli
+
+ENTRYPOINT [ "sh", "start.sh" ]

README.md

@@ -90,6 +90,15 @@ SERVER_API = {
 >>>python proxyPool.py webserver
 
 
+```
+
+### Docker
+
+```bash
+docker pull jhao104/proxy_pool
+
+docker run --env db_type=REDIS --env db_host=127.0.0.1 --env db_port=6379 --env db_password=pwd_str -p 5010:5010 jhao104/proxy_pool
+
 ```
 
 

Util/utilFunction.py

@@ -83,14 +83,13 @@ def validUsefulProxy(proxy):
     :return:
     """
     if isinstance(proxy, bytes):
-        proxy = proxy.decode('utf8')
+        proxy = proxy.decode("utf8")
     proxies = {"http": "http://{proxy}".format(proxy=proxy)}
     try:
-        # 超过20秒的代理就不要了
-        r = requests.get('http://httpbin.org/ip', proxies=proxies, timeout=10, verify=False)
-        if r.status_code == 200 and r.json().get("origin"):
-            # logger.info('%s is ok' % proxy)
+        r = requests.get('http://www.baidu.com', proxies=proxies, timeout=10, verify=False)
+        if r.status_code == 200:
             return True
     except Exception as e:
-        # logger.error(str(e))
-        return False
+        pass
+    return False
+

cli/start.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+python proxyPool.py webserver &
+python proxyPool.py schedule

doc/block_ips.md

@@ -3,5 +3,6 @@
 |   144.52.45.149   |  20190815  | 恶意访问 |
 |  39.100.153.226   |  20190816  | 恶意访问 |
 |  47.102.47.42   |  20190819  | 恶意访问 |
+|  125.71.211.125 |  20190820  | 恶意访问 |
 
 如需正常访问请提issues说明