mns-common 1.3.6.8__py3-none-any.whl → 1.3.7.0__py3-none-any.whl

mns_common/api/em/concept/__init__.py

@@ -0,0 +1,7 @@
+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)

mns_common/api/em/gd/__init__.py

@@ -0,0 +1,7 @@
+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)

mns_common/api/em/{east_money_stock_gdfx_free_top_10_api.py → gd/east_money_stock_gdfx_free_top_10_api.py}

@@ -9,7 +9,7 @@ import akshare as ak
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.utils.date_handle_util as date_handle_util
 from loguru import logger
-import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.em.em_stock_info_api as em_stock_info_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
@@ -178,7 +178,7 @@ def sync_stock_gdfx_top_10(stock_gdfx_top_10_em_df, period, symbol, str_day):
 
 # 十大股东+十大流通股东
 def sync_stock_gdfx_free_top_10_one_day(str_day):
-    real_time_quotes = east_money_stock_api.get_real_time_quotes_all_stocks()
+    real_time_quotes = em_stock_info_api.get_a_stock_info()
     real_time_quotes = real_time_quotes.loc[~(
         real_time_quotes['symbol'].isin(company_common_service_new_api.get_de_list_company()))]
     for real_time_one in real_time_quotes.itertuples():

mns_common/api/em/real_time/__init__.py

@@ -0,0 +1,7 @@
+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)

mns_common/api/em/{east_money_debt_api.py → real_time/east_money_debt_api.py}

@@ -36,7 +36,7 @@ page_number = 100
 # =8a086bfc3570bdde64a6a1c585cccb35&fltt=1&invt=1&fs=m:0+e:11,m:1+e:11,m:1+e:11+s:4194304,
 # m:0+e:11+s:8388608&dpt=zqsc.zpg&fields=f1,f2,f3,f4,f5,f6,f8,f10,f12,f13,f14,f18,f22,f152,
 # f237&wbp2u=|0|0|0|wap&fid=f3&po=1&pz=2000&_=1718163189870
-def get_debt_page_data(fields, pn) -> pd.DataFrame:
+def get_debt_page_data(fields, pn, proxies) -> pd.DataFrame:
     current_timestamp = str(int(round(time.time() * 1000, 0)))
     url = "https://push2.eastmoney.com/api/qt/clist/get"
 
@@ -57,7 +57,10 @@ def get_debt_page_data(fields, pn) -> pd.DataFrame:
         "_": current_timestamp
     }
     try:
-        r = requests.get(url, params)
+        if proxies is None:
+            r = requests.get(url, params)
+        else:
+            r = requests.get(url, params, proxies=proxies)
         data_text = r.text
 
         if pn == 1:
@@ -84,7 +87,7 @@ def get_debt_page_data(fields, pn) -> pd.DataFrame:
         return pd.DataFrame()
 
 
-def all_debt_ticker_data(fields) -> pd.DataFrame:
+def all_debt_ticker_data(fields, proxies) -> pd.DataFrame:
     """
     使用多线程获取所有债券数据
     """
@@ -96,7 +99,7 @@ def all_debt_ticker_data(fields) -> pd.DataFrame:
     # 创建线程池
     with ThreadPoolExecutor(max_workers=3) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(get_debt_page_data, fields, pn)
+        futures = [executor.submit(get_debt_page_data, fields, pn, proxies)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -113,18 +116,18 @@ def all_debt_ticker_data(fields) -> pd.DataFrame:
         return pd.DataFrame()
 
 
-def get_debt_real_time_quotes():
+def get_debt_real_time_quotes(proxies):
     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,f184,"
               "f211,f212,f232,f233,f234")
     # 获取第一页数据
-    page_one_df = get_debt_page_data(fields, 1)
+    page_one_df = get_debt_page_data(fields, 1, proxies)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_real_time_quotes_df(page_one_df)
         page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
-        page_df = all_debt_ticker_data(fields)
+        page_df = all_debt_ticker_data(fields, proxies)
         page_df = rename_real_time_quotes_df(page_df)
         page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
@@ -299,5 +302,5 @@ if __name__ == '__main__':
     info_df = get_kzz_bond_info()
     print(info_df)
     while True:
-        df = get_debt_real_time_quotes()
+        df = get_debt_real_time_quotes(None)
         logger.info(df)

mns_common/api/em/{east_money_etf_api.py → real_time/east_money_etf_api.py}

