xtn-tools-pro 1.0.0.0.9__py3-none-any.whl → 1.0.0.1.1__py3-none-any.whl

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.dist-info → xtn_tools_pro-1.0.0.1.1.dist-info}/METADATA

@@ -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.dist-info → xtn_tools_pro-1.0.0.1.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ xtn_tools_pro/db/MongoDB.py,sha256=zQLfZ-mhZWCFgY3dPF3dRAzAR3C8hrXO_yLZw9cUUUY,5
 xtn_tools_pro/db/MysqlDB.py,sha256=SBJrcjbZdxmtTKPGwl57NthPhs4uX8J3P6o_rK01O4k,13373
 xtn_tools_pro/db/RedisDB.py,sha256=ep32Yj8AAkUHRshSBhKsdl06UwO7Z-gQJLaezspVRKw,6053
 xtn_tools_pro/db/__init__.py,sha256=Zg91UWS02TO0Ba_0AY56s0oabRy93xLNFkpIIL_6mMM,416
-xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=Go9kSWnji0yELGZepOwYsTyjQjPDZ9AvnvUULIU1WUw,9874
+xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=G7awOFeBGAIYcyMMCcX90mgQbA7bfFn6YmwMa9DUD3o,10223
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
@@ -17,8 +17,8 @@ xtn_tools_pro/utils/log.py,sha256=8CRMiY7Q9LWGJLhfL0YfpANBwLets9f2qWfMOe5PpNM,81
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.0.0.9.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.0.9.dist-info/METADATA,sha256=d8Cpc2ummbUD_Fq6JSZDxfXVsDnue_qaF6OaQ_fE3So,431
-xtn_tools_pro-1.0.0.0.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.0.9.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.0.9.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.1.1.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.1.1.dist-info/METADATA,sha256=Gxj0V9FyVQjDxdhetSbfprPc6KxysVjYBpWGR0Ox-HE,431
+xtn_tools_pro-1.0.0.1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.1.1.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.1.1.dist-info/RECORD,,