mns-common 1.5.2.4__py3-none-any.whl → 1.5.2.6__py3-none-any.whl

mns_common/api/em/real_time/east_money_stock_a_v2_api.py

@@ -7,11 +7,21 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 
 import requests
+
+import mns_common.utils.data_frame_util as data_frame_util
 import json
-import pandas as pd
-from concurrent.futures import ThreadPoolExecutor
 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
+import mns_common.api.em.real_time.real_time_quotes_repeat_api as real_time_quotes_repeat_api
 
 #
 # fields_02 = "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43,f44,f45,f46,f47,f48,f49,f50,f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65,f66,f67,f68,f69,f70,f71,f72,f73,f74,f75,f76,f77,f78,f79,f80,f81,f82,f83,f84,f85,f86,f87,f88,f89,f90,f91,f92,f93,f94,f95,f96,f97,f98,f99,f100,f101,f102,f103,f104,f105,f106,f107,f108" \
@@ -20,6 +30,8 @@ from loguru import logger
 #             ",f309,f310,f312,f313,f314,f315,f316,f317,f318,f319,f320,f321,f322,f323,f324,f325,f326,f327,f328,f329,f330,f331,f332,f333,f334,f335,f336,f337,f338,f339,f340,f341,f342,f343,f344,f345,f346,f347,f348,f349,f350,f351,f352,f353,f354,f355,f356,f357,f358,f359,f360,f361,f362,f363,f364,f365,f366,f367,f368,f369,f370,f371,f372,f373,f374,f375,f376,f377,f378,f379,f380,f381,f382,f383,f384,f385,f386,f387,f388,f389,f390,f391,f392,f393,f394,f395,f396,f397,f398,f399,f401"
 
 
+fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
+
 fields = ("f2,f3,f5,f6,f8,"
           "f9,f10,f22,f12,f13,"
           "f14,f15,f16,f17,f18,"
@@ -39,7 +51,7 @@ min_number = 5600
 page_number = 100
 
 
-def get_stock_page_data(pn, fields, fs, proxies):
+def get_stock_page_data(pn, proxies, page_number, time_out):
     """
     获取单页股票数据
     """
@@ -53,7 +65,7 @@ def get_stock_page_data(pn, fields, fs, proxies):
     params = {
         "cb": "jQuery1124046660442520420653_" + str(current_timestamp_ms),
         "pn": str(pn),
-        "pz": "10000",  # 每页最大200条
+        "pz": str(page_number),  # 每页最大200条
         "po": "1",
         "np": "3",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -67,9 +79,9 @@ def get_stock_page_data(pn, fields, fs, proxies):
     }
     try:
         if proxies is None:
-            r = requests.get(url, params)
+            r = requests.get(url, params, timeout=time_out)
         else:
-            r = requests.get(url, params, proxies=proxies)
+            r = requests.get(url, params, proxies=proxies, timeout=time_out)
         data_text = r.text
         begin_index = data_text.index('[')
         end_index = data_text.index(']')
@@ -113,7 +125,6 @@ def all_stock_ticker_data_new(fields, fs, proxies) -> pd.DataFrame:
 
 
 def get_all_real_time_quotes(proxies):
-    fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
     # 获取第一页数据
     page_one_df = get_stock_page_data(1, fields, fs, proxies)
     # 数据接口正常返回5600以上的数量
@@ -286,6 +297,91 @@ def rename_real_time_quotes_df(temp_df):
     return temp_df
 
 
+def repeated_acquisition_ask_async(time_out, max_number, num_threads, pages_per_thread):
+    per_page = page_number
+    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(current_page, proxies, page_number, 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 get_stock_real_time_quotes(time_out, pages_per_thread):
+    try_numer = 3
+    while try_numer > 0:
+        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        proxies = {"https": proxy_ip,
+                   "http": proxy_ip}
+
+        total_number = real_time_quotes_repeat_api.get_stocks_num(1, proxies, 20, time_out)
+        if total_number > 0:
+            break
+        try_numer = try_numer - 1
+    if total_number == 0:
+        return pd.DataFrame()
+
+    total_pages = (max_number + page_number - 1) // page_number  # 向上取整
+
+    num_threads = int((total_pages / pages_per_thread) + 1)
+    return repeated_acquisition_ask_async(time_out, max_number, num_threads, pages_per_thread)
+
+
 # 示例调用
 if __name__ == "__main__":
     number = 1

mns_common/api/em/real_time/east_money_stock_hk_api.py

@@ -230,240 +230,10 @@ def get_hk_real_time_quotes(cookie, proxies):
         return page_df
 
 
-# 获取港股通名单 todo 被封以后替换
-def stock_hk_ggt_components_em(cookie, pn, proxies, page_size, time_out) -> pd.DataFrame:
-    """
-    东方财富网-行情中心-港股市场-港股通成份股
-    https://quote.eastmoney.com/center/gridlist.html#hk_components
-    :return: 港股通成份股
-    :rtype: pandas.DataFrame
-    """
-    headers = {
-        'Cookie': cookie
-    }
-    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
-    params = {
-        "pn": str(pn),
-        "pz": str(page_size),
-        "po": "1",
-        "np": "2",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "fid": "f3",
-        "fs": "b:DLMK0146,b:DLMK0144",
-        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f23,f24,"
-                  "f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
-        "_": "1639974456250",
-    }
-    try:
-        if proxies is None:
-            r = requests.get(url, params=params, timeout=time_out, headers=headers)
-        else:
-            r = requests.get(url, params=params, proxies=proxies, timeout=time_out, headers=headers)
-
-        data_json = r.json()
-        temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-        temp_df.reset_index(inplace=True)
-        temp_df["index"] = temp_df.index + 1
-        return temp_df
-    except Exception as e:
-        logger.error("获取港股通列表:{}", e)
-
-
-def rename_hg_ggt(temp_df):
-    temp_df.columns = [
-        "序号",
-        "-",
-        "最新价",
-        "涨跌幅",
-        "涨跌额",
-        "成交量",
-        "成交额",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "代码",
-        "-",
-        "名称",
-        "最高",
-        "最低",
-        "今开",
-        "昨收",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-    ]
-    temp_df = temp_df[
-        [
-            "序号",
-            "代码",
-            "名称",
-            "最新价",
-            "涨跌额",
-            "涨跌幅",
-            "今开",
-            "最高",
-            "最低",
-            "昨收",
-            "成交量",
-            "成交额",
-        ]
-    ]
-
-    temp_df = temp_df.rename(columns={
-        "序号": "index",
-        "代码": "symbol",
-        "名称": "name",
-        "最新价": "now_price",
-        "涨跌额": "range",
-        "涨跌幅": "chg",
-        "今开": "open",
-        "最高": "high",
-        "最低": "low",
-        "昨收": "yesterday_price",
-        "成交额": "amount",
-        "成交量": "volume",
-    })
-
-    return temp_df
-
-
-def get_stock_hk_ggt_components_em_count(cookie, pn, proxies, page_size, time_out):
-    headers = {
-        'Cookie': cookie
-    }
-    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
-    current_timestamp = str(int(round(time.time() * 1000, 0)))
-    params = {
-        "pn": str(pn),
-        "pz": str(page_size),
-        "po": "1",
-        "np": "2",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "fid": "f3",
-        "fs": "b:DLMK0146,b:DLMK0144",
-        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f23,f24,"
-                  "f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
-        "_": str(current_timestamp),
-    }
-    try:
-        if proxies is None:
-            r = requests.get(url, params, timeout=time_out, headers=headers)
-        else:
-            r = requests.get(url, params, proxies=proxies, timeout=time_out, headers=headers)
-        data_json = r.json()
-        total_number = int(data_json['data']['total'])
-        return total_number
-    except Exception as e:
-        logger.error("获取港股通列表,实时行情异常:{}", e)
-        return 0
-
-
-def repeated_acquisition_ask_hk_gtt_async(em_cookie, time_out, max_number, num_threads, pages_per_thread):
-    per_page = page_number
-    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 = stock_hk_ggt_components_em(em_cookie, current_page, proxies, page_number, 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_hg_ggt(result_df)
-
-
-# 港股通
-
-
-def get_ggt_real_time_quotes(em_cookie, time_out, pages_per_thread):
-    try_numer = 3
-    while try_numer > 0:
-        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
-        proxies = {"https": proxy_ip,
-                   "http": proxy_ip}
-
-        max_number = get_stock_hk_ggt_components_em_count(em_cookie, 1, proxies, 20, time_out)
-        if max_number > 0:
-            break
-        try_numer = try_numer - 1
-    if max_number == 0:
-        return pd.DataFrame()
-
-    total_pages = (max_number + page_number - 1) // page_number  # 向上取整
 
-    num_threads = int((total_pages / pages_per_thread) + 1)
-    return repeated_acquisition_ask_hk_gtt_async(em_cookie, time_out, max_number, num_threads, pages_per_thread)
 
 
 if __name__ == '__main__':
-    em_cookie = cookie_info_service.get_em_cookie()
-    test_df = get_ggt_real_time_quotes(em_cookie, 30, 6)
+    em_cookie_test = cookie_info_service.get_em_cookie()
+    test_df = get_ggt_real_time_quotes(em_cookie_test, 30, 6)
     print(test_df)

mns_common/api/em/real_time/east_money_stock_hk_gtt_api.py

@@ -0,0 +1,260 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+
+import pandas as pd
+from loguru import logger
+import requests
+import time
+import mns_common.component.proxies.proxy_common_api as proxy_common_api
+import concurrent.futures
+
+from threading import Lock
+import mns_common.utils.data_frame_util as data_frame_util
+
+# 分页条数
+page_number = 100
+
+
+def rename_hg_ggt(temp_df):
+    temp_df.columns = [
+        "序号",
+        "-",
+        "最新价",
+        "涨跌幅",
+        "涨跌额",
+        "成交量",
+        "成交额",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "代码",
+        "-",
+        "名称",
+        "最高",
+        "最低",
+        "今开",
+        "昨收",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+        "-",
+    ]
+    temp_df = temp_df[
+        [
+            "序号",
+            "代码",
+            "名称",
+            "最新价",
+            "涨跌额",
+            "涨跌幅",
+            "今开",
+            "最高",
+            "最低",
+            "昨收",
+            "成交量",
+            "成交额",
+        ]
+    ]
+
+    temp_df = temp_df.rename(columns={
+        "序号": "index",
+        "代码": "symbol",
+        "名称": "name",
+        "最新价": "now_price",
+        "涨跌额": "range",
+        "涨跌幅": "chg",
+        "今开": "open",
+        "最高": "high",
+        "最低": "low",
+        "昨收": "yesterday_price",
+        "成交额": "amount",
+        "成交量": "volume",
+    })
+
+    return temp_df
+
+
+# 获取港股通个数
+def get_stock_hk_ggt_components_em_count(cookie, pn, proxies, page_size, time_out):
+    headers = {
+        'Cookie': cookie
+    }
+    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
+    current_timestamp = str(int(round(time.time() * 1000, 0)))
+    params = {
+        "pn": str(pn),
+        "pz": str(page_size),
+        "po": "1",
+        "np": "2",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "fid": "f3",
+        "fs": "b:DLMK0146,b:DLMK0144",
+        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f23,f24,"
+                  "f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
+        "_": str(current_timestamp),
+    }
+    try:
+        if proxies is None:
+            r = requests.get(url, params, timeout=time_out, headers=headers)
+        else:
+            r = requests.get(url, params, proxies=proxies, timeout=time_out, headers=headers)
+        data_json = r.json()
+        total_number = int(data_json['data']['total'])
+        return total_number
+    except Exception as e:
+        logger.error("获取港股通列表,实时行情异常:{}", e)
+        return 0
+
+
+# 获取港股通名单 todo 被封以后替换
+def stock_hk_ggt_components_em(cookie, pn, proxies, page_size, time_out) -> pd.DataFrame:
+    """
+    东方财富网-行情中心-港股市场-港股通成份股
+    https://quote.eastmoney.com/center/gridlist.html#hk_components
+    :return: 港股通成份股
+    :rtype: pandas.DataFrame
+    """
+    headers = {
+        'Cookie': cookie
+    }
+    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "pn": str(pn),
+        "pz": str(page_size),
+        "po": "1",
+        "np": "2",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "fid": "f3",
+        "fs": "b:DLMK0146,b:DLMK0144",
+        "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f23,f24,"
+                  "f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
+        "_": "1639974456250",
+    }
+    try:
+        if proxies is None:
+            r = requests.get(url, params=params, timeout=time_out, headers=headers)
+        else:
+            r = requests.get(url, params=params, proxies=proxies, timeout=time_out, headers=headers)
+
+        data_json = r.json()
+        temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+        temp_df.reset_index(inplace=True)
+        temp_df["index"] = temp_df.index + 1
+        return temp_df
+    except Exception as e:
+        logger.error("获取港股通列表:{}", e)
+
+
+def repeated_acquisition_ask_hk_gtt_async(em_cookie, time_out, max_number, num_threads, pages_per_thread):
+    per_page = page_number
+    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 = stock_hk_ggt_components_em(em_cookie, current_page, proxies, page_number, 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_hg_ggt(result_df)
+
+
+# 港股通实时行情
+def get_ggt_real_time_quotes(em_cookie, time_out, pages_per_thread):
+    try_numer = 3
+    while try_numer > 0:
+        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        proxies = {"https": proxy_ip,
+                   "http": proxy_ip}
+
+        max_number = get_stock_hk_ggt_components_em_count(em_cookie, 1, proxies, 20, time_out)
+        if max_number > 0:
+            break
+        try_numer = try_numer - 1
+    if max_number == 0:
+        return pd.DataFrame()
+
+    total_pages = (max_number + page_number - 1) // page_number  # 向上取整
+
+    num_threads = int((total_pages / pages_per_thread) + 1)
+    return repeated_acquisition_ask_hk_gtt_async(em_cookie, time_out, max_number, num_threads, pages_per_thread)
+
+
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
+
+if __name__ == '__main__':
+    em_cookie_test = cookie_info_service.get_em_cookie()
+    test_df = get_ggt_real_time_quotes(em_cookie_test, 30, 6)
+    print(test_df)

mns_common/api/em/real_time/real_time_quotes_repeat_api.py

@@ -22,6 +22,53 @@ fs = "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048"
 PAGE_SIZE = 100
 
 
+def get_stocks_num(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
+
+        begin_index_total = data_text.index('"total":')
+
+        end_index_total = data_text.index('"diff"')
+
+        total_number = int(data_text[begin_index_total + 8:end_index_total - 1])
+
+        return total_number
+
+    except Exception as e:
+        logger.error("获取第{}页股票列表异常:{}", pn, str(e))
+        return 0
+
+
 def get_stock_page_data_time_out(pn, proxies, page_size, time_out):
     """
     获取单页股票数据
@@ -348,6 +395,26 @@ def rename_real_time_quotes_df(temp_df):
         return temp_df
 
 
+def get_stock_real_time_quotes(time_out, pages_per_thread):
+    try_numer = 3
+    while try_numer > 0:
+        proxy_ip = proxy_common_api.generate_proxy_ip_api(1)
+        proxies = {"https": proxy_ip,
+                   "http": proxy_ip}
+
+        total_number = get_stocks_num(1, proxies, 20, time_out)
+        if total_number > 0:
+            break
+        try_numer = try_numer - 1
+    if total_number == 0:
+        return pd.DataFrame()
+
+    total_pages = (max_number + PAGE_SIZE - 1) // PAGE_SIZE  # 向上取整
+
+    num_threads = int((total_pages / pages_per_thread) + 1)
+    return repeated_acquisition_ask_async(time_out, max_number, num_threads, pages_per_thread)
+
+
 if __name__ == '__main__':
 
     while True:
@@ -355,5 +422,5 @@ if __name__ == '__main__':
         # proxies = {"https": proxy_ip,
         #            "http": proxy_ip}
         time_out = 10  # Set the timeout value
-        result = repeated_acquisition_ask_async(time_out, 5800, 6, 10)
+        result = get_stock_real_time_quotes(time_out, 10)
         print(result)

mns_common/api/proxies/liu_guan_proxy_api.py

@@ -45,7 +45,6 @@ def get_proxy_api(order_id, secret, unbind_time):
     pid = str(list(random_row['pid'])[0])
 
     num = "1"
-
     noDuplicate = "1"
     lineSeparator = "0"
     singleIp = "0"
@@ -65,6 +64,7 @@ def get_proxy_api(order_id, secret, unbind_time):
     for dic in js_res["data"]:
         try:
             ip = dic["ip"]
+            # ip = dic["realIp"]
             port = dic["port"]
             ip_port = ip + ":" + str(port)
             return ip_port

mns_common/api/ths/zt/ths_stock_zt_pool_api.py

@@ -275,10 +275,14 @@ def zt_reason_group(zt_pool_df):
 
 
 def zt_analyse(symbol):
-    key = symbol + '涨停分析'
-    zt_dict = ths_wen_cai_api.wen_cai_api(key, 'stock')
-    zt_analyse_detail = zt_dict['涨停揭秘'][0]['content']['value']
-    return zt_analyse_detail
+    try:
+        key = symbol + '涨停分析'
+        zt_dict = ths_wen_cai_api.wen_cai_api(key, 'stock')
+        zt_analyse_detail = zt_dict['涨停揭秘'][0]['content']['value']
+        return zt_analyse_detail
+    except BaseException as e:
+        logger.error("获取涨停分享异常b:{},{}", symbol, str(e))
+        return ''
 
 
 if __name__ == '__main__':

mns_common/component/proxies/proxy_common_api.py

@@ -62,6 +62,7 @@ def generate_proxy_ip_api(minutes):
             # 获取10分钟动态ip
             ip = liu_guan_proxy_api.get_proxy_api(order_id, secret, str(60 * minutes))
             try_numer = try_numer - 1
+            logger.info(ip)
             return ip
         except BaseException as e:
             time.sleep(1)
@@ -244,5 +245,8 @@ def import_province_and_city():
 
 
 if __name__ == "__main__":
-    generate_proxy_ip(1)
-    # get_proxy_ip_pool(1, 50, 2)
+    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 * 1))

{mns_common-1.5.2.4.dist-info → mns_common-1.5.2.6.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.5.2.4
+Version: 1.5.2.6
 

{mns_common-1.5.2.4.dist-info → mns_common-1.5.2.6.dist-info}/RECORD

@@ -16,10 +16,11 @@ mns_common/api/em/real_time/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94
 mns_common/api/em/real_time/east_money_debt_api.py,sha256=j6LnAG4bowEVXaor10zhao0kPksjH0mj4_tx_tNSH9o,17808
 mns_common/api/em/real_time/east_money_etf_api.py,sha256=wv1Ae3ydWDZkhlGgCKO8-z-PQj3qRSvoN75xNna4Qcs,19392
 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_v2_api.py,sha256=mL4uuL6sVsC2Vnl09826AUnzxePGAUhlZ7I5BBFw8Ks,14530
-mns_common/api/em/real_time/east_money_stock_hk_api.py,sha256=G_GYF2JvKtYK0J61ySiUtkRKQGeCYz5-WACmucbZfzY,18015
+mns_common/api/em/real_time/east_money_stock_a_v2_api.py,sha256=v4c6oyutVE5345whT-scEduksi9Svgoov6A-1FYLikg,18354
+mns_common/api/em/real_time/east_money_stock_hk_api.py,sha256=FpL9tOLyl-hs9vrvw3SFDxSY7n0Da90FO8Amo54ctJM,10541
+mns_common/api/em/real_time/east_money_stock_hk_gtt_api.py,sha256=GEialRF41hnZWBL4ueESM7MMl0U_ARAoNSt2popOAEU,8248
 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=PKN2a_8fZpb7fA2Ns3FxVYiYlh34uxEFmmZu2MdqAu4,16008
+mns_common/api/em/real_time/real_time_quotes_repeat_api.py,sha256=rQTUAkMvpOGGgZAXU2EdEufmxIApatt5T3WMXLuDA3o,18094
 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
@@ -44,7 +45,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=lULS2ejxmVuM6t6PHBczvH-HjMJxiCYEDrCUAtci-t4,3730
+mns_common/api/proxies/liu_guan_proxy_api.py,sha256=MLoq13xT0uffqUWSCemTwQZlF20YC7EIcr3PFeY8_p8,3762
 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
@@ -68,7 +69,7 @@ mns_common/api/ths/self_choose/ths_self_choose_api.py,sha256=TkV4r8iRkgcm4OaclUT
 mns_common/api/ths/wen_cai/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/ths/wen_cai/ths_wen_cai_api.py,sha256=e_HoW_MVpYLIUSnClTCA9U2QJ5o1GGge6ZIPrs93zLs,4947
 mns_common/api/ths/zt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mns_common/api/ths/zt/ths_stock_zt_pool_api.py,sha256=HfFRpsq6j359g6KxJicw9tcny_NunDksKRG0R3e-biE,10991
+mns_common/api/ths/zt/ths_stock_zt_pool_api.py,sha256=AkfA-mE67dha5VIKiHyQbYljtAIds1xZ9-2iQbo17Tk,11141
 mns_common/api/ths/zt/ths_stock_zt_pool_v2_api.py,sha256=3ADUkXpf9FsXsg3r2_bQmdjkxhwB08UtVyTUGes9TnI,19515
 mns_common/api/us/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/us/ths_us_company_info_api.py,sha256=qQjv4F-ovQ2uuu-FlBAnxjvVA7qj9y_x5WZtUoyoEW4,241
@@ -117,7 +118,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=f3jVFFVcKWOslQre8gqpYWT6UlZIXp6rWofgVifgGIg,7945
+mns_common/component/proxies/proxy_common_api.py,sha256=Q7rnY3uceJmyXtG2rGLKnXUctSpkno-lrrQJIGUW2sI,8172
 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
@@ -159,7 +160,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.2.4.dist-info/METADATA,sha256=mCnfe7RNNmyggWU14hn45AetnG2uI02Axnyqsb9JQoY,61
-mns_common-1.5.2.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.5.2.4.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.5.2.4.dist-info/RECORD,,
+mns_common-1.5.2.6.dist-info/METADATA,sha256=GJmnp21FOIx5_GpaK3PHO1KDcEPiqslmBnqzvd0Ww6E,61
+mns_common-1.5.2.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.5.2.6.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.5.2.6.dist-info/RECORD,,