@@ -21,7 +21,7 @@ min_number = 1000
 page_number = 100
 
 
-def get_fund_etf_page_df(pn) -> pd.DataFrame:
+def get_fund_etf_page_df(pn, proxies) -> pd.DataFrame:
     """
     东方财富-ETF 实时行情
     https://quote.eastmoney.com/center/gridlist.html#fund_etf
@@ -52,7 +52,10 @@ def get_fund_etf_page_df(pn) -> pd.DataFrame:
         "_": str(current_timestamp),
     }
     try:
-        r = requests.get(url, timeout=15, params=params)
+        if proxies is None:
+            r = requests.get(url, params)
+        else:
+            r = requests.get(url, params, proxies=proxies)
         data_json = r.json()
         if pn == 1:
             try:
@@ -218,7 +221,7 @@ def get_fund_etf_page_df(pn) -> pd.DataFrame:
         return pd.DataFrame()
 
 
-def thread_pool_executor():
+def thread_pool_executor(proxies):
     """
        使用多线程获取所有ETF数据
        """
@@ -230,7 +233,7 @@ def thread_pool_executor():
     # 创建线程池
     with ThreadPoolExecutor(max_workers=3) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(get_fund_etf_page_df, pn)
+        futures = [executor.submit(get_fund_etf_page_df, pn, proxies)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -349,23 +352,23 @@ def rename_etf(fund_etf_spot_em_df):
     return fund_etf_spot_em_df
 
 
-def get_etf_real_time_quotes():
+def get_etf_real_time_quotes(proxies):
     # 获取第一页数据
-    page_one_df = get_fund_etf_page_df(1)
+    page_one_df = get_fund_etf_page_df(1, proxies)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_etf(page_one_df)
         page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
-        page_df = thread_pool_executor()
+        page_df = thread_pool_executor(proxies)
         page_df = rename_etf(page_df)
         page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 
 if __name__ == '__main__':
-    fund_etf_df = get_etf_real_time_quotes()
+    fund_etf_df = get_etf_real_time_quotes(None)
     fund_etf_df = fund_etf_df.sort_values(by=['amount'], ascending=False)
     fund_etf_df = fund_etf_df.fillna(0)
     print(fund_etf_df)

mns_common/api/em/{east_money_stock_api_v3.py → real_time/east_money_stock_a_api.py}

@@ -31,7 +31,7 @@ def get_stock_page_data(pn, fields, fs, proxies):
     # 将当前时间转换为时间戳（以毫秒为单位）
     current_timestamp_ms = int(current_time.timestamp() * 1000)
 
-    url = "https://13.push2.eastmoney.com/api/qt/clist/get"
+    url = "https://33.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "cb": "jQuery1124046660442520420653_" + str(current_timestamp_ms),
         "pn": str(pn),
@@ -48,7 +48,11 @@ def get_stock_page_data(pn, fields, fs, proxies):
         "_": current_timestamp_ms
     }
     try:
-        r = requests.get(url, params, proxies=proxies)
+        if proxies is None:
+            r = requests.get(url, params)
+        else:
+            r = requests.get(url, params, proxies=proxies)
+
         data_text = r.text
         if pn == 1:
             try:
@@ -224,8 +228,71 @@ def rename_real_time_quotes_df(temp_df):
     return temp_df
 
 
+# 北向/南向资金状况 北向已经停止
+def get_sum_north_south_net_buy_amt():
+    # 设置请求头部信息
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'
+    }
+
+    # 设置请求URL
+    url = 'http://push2.eastmoney.com/api/qt/kamt/get?fields1=f1,f2,f3,f4&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65,f66,f67,f68,f69,f70&ut=b2884a393a59ad640022ce1e1e78431c&deviceid=0&cb=jsonp_1622790712837&_=1622790712926'
+
+    # 发送HTTP请求
+    response = requests.get(url, headers=headers, params={"type": "json"})
+
+    # 解析JSON数据
+    data = json.loads(response.text.lstrip('jsonp_1622790712837(').rstrip(');'))
+
+    # 处理数据
+
+    # 单位(万元)
+    # dayNetAmtIn  资金净流入
+    # dayAmtRemain  当日资金余额
+    # dayAmtThreshold  当日资金限额
+    # monthNetAmtIn   当月净流入
+    # yearNetAmtIn    年度净流入
+    # allNetAmtIn     总净流入
+    # buyAmt          当日买入金额
+    # sellAmt         当日卖出金额
+    # buySellAmt      当日买入卖出总金额
+    # netBuyAmt        成交净买额
+
+    # Hongkong to Shanghai
+    hk2sh = data['data']['hk2sh']
+    hk2sh_df = pd.DataFrame(hk2sh, index=[0])
+    # Hongkong to ShenZhen
+    hk2sz = data['data']['hk2sz']
+    hk2sz_df = pd.DataFrame(hk2sz, index=[0])
+
+    # Shanghai to Hongkong
+    sh2hk = data['data']['sh2hk']
+    sh2hk_df = pd.DataFrame(sh2hk, index=[0])
+
+    # ShenZhen  to Hongkong
+    sz2hk = data['data']['sz2hk']
+    sz2hk_df = pd.DataFrame(sz2hk, index=[0])
+    # 北向总额
+    sum_north_netBuyAmt = hk2sh_df['netBuyAmt'] + hk2sz_df['netBuyAmt']
+
+    sum_south_netBuyAmt = sh2hk_df['netBuyAmt'] + sz2hk_df['netBuyAmt']
+
+    df = pd.DataFrame([[
+        list(hk2sh_df['netBuyAmt'])[0],
+        list(hk2sz_df['netBuyAmt'])[0],
+        list(sum_north_netBuyAmt)[0],
+        list(sh2hk_df['netBuyAmt'])[0],
+        list(sz2hk_df['netBuyAmt'])[0],
+        list(sum_south_netBuyAmt)[0]]],
+        columns=['sh_netBuyAmt', 'sz_netBuyAmt', 'sum_north_netBuyAmt',
+                 'sh_hk_netBuyAmt', 'sz_hk_netBuyAmt', 'sum_south_netBuyAmt'])
+
+    # 打印结果
+    return df
+
+
 # 示例调用
 if __name__ == "__main__":
     while True:
-        df = get_real_time_quotes_all_stocks()
+        df = get_real_time_quotes_all_stocks(None)
         logger.info("涨停数据,{}", 1)

mns_common/api/em/{east_money_stock_v2_api.py → real_time/east_money_stock_a_v2_api.py}

@@ -13,10 +13,23 @@ from concurrent.futures import ThreadPoolExecutor
 import datetime
 from loguru import logger
 
-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" \
-            ",f109,f110,f111,f112,f113,f114,f115,f116,f117,f118,f119,f120,f121,f122,f123,f124,f125,f126,f127,f128,f129,f130,f131,f132,f133,f134,f135,f136,f137,f138,f139,f140,f141,f142,f143,f144,f145,f146,f147,f148,f149,f150,f151,f152,f153,f154,f155,f156,f157,f158,f159,f160,f161,f162,f163,f164,f165,f166,f167,f168,f169,f170,f171,f172,f173,f174,f175,f176,f177,f178,f179,f180,f181,f182,f183,f184,f185,f186,f187,f188,f189,f190,f191,f192,f193,f194,f195,f196,f197,f198,f199,f200" \
-            ",f209,f210,f212,f213,f214,f215,f216,f217,f218,f219,f220,f221,f222,f223,f224,f225,f226,f227,f228,f229,f230,f231,f232,f233,f234,f235,f236,f237,f238,f239,f240,f241,f242,f243,f244,f245,f246,f247,f248,f249,f250,f251,f252,f253,f254,f255,f256,f257,f258,f259,f260,f261,f262,f263,f264,f265,f266,f267,f268,f269,f270,f271,f272,f273,f274,f275,f276,f277,f278,f279,f280,f281,f282,f283,f284,f285,f286,f287,f288,f289,f290,f291,f292,f293,f294,f295,f296,f297,f298,f299,f300" \
-            ",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"
+#
+# 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" \
+#             ",f109,f110,f111,f112,f113,f114,f115,f116,f117,f118,f119,f120,f121,f122,f123,f124,f125,f126,f127,f128,f129,f130,f131,f132,f133,f134,f135,f136,f137,f138,f139,f140,f141,f142,f143,f144,f145,f146,f147,f148,f149,f150,f151,f152,f153,f154,f155,f156,f157,f158,f159,f160,f161,f162,f163,f164,f165,f166,f167,f168,f169,f170,f171,f172,f173,f174,f175,f176,f177,f178,f179,f180,f181,f182,f183,f184,f185,f186,f187,f188,f189,f190,f191,f192,f193,f194,f195,f196,f197,f198,f199,f200" \
+#             ",f209,f210,f212,f213,f214,f215,f216,f217,f218,f219,f220,f221,f222,f223,f224,f225,f226,f227,f228,f229,f230,f231,f232,f233,f234,f235,f236,f237,f238,f239,f240,f241,f242,f243,f244,f245,f246,f247,f248,f249,f250,f251,f252,f253,f254,f255,f256,f257,f258,f259,f260,f261,f262,f263,f264,f265,f266,f267,f268,f269,f270,f271,f272,f273,f274,f275,f276,f277,f278,f279,f280,f281,f282,f283,f284,f285,f286,f287,f288,f289,f290,f291,f292,f293,f294,f295,f296,f297,f298,f299,f300" \
+#             ",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"
+
+
+fields = ("f2,f3,f5,f6,f8,"
+          "f9,f10,f22,f12,f13,"
+          "f14,f15,f16,f17,f18,"
+          "f20,f21,f23,f26,f33,"
+          "f34,f35,f37,f38,f39,"
+          "f62,f64,f65,f67,f68,"
+          "f66,f69,f70,f71,f72,"
+          "f76,f77,f78,f82,f83,"
+          "f84,f102,f184,f100,f103,"
+          "f352,f191,f193,f24,f25")
 
 # 最大返回条数
 max_number = 5800
@@ -26,7 +39,7 @@ min_number = 5600
 page_number = 100
 
 
-def get_stock_page_data(pn, fields, fs):
+def get_stock_page_data(pn, fields, fs, proxies):
     """
     获取单页股票数据
     """
@@ -53,7 +66,10 @@ def get_stock_page_data(pn, fields, fs):
         "_": current_timestamp_ms
     }
     try:
-        r = requests.get(url, params)
+        if proxies is None:
+            r = requests.get(url, params)
+        else:
+            r = requests.get(url, params, proxies=proxies)
         data_text = r.text
         begin_index = data_text.index('[')
         end_index = data_text.index(']')
@@ -68,7 +84,7 @@ def get_stock_page_data(pn, fields, fs):
         return pd.DataFrame()
 
 
-def all_stock_ticker_data_new(fields, fs) -> pd.DataFrame:
+def all_stock_ticker_data_new(fields, fs, proxies) -> pd.DataFrame:
     """
     使用多线程获取所有股票数据
     """
@@ -79,7 +95,7 @@ def all_stock_ticker_data_new(fields, fs) -> pd.DataFrame:
     # 创建线程池
     with ThreadPoolExecutor(max_workers=10) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(get_stock_page_data, pn, fields, fs)
+        futures = [executor.submit(get_stock_page_data, pn, fields, fs, proxies)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -96,16 +112,16 @@ def all_stock_ticker_data_new(fields, fs) -> pd.DataFrame:
         return pd.DataFrame()
 
 
-def get_all_real_time_quotes():
+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_02, fs)
+    page_one_df = get_stock_page_data(1, fields, fs, proxies)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_real_time_quotes_df(page_one_df)
         return page_one_df
     else:
-        page_df = all_stock_ticker_data_new(fields_02, fs)
+        page_df = all_stock_ticker_data_new(fields, fs, proxies)
         page_df = rename_real_time_quotes_df(page_df)
         return page_df
 
@@ -149,16 +165,19 @@ def rename_real_time_quotes_df(temp_df):
         "f70": "large_order_inflow",
         "f71": "large_order_outflow",
         "f72": "large_order_net_inflow",
+
         "f76": "medium_order_inflow",
         "f77": "medium_order_outflow",
         "f78": "medium_order_net_inflow",
         "f82": "small_order_inflow",
         "f83": "small_order_outflow",
+
         "f84": "small_order_net_inflow",
         "f102": "area",
         "f184": "today_main_net_inflow_ratio",
         "f100": "industry",
         "f103": "concept",
+
         "f352": "average_price",
         "f191": "hk_stock_code",
         "f193": "hk_stock_name",
@@ -267,74 +286,11 @@ def rename_real_time_quotes_df(temp_df):
     return temp_df
 
 
-# 北向/南向资金状况 北向已经停止
-def get_sum_north_south_net_buy_amt():
-    # 设置请求头部信息
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'
-    }
-
-    # 设置请求URL
-    url = 'http://push2.eastmoney.com/api/qt/kamt/get?fields1=f1,f2,f3,f4&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65,f66,f67,f68,f69,f70&ut=b2884a393a59ad640022ce1e1e78431c&deviceid=0&cb=jsonp_1622790712837&_=1622790712926'
-
-    # 发送HTTP请求
-    response = requests.get(url, headers=headers, params={"type": "json"})
-
-    # 解析JSON数据
-    data = json.loads(response.text.lstrip('jsonp_1622790712837(').rstrip(');'))
-
-    # 处理数据
-
-    # 单位(万元)
-    # dayNetAmtIn  资金净流入
-    # dayAmtRemain  当日资金余额
-    # dayAmtThreshold  当日资金限额
-    # monthNetAmtIn   当月净流入
-    # yearNetAmtIn    年度净流入
-    # allNetAmtIn     总净流入
-    # buyAmt          当日买入金额
-    # sellAmt         当日卖出金额
-    # buySellAmt      当日买入卖出总金额
-    # netBuyAmt        成交净买额
-
-    # Hongkong to Shanghai
-    hk2sh = data['data']['hk2sh']
-    hk2sh_df = pd.DataFrame(hk2sh, index=[0])
-    # Hongkong to ShenZhen
-    hk2sz = data['data']['hk2sz']
-    hk2sz_df = pd.DataFrame(hk2sz, index=[0])
-
-    # Shanghai to Hongkong
-    sh2hk = data['data']['sh2hk']
-    sh2hk_df = pd.DataFrame(sh2hk, index=[0])
-
-    # ShenZhen  to Hongkong
-    sz2hk = data['data']['sz2hk']
-    sz2hk_df = pd.DataFrame(sz2hk, index=[0])
-    # 北向总额
-    sum_north_netBuyAmt = hk2sh_df['netBuyAmt'] + hk2sz_df['netBuyAmt']
-
-    sum_south_netBuyAmt = sh2hk_df['netBuyAmt'] + sz2hk_df['netBuyAmt']
-
-    df = pd.DataFrame([[
-        list(hk2sh_df['netBuyAmt'])[0],
-        list(hk2sz_df['netBuyAmt'])[0],
-        list(sum_north_netBuyAmt)[0],
-        list(sh2hk_df['netBuyAmt'])[0],
-        list(sz2hk_df['netBuyAmt'])[0],
-        list(sum_south_netBuyAmt)[0]]],
-        columns=['sh_netBuyAmt', 'sz_netBuyAmt', 'sum_north_netBuyAmt',
-                 'sh_hk_netBuyAmt', 'sz_hk_netBuyAmt', 'sum_south_netBuyAmt'])
-
-    # 打印结果
-    return df
-
-
 # 示例调用
 if __name__ == "__main__":
-    get_sum_north_south_net_buy_amt()
+
     while True:
-        df = get_all_real_time_quotes()
+        df = get_all_real_time_quotes(None)
         print(df)
         zt_df = df.loc[df['wei_bi'] == 100]
         logger.info("涨停数据,{}", zt_df)

mns_common/api/em/{east_money_stock_hk_api.py → real_time/east_money_stock_hk_api.py}

@@ -1,5 +1,5 @@
-import sys
 import os
+import sys
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
@@ -23,7 +23,7 @@ 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")
 
 
-def hk_real_time_quotes_page_df(cookie, pn):
+def hk_real_time_quotes_page_df(cookie, pn, proxies):
     try:
         headers = {
             'Cookie': cookie
@@ -46,7 +46,10 @@ def hk_real_time_quotes_page_df(cookie, pn):
                    '&fields=' + fields +
                    '&_=' + str(current_timestamp))
 
-        r = requests.get(url_new, headers=headers)
+        if proxies is None:
+            r = requests.get(url_new, headers=headers)
+        else:
+            r = requests.get(url_new, headers=headers, proxies=proxies)
         result = r.content.decode("utf-8")
 
         if pn == 1:
@@ -179,7 +182,7 @@ def hk_real_time_quotes_page_df(cookie, pn):
         return pd.DataFrame()
 
 
-def thread_pool_executor(cookie):
+def thread_pool_executor(cookie, proxies):
     """
        使用多线程获取所有ETF数据
        """
@@ -191,7 +194,7 @@ def thread_pool_executor(cookie):
     # 创建线程池
     with ThreadPoolExecutor(max_workers=3) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(hk_real_time_quotes_page_df, cookie, pn)
+        futures = [executor.submit(hk_real_time_quotes_page_df, cookie, pn, proxies)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -208,19 +211,20 @@ def thread_pool_executor(cookie):
         return pd.DataFrame()
 
 
-def get_hk_real_time_quotes(cookie):
+def get_hk_real_time_quotes(cookie, proxies):
     # 获取第一页数据
-    page_one_df = hk_real_time_quotes_page_df(cookie, 1)
+    page_one_df = hk_real_time_quotes_page_df(cookie, 1, proxies)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
-        page_df = thread_pool_executor(cookie)
+        page_df = thread_pool_executor(cookie, proxies)
         page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 
+# 获取港股通名单 todo 被封以后替换
 def stock_hk_ggt_components_em() -> pd.DataFrame:
     pn = 1
 
@@ -320,7 +324,7 @@ if __name__ == '__main__':
     result_df = stock_hk_ggt_components_em()
     cookie_test = 'qgqp_b_id=1e0d79428176ed54bef8434efdc0e8c3; mtp=1; ct=QVRY_s8Tiag1WfK2tSW2n03qpsX-PD8aH_rIjKVooawX8K33UVnpIofK088lD1lguWlE_OEIpQwn3PJWFPhHvSvyvYr4Zka3l4vxtZfH1Uikjtyy9z1H4Swo0rQzMKXncVzBXiOo5TjE-Dy9fcoG3ZF7UVdQ35jp_cFwzOlpK5Y; ut=FobyicMgeV51lVMr4ZJXvn-72bp0oeSOvtzifFY_U7kBFtR6og4Usd-VtBM5XBBvHq0lvd9xXkvpIqWro9EDKmv6cbKOQGyawUSMcKVP57isZCaM7lWQ6jWXajvTfvV4mIR-W_MZNK8VY0lL9W4qNMniJ6PBn_gkJsSAJCadmsyI9cxmjx--gR4m54pdF_nie_y4iWHys83cmWR2R7Bt1KKqB25OmkfCQTJJqIf7QsqangVGMUHwMC39Z9QhrfCFHKVNrlqS503O6b9GitQnXtvUdJhCmomu; pi=4253366368931142%3Bp4253366368931142%3B%E8%82%A1%E5%8F%8B9x56I87727%3BYNigLZRW%2FzMdGgVDOJbwReDWnTPHl51dB0gQLiwaCf1XY98mlJYx6eJbsoYr5Nie%2BX1L%2BzaMsec99KkX%2BT29Ds1arfST7sIBXxjUQ3dp11IPUnXy64PaBFRTHzMRWnCFJvvhc%2FAI41rXSGXolC8YMxI%2BvyPS%2BuErwgOVjC5vvsIiKeO7TLyKkhqqQJPX%2F7RWC5Sf3QLh%3Bdwjn4Xho10%2FKjqOgTWs%2FJF4%2FkdKzeuBwM8sz9aLvJovejAkCAyGMyGYA6AE67Xk2Ki7x8zdfBifF2DG%2Fvf2%2BXAYN8ZVISSEWTIXh32Z5MxEacK4JBTkqyiD93e1vFBOFQ82BqaiVmntUq0V6FrTUHGeh1gG5Sg%3D%3D; uidal=4253366368931142%e8%82%a1%e5%8f%8b9x56I87727; sid=170711377; vtpst=|; quote_lt=1; websitepoptg_api_time=1715777390466; emshistory=%5B%22%E8%BD%AC%E5%80%BA%E6%A0%87%22%2C%22%E8%BD%AC%E5%80%BA%E6%A0%87%E7%9A%84%22%5D; st_si=00364513876913; st_asi=delete; HAList=ty-116-00700-%u817E%u8BAF%u63A7%u80A1%2Cty-1-688695-%u4E2D%u521B%u80A1%u4EFD%2Cty-1-600849-%u4E0A%u836F%u8F6C%u6362%2Cty-1-603361-%u6D59%u6C5F%u56FD%u7965%2Cty-1-603555-ST%u8D35%u4EBA%2Cty-0-000627-%u5929%u8302%u96C6%u56E2%2Cty-0-002470-%u91D1%u6B63%u5927%2Cty-0-832876-%u6167%u4E3A%u667A%u80FD%2Cty-0-300059-%u4E1C%u65B9%u8D22%u5BCC%2Cty-107-CWB-%u53EF%u8F6C%u503AETF-SPDR; st_pvi=26930719093675; st_sp=2024-04-28%2017%3A27%3A05; st_inirUrl=https%3A%2F%2Fcn.bing.com%2F; st_sn=23; st_psi=20240517111108288-113200301321-2767127768'
     while True:
-        df_hk_df = get_hk_real_time_quotes(cookie_test)
+        df_hk_df = get_hk_real_time_quotes(cookie_test, None)
         df_hk_df = df_hk_df[[
             "symbol",
             "name",

mns_common/api/em/{east_money_stock_us_api.py → real_time/east_money_stock_us_api.py}

@@ -22,7 +22,7 @@ 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")
 
 
-def us_real_time_quotes_page_df(cookie, pn):
+def us_real_time_quotes_page_df(cookie, pn, proxies):
     try:
         headers = {
             'Cookie': cookie
@@ -44,7 +44,10 @@ def us_real_time_quotes_page_df(cookie, pn):
             "fields": fields,
             "_": str(current_timestamp),
         }
-        r = requests.get(url, params=params, headers=headers, timeout=15)
+        if proxies is None:
+            r = requests.get(url, params=params, headers=headers)
+        else:
+            r = requests.get(url, params=params, headers=headers, proxies=proxies)
         data_json = r.json()
         if pn == 1:
             try:
@@ -64,7 +67,7 @@ def us_real_time_quotes_page_df(cookie, pn):
         return pd.DataFrame()
 
 
-def thread_pool_executor(cookie):
+def thread_pool_executor(cookie, proxies):
     """
        使用多线程获取所有美股数据
        """
@@ -76,7 +79,7 @@ def thread_pool_executor(cookie):
     # 创建线程池
     with ThreadPoolExecutor(max_workers=3) as executor:
         # 提交任务，获取每页数据
-        futures = [executor.submit(us_real_time_quotes_page_df, cookie, pn)
+        futures = [executor.submit(us_real_time_quotes_page_df, cookie, pn, proxies)
                    for pn in range(1, total_pages + 1)]
 
         # 收集结果
@@ -93,16 +96,16 @@ def thread_pool_executor(cookie):
         return pd.DataFrame()
 
 
-def get_us_stock_real_time_quotes(cookie):
+def get_us_stock_real_time_quotes(cookie, proxies):
     # 获取第一页数据
-    page_one_df = us_real_time_quotes_page_df(cookie, 1)
+    page_one_df = us_real_time_quotes_page_df(cookie, 1, proxies)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_us_stock(page_one_df)
         page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
-        page_df = thread_pool_executor(cookie)
+        page_df = thread_pool_executor(cookie, proxies)
         page_df = rename_us_stock(page_df)
         page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
@@ -219,7 +222,7 @@ def rename_us_stock(temp_df):
 if __name__ == '__main__':
     cookie_test = 'qgqp_b_id=1e0d79428176ed54bef8434efdc0e8c3; mtp=1; ct=QVRY_s8Tiag1WfK2tSW2n03qpsX-PD8aH_rIjKVooawX8K33UVnpIofK088lD1lguWlE_OEIpQwn3PJWFPhHvSvyvYr4Zka3l4vxtZfH1Uikjtyy9z1H4Swo0rQzMKXncVzBXiOo5TjE-Dy9fcoG3ZF7UVdQ35jp_cFwzOlpK5Y; ut=FobyicMgeV51lVMr4ZJXvn-72bp0oeSOvtzifFY_U7kBFtR6og4Usd-VtBM5XBBvHq0lvd9xXkvpIqWro9EDKmv6cbKOQGyawUSMcKVP57isZCaM7lWQ6jWXajvTfvV4mIR-W_MZNK8VY0lL9W4qNMniJ6PBn_gkJsSAJCadmsyI9cxmjx--gR4m54pdF_nie_y4iWHys83cmWR2R7Bt1KKqB25OmkfCQTJJqIf7QsqangVGMUHwMC39Z9QhrfCFHKVNrlqS503O6b9GitQnXtvUdJhCmomu; pi=4253366368931142%3Bp4253366368931142%3B%E8%82%A1%E5%8F%8B9x56I87727%3BYNigLZRW%2FzMdGgVDOJbwReDWnTPHl51dB0gQLiwaCf1XY98mlJYx6eJbsoYr5Nie%2BX1L%2BzaMsec99KkX%2BT29Ds1arfST7sIBXxjUQ3dp11IPUnXy64PaBFRTHzMRWnCFJvvhc%2FAI41rXSGXolC8YMxI%2BvyPS%2BuErwgOVjC5vvsIiKeO7TLyKkhqqQJPX%2F7RWC5Sf3QLh%3Bdwjn4Xho10%2FKjqOgTWs%2FJF4%2FkdKzeuBwM8sz9aLvJovejAkCAyGMyGYA6AE67Xk2Ki7x8zdfBifF2DG%2Fvf2%2BXAYN8ZVISSEWTIXh32Z5MxEacK4JBTkqyiD93e1vFBOFQ82BqaiVmntUq0V6FrTUHGeh1gG5Sg%3D%3D; uidal=4253366368931142%e8%82%a1%e5%8f%8b9x56I87727; sid=170711377; vtpst=|; quote_lt=1; websitepoptg_api_time=1715777390466; emshistory=%5B%22%E8%BD%AC%E5%80%BA%E6%A0%87%22%2C%22%E8%BD%AC%E5%80%BA%E6%A0%87%E7%9A%84%22%5D; st_si=00364513876913; st_asi=delete; HAList=ty-116-00700-%u817E%u8BAF%u63A7%u80A1%2Cty-1-688695-%u4E2D%u521B%u80A1%u4EFD%2Cty-1-600849-%u4E0A%u836F%u8F6C%u6362%2Cty-1-603361-%u6D59%u6C5F%u56FD%u7965%2Cty-1-603555-ST%u8D35%u4EBA%2Cty-0-000627-%u5929%u8302%u96C6%u56E2%2Cty-0-002470-%u91D1%u6B63%u5927%2Cty-0-832876-%u6167%u4E3A%u667A%u80FD%2Cty-0-300059-%u4E1C%u65B9%u8D22%u5BCC%2Cty-107-CWB-%u53EF%u8F6C%u503AETF-SPDR; st_pvi=26930719093675; st_sp=2024-04-28%2017%3A27%3A05; st_inirUrl=https%3A%2F%2Fcn.bing.com%2F; st_sn=23; st_psi=20240517111108288-113200301321-2767127768'
     while True:
-        us_df = get_us_stock_real_time_quotes(cookie_test)
+        us_df = get_us_stock_real_time_quotes(cookie_test, None)
         us_df = us_df.loc[us_df['flow_mv'] != 0]
         us_df = us_df.sort_values(by=['amount'], ascending=False)
         us_stock_df = us_df[[

mns_common/api/ths/zt/ths_stock_zt_pool_api.py

@@ -31,7 +31,7 @@ import mns_common.component.company.company_common_service_api as company_common
 # 当设置具体数值n时，循环请求n页，返回n页合并数据。
 
 
-import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.em.em_real_time_quotes_api as em_real_time_quotes_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import pandas as pd
 import mns_common.component.common_service_fun_api as common_service_fun_api
@@ -122,7 +122,7 @@ def get_real_time_zt_info():
     zt_df = get_zt_reason(str_day)
     if data_frame_util.is_empty(zt_df):
         return None
-    real_time_df = east_money_stock_api.get_real_time_quotes_all_stocks()
+    real_time_df = em_real_time_quotes_api.get_real_time_quotes_now(None, None)
 
     zt_df = merge_high_chg(real_time_df, zt_df)
 
@@ -274,7 +274,5 @@ def zt_reason_group(zt_pool_df):
     return result_group_df
 
 
-import mns_common.api.ths.self_choose.ths_self_choose_api as ths_self_choose_api
-
 if __name__ == '__main__':
     get_real_time_zt_info()

mns_common/api/ths/zt/ths_stock_zt_pool_v2_api.py

@@ -40,7 +40,7 @@ from loguru import logger
 # 当设置具体数值n时，循环请求n页，返回n页合并数据。
 
 
-import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.em.em_real_time_quotes_api as em_real_time_quotes_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import pandas as pd
 import mns_common.component.common_service_fun_api as common_service_fun_api
@@ -139,7 +139,7 @@ def convert_statistics(stat):
 
 # 获取实时行情涨停列表
 def get_real_time_zt_info():
-    real_time_df = east_money_stock_api.get_real_time_quotes_all_stocks()
+    real_time_df = em_real_time_quotes_api.get_real_time_quotes_now(None, None)
     real_time_df_zt = real_time_df.loc[real_time_df['chg'] > common_service_fun_api.ZT_CHG]
     if data_frame_util.is_empty(real_time_df_zt):
         return pd.DataFrame()