xtn-tools-pro 1.0.0.1.4__tar.gz → 1.0.0.1.6__tar.gz

{xtn-tools-pro-1.0.0.1.4/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.1.6}/PKG-INFO

@@ -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

{xtn-tools-pro-1.0.0.1.4 → xtn-tools-pro-1.0.0.1.6}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.1.4",  # 版本
+    version="1.0.0.1.6",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@163.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介
@@ -33,7 +33,8 @@ setuptools.setup(
         "pymysql",
         "dbutils",
         "colorlog",
-        "requests"
+        "requests",
+        "Faker"
     ],
     python_requires='>=3',
 )

{xtn-tools-pro-1.0.0.1.4 → xtn-tools-pro-1.0.0.1.6}/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-1.0.0.1.4 → xtn-tools-pro-1.0.0.1.6}/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 → xtn-tools-pro-1.0.0.1.6/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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

{xtn-tools-pro-1.0.0.1.4 → xtn-tools-pro-1.0.0.1.6}/xtn_tools_pro.egg-info/requires.txt

@@ -4,3 +4,4 @@ pymysql
 dbutils
 colorlog
 requests
+Faker