akshare 1.12.99__py3-none-any.whl → 1.15.73__py3-none-any.whl

akshare/economic/macro_usa.py

@@ -1,27 +1,78 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/7/19 18:00
+Date: 2024/4/4 18:00
 Desc: 金十数据中心-经济指标-美国
 https://datacenter.jin10.com/economic
 """
-import json
+
+import datetime
 import time
 
 import pandas as pd
 import requests
 
-from akshare.economic.cons import (
-    JS_USA_NON_FARM_URL,
-    JS_USA_UNEMPLOYMENT_RATE_URL,
-    JS_USA_EIA_CRUDE_URL,
-    JS_USA_INITIAL_JOBLESS_URL,
-    JS_USA_CORE_PCE_PRICE_URL,
-    JS_USA_CPI_MONTHLY_URL,
-    JS_USA_LMCI_URL,
-    JS_USA_ADP_NONFARM_URL,
-    JS_USA_GDP_MONTHLY_URL,
-)
+
+def __macro_usa_base_func(symbol: str, params: dict) -> pd.DataFrame:
+    """
+    金十数据中心-经济指标-美国-基础函数
+    https://datacenter.jin10.com/economic
+    :return: 美国经济指标数据
+    :rtype: pandas.DataFrame
+    """
+    import warnings
+
+    warnings.filterwarnings(action="ignore", category=FutureWarning)
+    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",
+        "x-app-id": "rU6QIu7JHe2gOUeR",
+        "x-csrf-token": "x-csrf-token",
+        "x-version": "1.0.0",
+    }
+    url = "https://datacenter-api.jin10.com/reports/list_v2"
+    params = params
+    big_df = pd.DataFrame()
+    while True:
+        r = requests.get(url, params=params, headers=headers)
+        data_json = r.json()
+        if not data_json["data"]["values"]:
+            break
+        temp_df = pd.DataFrame(data_json["data"]["values"])
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
+        last_date_str = temp_df.iat[-1, 0]
+        last_date_str = (
+            (
+                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
+                - datetime.timedelta(days=1)
+            )
+            .date()
+            .isoformat()
+        )
+        params.update({"max_date": f"{last_date_str}"})
+    big_df.columns = [
+        "日期",
+        "今值",
+        "预测值",
+        "前值",
+    ]
+    big_df["商品"] = symbol
+    big_df = big_df[
+        [
+            "商品",
+            "日期",
+            "今值",
+            "预测值",
+            "前值",
+        ]
+    ]
+    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")
+    big_df.sort_values(["日期"], inplace=True)
+    big_df.reset_index(inplace=True, drop=True)
+    return big_df
 
 
 # 东方财富-美国-未决房屋销售月率
@@ -71,7 +122,46 @@ def macro_usa_phs() -> pd.DataFrame:
     ]
     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["发布日期"]).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    return temp_df
+
+
+# 东方财富-经济指标-美国-物价水平-美国核心CPI月率报告
+def macro_usa_cpi_yoy() -> pd.DataFrame:
+    """
+    东方财富-经济数据一览-美国-CPI年率, 数据区间从 2008-至今
+    https://data.eastmoney.com/cjsj/foreign_0_12.html
+    :return: 美国 CPI 年率报告
+    :rtype: pandas.DataFrame
+    """
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
+    params = {
+        "reportName": "RPT_ECONOMICVALUE_USA",
+        "columns": "ALL",
+        "filter": '(INDICATOR_ID="EMG00000733")',
+        "sortColumns": "REPORT_DATE",
+        "sortTypes": "-1",
+        "source": "WEB",
+        "client": "WEB",
+        "_": "1689320600161",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    data_list = data_json["result"]["data"]
+    temp_df = pd.DataFrame(
+        data_list, columns=["REPORT_DATE", "PUBLISH_DATE", "VALUE", "PRE_VALUE"]
+    )
+    temp_df.columns = [
+        "时间",
+        "发布日期",
+        "现值",
+        "前值",
+    ]
+    temp_df["时间"] = pd.to_datetime(temp_df["时间"], errors="coerce").dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
+    temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
+    temp_df.sort_values(by=["时间"], inplace=True, ignore_index=True)
     return temp_df
 
 
@@ -80,159 +170,36 @@ def macro_usa_gdp_monthly() -> pd.DataFrame:
     """
     金十数据-美国国内生产总值(GDP)报告, 数据区间从 20080228-至今
     https://datacenter.jin10.com/reportType/dc_usa_gdp
