xtn-tools-pro 1.0.0.1.5__tar.gz → 1.0.0.1.7__tar.gz

{xtn-tools-pro-1.0.0.1.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.1.7}/PKG-INFO

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

{xtn-tools-pro-1.0.0.1.5 → xtn-tools-pro-1.0.0.1.7}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.1.5",  # 版本
+    version="1.0.0.1.7",  # 版本
     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.5 → xtn-tools-pro-1.0.0.1.7}/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):
         """
             记录日志
@@ -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()
@@ -163,16 +168,16 @@ class ProxyPool:
                     self.__get_api_proxy()
                     time.sleep(1)
                     # 判断时间是否超过当前23:59分时间戳
-                    t_a = get_time_now_timestamp(is_time_10=True)
-                    if t_a >= self.__now_day59_timestamp:
-                        self.__log(
-                            "时间23:59，结束循环，{t} {a} {a_v} {b} {b_v}".format(t=int(time.time()),
-                                                                          a=type(t_a),
-                                                                          a_v=t_a,
-                                                                          b=type(self.__now_day59_timestamp),
-                                                                          b_v=self.__now_day59_timestamp)
-                        )
-                        break
+                    # t_a = get_time_now_timestamp(is_time_10=True)
+                    # if t_a >= self.__now_day59_timestamp:
+                    #     self.__log(
+                    #         "时间23:59，结束循环，{t} {a} {a_v} {b} {b_v}".format(t=int(time.time()),
+                    #                                                       a=type(t_a),
+                    #                                                       a_v=t_a,
+                    #                                                       b=type(self.__now_day59_timestamp),
+                    #                                                       b_v=self.__now_day59_timestamp)
+                    #     )
+                    #     break
             except Exception as eee:
                 self.__log("程序异常报错:{eee} {b_t} {b_v}".format(eee=eee,
                                                              b_t=type(self.__now_day59_timestamp),

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

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

{xtn-tools-pro-1.0.0.1.5 → xtn-tools-pro-1.0.0.1.7}/xtn_tools_pro.egg-info/requires.txt

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