xtn-tools-pro 1.0.0.0.9__tar.gz → 1.0.0.1.1__tar.gz

{xtn-tools-pro-1.0.0.0.9/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.0.9
+Version: 1.0.0.1.1
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@163.com

{xtn-tools-pro-1.0.0.0.9 → xtn-tools-pro-1.0.0.1.1}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.0.9",  # 版本
+    version="1.0.0.1.1",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@163.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.0.0.9 → xtn-tools-pro-1.0.0.1.1}/xtn_tools_pro/proxy/XiaoXiangProxy.py

@@ -151,23 +151,24 @@ class ProxyPool:
                 self.__log("获取小象代理报错：{e}".format(e=e))
 
     def run(self):
-        try:
-            # 手动绑定终端IP
-            response = requests.get(url=self.__XiaoXiangAutoBinding, verify=False, timeout=3)
-            self.__log(response.text)
-            while True:
-                # 检查代理
-                self.__check_proxy()
-                # 获取小象代理
-                self.__get_api_proxy()
-                time.sleep(1)
-                # 判断时间是否超过当前23:59分时间戳
-                if get_time_now_timestamp(is_time_10=True) >= self.__now_day59_timestamp:
-                    self.__log("时间23:59，结束循环，{t}".format(t=int(time.time())))
-                    break
-        except Exception as eee:
-            self.__log("程序异常报错:{eee}".format(eee=eee))
-            # self.__del__()
+        while True:
+            try:
+                # 手动绑定终端IP
+                response = requests.get(url=self.__XiaoXiangAutoBinding, verify=False, timeout=3)
+                self.__log(response.text)
+                while True:
+                    # 检查代理
+                    self.__check_proxy()
+                    # 获取小象代理
+                    self.__get_api_proxy()
+                    time.sleep(1)
+                    # 判断时间是否超过当前23:59分时间戳
+                    if get_time_now_timestamp(is_time_10=True) >= self.__now_day59_timestamp:
+                        self.__log("时间23:59，结束循环，{t}".format(t=int(time.time())))
+                        break
+            except Exception as eee:
+                self.__log("程序异常报错:{eee}".format(eee=eee))
+                # self.__del__()
 
     def get_proxy(self):
         """
@@ -195,13 +196,18 @@ class ProxyPool:
         :return:
         """
         try:
-            self.__redis_pool.set(self.__redisProxyName+":"+proxy_v, "999999")
-            self.__log("设置不可用的代理 {proxy_v} 为 999999".format(proxy_v=proxy_v))
+            proxy_val_list = list(self.__redis_pool.get_all_key("{}*".format(self.__redisProxyName)))
+            for proxy_val in proxy_val_list:
+                if proxy_v in proxy_val:
+                    self.__redis_pool.set(proxy_val, "999999")
+                    self.__log("设置不可用的代理 {proxy_v} 为 999999".format(proxy_v=proxy_v))
+                    return
         except Exception as e:
             self.__log("爬虫手动传入代理：{e}".format(e=e))
 
 
 if __name__ == '__main__':
-    p = ProxyPool(ip="127.0.0.1", port=6379, db=0, user_pass="xtn-kk", XiaoXiangProxyAppKey="1101384562594172928",
-                  XiaoXiangProxyAppSecret="PJ0QBWML")
-    print(p.get_proxy())
+    p = ProxyPool(ip="127.0.0.1", port=6379, db=0, user_pass="xtn-kk", XiaoXiangProxyAppKey="1107231349661913088",
+                  XiaoXiangProxyAppSecret="8kignGIX")
+    # print(p.set_proxy_error("http://49.83.105.188:32300"))
+    p.run()

{xtn-tools-pro-1.0.0.0.9 → xtn-tools-pro-1.0.0.1.1/xtn_tools_pro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.0.9
+Version: 1.0.0.1.1
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@163.com