mns-common 1.5.1.5__py3-none-any.whl → 1.5.1.7__py3-none-any.whl

mns_common/api/akshare/__init__.py

@@ -5,4 +5,3 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 14
 project_path = file_path[0:end]
 sys.path.append(project_path)
-

mns_common/api/em/real_time/east_money_stock_a_api.py

@@ -1,6 +1,6 @@
-import sys
 import os
-import time
+import sys
+from loguru import logger
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
@@ -12,7 +12,6 @@ import json
 import pandas as pd
 from concurrent.futures import ThreadPoolExecutor
 import datetime
-from loguru import logger
 import mns_common.utils.data_frame_util as data_frame_util
 
 mongodb_util = MongodbUtil('27017')
@@ -69,7 +68,7 @@ def get_stock_page_data(pn, proxies, page_size):
                 global max_number
                 max_number = int(data_text[begin_index_total + 8:end_index_total - 1])
             except Exception as e:
-                logger.error(f"获取第{pn}页股票列表异常: {e}")
+                # logger.error(f"获取第{pn}页股票列表异常: {e}")
                 return pd.DataFrame()
 
         begin_index = data_text.index('[')
@@ -79,9 +78,11 @@ def get_stock_page_data(pn, proxies, page_size):
         if data_json is None:
             return pd.DataFrame()
         else:
-            return pd.DataFrame(data_json)
+            result_df = pd.DataFrame(data_json)
+            result_df['page_number'] = pn
+            return result_df
     except Exception as e:
-        logger.error(f"获取第{pn}页股票列表异常: {e}")
+        logger.error("获取第{}页股票列表异常:{}", pn, str(e))
         return pd.DataFrame()
 
 
@@ -290,16 +291,13 @@ def get_sum_north_south_net_buy_amt():
     return df
 
 
-# 示例调用
-if __name__ == "__main__":
+import mns_common.component.proxies.proxy_common_api as proxy_common_api
+
+if __name__ == '__main__':
+
+    proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+    proxies = {"https": proxy_ip,
+               "http": proxy_ip}
     while True:
-        ip_proxy_pool = mongodb_util.find_all_data('ip_proxy_pool')
-        if data_frame_util.is_not_empty(ip_proxy_pool):
-            proxy_ip = list(ip_proxy_pool['ip'])[0]
-            proxy = {
-                "https": proxy_ip}
-            df = get_real_time_quotes_all_stocks(proxy)
-            logger.info("涨停数据,{}", 1)
-        else:
-            time.sleep(1)
-            logger.error("ip为空")
+        result = all_stock_ticker_data_new(proxies)
+        print(result)

mns_common/api/em/real_time/real_time_quotes_repeat_api.py