-    :return: pandas.Series
+    :return: 美国国内生产总值(GDP)
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    r = requests.get(
-        JS_USA_GDP_MONTHLY_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(r.text[r.text.find("{") : r.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国国内生产总值(GDP)"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "53",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_df = pd.DataFrame(r.json()["data"]["values"])
-    temp_df.index = pd.to_datetime(temp_df.iloc[:, 0])
-    temp_df.columns = ['date'] + json_data["kinds"]
-    del temp_df['date']
-    temp_df = pd.concat([value_df, temp_df])
-
-    temp_df.dropna(subset=["预测值(%)"], inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.columns = ['日期', '今值', '预测值', '前值']
-    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_numeric(temp_df['前值'], errors="coerce")
+    temp_df = __macro_usa_base_func(symbol="美国国内生产总值(GDP)", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-物价水平-美国CPI月率报告
 def macro_usa_cpi_monthly() -> pd.DataFrame:
     """
-    美国CPI月率报告, 数据区间从19700101-至今
+    美国 CPI 月率报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_cpi
-    https://cdn.jin10.com/dc/reports/dc_usa_cpi_all.js?v=1578741110
-    :return: 美国CPI月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国 CPI 月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_CPI_MONTHLY_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国居民消费价格指数(CPI)(月环比)"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "9",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "cpi_monthly"
-    temp_df = temp_df.astype("float")
-    return temp_df
-
-
-# 东方财富-经济指标-美国-物价水平-美国核心CPI月率报告
-def macro_usa_cpi_yoy() -> pd.DataFrame:
-    """
-    东方财富-经济数据一览-美国-CPI年率, 数据区间从 2008-至今
-    https://data.eastmoney.com/cjsj/foreign_0_12.html
-    :return: 美国 CPI 年率报告
-    :rtype: pandas.DataFrame
-    """
-    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
-    params = {
-        "reportName": "RPT_ECONOMICVALUE_USA",
-        "columns": "ALL",
-        "filter": '(INDICATOR_ID="EMG00000733")',
-        "sortColumns": "REPORT_DATE",
-        "sortTypes": "-1",
-        "source": "WEB",
-        "client": "WEB",
-        "_": "1689320600161",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    data_list = data_json["result"]["data"]
-    temp_df = pd.DataFrame(data_list, columns=['REPORT_DATE', 'PUBLISH_DATE', 'VALUE', 'PRE_VALUE'])
-    temp_df.columns = [
-            "时间",
-            "发布日期",
-            "现值",
-            "前值",
-        ]
-    temp_df["时间"] = pd.to_datetime(temp_df["时间"], errors="coerce").dt.date
-    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
-    temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
-    temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df.sort_values(['时间'], inplace=True, ignore_index=True)
+    temp_df = __macro_usa_base_func(symbol="美国CPI月率", params=params)
     return temp_df
 
 
@@ -241,63 +208,17 @@ def macro_usa_core_cpi_monthly() -> pd.DataFrame:
     """
     美国核心 CPI 月率报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_core_cpi
-    https://cdn.jin10.com/dc/reports/dc_usa_core_cpi_all.js?v=1578740570
-    :return: 美国核心CPI月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国核心CPI月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_core_cpi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国核心CPI月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "6",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_core_cpi"
-    temp_df = temp_df.astype("float")
-    temp_df = pd.DataFrame(temp_df)
-    temp_df.reset_index(inplace=True, drop=False)
-    temp_df.columns = ['date', 'value']
-    temp_df['date'] = pd.to_datetime(temp_df['date'], errors="coerce").dt.date
-    temp_df['value'] = pd.to_numeric(temp_df['value'], errors="coerce")
+    temp_df = __macro_usa_base_func(symbol="美国核心CPI月率", params=params)
     return temp_df
 
 
@@ -306,118 +227,36 @@ def macro_usa_personal_spending() -> pd.DataFrame:
     """
     美国个人支出月率报告, 数据区间从19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_personal_spending
-    https://cdn.jin10.com/dc/reports/dc_usa_personal_spending_all.js?v=1578741327
-    :return: 美国个人支出月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国个人支出月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_personal_spending_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国个人支出月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "35",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_personal_spending"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国个人支出月率", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-物价水平-美国零售销售月率报告
 def macro_usa_retail_sales() -> pd.DataFrame:
     """
-    美国零售销售月率报告, 数据区间从19920301-至今
+    美国零售销售月率报告, 数据区间从 19920301-至今
     https://datacenter.jin10.com/reportType/dc_usa_retail_sales
-    https://cdn.jin10.com/dc/reports/dc_usa_retail_sales_all.js?v=1578741528
     :return: 美国零售销售月率报告-今值(%)
-    :rtype: pandas.Series
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_retail_sales_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国零售销售月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "39",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_retail_sales"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国零售销售月率", params=params)
     return temp_df
 
 
@@ -426,58 +265,17 @@ def macro_usa_import_price() -> pd.DataFrame:
     """
     美国进口物价指数报告, 数据区间从19890201-至今
     https://datacenter.jin10.com/reportType/dc_usa_import_price
-    https://cdn.jin10.com/dc/reports/dc_usa_import_price_all.js?v=1578741716
     :return: 美国进口物价指数报告-今值(%)
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_import_price_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国进口物价指数"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "18",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_import_price"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国进口物价指数", params=params)
     return temp_df
 
 
@@ -491,235 +289,68 @@ def macro_usa_export_price() -> pd.DataFrame:
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_export_price_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国出口价格指数"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "79",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_export_price"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国出口价格指数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-LMCI
 def macro_usa_lmci() -> pd.DataFrame:
     """
-    美联储劳动力市场状况指数报告, 数据区间从20141006-至今
+    美联储劳动力市场状况指数报告, 数据区间从 20141006-至今
     https://datacenter.jin10.com/reportType/dc_usa_lmci
-    https://cdn.jin10.com/dc/reports/dc_usa_lmci_all.js?v=1578742043
     :return: 美联储劳动力市场状况指数报告-今值(%)
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_LMCI_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美联储劳动力市场状况指数"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "93",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "lmci"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美联储劳动力市场状况指数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-失业率-美国失业率报告
 def macro_usa_unemployment_rate() -> pd.DataFrame:
     """
-    美国失业率报告, 数据区间从19700101-至今
+    美国失业率报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_unemployment_rate
-    https://cdn.jin10.com/dc/reports/dc_usa_unemployment_rate_all.js?v=1578821511
-    :return: 获取美国失业率报告-今值(%)
+    :return: 获取美国失业率报告
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_UNEMPLOYMENT_RATE_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国失业率"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "47",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "unemployment_rate"
+    temp_df = __macro_usa_base_func(symbol="美国失业率", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-失业率-美国挑战者企业裁员人数报告
 def macro_usa_job_cuts() -> pd.DataFrame:
     """
-    美国挑战者企业裁员人数报告, 数据区间从19940201-至今
+    美国挑战者企业裁员人数报告, 数据区间从 19940201-至今
     https://datacenter.jin10.com/reportType/dc_usa_job_cuts
-    https://cdn.jin10.com/dc/reports/dc_usa_job_cuts_all.js?v=1578742262
-    :return: 美国挑战者企业裁员人数报告-今值(万人)
-    :rtype: pandas.Series
+    :return: 美国挑战者企业裁员人数报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_job_cuts_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国挑战者企业裁员人数报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万人)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "78",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "usa_job_cuts"
+    temp_df = __macro_usa_base_func(symbol="美国挑战者企业裁员人数", params=params)
     return temp_df
 
 
@@ -728,374 +359,123 @@ def macro_usa_non_farm() -> pd.DataFrame:
     """
     美国非农就业人数报告, 数据区间从19700102-至今
     https://datacenter.jin10.com/reportType/dc_nonfarm_payrolls
-    https://cdn.jin10.com/dc/reports/dc_nonfarm_payrolls_all.js?v=1578742490
-    :return: 美国非农就业人数报告-今值(万人)
+    :return: 美国非农就业人数报告
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_NON_FARM_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国非农就业人数"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万人)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "33",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "non_farm"
+    temp_df = __macro_usa_base_func(symbol="美国非农就业人数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-就业人口-美国ADP就业人数报告
 def macro_usa_adp_employment() -> pd.DataFrame:
     """
-    美国ADP就业人数报告, 数据区间从20010601-至今
+    美国ADP就业人数报告, 数据区间从 20010601-至今
     https://datacenter.jin10.com/reportType/dc_adp_nonfarm_employment
-    https://cdn.jin10.com/dc/reports/dc_adp_nonfarm_employment_all.js?v=1578742564
-    :return: 美国ADP就业人数报告-今值(万人)
+    :return: 美国ADP就业人数报告
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_ADP_NONFARM_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国ADP就业人数(万人)"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万人)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "1",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "adp"
+    temp_df = __macro_usa_base_func(symbol="美国ADP就业人数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-消费者收入与支出-美国核心PCE物价指数年率报告
 def macro_usa_core_pce_price() -> pd.DataFrame:
     """
-    美国核心PCE物价指数年率报告, 数据区间从19700101-至今
+    美国核心PCE物价指数年率报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_core_pce_price
-    https://cdn.jin10.com/dc/reports/dc_usa_core_pce_price_all.js?v=1578742641
-    :return: 美国核心PCE物价指数年率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国核心PCE物价指数年率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_CORE_PCE_PRICE_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国核心PCE物价指数年率"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "80",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "core_pce_price"
+    temp_df = __macro_usa_base_func(symbol="美国核心PCE物价指数年率", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-劳动力市场-消费者收入与支出-美国实际个人消费支出季率初值报告
 def macro_usa_real_consumer_spending() -> pd.DataFrame:
     """
-    美国实际个人消费支出季率初值报告, 数据区间从20131107-至今
+    美国实际个人消费支出季率初值报告, 数据区间从 20131107-至今
     https://datacenter.jin10.com/reportType/dc_usa_real_consumer_spending
-    https://cdn.jin10.com/dc/reports/dc_usa_real_consumer_spending_all.js?v=1578742802
-    :return: 美国实际个人消费支出季率初值报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国实际个人消费支出季率初值报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_real_consumer_spending_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国实际个人消费支出季率初值报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "81",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "usa_real_consumer_spending"
+    temp_df = __macro_usa_base_func(
+        symbol="美国实际个人消费支出季率初值", params=params
+    )
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-贸易状况-美国贸易帐报告
 def macro_usa_trade_balance() -> pd.DataFrame:
     """
-    美国贸易帐报告, 数据区间从19700101-至今
+    美国贸易帐报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_trade_balance
-    https://cdn.jin10.com/dc/reports/dc_usa_trade_balance_all.js?v=1578742911
-    :return: 美国贸易帐报告-今值(亿美元)
-    :rtype: pandas.Series
+    :return: 美国贸易帐报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_trade_balance_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国贸易帐报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(亿美元)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "42",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "usa_trade_balance"
+    temp_df = __macro_usa_base_func(symbol="美国贸易帐报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-贸易状况-美国经常帐报告
 def macro_usa_current_account() -> pd.DataFrame:
     """
-    美国经常帐报告, 数据区间从20080317-至今
+    美国经常帐报告, 数据区间从 20080317-至今
     https://datacenter.jin10.com/reportType/dc_usa_current_account
-    https://cdn.jin10.com/dc/reports/dc_usa_current_account_all.js?v=1578743012
-    :return: 美国经常帐报告-今值(亿美元)
-    :rtype: pandas.Series
+    :return: 美国经常帐报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_current_account_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国经常账报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(亿美元)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "category": "ec",
         "attr_id": "12",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df = temp_df.astype("float")
-    temp_df.name = "usa_current_account"
+    temp_df = __macro_usa_base_func(symbol="美国经常账报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-制造业-贝克休斯钻井报告
 def macro_usa_rig_count() -> pd.DataFrame:
     """
-    贝克休斯钻井报告, 数据区间从20080317-至今
+    贝克休斯钻井报告, 数据区间从 20080317-至今
     https://datacenter.jin10.com/reportType/dc_rig_count_summary
-    https://cdn.jin10.com/dc/reports/dc_rig_count_summary_all.js?v=1578743203
     :return: 贝克休斯钻井报告-当周
-    :rtype: pandas.Series
+    :rtype: pandas.DataFrame
     """
     t = time.time()
     params = {"_": t}
     res = requests.get(
-        "https://cdn.jin10.com/data_center/reports/baker.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/baker.json", params=params
     )
     temp_df = pd.DataFrame(res.json().get("values")).T
     big_df = pd.DataFrame()
@@ -1108,69 +488,28 @@ def macro_usa_rig_count() -> pd.DataFrame:
     big_df["美国天然气钻井_钻井数"] = temp_df["美国天然气钻井"].apply(lambda x: x[0])
     big_df["美国天然气钻井_变化"] = temp_df["美国天然气钻井"].apply(lambda x: x[1])
     big_df = big_df.astype("float")
+    big_df.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], inplace=True, ignore_index=True)
     return big_df
 
 
-# 金十数据中心-经济指标-美国-产业指标-制造业-美国个人支出月率报告
-
-
 # 金十数据中心-经济指标-美国-产业指标-制造业-美国生产者物价指数(PPI)报告
 def macro_usa_ppi() -> pd.DataFrame:
     """
-    美国生产者物价指数(PPI)报告, 数据区间从20080226-至今
+    美国生产者物价指数(PPI)报告, 数据区间从 20080226-至今
     https://datacenter.jin10.com/reportType/dc_usa_ppi
-    https://cdn.jin10.com/dc/reports/dc_usa_ppi_all.js?v=1578743628
-    :return: 美国生产者物价指数(PPI)报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国生产者物价指数(PPI)报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_ppi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国生产者物价指数(PPI)报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "37",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_ppi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国生产者物价指数", params=params)
     return temp_df
 
 
@@ -1179,1078 +518,345 @@ def macro_usa_core_ppi() -> pd.DataFrame:
     """
     美国核心生产者物价指数(PPI)报告, 数据区间从20080318-至今
     https://datacenter.jin10.com/reportType/dc_usa_core_ppi
-    https://cdn.jin10.com/dc/reports/dc_usa_core_ppi_all.js?v=1578743709
     :return: 美国核心生产者物价指数(PPI)报告-今值(%)
-    :rtype: pandas.Series
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_core_ppi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国核心生产者物价指数(PPI)报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "7",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_core_ppi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国核心生产者物价指数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-制造业-美国API原油库存报告
 def macro_usa_api_crude_stock() -> pd.DataFrame:
     """
-    美国API原油库存报告, 数据区间从20120328-至今
+    美国 API 原油库存报告, 数据区间从 20120328-至今
     https://datacenter.jin10.com/reportType/dc_usa_api_crude_stock
     https://cdn.jin10.com/dc/reports/dc_usa_api_crude_stock_all.js?v=1578743859
     :return: 美国API原油库存报告-今值(万桶)
     :rtype: pandas.Series
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_api_crude_stock_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国API原油库存报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万桶)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "69",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_api_crude_stock"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国API原油库存", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-制造业-美国Markit制造业PMI初值报告
-def macro_usa_pmi() -> pd.Series:
+def macro_usa_pmi() -> pd.DataFrame:
     """
-    美国Markit制造业PMI初值报告, 数据区间从20120601-至今
+    美国 Markit 制造业 PMI 初值报告, 数据区间从 20120601-至今
     https://datacenter.jin10.com/reportType/dc_usa_pmi
-    https://cdn.jin10.com/dc/reports/dc_usa_pmi_all.js?v=1578743969
-    :return: 美国Markit制造业PMI初值报告-今值
-    :rtype: pandas.Series
+    :return: 美国 Markit 制造业 PMI 初值报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_pmi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国Markit制造业PMI报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "74",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_pmi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国Markit制造业PMI报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-制造业-美国ISM制造业PMI报告
 def macro_usa_ism_pmi() -> pd.DataFrame:
     """
-    美国ISM制造业PMI报告, 数据区间从19700101-至今
+    美国 ISM 制造业 PMI 报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_ism_pmi
-    https://cdn.jin10.com/dc/reports/dc_usa_ism_pmi_all.js?v=1578744071
-    :return: 美国ISM制造业PMI报告-今值
-    :rtype: pandas.Series
+    :return: 美国 ISM 制造业 PMI 报告-今值
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_ism_pmi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国ISM制造业PMI报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "28",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_ism_pmi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国ISM制造业PMI报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-工业-美国工业产出月率报告
 def macro_usa_industrial_production() -> pd.DataFrame:
     """
-    美国工业产出月率报告, 数据区间从19700101-至今
+    美国工业产出月率报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_industrial_production
-    https://cdn.jin10.com/dc/reports/dc_usa_industrial_production_all.js?v=1578744188
     :return: 美国工业产出月率报告-今值(%)
-    :rtype: pandas.Series
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_industrial_production_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国工业产出月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "20",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_industrial_production"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国工业产出月率报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-工业-美国耐用品订单月率报告
 def macro_usa_durable_goods_orders() -> pd.DataFrame:
     """
-    美国耐用品订单月率报告, 数据区间从20080227-至今
+    美国耐用品订单月率报告, 数据区间从 20080227-至今
     https://datacenter.jin10.com/reportType/dc_usa_durable_goods_orders
-    https://cdn.jin10.com/dc/reports/dc_usa_durable_goods_orders_all.js?v=1578744295
-    :return: 美国耐用品订单月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国耐用品订单月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_durable_goods_orders_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国耐用品订单月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "13",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_durable_goods_orders"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国耐用品订单月率报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-工业-美国工厂订单月率报告
 def macro_usa_factory_orders() -> pd.DataFrame:
     """
-    美国工厂订单月率报告, 数据区间从19920401-至今
+    美国工厂订单月率报告, 数据区间从 19920401-至今
     https://datacenter.jin10.com/reportType/dc_usa_factory_orders
-    https://cdn.jin10.com/dc/reports/dc_usa_factory_orders_all.js?v=1578744385
-    :return: 美国工厂订单月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国工厂订单月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_factory_orders_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国工厂订单月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "16",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_factory_orders"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国工厂订单月率报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-服务业-美国Markit服务业PMI初值报告
 def macro_usa_services_pmi() -> pd.DataFrame:
     """
-    美国Markit服务业PMI初值报告, 数据区间从20120701-至今
+    美国Markit服务业PMI初值报告, 数据区间从 20120701-至今
     https://datacenter.jin10.com/reportType/dc_usa_services_pmi
-    https://cdn.jin10.com/dc/reports/dc_usa_services_pmi_all.js?v=1578744503
-    :return: 美国Markit服务业PMI初值报告-今值
-    :rtype: pandas.Series
+    :return: 美国Markit服务业PMI初值报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_services_pmi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国Markit服务业PMI初值报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "89",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_services_pmi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国Markit服务业PMI初值报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-服务业-美国商业库存月率报告
 def macro_usa_business_inventories() -> pd.DataFrame:
     """
-    美国商业库存月率报告, 数据区间从19920301-至今
+    美国商业库存月率报告, 数据区间从 19920301-至今
     https://datacenter.jin10.com/reportType/dc_usa_business_inventories
-    https://cdn.jin10.com/dc/reports/dc_usa_business_inventories_all.js?v=1578744618
-    :return: 美国商业库存月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国商业库存月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_business_inventories_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国商业库存月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "4",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_business_inventories"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国商业库存月率报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-服务业-美国ISM非制造业PMI报告
 def macro_usa_ism_non_pmi() -> pd.DataFrame:
     """
-    美国ISM非制造业PMI报告, 数据区间从19970801-至今
+    美国ISM非制造业PMI报告, 数据区间从 19970801-至今
     https://datacenter.jin10.com/reportType/dc_usa_ism_non_pmi
-    https://cdn.jin10.com/dc/reports/dc_usa_ism_non_pmi_all.js?v=1578744693
-    :return: 美国ISM非制造业PMI报告-今值
-    :rtype: pandas.Series
+    :return: 美国ISM非制造业PMI报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_ism_non_pmi_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国ISM非制造业PMI报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "29",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_ism_non_pmi"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国ISM非制造业PMI报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国NAHB房产市场指数报告
 def macro_usa_nahb_house_market_index() -> pd.DataFrame:
     """
-    美国NAHB房产市场指数报告, 数据区间从19850201-至今
+    美国NAHB房产市场指数报告, 数据区间从 19850201-至今
     https://datacenter.jin10.com/reportType/dc_usa_nahb_house_market_index
-    https://cdn.jin10.com/dc/reports/dc_usa_nahb_house_market_index_all.js?v=1578744817
-    :return: 美国NAHB房产市场指数报告-今值
-    :rtype: pandas.Series
+    :return: 美国NAHB房产市场指数报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_nahb_house_market_index_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国NAHB房产市场指数报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "31",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_nahb_house_market_index"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国NAHB房产市场指数报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国新屋开工总数年化报告
 def macro_usa_house_starts() -> pd.DataFrame:
     """
-    美国新屋开工总数年化报告, 数据区间从19700101-至今
+    美国新屋开工总数年化报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_house_starts
-    https://cdn.jin10.com/dc/reports/dc_usa_house_starts_all.js?v=1578747388
-    :return: 美国新屋开工总数年化报告-今值(万户)
-    :rtype: pandas.Series
+    :return: 美国新屋开工总数年化报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_house_starts_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国新屋开工总数年化报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万户)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "17",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_house_starts"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国新屋开工总数年化报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国新屋销售总数年化报告
 def macro_usa_new_home_sales() -> pd.DataFrame:
     """
-    美国新屋销售总数年化报告, 数据区间从19700101-至今
+    美国新屋销售总数年化报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_new_home_sales
-    https://cdn.jin10.com/dc/reports/dc_usa_new_home_sales_all.js?v=1578747501
-    :return: 美国新屋销售总数年化报告-今值(万户)
-    :rtype: pandas.Series
+    :return: 美国新屋销售总数年化报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_new_home_sales_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国新屋销售总数年化报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万户)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "32",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_new_home_sales"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国新屋销售总数年化报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国营建许可总数报告
 def macro_usa_building_permits() -> pd.DataFrame:
     """
-    美国营建许可总数报告, 数据区间从20080220-至今
+    美国营建许可总数报告, 数据区间从 20080220-至今
     https://datacenter.jin10.com/reportType/dc_usa_building_permits
-    https://cdn.jin10.com/dc/reports/dc_usa_building_permits_all.js?v=1578747599
-    :return: 美国营建许可总数报告-今值(万户)
-    :rtype: pandas.Series
+    :return: 美国营建许可总数报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_building_permits_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国营建许可总数报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万户)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "3",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_building_permits"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国营建许可总数报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国成屋销售总数年化报告
 def macro_usa_exist_home_sales() -> pd.DataFrame:
     """
-    美国成屋销售总数年化报告, 数据区间从19700101-至今
+    美国成屋销售总数年化报告, 数据区间从 19700101-至今
     https://datacenter.jin10.com/reportType/dc_usa_exist_home_sales
-    https://cdn.jin10.com/dc/reports/dc_usa_exist_home_sales_all.js?v=1578747703
-    :return: 美国成屋销售总数年化报告-今值(万户)
-    :rtype: pandas.Series
+    :return: 美国成屋销售总数年化报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_exist_home_sales_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国成屋销售总数年化报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万户)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "15",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_exist_home_sales"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国成屋销售总数年化报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国FHFA房价指数月率报告
 def macro_usa_house_price_index() -> pd.DataFrame:
     """
-    美国FHFA房价指数月率报告, 数据区间从19910301-至今
+    美国FHFA房价指数月率报告, 数据区间从 19910301-至今
     https://datacenter.jin10.com/reportType/dc_usa_house_price_index
-    https://cdn.jin10.com/dc/reports/dc_usa_house_price_index_all.js?v=1578747781
-    :return: 美国FHFA房价指数月率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国FHFA房价指数月率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_house_price_index_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国FHFA房价指数月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "51",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_house_price_index"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国FHFA房价指数月率报告", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国S&P/CS20座大城市房价指数年率报告
 def macro_usa_spcs20() -> pd.DataFrame:
     """
-    美国S&P/CS20座大城市房价指数年率报告, 数据区间从20010201-至今
+    美国S&P/CS20座大城市房价指数年率报告, 数据区间从 20010201-至今
     https://datacenter.jin10.com/reportType/dc_usa_spcs20
-    https://cdn.jin10.com/dc/reports/dc_usa_spcs20_all.js?v=1578747873
-    :return: 美国S&P/CS20座大城市房价指数年率报告-今值(%)
-    :rtype: pandas.Series
+    :return: 美国S&P/CS20座大城市房价指数年率报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_spcs20_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国S&P/CS20座大城市房价指数年率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "52",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", keep="last", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_spcs20"
-    temp_df = temp_df.astype(float)
+    temp_df = __macro_usa_base_func(
+        symbol="美国S&P/CS20座大城市房价指数年率", params=params
+    )
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-产业指标-房地产-美国成屋签约销售指数月率报告
 def macro_usa_pending_home_sales() -> pd.DataFrame:
     """
-    美国成屋签约销售指数月率报告, 数据区间从20010301-至今
+    美国成屋签约销售指数月率报告, 数据区间从 20010301-至今
     https://datacenter.jin10.com/reportType/dc_usa_pending_home_sales
-    https://cdn.jin10.com/dc/reports/dc_usa_pending_home_sales_all.js?v=1578747959
     :return: 美国成屋签约销售指数月率报告
-    :rtype: pandas.Series
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_pending_home_sales_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国成屋签约销售指数月率报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(%)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "34",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", keep="last", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "usa_pending_home_sales"
-    temp_df = temp_df.astype(float)
+    temp_df = __macro_usa_base_func(
+        symbol="美国成屋签约销售指数月率报告", params=params
+    )
     return temp_df
 
 
@@ -2258,353 +864,134 @@ def macro_usa_pending_home_sales() -> pd.DataFrame:
 def macro_usa_cb_consumer_confidence() -> pd.DataFrame:
     """
     金十数据中心-经济指标-美国-领先指标-美国谘商会消费者信心指数报告, 数据区间从 19700101-至今
-    https://cdn.jin10.com/dc/reports/dc_usa_cb_consumer_confidence_all.js?v=1578576859
-    :return: 美国谘商会消费者信心指数报告-今值
-    :rtype: pandas.Series
+    https://datacenter.jin10.com/reportType/dc_usa_cb_consumer_confidence
+    :return: 美国谘商会消费者信心指数报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_cb_consumer_confidence_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国谘商会消费者信心指数报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "5",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", keep="last", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "cb_consumer_confidence"
-    temp_df = temp_df.astype(float)
+    temp_df = __macro_usa_base_func(symbol="美国谘商会消费者信心指数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-领先指标-美国NFIB小型企业信心指数报告
 def macro_usa_nfib_small_business() -> pd.DataFrame:
     """
-    美国NFIB小型企业信心指数报告, 数据区间从19750201-至今
-    https://cdn.jin10.com/dc/reports/dc_usa_nfib_small_business_all.js?v=1578576631
-    :return: 美国NFIB小型企业信心指数报告-今值
-    :rtype: pandas.Series
+    美国NFIB小型企业信心指数报告, 数据区间从 19750201-至今
+    https://datacenter.jin10.com/reportType/dc_usa_nfib_small_business
+    :return: 美国NFIB小型企业信心指数报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_nfib_small_business_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国NFIB小型企业信心指数报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "63",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", keep="last", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "nfib_small_business"
-    temp_df = temp_df.astype(float)
+    temp_df = __macro_usa_base_func(
+        symbol="美国NFIB小型企业信心指数报告", params=params
+    )
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-领先指标-美国密歇根大学消费者信心指数初值报告
 def macro_usa_michigan_consumer_sentiment() -> pd.DataFrame:
     """
-    美国密歇根大学消费者信心指数初值报告, 数据区间从19700301-至今
+    美国密歇根大学消费者信心指数初值报告, 数据区间从 19700301-至今
     https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment
-    :return: 美国密歇根大学消费者信心指数初值报告-今值
-    :rtype: pandas.Series
+    :return: 美国密歇根大学消费者信心指数初值报告
+    :rtype: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        f"https://cdn.jin10.com/dc/reports/dc_usa_michigan_consumer_sentiment_all.js?v={str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)}"
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国密歇根大学消费者信心指数初值报告"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "50",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", keep="last", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "michigan_consumer_sentiment"
-    temp_df = temp_df.astype(float)
+    temp_df = __macro_usa_base_func(
+        symbol="美国密歇根大学消费者信心指数初值报告", params=params
+    )
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-其他-美国EIA原油库存报告
 def macro_usa_eia_crude_rate() -> pd.DataFrame:
     """
-    美国EIA原油库存报告, 数据区间从19950801-至今
+    美国 EIA 原油库存报告, 数据区间从 19950801-至今
     https://datacenter.jin10.com/reportType/dc_eia_crude_oil
-    :return: pandas.Series
-    1982-09-01   -262.6
-    1982-10-01       -8
-    1982-11-01    -41.3
-    1982-12-01    -87.6
-    1983-01-01     51.3
-                  ...
-    2019-10-02      310
-    2019-10-09    292.7
-    2019-10-16        0
-    2019-10-17    928.1
-    2019-10-23        0
+    :return: 美国 EIA 原油库存报告
+    :return: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_EIA_CRUDE_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国EIA原油库存(万桶)"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万桶)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "10",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "eia_crude_rate"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国EIA原油库存", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-其他-美国初请失业金人数报告
 def macro_usa_initial_jobless() -> pd.DataFrame:
     """
-    美国初请失业金人数报告, 数据区间从19700101-至今
-    :return: pandas.Series
-    1970-01-01    22.1087
-    1970-02-01    24.9318
-    1970-03-01      25.85
-    1970-04-01    26.8682
-    1970-05-01    33.1591
-                   ...
-    2019-09-26       21.5
-    2019-10-03         22
-    2019-10-10         21
-    2019-10-17       21.4
-    2019-10-24          0
+    美国初请失业金人数报告, 数据区间从 19700101-至今
+    https://datacenter.jin10.com/reportType/dc_initial_jobless
+    :return: 美国 EIA 原油库存报告
+    :return: pandas.DataFrame
     """
     t = time.time()
-    res = requests.get(
-        JS_USA_INITIAL_JOBLESS_URL.format(
-            str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
-        )
-    )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
-    date_list = [item["date"] for item in json_data["list"]]
-    value_list = [item["datas"]["美国初请失业金人数(万人)"] for item in json_data["list"]]
-    value_df = pd.DataFrame(value_list)
-    value_df.columns = json_data["kinds"]
-    value_df.index = pd.to_datetime(date_list)
-    temp_df = value_df["今值(万人)"]
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
         "attr_id": "44",
         "_": str(int(round(t * 1000))),
     }
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "referer": "https://datacenter.jin10.com/reportType/dc_usa_michigan_consumer_sentiment",
-        "sec-fetch-dest": "empty",
-        "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/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    temp_se = pd.DataFrame(r.json()["data"]["values"]).iloc[:, :2]
-    temp_se.index = pd.to_datetime(temp_se.iloc[:, 0])
-    temp_se = temp_se.iloc[:, 1]
-    temp_df = pd.concat([temp_df, temp_se])
-    temp_df.dropna(inplace=True)
-    temp_df.sort_index(inplace=True)
-    temp_df = temp_df.reset_index()
-    temp_df.drop_duplicates(subset="index", inplace=True)
-    temp_df.set_index("index", inplace=True)
-    temp_df = temp_df.squeeze()
-    temp_df.index.name = None
-    temp_df.name = "initial_jobless"
-    temp_df = temp_df.astype("float")
+    temp_df = __macro_usa_base_func(symbol="美国初请失业金人数", params=params)
     return temp_df
 
 
 # 金十数据中心-经济指标-美国-其他-美国原油产量报告
 def macro_usa_crude_inner() -> pd.DataFrame:
     """
-    美国原油产量报告, 数据区间从19830107-至今
+    美国原油产量报告, 数据区间从 19830107-至今
     https://datacenter.jin10.com/reportType/dc_eia_crude_oil_produce
-    :return: pandas.Series
-    1983-01-07     863.40
-    1983-01-14     863.40
-    1983-01-21     863.40
-    1983-01-28     863.40
-    1983-02-04     866.00
-                   ...
-    2019-09-20    1250.00
-    2019-09-27    1240.00
-    2019-10-04    1260.00
-    2019-10-11    1260.00
-    2019-10-18    1260.00
+    :return: 美国原油产量报告
+    :return: pandas.DataFrame
     """
     t = time.time()
     params = {"_": t}
     res = requests.get(
-        "https://cdn.jin10.com/data_center/reports/usa_oil.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/usa_oil.json", params=params
     )
     temp_df = pd.DataFrame(res.json().get("values")).T
     big_df = pd.DataFrame()
-    big_df["美国国内原油总量_产量"] = temp_df["美国国内原油总量"].apply(lambda x: x[0])
-    big_df["美国国内原油总量_变化"] = temp_df["美国国内原油总量"].apply(lambda x: x[1])
-    big_df["美国本土48州原油产量_产量"] = temp_df["美国本土48州原油产量"].apply(lambda x: x[0])
-    big_df["美国本土48州原油产量_变化"] = temp_df["美国本土48州原油产量"].apply(lambda x: x[1])
-    big_df["美国阿拉斯加州原油产量_产量"] = temp_df["美国阿拉斯加州原油产量"].apply(lambda x: x[0])
-    big_df["美国阿拉斯加州原油产量_变化"] = temp_df["美国阿拉斯加州原油产量"].apply(lambda x: x[1])
+    big_df["美国国内原油总量-产量"] = temp_df["美国国内原油总量"].apply(lambda x: x[0])
+    big_df["美国国内原油总量-变化"] = temp_df["美国国内原油总量"].apply(lambda x: x[1])
+    big_df["美国本土48州原油产量-产量"] = temp_df["美国本土48州原油产量"].apply(
+        lambda x: x[0]
+    )
+    big_df["美国本土48州原油产量-变化"] = temp_df["美国本土48州原油产量"].apply(
+        lambda x: x[1]
+    )
+    big_df["美国阿拉斯加州原油产量-产量"] = temp_df["美国阿拉斯加州原油产量"].apply(
+        lambda x: x[0]
+    )
+    big_df["美国阿拉斯加州原油产量-变化"] = temp_df["美国阿拉斯加州原油产量"].apply(
+        lambda x: x[1]
+    )
     big_df = big_df.astype("float")
+    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
 
 
@@ -2613,24 +1000,27 @@ def macro_usa_cftc_nc_holding() -> pd.DataFrame:
     """
     美国商品期货交易委员会CFTC外汇类非商业持仓报告, 数据区间从 19830107-至今
     https://datacenter.jin10.com/reportType/dc_cftc_nc_report
-    https://cdn.jin10.com/data_center/reports/cftc_4.json?_=1591535493741
+    :return: 美国商品期货交易委员会CFTC外汇类非商业持仓报告
     :return: pandas.DataFrame
     """
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/cftc_4.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/cftc_4.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
-    temp_df.fillna("[0, 0, 0]", inplace=True)
+    temp_df.fillna(value="[0, 0, 0]", inplace=True)
     big_df = pd.DataFrame()
     for item in temp_df.columns:
         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.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], ignore_index=True, inplace=True)
     return big_df
 
 
@@ -2639,24 +1029,27 @@ def macro_usa_cftc_c_holding() -> pd.DataFrame:
     """
     美国商品期货交易委员会CFTC商品类非商业持仓报告, 数据区间从 19830107-至今
     https://datacenter.jin10.com/reportType/dc_cftc_c_report
-    https://cdn.jin10.com/data_center/reports/cftc_2.json?_=1591536282271
+    :return: 美国商品期货交易委员会CFTC外汇类非商业持仓报告
     :return: pandas.DataFrame
     """
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/cftc_2.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/cftc_2.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
-    temp_df.fillna("[0, 0, 0]", inplace=True)
+    temp_df.fillna(value="[0, 0, 0]", inplace=True)
     big_df = pd.DataFrame()
     for item in temp_df.columns:
         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.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], ignore_index=True, inplace=True)
     return big_df
 
 
@@ -2665,24 +1058,27 @@ def macro_usa_cftc_merchant_currency_holding() -> pd.DataFrame:
     """
     美国商品期货交易委员会CFTC外汇类商业持仓报告, 数据区间从 19860115-至今
     https://datacenter.jin10.com/reportType/dc_cftc_merchant_currency
-    https://cdn.jin10.com/data_center/reports/cftc_3.json?_=1591536389283
+    :return: 美国商品期货交易委员会CFTC外汇类商业持仓报告
     :return: pandas.DataFrame
     """
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/cftc_3.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/cftc_3.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
-    temp_df.fillna("[0, 0, 0]", inplace=True)
+    temp_df.fillna(value="[0, 0, 0]", inplace=True)
     big_df = pd.DataFrame()
     for item in temp_df.columns:
         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.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], ignore_index=True, inplace=True)
     return big_df
 
 
@@ -2691,53 +1087,55 @@ def macro_usa_cftc_merchant_goods_holding() -> pd.DataFrame:
     """
     美国商品期货交易委员会CFTC商品类商业持仓报告, 数据区间从 19860115-至今
     https://datacenter.jin10.com/reportType/dc_cftc_merchant_goods
-    https://cdn.jin10.com/data_center/reports/cftc_1.json?_=1591536502095
     :return: 美国商品期货交易委员会CFTC商品类商业持仓报告
     :rtype: pandas.DataFrame
     """
     t = time.time()
     params = {"_": str(int(round(t * 1000)))}
     r = requests.get(
-        "https://cdn.jin10.com/data_center/reports/cftc_1.json", params=params
+        url="https://cdn.jin10.com/data_center/reports/cftc_1.json", params=params
     )
     json_data = r.json()
     temp_df = pd.DataFrame(json_data["values"]).T
-    temp_df.fillna("[0, 0, 0]", inplace=True)
+    temp_df.fillna(value="[0, 0, 0]", inplace=True)
     big_df = pd.DataFrame()
     for item in temp_df.columns:
         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.reset_index(inplace=True)
+    big_df.rename(columns={"index": "日期"}, inplace=True)
+    big_df.sort_values(by=["日期"], ignore_index=True, inplace=True)
     return big_df
 
 
 # 金十数据中心-CME-贵金属
-# def macro_usa_cme_merchant_goods_holding():
-#     """
-#     CME-贵金属, 数据区间从 19860115-至今
-#     https://datacenter.jin10.com/org
-#     https://cdn.jin10.com/data_center/reports/cme_3.json?_=1591536643385
-#     :return: pandas.DataFrame
-#     """
-#     t = time.time()
-#     params = {
-#         "_": str(int(round(t * 1000)))
-#     }
-#     r = requests.get("https://cdn.jin10.com/data_center/reports/cme_3.json", params=params)
-#     json_data = r.json()
-#     json_data["values"].keys()
-#     temp_df = pd.DataFrame(json_data["values"]).T
-#     temp_df.fillna("[0, 0, 0]", inplace=True)
-#     big_df = pd.DataFrame()
-#     for item in temp_df.columns:
-#         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)
-#     return big_df
+def macro_usa_cme_merchant_goods_holding():
+    """
+    CME-贵金属, 数据区间从 20180405-至今
+    https://datacenter.jin10.com/org
+    :return: CME-贵金属
+    :return: pandas.DataFrame
+    """
+    t = time.time()
+    params = {"_": str(int(round(t * 1000)))}
+    r = requests.get(
+        url="https://cdn.jin10.com/data_center/reports/cme_3.json", params=params
+    )
+    json_data = r.json()
+    big_df = pd.DataFrame()
+    for item in json_data["values"].keys():
+        temp_df = pd.DataFrame(json_data["values"][item])
+        temp_df["日期"] = item
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
+
+    big_df.columns = ["pz", "tc", "-", "-", "-", "成交量", "-", "-", "日期"]
+    big_df["品种"] = big_df["pz"] + "-" + big_df["tc"]
+    big_df = big_df[["日期", "品种", "成交量"]]
+    big_df.sort_values(["日期"], ignore_index=True, inplace=True)
+    return big_df
 
 
 if __name__ == "__main__":
@@ -2748,100 +1146,131 @@ if __name__ == "__main__":
     # 金十数据中心-经济指标-美国-经济状况-美国GDP
     macro_usa_gdp_monthly_df = macro_usa_gdp_monthly()
     print(macro_usa_gdp_monthly_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国CPI月率报告
     macro_usa_cpi_monthly_df = macro_usa_cpi_monthly()
     print(macro_usa_cpi_monthly_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国核心CPI月率报告
     macro_usa_core_cpi_monthly_df = macro_usa_core_cpi_monthly()
     print(macro_usa_core_cpi_monthly_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国个人支出月率报告
     macro_usa_personal_spending_df = macro_usa_personal_spending()
     print(macro_usa_personal_spending_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国零售销售月率报告
     macro_usa_retail_sales_df = macro_usa_retail_sales()
     print(macro_usa_retail_sales_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国进口物价指数报告
     macro_usa_import_price_df = macro_usa_import_price()
     print(macro_usa_import_price_df)
+
     # 金十数据中心-经济指标-美国-物价水平-美国出口价格指数报告
     macro_usa_export_price_df = macro_usa_export_price()
     print(macro_usa_export_price_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-LMCI
     macro_usa_lmci_df = macro_usa_lmci()
     print(macro_usa_lmci_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-失业率-美国失业率报告
     macro_usa_unemployment_rate_df = macro_usa_unemployment_rate()
     print(macro_usa_unemployment_rate_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-失业率-美国挑战者企业裁员人数报告
     macro_usa_job_cuts_df = macro_usa_job_cuts()
     print(macro_usa_job_cuts_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-就业人口-美国非农就业人数报告
     macro_usa_non_farm_df = macro_usa_non_farm()
     print(macro_usa_non_farm_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-就业人口-美国ADP就业人数报告
     macro_usa_adp_employment_df = macro_usa_adp_employment()
     print(macro_usa_adp_employment_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-消费者收入与支出-美国核心PCE物价指数年率报告
     macro_usa_core_pce_price_df = macro_usa_core_pce_price()
     print(macro_usa_core_pce_price_df)
+
     # 金十数据中心-经济指标-美国-劳动力市场-消费者收入与支出-美国实际个人消费支出季率初值报告
     macro_usa_real_consumer_spending_df = macro_usa_real_consumer_spending()
     print(macro_usa_real_consumer_spending_df)
+
     # 金十数据中心-经济指标-美国-贸易状况-美国贸易帐报告
     macro_usa_trade_balance_df = macro_usa_trade_balance()
     print(macro_usa_trade_balance_df)
+
     # 金十数据中心-经济指标-美国-贸易状况-美国经常帐报告
     macro_usa_current_account_df = macro_usa_current_account()
     print(macro_usa_current_account_df)
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-贝克休斯钻井报告
     macro_usa_rig_count_df = macro_usa_rig_count()
     print(macro_usa_rig_count_df)
-    # 金十数据中心-经济指标-美国-产业指标-制造业-美国个人支出月率报告
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-美国生产者物价指数(PPI)报告
     macro_usa_ppi_df = macro_usa_ppi()
     print(macro_usa_ppi_df)
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-美国核心生产者物价指数(PPI)报告
     macro_usa_core_ppi_df = macro_usa_core_ppi()
     print(macro_usa_core_ppi_df)
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-美国API原油库存报告
     macro_usa_api_crude_stock_df = macro_usa_api_crude_stock()
     print(macro_usa_api_crude_stock_df)
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-美国Markit制造业PMI初值报告
     macro_usa_pmi_df = macro_usa_pmi()
     print(macro_usa_pmi_df)
+
     # 金十数据中心-经济指标-美国-产业指标-制造业-美国ISM制造业PMI报告
     macro_usa_ism_pmi_df = macro_usa_ism_pmi()
     print(macro_usa_ism_pmi_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国NAHB房产市场指数报告
     macro_usa_nahb_house_market_index_df = macro_usa_nahb_house_market_index()
     print(macro_usa_nahb_house_market_index_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国新屋开工总数年化报告
     macro_usa_house_starts_df = macro_usa_house_starts()
     print(macro_usa_house_starts_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国新屋销售总数年化报告
     macro_usa_new_home_sales_df = macro_usa_new_home_sales()
     print(macro_usa_new_home_sales_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国营建许可总数报告
     macro_usa_building_permits_df = macro_usa_building_permits()
     print(macro_usa_building_permits_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国成屋销售总数年化报告
     macro_usa_exist_home_sales_df = macro_usa_exist_home_sales()
     print(macro_usa_exist_home_sales_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国FHFA房价指数月率报告
     macro_usa_house_price_index_df = macro_usa_house_price_index()
     print(macro_usa_house_price_index_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国S&P/CS20座大城市房价指数年率报告
     macro_usa_spcs20_df = macro_usa_spcs20()
     print(macro_usa_spcs20_df)
+
     # 金十数据中心-经济指标-美国-产业指标-房地产-美国成屋签约销售指数月率报告
     macro_usa_pending_home_sales_df = macro_usa_pending_home_sales()
     print(macro_usa_pending_home_sales_df)
+
     # 金十数据中心-经济指标-美国-领先指标-美国谘商会消费者信心指数报告
     macro_usa_cb_consumer_confidence_df = macro_usa_cb_consumer_confidence()
     print(macro_usa_cb_consumer_confidence_df)
+
     # 金十数据中心-经济指标-美国-领先指标-美国NFIB小型企业信心指数报告
     macro_usa_nfib_small_business_df = macro_usa_nfib_small_business()
     print(macro_usa_nfib_small_business_df)
+
     # 金十数据中心-经济指标-美国-领先指标-美国密歇根大学消费者信心指数初值报告
     macro_usa_michigan_consumer_sentiment_df = macro_usa_michigan_consumer_sentiment()
     print(macro_usa_michigan_consumer_sentiment_df)
@@ -2861,14 +1290,21 @@ if __name__ == "__main__":
     # 金十数据中心-美国商品期货交易委员会CFTC外汇类非商业持仓报告
     macro_usa_cftc_nc_holding_df = macro_usa_cftc_nc_holding()
     print(macro_usa_cftc_nc_holding_df)
+
     # 金十数据中心-美国商品期货交易委员会CFTC商品类非商业持仓报告
     macro_usa_cftc_c_holding_df = macro_usa_cftc_c_holding()
     print(macro_usa_cftc_c_holding_df)
+
     # 金十数据中心-美国商品期货交易委员会CFTC外汇类商业持仓报告
     macro_usa_cftc_merchant_currency_holding_df = (
         macro_usa_cftc_merchant_currency_holding()
     )
     print(macro_usa_cftc_merchant_currency_holding_df)
+
     # 金十数据中心-美国商品期货交易委员会CFTC商品类商业持仓报告
     macro_usa_cftc_merchant_goods_holding_df = macro_usa_cftc_merchant_goods_holding()
     print(macro_usa_cftc_merchant_goods_holding_df)
+
+    # 金十数据中心-CME-贵金属
+    macro_usa_cme_merchant_goods_holding_df = macro_usa_cme_merchant_goods_holding()
+    print(macro_usa_cme_merchant_goods_holding_df)