akshare 1.13.46__py3-none-any.whl → 1.17.99__py3-none-any.whl

akshare/stock_feature/stock_hist_em.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/3/20 15:00
+Date: 2025/3/10 18:00
 Desc: 东方财富网-行情首页-沪深京 A 股
 https://quote.eastmoney.com/
 """
 
-from functools import lru_cache
-
 import pandas as pd
 import requests
 
+from akshare.utils.func import fetch_paginated_data
+
 
 def stock_zh_a_spot_em() -> pd.DataFrame:
     """
@@ -22,24 +22,20 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,"
-        "f20,f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f20,f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "index",
         "_",
         "最新价",
         "涨跌幅",
@@ -72,8 +68,6 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
     temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
@@ -137,24 +131,20 @@ def stock_sh_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:1 t:2,m:1 t:23",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,"
-        "f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -187,9 +177,6 @@ def stock_sh_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -252,24 +239,20 @@ def stock_sz_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:6,m:0 t:80",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,"
-        "f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -302,9 +285,6 @@ def stock_sz_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -367,24 +347,20 @@ def stock_bj_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:81 s:2048",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24"
-        ",f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  ",f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -417,9 +393,6 @@ def stock_bj_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -482,7 +455,7 @@ def stock_new_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -492,15 +465,11 @@ def stock_new_a_spot_em() -> pd.DataFrame:
         "fid": "f26",
         "fs": "m:0 f:8,m:1 f:8",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,"
-        "f25,f26,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f25,f26,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -534,9 +503,6 @@ def stock_new_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -602,25 +568,21 @@ def stock_cy_a_spot_em() -> pd.DataFrame:
     url = "https://7.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
         "wbp2u": "|0|0|0|web",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:80",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,"
-        "f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -653,9 +615,6 @@ def stock_cy_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -718,25 +677,21 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
     url = "https://7.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
         "wbp2u": "|0|0|0|web",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:1 t:23",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,"
-        "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -769,9 +724,6 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -824,6 +776,69 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
     return temp_df
 
 
