mns-common 1.3.9.5__tar.gz → 1.3.9.6__tar.gz

{mns_common-1.3.9.5 → mns_common-1.3.9.6}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.9.5
+Version: 1.3.9.6

{mns_common-1.3.9.5 → mns_common-1.3.9.6}/mns_common/component/proxies/proxy_common_api.py

@@ -7,7 +7,6 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 
 import mns_common.api.proxies.liu_guan_proxy_api as liu_guan_proxy_api
-from functools import lru_cache
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
 from mns_common.db.MongodbUtil import MongodbUtil
@@ -17,23 +16,26 @@ import datetime
 mongodb_util = MongodbUtil('27017')
 
 
-@lru_cache(maxsize=None)
 def query_liu_guan_proxy_ip():
     ip_proxy_pool = mongodb_util.find_all_data(db_name_constant.IP_PROXY_POOL)
     return ip_proxy_pool
 
 
-def clear_proxy_ip_cache():
-    query_liu_guan_proxy_ip.cache_clear()
+def remove_proxy_ip():
     mongodb_util.remove_data({}, db_name_constant.IP_PROXY_POOL)
 
 
-def check_valid(str_now_date, ip_proxy_pool):
+def check_valid(ip_proxy_pool):
     effect_time = list(ip_proxy_pool['effect_time'])[0]
+
+    now_date = datetime.datetime.now()
+
+    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+
     if effect_time > str_now_date:
         return True
     else:
-        clear_proxy_ip_cache()
+        remove_proxy_ip()
         return False
 
 
@@ -48,7 +50,7 @@ def generate_proxy_ip(minutes):
         secret = list(stock_account_info['account'])[0]
 
         now_date = datetime.datetime.now()
-        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=50)
+        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=30)
         new_date = now_date + time_to_add
         str_now_date = new_date.strftime('%Y-%m-%d %H:%M:%S')
 
@@ -65,20 +67,21 @@ def generate_proxy_ip(minutes):
         return ip
 
 
-def get_proxy_ip(str_now_date, minutes):
+def get_proxy_ip( minutes):
     ip_proxy_pool = query_liu_guan_proxy_ip()
     if data_frame_util.is_empty(ip_proxy_pool):
         return generate_proxy_ip(minutes)
     else:
-        if check_valid(str_now_date, ip_proxy_pool):
+        if check_valid( ip_proxy_pool):
             return list(ip_proxy_pool['ip'])[0]
         else:
             return generate_proxy_ip(minutes)
 
 
 if __name__ == '__main__':
+    get_proxy_ip(1)
     while True:
-        now_date = datetime.datetime.now()
-        str_now_date_test = now_date.strftime('%Y-%m-%d %H:%M:%S')
+        now_date_test = datetime.datetime.now()
+        str_now_date_test = now_date_test.strftime('%Y-%m-%d %H:%M:%S')
         ip_test = get_proxy_ip(str_now_date_test)
         print(ip_test)

{mns_common-1.3.9.5 → mns_common-1.3.9.6}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.3.9.5
+Version: 1.3.9.6

{mns_common-1.3.9.5 → mns_common-1.3.9.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns_common',
-    version='1.3.9.5',
+    version='1.3.9.6',
     # packages=["mns_common", "mns_common.api",
     #           "mns_common.api.akshare",
     #           "mns_common.api.em",