xtn-tools-pro 1.0.0.1.4__py3-none-any.whl → 1.0.0.1.6__py3-none-any.whl

xtn_tools_pro/proxy/XiaoXiangProxy.py

@@ -55,6 +55,8 @@ class ProxyPool:
         #     nowDate = str(datetime.datetime.now().strftime('%Y_%m_%d'))
         #     logger.add(loggerPath.format(t=nowDate))
 
+        self.bind_ip()
+
     def __log(self, text):
         """
             记录日志
@@ -74,7 +76,7 @@ class ProxyPool:
             # 获取时间
             time_out = proxy_val.split(":")[-1]
             # 获取使用次数
-            proxy_val_count = self.__redis_pool.get(proxy_val)
+            proxy_val_count = int(self.__redis_pool.get(proxy_val))
             if int(time_out) + self.__usage_time < get_time_now_timestamp(is_time_10=True):
                 del_state = self.__redis_pool.delete(proxy_val)
                 self.__log(
@@ -150,12 +152,15 @@ class ProxyPool:
             except Exception as e:
                 self.__log("获取小象代理报错：{e}".format(e=e))
 
+    def bind_ip(self):
+        # 手动绑定终端IP
+        response = requests.get(url=self.__XiaoXiangAutoBinding, verify=False, timeout=3)
+        self.__log(response.text)
+
     def run(self):
         while True:
             try:
-                # 手动绑定终端IP
-                response = requests.get(url=self.__XiaoXiangAutoBinding, verify=False, timeout=3)
-                self.__log(response.text)
+                self.bind_ip()
                 while True:
                     # 检查代理
                     self.__check_proxy()

xtn_tools_pro/utils/helpers.py

@@ -122,5 +122,9 @@ def get_build_url_with_params(url, params):
     full_url = url + "?" + encoded_params
     return full_url
 
+
+
 if __name__ == '__main__':
-    print(get_uuid(4))
+    # print(get_uuid(4))
+    from faker import Faker
+

{xtn_tools_pro-1.0.0.1.4.dist-info → xtn_tools_pro-1.0.0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.1.4
+Version: 1.0.0.1.6
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@163.com
@@ -14,5 +14,6 @@ Requires-Dist: pymysql
 Requires-Dist: dbutils
 Requires-Dist: colorlog
 Requires-Dist: requests
+Requires-Dist: Faker
 
 xtnkk-tools

{xtn_tools_pro-1.0.0.1.4.dist-info → xtn_tools_pro-1.0.0.1.6.dist-info}/RECORD

@@ -6,19 +6,19 @@ 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=hKgCozZJHlEvZeljtHcqodwdRkZ36XQNxbPOtGAptJA,10964
+xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=jrkXN8mI45jEQG4je5Pa-M1e896No7AQCjFCnoVqP0A,11029
 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
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
 xtn_tools_pro/utils/file_utils.py,sha256=4Bmb1ISxqQC-7doPXDyY2o-H0m4upj_-hlLrO36sKJg,1509
-xtn_tools_pro/utils/helpers.py,sha256=VzevgDk0tZAxFmuFlMBIaJ3QyiFxp5Qg-mLPgE83jRI,3773
+xtn_tools_pro/utils/helpers.py,sha256=eHhvhcw_jcUhCA6HwOqpD4XU_V_ZoHDgj3qtLR8yzx8,3812
 xtn_tools_pro/utils/log.py,sha256=8CRMiY7Q9LWGJLhfL0YfpANBwLets9f2qWfMOe5PpNM,8139
 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.1.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.1.4.dist-info/METADATA,sha256=wzAGsZ9lbI2euvTN8jSJJ_JIyEMhfgAggchFmHAe9Iw,431
-xtn_tools_pro-1.0.0.1.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.1.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.1.4.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.1.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.1.6.dist-info/METADATA,sha256=-105u2_ReXldovsvWvumjALgYxt9nEoafj1yvFYScyQ,453
+xtn_tools_pro-1.0.0.1.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.1.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.1.6.dist-info/RECORD,,