+def stock_zh_ab_comparison_em() -> pd.DataFrame:
+    """
+    东方财富网-行情中心-沪深京个股-AB股比价-全部AB股比价
+    https://quote.eastmoney.com/center/gridlist.html#ab_comparison
+    :return: 实时行情
+    :rtype: pandas.DataFrame
+    """
+    url = "https://push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "np": "1",
+        "fltt": "1",
+        "invt": "2",
+        "fs": "m:1+b:BK0498,m:0+b:BK0498",
+        "fields": "f201,f202,f203,f196,f200,f197,f152,f12,f13,f14,f1,f2,f4,f3,f199",
+        "fid": "f199",
+        "pn": "1",
+        "pz": "100",
+        "po": "1",
+        "dect": "1",
+        "wbp2u": "|0|0|0|web",
+    }
+    columns_map = {
+        "index": "序号",
+        "f1": "-",
+        "f2": "最新价B",
+        "f3": "涨跌幅B",
+        "f4": "-",
+        "f12": "A股代码",
+        "f13": "-",
+        "f14": "A股名称",
+        "f152": "-",
+        "f196": "最新价A",
+        "f197": "涨跌幅A",
+        "f199": "比价",
+        "f200": "-",
+        "f201": "B股代码",
+        "f202": "-",
+        "f203": "B股名称"
+    }
+    temp_df = fetch_paginated_data(url, params)
+    temp_df = temp_df.rename(columns=columns_map)
+    list_name = [value for key, value in columns_map.items() if value != "_"]
+    temp_df = temp_df[list_name]
+    temp_df = temp_df[[
+        "序号",
+        "B股代码",
+        "B股名称",
+        "最新价B",
+        "涨跌幅B",
+        "A股代码",
+        "A股名称",
+        "最新价A",
+        "涨跌幅A",
+        "比价",
+    ]]
+    temp_df["最新价B"] = pd.to_numeric(temp_df["最新价B"], errors="coerce") / 100
+    temp_df["涨跌幅B"] = pd.to_numeric(temp_df["涨跌幅B"], errors="coerce") / 100
+    temp_df["最新价A"] = pd.to_numeric(temp_df["最新价A"], errors="coerce") / 100
+    temp_df["涨跌幅A"] = pd.to_numeric(temp_df["涨跌幅A"], errors="coerce") / 100
+    temp_df["比价"] = pd.to_numeric(temp_df["比价"], errors="coerce") / 100
+    return temp_df
+
+
 def stock_zh_b_spot_em() -> pd.DataFrame:
     """
     东方财富网- B 股-实时行情
@@ -834,24 +849,20 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
     url = "https://28.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:7,m:1 t:3",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20"
-        ",f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1623833739532",
+                  ",f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -884,9 +895,6 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -939,79 +947,6 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
     return temp_df
 
 
-@lru_cache()
-def code_id_map_em() -> dict:
-    """
-    东方财富-股票和市场代码
-    https://quote.eastmoney.com/center/gridlist.html#hs_a_board
-    :return: 股票和市场代码
-    :rtype: dict
-    """
-    url = "https://80.push2.eastmoney.com/api/qt/clist/get"
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "1",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:1 t:2,m:1 t:23",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
-    temp_df["market_id"] = 1
-    temp_df.columns = ["sh_code", "sh_id"]
-    code_id_dict = dict(zip(temp_df["sh_code"], temp_df["sh_id"]))
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "1",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:6,m:0 t:80",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
-    temp_df_sz["sz_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["sz_id"])))
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "1",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:81 s:2048",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
-    temp_df_sz["bj_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["bj_id"])))
-    return code_id_dict
-
-
 def stock_zh_a_hist(
     symbol: str = "000001",
     period: str = "daily",
@@ -1038,7 +973,7 @@ def stock_zh_a_hist(
     :return: 每日行情
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     adjust_dict = {"qfq": "1", "hfq": "2", "": "0"}
     period_dict = {"daily": "101", "weekly": "102", "monthly": "103"}
     url = "https://push2his.eastmoney.com/api/qt/stock/kline/get"
@@ -1048,16 +983,16 @@ def stock_zh_a_hist(
         "ut": "7eea3edcaed734bea9cbfc24409ed989",
         "klt": period_dict[period],
         "fqt": adjust_dict[adjust],
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "beg": start_date,
         "end": end_date,
-        "_": "1623766962675",
     }
     r = requests.get(url, params=params, timeout=timeout)
     data_json = r.json()
     if not (data_json["data"] and data_json["data"]["klines"]):
         return pd.DataFrame()
     temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]["klines"]])
+    temp_df["股票代码"] = symbol
     temp_df.columns = [
         "日期",
         "开盘",
@@ -1070,6 +1005,7 @@ def stock_zh_a_hist(
         "涨跌幅",
         "涨跌额",
         "换手率",
+        "股票代码",
     ]
     temp_df["日期"] = pd.to_datetime(temp_df["日期"], errors="coerce").dt.date
     temp_df["开盘"] = pd.to_numeric(temp_df["开盘"], errors="coerce")
@@ -1082,6 +1018,22 @@ def stock_zh_a_hist(
     temp_df["涨跌幅"] = pd.to_numeric(temp_df["涨跌幅"], errors="coerce")
     temp_df["涨跌额"] = pd.to_numeric(temp_df["涨跌额"], errors="coerce")
     temp_df["换手率"] = pd.to_numeric(temp_df["换手率"], errors="coerce")
+    temp_df = temp_df[
+        [
+            "日期",
+            "股票代码",
+            "开盘",
+            "收盘",
+            "最高",
+            "最低",
+            "成交量",
+            "成交额",
+            "振幅",
+            "涨跌幅",
+            "涨跌额",
+            "换手率",
+        ]
+    ]
     return temp_df
 
 
@@ -1108,7 +1060,7 @@ def stock_zh_a_hist_min_em(
     :return: 每日分时行情
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     adjust_map = {
         "": "0",
         "qfq": "1",
@@ -1122,8 +1074,7 @@ def stock_zh_a_hist_min_em(
             "ut": "7eea3edcaed734bea9cbfc24409ed989",
             "ndays": "5",
             "iscr": "0",
-            "secid": f"{code_id_dict[symbol]}.{symbol}",
-            "_": "1623766962675",
+            "secid": f"{market_code}.{symbol}",
         }
         r = requests.get(url, timeout=15, params=params)
         data_json = r.json()
@@ -1160,10 +1111,9 @@ def stock_zh_a_hist_min_em(
             "ut": "7eea3edcaed734bea9cbfc24409ed989",
             "klt": period,
             "fqt": adjust_map[adjust],
-            "secid": f"{code_id_dict[symbol]}.{symbol}",
+            "secid": f"{market_code}.{symbol}",
             "beg": "0",
             "end": "20500000",
-            "_": "1630930917857",
         }
         r = requests.get(url, timeout=15, params=params)
         data_json = r.json()
@@ -1232,17 +1182,15 @@ def stock_zh_a_hist_pre_min_em(
     :return: 每日分时行情包含盘前数据
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     url = "https://push2.eastmoney.com/api/qt/stock/trends2/get"
     params = {
         "fields1": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58",
-        "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "ndays": "1",
         "iscr": "1",
         "iscca": "0",
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
-        "_": "1623766962675",
+        "secid": f"{market_code}.{symbol}",
     }
     r = requests.get(url, timeout=15, params=params)
     data_json = r.json()
@@ -1259,7 +1207,7 @@ def stock_zh_a_hist_pre_min_em(
     ]
     temp_df.index = pd.to_datetime(temp_df["时间"])
     date_format = temp_df.index[0].date().isoformat()
-    temp_df = temp_df[date_format + " " + start_time : date_format + " " + end_time]
+    temp_df = temp_df[date_format + " " + start_time: date_format + " " + end_time]
     temp_df.reset_index(drop=True, inplace=True)
     temp_df["开盘"] = pd.to_numeric(temp_df["开盘"], errors="coerce")
     temp_df["收盘"] = pd.to_numeric(temp_df["收盘"], errors="coerce")
@@ -1282,22 +1230,20 @@ def stock_hk_spot_em() -> pd.DataFrame:
     url = "https://72.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:128 t:3,m:128 t:4,m:128 t:1,m:128 t:2",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,"
-        "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1624010056945",
+                  "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1330,9 +1276,6 @@ def stock_hk_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -1372,22 +1315,20 @@ def stock_hk_main_board_spot_em() -> pd.DataFrame:
     url = "https://81.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:128 t:3",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,"
-        "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
-        "_": "1624010056945",
+                  "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1420,9 +1361,6 @@ def stock_hk_main_board_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -1480,14 +1418,12 @@ def stock_hk_hist(
     url = "https://33.push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
         "secid": f"116.{symbol}",
-        "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "fields1": "f1,f2,f3,f4,f5,f6",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
         "klt": period_dict[period],
         "fqt": adjust_dict[adjust],
         "end": "20500000",
         "lmt": "1000000",
-        "_": "1623766962675",
     }
     r = requests.get(url, timeout=15, params=params)
     data_json = r.json()
@@ -1559,11 +1495,9 @@ def stock_hk_hist_min_em(
         params = {
             "fields1": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13",
             "fields2": "f51,f52,f53,f54,f55,f56,f57,f58",
-            "ut": "fa5fd1943c7b386f172d6893dbfba10b",
             "iscr": "0",
             "ndays": "5",
             "secid": f"116.{symbol}",
-            "_": "1623766962675",
         }
         r = requests.get(url, timeout=15, params=params)
         data_json = r.json()
@@ -1603,7 +1537,6 @@ def stock_hk_hist_min_em(
             "secid": f"116.{symbol}",
             "beg": "0",
             "end": "20500000",
-            "_": "1630930917857",
         }
         r = requests.get(url, timeout=15, params=params)
         data_json = r.json()
@@ -1665,22 +1598,20 @@ def stock_us_spot_em() -> pd.DataFrame:
     url = "https://72.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "20000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:105,m:106,m:107",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,"
-        "f21,f23,f24,f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
-        "_": "1624010056945",
+                  "f21,f23,f24,f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1715,9 +1646,6 @@ def stock_us_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df["代码"] = temp_df["编码"].astype(str) + "." + temp_df["简称"]
     temp_df = temp_df[
         [
@@ -1783,14 +1711,12 @@ def stock_us_hist(
     url = "https://63.push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
         "secid": f"{symbol}",
-        "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "fields1": "f1,f2,f3,f4,f5,f6",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
         "klt": period_dict[period],
         "fqt": adjust_dict[adjust],
         "end": "20500000",
         "lmt": "1000000",
-        "_": "1623766962675",
     }
     r = requests.get(url, timeout=15, params=params)
     data_json = r.json()
@@ -1848,13 +1774,11 @@ def stock_us_hist_min_em(
     params = {
         "fields1": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58",
-        "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "iscr": "0",
         "ndays": "5",
         "secid": f"{symbol.split('.')[0]}.{symbol.split('.')[1]}",
-        "_": "1623766962675",
     }
-    r = requests.get(url, timeout=15, params=params)
+    r = requests.get(url, params=params, timeout=15)
     data_json = r.json()
     if not data_json["data"]["trends"]:
         return pd.DataFrame()
@@ -1879,7 +1803,7 @@ def stock_us_hist_min_em(
     temp_df["成交量"] = pd.to_numeric(temp_df["成交量"], errors="coerce")
     temp_df["成交额"] = pd.to_numeric(temp_df["成交额"], errors="coerce")
     temp_df["最新价"] = pd.to_numeric(temp_df["最新价"], errors="coerce")
-    temp_df["时间"] = pd.to_datetime(temp_df["时间"]).astype(str)
+    temp_df["时间"] = pd.to_datetime(temp_df["时间"], errors="coerce").astype(str)
     return temp_df
 
 
@@ -1908,9 +1832,6 @@ if __name__ == "__main__":
     stock_zh_b_spot_em_df = stock_zh_b_spot_em()
     print(stock_zh_b_spot_em_df)
 
-    code_id_map_em_df = code_id_map_em()
-    print(code_id_map_em_df)
-
     stock_hk_spot_em_df = stock_hk_spot_em()
     print(stock_hk_spot_em_df)
 
@@ -1918,11 +1839,11 @@ if __name__ == "__main__":
     print(stock_hk_main_board_spot_em_df)
 
     stock_zh_a_hist_df = stock_zh_a_hist(
-        symbol="000001",
+        symbol="600734",
         period="daily",
-        start_date="20170301",
-        end_date="20231030",
-        adjust="",
+        start_date="20050501",
+        end_date="20250304",
+        adjust="hfq",
     )
     print(stock_zh_a_hist_df)
 
@@ -1987,9 +1908,9 @@ if __name__ == "__main__":
     print(stock_us_hist_min_em_df)
 
     stock_zh_a_hist_min_em_df = stock_zh_a_hist_min_em(
-        symbol="000001",
-        start_date="2024-03-20 09:30:00",
-        end_date="2024-03-20 15:00:00",
+        symbol="300364",
+        start_date="2025-03-07 09:30:00",
+        end_date="2025-03-07 15:00:00",
         period="5",
         adjust="hfq",
     )
@@ -1999,7 +1920,7 @@ if __name__ == "__main__":
         symbol="833454",
         period="daily",
         start_date="20170301",
-        end_date="20211115",
+        end_date="20241115",
         adjust="hfq",
     )
     print(stock_zh_a_hist_df)
@@ -2008,8 +1929,8 @@ if __name__ == "__main__":
         symbol="01611",
         period="1",
         adjust="",
-        start_date="2024-04-12 09:30:00",
-        end_date="2024-04-12 18:32:00",
+        start_date="2025-03-07 09:30:00",
+        end_date="2025-03-07 18:32:00",
     )
     print(stock_hk_hist_min_em_df)