@@ -0,0 +1,363 @@
+import requests
+
+import mns_common.utils.data_frame_util as data_frame_util
+import json
+import datetime
+
+import threading
+from concurrent.futures import ThreadPoolExecutor
+import mns_common.component.proxies.proxy_common_api as proxy_common_api
+from loguru import logger
+import concurrent.futures
+import pandas as pd
+import time
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from threading import Lock
+
+fields = ("f352,f2,f3,f5,f6,f8,f10,f11,f22,f12,f14,f15,f16,f17,"
+          "f18,f20,f21,f26,f33,f34,f35,f62,f66,f69,f72,f100,f184,f211,f212"),
+fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
+
+# 最大返回条数
+max_number = 5800
+# 最小返回条数
+min_number = 5600
+# 分页条数
+PAGE_SIZE = 100
+
+
+def get_stock_page_data_time_out(pn, proxies, page_size, time_out):
+    """
+    获取单页股票数据
+    """
+    # 获取当前日期和时间
+    current_time = datetime.datetime.now()
+
+    # 将当前时间转换为时间戳（以毫秒为单位）
+    current_timestamp_ms = int(current_time.timestamp() * 1000)
+
+    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "cb": "jQuery1124046660442520420653_" + str(current_timestamp_ms),
+        "pn": str(pn),
+        "pz": str(page_size),  # 每页最大200条
+        "po": "0",
+        "np": "3",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "invt": "2",
+        "wbp2u": "|0|0|0|web",
+        "fid": "f12",
+        "fs": fs,
+        "fields": fields,
+        "_": current_timestamp_ms
+    }
+    try:
+        if proxies is None:
+            r = requests.get(url, params, timeout=time_out)
+        else:
+            r = requests.get(url, params, proxies=proxies, timeout=time_out)
+
+        data_text = r.text
+        if pn == 1:
+            try:
+                begin_index_total = data_text.index('"total":')
+
+                end_index_total = data_text.index('"diff"')
+                global max_number
+                max_number = int(data_text[begin_index_total + 8:end_index_total - 1])
+            except Exception as e:
+                logger.error("获取第{}页股票列表异常:{}", pn, str(e))
+                return pd.DataFrame()
+
+        begin_index = data_text.index('[')
+        end_index = data_text.index(']')
+        data_json = data_text[begin_index:end_index + 1]
+        data_json = json.loads(data_json)
+        if data_json is None:
+            return pd.DataFrame()
+        else:
+            result_df = pd.DataFrame(data_json)
+            result_df['page_number'] = pn
+            return result_df
+    except Exception as e:
+        logger.error("获取第{}页股票列表异常:{}", pn, str(e))
+        return pd.DataFrame()
+
+
+def repeated_acquisition_ask(per_page, max_number, time_out, max_workers=5):
+    total_pages = (max_number + per_page - 1) // per_page  # 向上取整
+    result_df = pd.DataFrame()
+    df_lock = Lock()  # 线程安全的DataFrame合并锁
+
+    def fetch_pages(page_nums):
+        """单个线程处理一组页面，复用代理IP直到失效"""
+        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        proxies = {"https": proxy_ip, "http": proxy_ip}
+        thread_results = []  # 线程内临时存储结果
+
+        for page_num in page_nums:
+            while True:  # 重试循环（复用当前IP）
+                try:
+                    page_df = get_stock_page_data_time_out(
+                        page_num, proxies, per_page, time_out
+                    )
+                    if data_frame_util.is_not_empty(page_df):
+                        logger.info("线程{} 页面{}获取成功（IP复用中）",
+                                    threading.get_ident(), page_num)
+                        thread_results.append(page_df)
+                        break  # 成功后继续用当前IP处理下一页
+                    else:
+                        logger.warning("页面数据为空:{},重试中...", page_num)
+                        # 数据为空，更换IP
+                        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+                        proxies = {"https": proxy_ip, "http": proxy_ip}
+                        time.sleep(0.2)
+                except BaseException as e:
+                    logger.error("线程{} 页面{}获取异常[{}]，更换IP重试",
+                                 threading.get_ident(), page_num, str(e))
+                    # 发生异常，更换IP
+                    proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+                    proxies = {"https": proxy_ip, "http": proxy_ip}
+                    time.sleep(1)
+        return thread_results
+
+    # 页面分配：平均分配给每个线程
+    def split_pages(total, workers):
+        pages = list(range(1, total + 1))
+        avg = total // workers
+        remainder = total % workers
+        split = []
+        start = 0
+        for i in range(workers):
+            end = start + avg + (1 if i < remainder else 0)
+            split.append(pages[start:end])
+            start = end
+        return split
+
+    # 分配页面组
+    page_groups = split_pages(total_pages, max_workers)
+
+    # 多线程执行
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        futures = [executor.submit(fetch_pages, group) for group in page_groups]
+
+        # 合并结果
+        for future in as_completed(futures):
+            try:
+                thread_dfs = future.result()
+                if thread_dfs:
+                    with df_lock:
+                        result_df = pd.concat([result_df] + thread_dfs, ignore_index=True)
+            except Exception as e:
+                logger.error("线程结果处理失败:{}", str(e))
+
+    return result_df
+
+
+def repeated_acquisition_ask_sync(time_out):
+    per_page = PAGE_SIZE
+    total_pages = (max_number + per_page - 1) // per_page  # 向上取整
+    result_df = pd.DataFrame()
+    now_page = 1
+    proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+    while now_page <= total_pages:
+        proxies = {"https": proxy_ip,
+                   "http": proxy_ip}
+        try:
+            page_df = get_stock_page_data_time_out(now_page, proxies, PAGE_SIZE, time_out)
+            if data_frame_util.is_not_empty(page_df):
+                result_df = pd.concat([page_df, result_df])
+                logger.info("获取页面数据成功:{}", now_page)
+                now_page = now_page + 1
+            else:
+                time.sleep(0.2)
+                proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+                logger.info("获取页面数据失败:{}", now_page)
+        except BaseException as e:
+            time.sleep(1)
+            proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        # 示例调用
+    return result_df
+
+
+def repeated_acquisition_ask_async(time_out, max_number, num_threads, pages_per_thread):
+    per_page = PAGE_SIZE
+    total_pages = (max_number + per_page - 1) // per_page  # 向上取整
+    result_df = pd.DataFrame()
+
+    # 创建线程锁以确保线程安全
+    df_lock = Lock()
+
+    # 计算每个线程处理的页数范围
+    def process_page_range(start_page, end_page, thread_id):
+        nonlocal result_df
+        local_df = pd.DataFrame()
+        current_page = start_page
+        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+
+        while current_page <= end_page and current_page <= total_pages:
+            proxies = {"https": proxy_ip, "http": proxy_ip}
+            try:
+                page_df = get_stock_page_data_time_out(current_page, proxies, PAGE_SIZE, time_out)
+                if data_frame_util.is_not_empty(page_df):
+                    local_df = pd.concat([local_df, page_df])
+                    logger.info("线程{}获取页面数据成功: {}", thread_id, current_page)
+                    current_page += 1
+                else:
+                    time.sleep(0.2)
+                    proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+                    logger.info("线程{}获取页面数据失败: {}", thread_id, current_page)
+            except BaseException as e:
+                time.sleep(1)
+                proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+                logger.error("线程{}处理页面{}时发生错误: {}", thread_id, current_page, e)
+
+        with df_lock:
+            result_df = pd.concat([result_df, local_df])
+        return len(local_df)
+
+    # 计算每个线程的页面范围
+    page_ranges = []
+    for i in range(num_threads):
+        start_page = i * pages_per_thread + 1
+        end_page = (i + 1) * pages_per_thread
+        if start_page > total_pages:
+            break
+        page_ranges.append((start_page, end_page, i + 1))
+
+    # 使用线程池执行任务
+    with concurrent.futures.ThreadPoolExecutor(max_workers=num_threads) as executor:
+        # 提交所有任务
+        futures = [
+            executor.submit(process_page_range, start, end, tid)
+            for start, end, tid in page_ranges
+        ]
+
+        # 等待所有任务完成并获取结果
+        results = []
+        for future in concurrent.futures.as_completed(futures):
+            try:
+                result = future.result()
+                results.append(result)
+            except Exception as e:
+                logger.error("线程执行出错: {}", e)
+
+    return rename_real_time_quotes_df(result_df)
+
+
+def rename_real_time_quotes_df(temp_df):
+    temp_df = temp_df.rename(columns={
+        "f2": "now_price",
+        "f3": "chg",
+        "f5": "volume",
+        "f6": "amount",
+        "f8": "exchange",
+        "f10": "quantity_ratio",
+        "f22": "up_speed",
+        "f11": "up_speed_05",
+        "f12": "symbol",
+        "f14": "name",
+        "f15": "high",
+        "f16": "low",
+        "f17": "open",
+        "f18": "yesterday_price",
+        "f20": "total_mv",
+        "f21": "flow_mv",
+        "f26": "list_date",
+        "f33": "wei_bi",
+        "f34": "outer_disk",
+        "f35": "inner_disk",
+        "f62": "today_main_net_inflow",
+        "f66": "super_large_order_net_inflow",
+        "f69": "super_large_order_net_inflow_ratio",
+        "f72": "large_order_net_inflow",
+        # "f78": "medium_order_net_inflow",
+        # "f84": "small_order_net_inflow",
+        "f100": "industry",
+        # "f103": "concept",
+        "f184": "today_main_net_inflow_ratio",
+        "f352": "average_price",
+        "f211": "buy_1_num",
+        "f212": "sell_1_num"
+    })
+    if data_frame_util.is_empty(temp_df):
+        return pd.DataFrame()
+    else:
+        temp_df.loc[temp_df['buy_1_num'] == '-', 'buy_1_num'] = 0
+        temp_df.loc[temp_df['sell_1_num'] == '-', 'sell_1_num'] = 0
+        temp_df.loc[temp_df['up_speed_05'] == '-', 'up_speed_05'] = 0
+        temp_df.loc[temp_df['up_speed'] == '-', 'up_speed'] = 0
+        temp_df.loc[temp_df['average_price'] == '-', 'average_price'] = 0
+        temp_df.loc[temp_df['wei_bi'] == '-', 'wei_bi'] = 0
+        temp_df.loc[temp_df['yesterday_price'] == '-', 'yesterday_price'] = 0
+        temp_df.loc[temp_df['now_price'] == '-', 'now_price'] = 0
+        temp_df.loc[temp_df['chg'] == '-', 'chg'] = 0
+        temp_df.loc[temp_df['volume'] == '-', 'volume'] = 0
+        temp_df.loc[temp_df['amount'] == '-', 'amount'] = 0
+        temp_df.loc[temp_df['exchange'] == '-', 'exchange'] = 0
+        temp_df.loc[temp_df['quantity_ratio'] == '-', 'quantity_ratio'] = 0
+        temp_df.loc[temp_df['high'] == '-', 'high'] = 0
+        temp_df.loc[temp_df['low'] == '-', 'low'] = 0
+        temp_df.loc[temp_df['open'] == '-', 'open'] = 0
+        temp_df.loc[temp_df['total_mv'] == '-', 'total_mv'] = 0
+        temp_df.loc[temp_df['flow_mv'] == '-', 'flow_mv'] = 0
+        temp_df.loc[temp_df['inner_disk'] == '-', 'inner_disk'] = 0
+        temp_df.loc[temp_df['outer_disk'] == '-', 'outer_disk'] = 0
+        temp_df.loc[temp_df['today_main_net_inflow_ratio'] == '-', 'today_main_net_inflow_ratio'] = 0
+        temp_df.loc[temp_df['today_main_net_inflow'] == '-', 'today_main_net_inflow'] = 0
+        temp_df.loc[temp_df['super_large_order_net_inflow'] == '-', 'super_large_order_net_inflow'] = 0
+        temp_df.loc[temp_df['super_large_order_net_inflow_ratio'] == '-', 'super_large_order_net_inflow_ratio'] = 0
+        temp_df.loc[temp_df['large_order_net_inflow'] == '-', 'large_order_net_inflow'] = 0
+        # temp_df.loc[temp_df['medium_order_net_inflow'] == '-', 'medium_order_net_inflow'] = 0
+        # temp_df.loc[temp_df['small_order_net_inflow'] == '-', 'small_order_net_inflow'] = 0
+
+        temp_df["list_date"] = pd.to_numeric(temp_df["list_date"], errors="coerce")
+        temp_df["wei_bi"] = pd.to_numeric(temp_df["wei_bi"], errors="coerce")
+        temp_df["average_price"] = pd.to_numeric(temp_df["average_price"], errors="coerce")
+        temp_df["yesterday_price"] = pd.to_numeric(temp_df["yesterday_price"], errors="coerce")
+        temp_df["now_price"] = pd.to_numeric(temp_df["now_price"], errors="coerce")
+        temp_df["chg"] = pd.to_numeric(temp_df["chg"], errors="coerce")
+        temp_df["volume"] = pd.to_numeric(temp_df["volume"], errors="coerce")
+        temp_df["amount"] = pd.to_numeric(temp_df["amount"], errors="coerce")
+        temp_df["exchange"] = pd.to_numeric(temp_df["exchange"], errors="coerce")
+        temp_df["quantity_ratio"] = pd.to_numeric(temp_df["quantity_ratio"], errors="coerce")
+        temp_df["high"] = pd.to_numeric(temp_df["high"], errors="coerce")
+        temp_df["low"] = pd.to_numeric(temp_df["low"], errors="coerce")
+        temp_df["open"] = pd.to_numeric(temp_df["open"], errors="coerce")
+        temp_df["total_mv"] = pd.to_numeric(temp_df["total_mv"], errors="coerce")
+        temp_df["flow_mv"] = pd.to_numeric(temp_df["flow_mv"], errors="coerce")
+        temp_df["outer_disk"] = pd.to_numeric(temp_df["outer_disk"], errors="coerce")
+        temp_df["inner_disk"] = pd.to_numeric(temp_df["inner_disk"], errors="coerce")
+        temp_df["today_main_net_inflow"] = pd.to_numeric(temp_df["today_main_net_inflow"], errors="coerce")
+        temp_df["super_large_order_net_inflow"] = pd.to_numeric(temp_df["super_large_order_net_inflow"],
+                                                                errors="coerce")
+        temp_df["super_large_order_net_inflow_ratio"] = pd.to_numeric(temp_df["super_large_order_net_inflow_ratio"],
+                                                                      errors="coerce")
+        temp_df["large_order_net_inflow"] = pd.to_numeric(temp_df["large_order_net_inflow"],
+                                                          errors="coerce")
+        # temp_df["medium_order_net_inflow"] = pd.to_numeric(temp_df["medium_order_net_inflow"],
+        #                                                    errors="coerce")
+        # temp_df["small_order_net_inflow"] = pd.to_numeric(temp_df["small_order_net_inflow"], errors="coerce")
+
+        # 大单比例
+        temp_df['large_order_net_inflow_ratio'] = round((temp_df['large_order_net_inflow'] / temp_df['amount']) * 100,
+                                                        2)
+
+        # 外盘是内盘倍数
+        temp_df['disk_ratio'] = round((temp_df['outer_disk'] - temp_df['inner_disk']) / temp_df['inner_disk'], 2)
+        # 只有外盘没有内盘
+        temp_df.loc[temp_df["inner_disk"] == 0, ['disk_ratio']] = 1688
+        temp_df = temp_df.sort_values(by=['chg'], ascending=False)
+        return temp_df
+
+
+if __name__ == '__main__':
+
+    while True:
+        # proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        # proxies = {"https": proxy_ip,
+        #            "http": proxy_ip}
+        time_out = 10  # Set the timeout value
+        result = repeated_acquisition_ask_async(time_out, 5800, 6, 10)
+        print(result)

