添加获取全部代理ip方法和接口

build_tools.py

@@ -122,6 +122,15 @@ def show_proxy():
     return jsonify(data=pool)
 
 
+@app.route('/crawl/proxy/getips', methods=['GET'])
+@auth.login_required
+def show_proxy_ips():
+    socks_ips = socks5ProxyPool.get_all_proxy_ip('socks5')
+    http_ips = httpProxyPool.get_all_proxy_ip('http')
+    ip_dict = {'socks': socks_ips, 'http': http_ips}
+    return jsonify(data=ip_dict)
+
+
 @app.route('/upload/data/<scheduler_class_name>/<table>', methods=['POST'])
 @auth.login_required
 def upload_data(scheduler_class_name, table):

services/proxy.py

@@ -260,6 +260,9 @@ class ProxyPoolClient(BaseProxyPool):
         # 展示时按照过期时间从大到小排列
         return list(sorted(_pool_proxy, key=lambda x: x['expire'], reverse=True))
 
+    def get_all_proxy_ip(self, protocol):
+        return [proxy['proxies']['http'].replace(f'{protocol}://', '') for proxy in self.get_all_proxy()]
+
     def proxies(self):
         lock = acquire_lock_with_timeout(self.redis_db, self.lock_label)
         if lock: