akshare 1.12.95__py3-none-any.whl → 1.15.72__py3-none-any.whl

akshare/economic/macro_china_hk.py

@@ -1,50 +1,80 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2021/12/6 15:21
+Date: 2024/4/3 16:21
 Desc: 中国-香港-宏观指标
 https://data.eastmoney.com/cjsj/foreign_8_0.html
 """
+
 import pandas as pd
 import requests
 
-from akshare.utils import demjson
-
 
-def macro_china_hk_cpi() -> pd.DataFrame:
+def macro_china_hk_core(symbol: str = "EMG00341602") -> pd.DataFrame:
     """
-    东方财富-经济数据一览-中国香港-消费者物价指数
-    https://data.eastmoney.com/cjsj/foreign_8_0.html
-    :return: 消费者物价指数
+    东方财富-数据中心-经济数据一览-宏观经济-日本-核心代码
+    https://data.eastmoney.com/cjsj/foreign_1_0.html
+    :param symbol: 代码
+    :type symbol: str
+    :return: 指定 symbol 的数据
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
+        "reportName": "RPT_ECONOMICVALUE_HK",
+        "columns": "ALL",
+        "filter": f'(INDICATOR_ID="{symbol}")',
+        "pageNumber": "1",
+        "pageSize": "5000",
+        "sortColumns": "REPORT_DATE",
+        "sortTypes": "-1",
+        "source": "WEB",
+        "client": "WEB",
         "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "0",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1621332091873",
+        "_": "1667639896816",
     }
     r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["result"]["data"])
+    temp_df.rename(
+        columns={
+            "COUNTRY": "-",
+            "INDICATOR_ID": "-",
+            "INDICATOR_NAME": "-",
+            "REPORT_DATE_CH": "时间",
+            "REPORT_DATE": "-",
+            "PUBLISH_DATE": "发布日期",
+            "VALUE": "现值",
+            "PRE_VALUE": "前值",
+            "INDICATOR_IDOLD": "-",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
     ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    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["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(["发布日期"], inplace=True, ignore_index=True)
+    return temp_df
+
+
+def macro_china_hk_cpi() -> pd.DataFrame:
+    """
+    东方财富-经济数据一览-中国香港-消费者物价指数
+    https://data.eastmoney.com/cjsj/foreign_8_0.html
+    :return: 消费者物价指数
+    :rtype: pandas.DataFrame
+    """
+    temp_df = macro_china_hk_core(symbol="EMG01336996")
     return temp_df
 
 
@@ -55,33 +85,7 @@ def macro_china_hk_cpi_ratio() -> pd.DataFrame:
     :return: 消费者物价指数年率
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "1",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00059282")
     return temp_df
 
 
@@ -92,33 +96,7 @@ def macro_china_hk_rate_of_unemployment() -> pd.DataFrame:
     :return: 失业率
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "2",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00059647")
     return temp_df
 
 
@@ -129,33 +107,7 @@ def macro_china_hk_gbp() -> pd.DataFrame:
     :return: 香港 GDP
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "3",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值']) / 100
-    temp_df['现值'] = pd.to_numeric(temp_df['现值']) / 100
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG01337008")
     return temp_df
 
 
@@ -166,33 +118,7 @@ def macro_china_hk_gbp_ratio() -> pd.DataFrame:
     :return: 香港 GDP 同比
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "4",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG01337009")
     return temp_df
 
 
@@ -203,33 +129,7 @@ def macro_china_hk_building_volume() -> pd.DataFrame:
     :return: 香港楼宇买卖合约数量
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "5",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00158055")
     return temp_df
 
 
@@ -240,33 +140,7 @@ def macro_china_hk_building_amount() -> pd.DataFrame:
     :return: 香港楼宇买卖合约成交金额
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "6",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值']) / 100
-    temp_df['现值'] = pd.to_numeric(temp_df['现值']) / 100
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00158066")
     return temp_df
 
 
@@ -277,33 +151,7 @@ def macro_china_hk_trade_diff_ratio() -> pd.DataFrame:
     :return: 香港商品贸易差额年率
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "7",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00157898")
     return temp_df
 
 
@@ -314,33 +162,7 @@ def macro_china_hk_ppi() -> pd.DataFrame:
     :return: 香港制造业 PPI 年率
     :rtype: pandas.DataFrame
     """
-    url = "https://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
-    params = {
-        "type": "GJZB",
-        "sty": "HKZB",
-        "js": "({data:[(x)],pages:(pc)})",
-        "p": "1",
-        "ps": "2000",
-        "mkt": "8",
-        "stat": "8",
-        "pageNo": "1",
-        "pageNum": "1",
-        "_": "1621332091873",
-    }
-    r = requests.get(url, params=params)
-    data_text = r.text
-    data_json = demjson.decode(data_text[1:-1])
-    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]])
-    temp_df.columns = [
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]
-    temp_df['前值'] = pd.to_numeric(temp_df['前值'])
-    temp_df['现值'] = pd.to_numeric(temp_df['现值'])
-    temp_df['时间'] = pd.to_datetime(temp_df['时间']).dt.date
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df = macro_china_hk_core(symbol="EMG00157818")
     return temp_df
 
 

akshare/economic/macro_china_nbs.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/9/14 18:00
+Date: 2024/6/30 22:00
 Desc: 中国-国家统计局-宏观数据
 https://data.stats.gov.cn/easyquery.htm
 """
+
 import time
 from functools import lru_cache
 from typing import Union, Literal, List, Dict
@@ -54,7 +55,8 @@ def _get_nbs_wds_tree(idcode: str, dbcode: str, rowcode: str) -> List[Dict]:
         "k1": str(time.time_ns())[:13],
     }
     r = requests.post(url, params=params, verify=False, allow_redirects=True)
-    data_json = r.json()["returndata"][0]["nodes"]
+    data_json = r.json()
+    data_json = data_json["returndata"][0]["nodes"]
     return data_json
 
 
@@ -78,7 +80,7 @@ def macro_china_nbs_nation(
 ) -> pd.DataFrame:
     """
     国家统计局全国数据通用接口
-    http://data.stats.gov.cn/easyquery.htm
+    https://data.stats.gov.cn/easyquery.htm
     :param kind: 数据类别
     :param path: 数据路径
     :param period: 时间区间，例如'LAST10', '2016-2023', '2016-'等
@@ -146,7 +148,13 @@ def macro_china_nbs_nation(
 
 def macro_china_nbs_region(
     kind: Literal[
-        "分省月度数据", "分省季度数据", "分省年度数据", "主要城市月度价格", "主要城市年度数据", "港澳台月度数据", "港澳台年度数据"
+        "分省月度数据",
+        "分省季度数据",
+        "分省年度数据",
+        "主要城市月度价格",
+        "主要城市年度数据",
+        "港澳台月度数据",
+        "港澳台年度数据",
     ],
     path: str,
     indicator: Union[str, None],
@@ -261,16 +269,25 @@ def macro_china_nbs_region(
 
 if __name__ == "__main__":
     macro_china_nbs_nation_df = macro_china_nbs_nation(
-        kind="月度数据", path="工业 > 工业企业主要经济指标", period="LAST13"
+        kind="月度数据",
+        path="工业 > 工业分大类行业出口交货值(2018-至今) > 废弃资源综合利用业",
+        period="LAST5",
     )
     print(macro_china_nbs_nation_df)
 
     macro_china_nbs_region_df = macro_china_nbs_region(
-        "分省季度数据", "人民生活 > 居民人均可支配收入", period="2018-2022", indicator=None, region="北京市"
+        kind="分省季度数据",
+        path="人民生活 > 居民人均可支配收入",
+        period="2018-2022",
+        indicator=None,
+        region="北京市",
     )
     print(macro_china_nbs_region_df)
 
     macro_china_nbs_region_df = macro_china_nbs_region(
-        "分省季度数据", "国民经济核算 > 地区生产总值", period="2018-", indicator="地区生产总值_累计值(亿元)"
+        kind="分省季度数据",
+        path="国民经济核算 > 地区生产总值",
+        period="2018-",
+        indicator="地区生产总值_累计值(亿元)",
     )
     print(macro_china_nbs_region_df)

akshare/economic/macro_constitute.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/12/27 20:08
+Date: 2024/4/3 16:08
 Desc: 金十数据-数据中心-主要机构-宏观经济
 https://datacenter.jin10.com/
 """
+
+import datetime
 import time
 
 import pandas as pd
 import requests
 from tqdm import tqdm
-import datetime
 
 
 def macro_cons_gold() -> pd.DataFrame:
@@ -22,7 +23,8 @@ def macro_cons_gold() -> pd.DataFrame:
     """
     t = time.time()
     headers = {
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/107.0.0.0 Safari/537.36",
         "x-app-id": "rU6QIu7JHe2gOUeR",
         "x-csrf-token": "x-csrf-token",
         "x-version": "1.0.0",
@@ -41,7 +43,7 @@ def macro_cons_gold() -> pd.DataFrame:
         if not data_json["data"]["values"]:
             break
         temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
         last_date_str = temp_df.iat[-1, 0]
         last_date_str = (
             (
@@ -68,7 +70,7 @@ def macro_cons_gold() -> pd.DataFrame:
             "总价值",
         ]
     ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
+    big_df["日期"] = pd.to_datetime(big_df["日期"], errors="coerce").dt.date
     big_df["总库存"] = pd.to_numeric(big_df["总库存"], errors="coerce")
     big_df["增持/减持"] = pd.to_numeric(big_df["增持/减持"], errors="coerce")
     big_df["总价值"] = pd.to_numeric(big_df["总价值"], errors="coerce")
@@ -86,7 +88,8 @@ def macro_cons_silver() -> pd.DataFrame:
     """
     t = time.time()
     headers = {
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/107.0.0.0 Safari/537.36",
         "x-app-id": "rU6QIu7JHe2gOUeR",
         "x-csrf-token": "x-csrf-token",
         "x-version": "1.0.0",
@@ -105,7 +108,7 @@ def macro_cons_silver() -> pd.DataFrame:
         if not data_json["data"]["values"]:
             break
         temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
         last_date_str = temp_df.iat[-1, 0]
         last_date_str = (
             (
@@ -132,7 +135,7 @@ def macro_cons_silver() -> pd.DataFrame:
             "总价值",
         ]
     ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
+    big_df["日期"] = pd.to_datetime(big_df["日期"], errors="coerce").dt.date
     big_df["总库存"] = pd.to_numeric(big_df["总库存"], errors="coerce")
     big_df["增持/减持"] = pd.to_numeric(big_df["增持/减持"], errors="coerce")
     big_df["总价值"] = pd.to_numeric(big_df["总价值"], errors="coerce")
@@ -163,13 +166,14 @@ def macro_cons_opec_month() -> pd.DataFrame:
         "referer": "https://datacenter.jin10.com/reportType/dc_opec_report",
         "sec-fetch-mode": "cors",
         "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/79.0.3945.117 Safari/537.36",
         "x-app-id": "rU6QIu7JHe2gOUeR",
         "x-csrf-token": "",
         "x-version": "1.0.0",
     }
     res = requests.get(
-        f"https://datacenter-api.jin10.com/reports/dates?category=opec&_={str(int(round(t * 1000)))}",
+        url=f"https://datacenter-api.jin10.com/reports/dates?category=opec&_={str(int(round(t * 1000)))}",
         headers=headers,
     )  # 日期序列
     all_date_list = res.json()["data"]
@@ -177,7 +181,8 @@ def macro_cons_opec_month() -> pd.DataFrame:
     for item in bar:
         bar.set_description(f"Please wait for a moment, now downloading {item}'s data")
         res = requests.get(
-            f"https://datacenter-api.jin10.com/reports/list?category=opec&date={item}&_={str(int(round(t * 1000)))}",
+            url=f"https://datacenter-api.jin10.com/reports/list?"
+            f"category=opec&date={item}&_={str(int(round(t * 1000)))}",
             headers=headers,
         )
         temp_df = pd.DataFrame(
@@ -203,7 +208,7 @@ def macro_cons_opec_month() -> pd.DataFrame:
                     "欧佩克产量",
                 ]
             ].iloc[-2, :]
-        except:
+        except:  # noqa: E722
             temp_df = temp_df[
                 [
                     "阿尔及利亚",

akshare/economic/macro_euro.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/11/3 15:08
+Date: 2024/4/3 17:08
 Desc: 金十数据中心-经济指标-欧元区
 金十数据中心-经济指标-欧元区-国民经济运行状况-经济状况
 金十数据中心-经济指标-欧元区-国民经济运行状况-物价水平
@@ -10,6 +10,7 @@ Desc: 金十数据中心-经济指标-欧元区
 金十数据中心-经济指标-欧元区-产业指标
 金十数据中心-经济指标-欧元区-领先指标
 """
+
 import time
 
 import pandas as pd
@@ -799,7 +800,7 @@ def macro_euro_lme_holding() -> pd.DataFrame:
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/lme_position.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/lme_position.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
@@ -809,8 +810,12 @@ def macro_euro_lme_holding() -> pd.DataFrame:
         for i in range(3):
             inner_temp_df = temp_df.loc[:, item].apply(lambda x: eval(str(x))[i])
             inner_temp_df.name = inner_temp_df.name + "-" + json_data["keys"][i]["name"]
-            big_df = pd.concat([big_df, inner_temp_df], axis=1)
-    big_df.sort_index(inplace=True)
+            big_df = pd.concat(objs=[big_df, inner_temp_df], axis=1)
+    big_df = big_df.astype("float")
+    big_df = big_df.iloc[:-1, :].copy()
+    big_df.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], ignore_index=True, inplace=True)
     return big_df
 
 
@@ -826,7 +831,7 @@ def macro_euro_lme_stock() -> pd.DataFrame:
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/lme_stock.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/lme_stock.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
@@ -835,8 +840,10 @@ def macro_euro_lme_stock() -> pd.DataFrame:
         for i in range(3):
             inner_temp_df = temp_df.loc[:, item].apply(lambda x: eval(str(x))[i])
             inner_temp_df.name = inner_temp_df.name + "-" + json_data["keys"][i]["name"]
-            big_df = pd.concat([big_df, inner_temp_df], axis=1)
+            big_df = pd.concat(objs=[big_df, inner_temp_df], axis=1)
     big_df.sort_index(inplace=True)
+    big_df.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
     return big_df