mns_common/api/proxies/liu_guan_proxy_api.py

@@ -10,6 +10,13 @@ import requests
 import time
 import hashlib
 import json
+from mns_common.db.MongodbUtil import MongodbUtil
+from functools import lru_cache
+import mns_common.constant.db_name_constant as db_name_constant
+
+mongodb_util = MongodbUtil('27017')
+
+import random
 
 # 提取订单
 """
@@ -26,8 +33,49 @@ import json
 """
 
 
+@lru_cache(maxsize=None)
+def query_province_and_city_info():
+    return mongodb_util.find_all_data(db_name_constant.IP_PROXY_CITY_PROVINCE)
+
+
 def get_proxy_api(order_id, secret, unbind_time):
+    province_and_city_info_df = query_province_and_city_info()
+    random_row = province_and_city_info_df.sample(n=1)
+    cid = str(list(random_row['cid'])[0])
+    pid = str(list(random_row['pid'])[0])
+
     num = "1"
+
+    noDuplicate = "1"
+    lineSeparator = "0"
+    singleIp = "0"
+    time_str = str(int(time.time()))  # 时间戳
+
+    # 计算sign
+    txt = "orderId=" + order_id + "&" + "secret=" + secret + "&" + "time=" + time_str
+    sign = hashlib.md5(txt.encode()).hexdigest()
+    # 访问URL获取IP
+    url = (
+            "http://api.hailiangip.com:8422/api/getIp?type=1" + "&num=" + num + "&pid=" + pid
+            + "&unbindTime=" + unbind_time + "&cid=" + cid
+            + "&orderId=" + order_id + "&time=" + time_str + "&sign=" + sign + "&dataType=0"
+            + "&lineSeparator=" + lineSeparator + "&noDuplicate=" + noDuplicate + "&singleIp=" + singleIp)
+    my_response = requests.get(url).content
+    js_res = json.loads(my_response)
+    for dic in js_res["data"]:
+        try:
+            ip = dic["ip"]
+            port = dic["port"]
+            ip_port = ip + ":" + str(port)
+            return ip_port
+        except BaseException as e:
+            logger.error("获取ip地址异常:{}", e)
+            return None
+
+
+# 线程池
+def get_proxy_pool_api(order_id, secret, unbind_time, ip_num):
+    num = str(ip_num)
     pid = "-1"
     cid = ""
     noDuplicate = "1"
@@ -46,20 +94,22 @@ def get_proxy_api(order_id, secret, unbind_time):
             + "&lineSeparator=" + lineSeparator + "&noDuplicate=" + noDuplicate + "&singleIp=" + singleIp)
     my_response = requests.get(url).content
     js_res = json.loads(my_response)
+    ip_pool_list = []
     for dic in js_res["data"]:
         try:
             ip = dic["ip"]
             port = dic["port"]
             ip_port = ip + ":" + str(port)
-            return ip_port
+            ip_pool_list.append(ip_port)
         except BaseException as e:
             logger.error("获取ip地址异常:{}", e)
             return None
+    return ip_pool_list
 
 
 if __name__ == '__main__':
-    order_id = ''
-    secret = ''
-    unbind_time = str(60 * 10)
-    ip = get_proxy_api(order_id, secret, unbind_time)
+    order_id_test = ''
+    secret_test = ''
+    unbind_time_test = str(60 * 10)
+    ip = get_proxy_api(order_id_test, secret_test, unbind_time_test)
     print(ip)

mns_common/component/proxies/proxy_common_api.py

@@ -12,7 +12,6 @@ import mns_common.utils.data_frame_util as data_frame_util
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
 import datetime
-import requests
 import time
 from loguru import logger
 from functools import lru_cache
