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

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

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

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

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

{xtn-tools-pro-1.0.0.1.6 → xtn-tools-pro-1.0.0.1.8}/xtn_tools_pro/db/RedisDB.py

@@ -113,6 +113,14 @@ class RedisDBPro:
         else:
             return self._redis.sadd(table, values)
 
+    def spop(self, table):
+        """
+            从集合中弹出元素
+        :param table:
+        :return:
+        """
+        return self._redis.spop(table)
+
     def incr(self, key):
         """
             对一个键的值进行自增操作

{xtn-tools-pro-1.0.0.1.6 → xtn-tools-pro-1.0.0.1.8}/xtn_tools_pro/proxy/XiaoXiangProxy.py

@@ -168,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.6 → xtn-tools-pro-1.0.0.1.8/xtn_tools_pro.egg-info}/PKG-INFO

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