@@ -21,23 +20,25 @@ import threading
 
 mongodb_util = MongodbUtil('27017')
 
+IP_POOL = 'ip_pool'
+ONE_IP = 'one_ip'
+query_one = {'ip_type': ONE_IP}
+query_pool = {'ip_type': IP_POOL}
+
 
 def query_liu_guan_proxy_ip():
-    ip_proxy_pool = mongodb_util.find_all_data(db_name_constant.IP_PROXY_POOL)
+    ip_proxy_pool = mongodb_util.find_query_data(db_name_constant.IP_PROXY_POOL, query_one)
     return ip_proxy_pool
 
 
 def remove_proxy_ip():
-    mongodb_util.remove_data({}, db_name_constant.IP_PROXY_POOL)
+    mongodb_util.remove_data(query_one, db_name_constant.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:
@@ -47,17 +48,24 @@ def check_valid(ip_proxy_pool):
 
 @lru_cache(maxsize=None)
 def get_account_cache():
-    query = {"type": "liu_guan_proxy", }
+    query = {"type": "liu_guan_proxy"}
     return mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
 
 
 def generate_proxy_ip_api(minutes):
-    stock_account_info = get_account_cache()
-    order_id = list(stock_account_info['password'])[0]
-    secret = list(stock_account_info['account'])[0]
-    # 获取10分钟动态ip
-    ip = liu_guan_proxy_api.get_proxy_api(order_id, secret, str(60 * minutes))
-    return ip
+    try_numer = 3
+    while try_numer > 0:
+        try:
+            stock_account_info = get_account_cache()
+            order_id = list(stock_account_info['password'])[0]
+            secret = list(stock_account_info['account'])[0]
+            # 获取10分钟动态ip
+            ip = liu_guan_proxy_api.get_proxy_api(order_id, secret, str(60 * minutes))
+            try_numer = try_numer - 1
+            return ip
+        except BaseException as e:
+            time.sleep(1)
+            continue
 
 
 def generate_proxy_ip(minutes):
@@ -77,6 +85,7 @@ def generate_proxy_ip(minutes):
             ip = generate_proxy_ip_api(minutes)
             if check_proxy(ip):
                 result_dict = {"_id": ip,
+                               'ip_type': ONE_IP,
                                'effect_time': str_now_date,
                                'ip': ip}
                 result_df = pd.DataFrame(result_dict, index=[1])
@@ -113,6 +122,73 @@ def check_proxy(proxy_ip):
         return False
 
 
+# 查询ip池子
+def query_liu_guan_proxy_ip_pool():
+    ip_proxy_pool = mongodb_util.find_query_data(db_name_constant.IP_PROXY_POOL, query_pool)
+    return ip_proxy_pool
+
+
+def remove_proxy_ip_pool():
+    mongodb_util.remove_data(query_pool, db_name_constant.IP_PROXY_POOL)
+
+
+def generate_proxy_ip_pool_api(minutes, ip_num):
+    stock_account_info = get_account_cache()
+    order_id = list(stock_account_info['password'])[0]
+    secret = list(stock_account_info['account'])[0]
+    # 获取10分钟动态ip
+    ip_pool = liu_guan_proxy_api.get_proxy_pool_api(order_id, secret, str(60 * minutes), ip_num)
+    return ip_pool
+
+
+def get_proxy_ip_pool(minutes, seconds, ip_num):
+    ip_proxy_pool = query_liu_guan_proxy_ip_pool()
+    if data_frame_util.is_empty(ip_proxy_pool):
+        return generate_proxy_ip_pool(minutes, seconds, ip_num)
+    else:
+        if check_valid(ip_proxy_pool):
+            ip_pool = list(ip_proxy_pool['ip_pool'])[0]
+            effect_time = list(ip_proxy_pool['effect_time'])[0]
+            result = {'ip_pool': ip_pool,
+                      'effect_time': effect_time}
+            return result
+        else:
+            # 已经失效 移除ip pool
+            remove_proxy_ip_pool()
+            # 重新生成
+            return generate_proxy_ip_pool(minutes, seconds, ip_num)
+
+
+# seconds 有效秒数,minutes 需要减1
+def generate_proxy_ip_pool(minutes, seconds, ip_num):
+    ip_proxy_pool = query_liu_guan_proxy_ip_pool()
+    if data_frame_util.is_not_empty(ip_proxy_pool):
+        ip_pool = list(ip_proxy_pool['ip_pool'])[0]
+        effect_time = list(ip_proxy_pool['effect_time'])[0]
+
+
+    else:
+        remove_proxy_ip_pool()
+        now_date = datetime.datetime.now()
+        # 加上分钟 少10秒
+        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=seconds)
+        new_date = now_date + time_to_add
+        effect_time = new_date.strftime('%Y-%m-%d %H:%M:%S')
+        ip_pool = generate_proxy_ip_pool_api(minutes, ip_num)
+        result_dict = {
+            "_id": [IP_POOL],
+            'ip_type': [IP_POOL],
+            'effect_time': [effect_time],
+            'ip_pool': [ip_pool]  # 每个字段都包装成列表
+        }
+        result_df = pd.DataFrame(result_dict)
+
+        mongodb_util.insert_mongo(result_df, db_name_constant.IP_PROXY_POOL)
+    result = {'ip_pool': ip_pool,
+              'effect_time': effect_time}
+    return result
+
+
 def get_em_real_time_data(proxy_ip):
     proxies = {
         "http": proxy_ip,
@@ -152,5 +228,21 @@ def call_with_timeout(func, *args, timeout=2, **kwargs):
     return result
 
 
+@lru_cache(maxsize=None)
+def query_province_and_city_info():
+    return mongodb_util.find_all_data(db_name_constant.IP_PROXY_CITY_PROVINCE)
+
+
+def import_province_and_city():
+    # 设置文件夹路径
+    folder_path = r'E:\province-and-city.xlsx'
+    df = pd.read_excel(folder_path)
+    df['_id'] = df['cid']
+
+    mongodb_util.save_mongo(df, db_name_constant.IP_PROXY_CITY_PROVINCE)
+    return df
+
+
 if __name__ == "__main__":
-    generate_proxy_ip(1)
+    import_province_and_city()
+    # get_proxy_ip_pool(1, 50, 2)

mns_common/constant/db_name_constant.py

@@ -24,6 +24,9 @@ EM_US_STOCK_INFO = 'em_us_stock_info'
 # ip代理池
 IP_PROXY_POOL = 'ip_proxy_pool'
 
+# ip代理城市信息
+IP_PROXY_CITY_PROVINCE = 'ip_proxy_city_province'
+
 # 大单同步表
 BIG_DEAL_NAME = "ths_big_deal_fund"
 # 大单选择表
@@ -151,7 +154,6 @@ COMPANY_HOLDING_INFO = 'company_holding_info'
 #  公司业务组成
 COMPANY_BUSINESS_INFO = 'company_business_info'
 
-
 #  公司公告信息
 COMPANY_ANNOUNCE_INFO = 'company_announce_info'
 

{mns_common-1.5.1.5.dist-info → mns_common-1.5.1.7.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.5.1.5
+Version: 1.5.1.7
 

{mns_common-1.5.1.5.dist-info → mns_common-1.5.1.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mns_common/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
-mns_common/api/akshare/__init__.py,sha256=xu36nA6MJTauswUWPfKIKH0E-lpOAHTw2TL5QI_6TeY,165
+mns_common/api/akshare/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/akshare/k_line_api.py,sha256=IfqJDG2e-_Ry1f_MqjIff6jad9IIC3TjnpmaJ9H_pbk,4290
 mns_common/api/akshare/stock_bid_ask_api.py,sha256=Af9t6Pv_-p7PJJ_7rF_JVaGBomkvePMMqALwuBh2Gfw,4139
 mns_common/api/akshare/stock_dt_pool.py,sha256=sKedOTzqsBZprJHJEr2sRYa8xbeSK7tRenqBE3wOdUc,2245
@@ -15,10 +15,11 @@ mns_common/api/em/gd/east_money_stock_gdfx_free_top_10_api.py,sha256=I2-JjFjTjvO
 mns_common/api/em/real_time/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/em/real_time/east_money_debt_api.py,sha256=jMvMZtlrDfExl_4jZ1hepHX8rUoeVLoLSOIhRBjkUGk,14753
 mns_common/api/em/real_time/east_money_etf_api.py,sha256=tCyH4fNx-KfVRFuNGkgM8d_xkvR0oAfr8T3e7_XrjTM,14414
-mns_common/api/em/real_time/east_money_stock_a_api.py,sha256=6xYcNJyMhFFL2eNxQ9c0TbQ53wgumNovVHisXgQX7bs,12737
+mns_common/api/em/real_time/east_money_stock_a_api.py,sha256=-FtOGAsR4HtdqkKrm2JE65yTsUnvxAq5ACTp-VvSaSQ,12654
 mns_common/api/em/real_time/east_money_stock_a_v2_api.py,sha256=mL4uuL6sVsC2Vnl09826AUnzxePGAUhlZ7I5BBFw8Ks,14530
 mns_common/api/em/real_time/east_money_stock_hk_api.py,sha256=KFIYUZ3N4ULrataeCIXwZPo775O7joKgMF466uwVDdY,15154
 mns_common/api/em/real_time/east_money_stock_us_api.py,sha256=RiTrdZDuDgTOtiMSD1Ba9aQAx4vghM66pEp_LicH3Ps,11632
+mns_common/api/em/real_time/real_time_quotes_repeat_api.py,sha256=kihvxJCUqNr5rQR7CkK8ECWqYd65lcRfvvZoB_HYKH8,16090
 mns_common/api/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/hk/ths_hk_company_info_api.py,sha256=Cxlbuccopa0G1s8o0uTnnyLn2QaxOvbDpJQJOj7J8a8,5360
 mns_common/api/k_line/__init__.py,sha256=itoGlqKhsx7EVXQoD1vchDKQ5GPB16vDjofTSuQtrXg,161
@@ -43,7 +44,7 @@ mns_common/api/kpl/symbol/symbol_his_quotes_api.py,sha256=5F9L8V2UI_YUYe2dO6FbVK
 mns_common/api/msg/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/msg/push_msg_api.py,sha256=z8jDqFWygfxnCFFfQp4K-llgg27nRLv7Mx72lOddBH0,1390
 mns_common/api/proxies/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_common/api/proxies/liu_guan_proxy_api.py,sha256=VASqcWnKyAEmF4UYNY39Jazh45qugVMYblRrdKfQFuE,1923
+mns_common/api/proxies/liu_guan_proxy_api.py,sha256=lULS2ejxmVuM6t6PHBczvH-HjMJxiCYEDrCUAtci-t4,3730
 mns_common/api/qmt/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/qmt/qmt_minunte_tick_data.py,sha256=uwSw_AkA9RaD3pXPKzxqi4TKEkpglmFUwtYl9r5E6G8,3019
 mns_common/api/ths/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
@@ -116,7 +117,7 @@ mns_common/component/k_line/patterns/pattern_Enum.py,sha256=bl8cH1H3BWdj_deVO124
 mns_common/component/price/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/price/trade_price_service_api.py,sha256=0loBjbOt__o-ngc2Q4n5lF8_0x2WINRpL-cH1341Uaw,4396
 mns_common/component/proxies/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_common/component/proxies/proxy_common_api.py,sha256=N2VaiEQ15KycjSNmCHAguR1xiASZzJu1y24NhFCr7BA,4663
+mns_common/component/proxies/proxy_common_api.py,sha256=knTYLnVhBg1UIXVrqzyFhb7BH9UKhQlyOzY8BmKRwAY,7984
 mns_common/component/qmt/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/qmt/qmt_buy_service.py,sha256=tLTgrSxCcxuMhADRBBrW4ZWR_3MdbMZvvMdH5hbwyJU,7190
 mns_common/component/real_time/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
@@ -138,7 +139,7 @@ mns_common/component/zt/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3Hi
 mns_common/component/zt/zt_common_service_api.py,sha256=6pHRLLJjKcLLBA-xXkAU8SE6DZ5dgVFBRVjJmhkL0II,11945
 mns_common/constant/__init__.py,sha256=xu36nA6MJTauswUWPfKIKH0E-lpOAHTw2TL5QI_6TeY,165
 mns_common/constant/black_list_classify_enum.py,sha256=I8U_DcltzYvlWjgn-TFLImgVgPuO0lxMnEJAQJBljdo,3995
-mns_common/constant/db_name_constant.py,sha256=RkSnmESDHf2yNrrwoa7Ox7SVVa2roq_RDwn1Lx0kP_k,4958
+mns_common/constant/db_name_constant.py,sha256=lDb4WD7ZsoMofLuzZU2R-B-6pjU185_9pBKeeQH_-78,5033
 mns_common/constant/east_money_stock_api.py,sha256=mW0b8sEgkf8WJtars2frOQYzsWgjIl4FDYEwcCcCSZY,7557
 mns_common/constant/extra_income_db_name.py,sha256=aXPuJSEgX7F3zpf4zal6wxejkxPbVmou_LMVlfms1SY,2701
 mns_common/constant/price_enum.py,sha256=nhcPxk0AFdQAp8IsNr5EP9xURLqqJuSl6ljIzTp7Wyo,1093
@@ -158,7 +159,7 @@ mns_common/utils/date_handle_util.py,sha256=XS-MyA8_7k35LOCFAYOHgVcVkMft_Kc4Wa9U
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.5.1.5.dist-info/METADATA,sha256=YLPOLO_99ZymHoEEaKi2LjFOg3DPzburAquYZHCVRLs,61
-mns_common-1.5.1.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.5.1.5.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.5.1.5.dist-info/RECORD,,
+mns_common-1.5.1.7.dist-info/METADATA,sha256=u0T_v08wnex8MtMRI8qfYjKUI8JWaZt7cgl3PzSP0fk,61
+mns_common-1.5.1.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.5.1.7.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.5.1.7.dist-info/RECORD,,