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

akshare/economic/macro_china.py

@@ -1,17 +1,20 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/5/17 16:20
+Date: 2025/11/12 15:20
 Desc: 宏观数据-中国
 """
 
 import datetime
 import json
 import math
+import ssl
 import time
 
 import pandas as pd
 import requests
+from requests.adapters import HTTPAdapter
+from urllib3.poolmanager import PoolManager
 
 from akshare.economic.cons import (
     JS_CHINA_ENERGY_DAILY_URL,
@@ -20,6 +23,24 @@ from akshare.utils import demjson
 from akshare.utils.tqdm import get_tqdm
 
 
+class TLSAdapter(HTTPAdapter):
+    def init_poolmanager(self, connections, maxsize, block=False):
+        ctx = ssl.create_default_context()
+        # 降低安全级别以兼容旧服务器
+        ctx.set_ciphers('DEFAULT@SECLEVEL=1')
+        # 禁用不安全的协议
+        ctx.options |= ssl.OP_NO_SSLv2
+        ctx.options |= ssl.OP_NO_SSLv3
+        # 指定使用 TLSv1.2
+        self.poolmanager = PoolManager(
+            num_pools=connections,
+            maxsize=maxsize,
+            block=block,
+            ssl_version=ssl.PROTOCOL_TLSv1_2,
+            ssl_context=ctx
+        )
+
+
 def __macro_china_base_func(symbol: str, params: dict) -> pd.DataFrame:
     """
     金十数据中心-经济指标-美国-基础函数
@@ -32,7 +53,7 @@ def __macro_china_base_func(symbol: str, params: dict) -> pd.DataFrame:
     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",
+                      "Chrome/107.0.0.0 Safari/537.36",
         "x-app-id": "rU6QIu7JHe2gOUeR",
         "x-csrf-token": "x-csrf-token",
         "x-version": "1.0.0",
@@ -93,8 +114,8 @@ def macro_china_qyspjg() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,BASE,BASE_SAME,BASE_SEQUENTIAL,FARM_BASE,FARM_BASE_SAME,"
-        "FARM_BASE_SEQUENTIAL,MINERAL_BASE,MINERAL_BASE_SAME,MINERAL_BASE_SEQUENTIAL,"
-        "ENERGY_BASE,ENERGY_BASE_SAME,ENERGY_BASE_SEQUENTIAL",
+                   "FARM_BASE_SEQUENTIAL,MINERAL_BASE,MINERAL_BASE_SAME,MINERAL_BASE_SEQUENTIAL,"
+                   "ENERGY_BASE,ENERGY_BASE_SAME,ENERGY_BASE_SEQUENTIAL",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -105,7 +126,6 @@ def macro_china_qyspjg() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -189,7 +209,7 @@ def macro_china_fdi() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,ACTUAL_FOREIGN,ACTUAL_FOREIGN_SAME,ACTUAL_FOREIGN_SEQUENTIAL,"
-        "ACTUAL_FOREIGN_ACCUMULATE,FOREIGN_ACCUMULATE_SAME",
+                   "ACTUAL_FOREIGN_ACCUMULATE,FOREIGN_ACCUMULATE_SAME",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -200,7 +220,6 @@ def macro_china_fdi() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -230,6 +249,7 @@ def macro_china_fdi() -> pd.DataFrame:
     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.sort_values(["月份"], ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -237,12 +257,14 @@ def macro_china_fdi() -> pd.DataFrame:
 def macro_china_shrzgm() -> pd.DataFrame:
     """
     商务数据中心-国内贸易-社会融资规模增量统计
-    http://data.mofcom.gov.cn/gnmy/shrzgm.shtml
+    https://data.mofcom.gov.cn/gnmy/shrzgm.shtml
     :return: 社会融资规模增量统计
     :rtype: pandas.DataFrame
     """
-    url = "http://data.mofcom.gov.cn/datamofcom/front/gnmy/shrzgmQuery"
-    r = requests.post(url)
+    session = requests.Session()
+    session.mount(prefix='https://', adapter=TLSAdapter())
+    url = "https://data.mofcom.gov.cn/datamofcom/front/gnmy/shrzgmQuery"
+    r = session.post(url)
     data_json = r.json()
     temp_df = pd.DataFrame(data_json)
     temp_df.columns = [
@@ -326,6 +348,7 @@ def macro_china_urban_unemployment() -> pd.DataFrame:
     temp_df.columns = ["date", "item", "value"]
     temp_df["item"] = temp_df["item"].map(code_item_map)
     temp_df["value"] = pd.to_numeric(temp_df["value"], errors="coerce")
+    temp_df.sort_values(by=["date"], ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -709,7 +732,7 @@ def macro_china_daily_energy() -> pd.DataFrame:
             str(int(round(t * 1000))), str(int(round(t * 1000)) + 90)
         )
     )
-    json_data = json.loads(res.text[res.text.find("{") : res.text.rfind("}") + 1])
+    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"]
@@ -982,7 +1005,6 @@ def macro_china_lpr() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1689835278471",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -1024,7 +1046,7 @@ def macro_china_new_house_price(
     params = {
         "reportName": "RPT_ECONOMY_HOUSE_PRICE",
         "columns": "REPORT_DATE,CITY,FIRST_COMHOUSE_SAME,FIRST_COMHOUSE_SEQUENTIAL,FIRST_COMHOUSE_BASE,"
-        "SECOND_HOUSE_SAME,SECOND_HOUSE_SEQUENTIAL,SECOND_HOUSE_BASE,REPORT_DAY",
+                   "SECOND_HOUSE_SAME,SECOND_HOUSE_SEQUENTIAL,SECOND_HOUSE_BASE,REPORT_DAY",
         "filter": f'(CITY in ("{city_first}","{city_second}"))',
         "pageNumber": "1",
         "pageSize": "500",
@@ -1035,7 +1057,6 @@ def macro_china_new_house_price(
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669352163467",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -1046,8 +1067,8 @@ def macro_china_new_house_price(
         "新建商品住宅价格指数-同比",
         "新建商品住宅价格指数-环比",
         "新建商品住宅价格指数-定基",
-        "二手住宅价格指数-环比",
         "二手住宅价格指数-同比",
+        "二手住宅价格指数-环比",
         "二手住宅价格指数-定基",
         "-",
     ]
@@ -1058,8 +1079,8 @@ def macro_china_new_house_price(
             "新建商品住宅价格指数-同比",
             "新建商品住宅价格指数-环比",
             "新建商品住宅价格指数-定基",
-            "二手住宅价格指数-环比",
             "二手住宅价格指数-同比",
+            "二手住宅价格指数-环比",
             "二手住宅价格指数-定基",
         ]
     ]
@@ -1082,6 +1103,7 @@ def macro_china_new_house_price(
     temp_df["二手住宅价格指数-定基"] = pd.to_numeric(
         temp_df["二手住宅价格指数-定基"], errors="coerce"
     )
+    temp_df.sort_values(["日期"], ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -1096,7 +1118,7 @@ def macro_china_enterprise_boom_index() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,BOOM_INDEX,FAITH_INDEX,BOOM_INDEX_SAME,BOOM_INDEX_SEQUENTIAL,"
-        "FAITH_INDEX_SAME,FAITH_INDEX_SEQUENTIAL",
+                   "FAITH_INDEX_SAME,FAITH_INDEX_SEQUENTIAL",
         "pageNumber": "1",
         "pageSize": "500",
         "sortColumns": "REPORT_DATE",
@@ -1107,7 +1129,6 @@ def macro_china_enterprise_boom_index() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669352163467",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -1175,7 +1196,6 @@ def macro_china_national_tax_receipts() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669352163467",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -1206,7 +1226,7 @@ def macro_china_bank_financing() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI01516267")',
         "source": "WEB",
         "client": "WEB",
@@ -1252,7 +1272,7 @@ def macro_china_insurance_income() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMM00088870")',
         "source": "WEB",
         "client": "WEB",
@@ -1298,7 +1318,7 @@ def macro_china_mobile_number() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00225823")',
         "source": "WEB",
         "client": "WEB",
@@ -1345,7 +1365,7 @@ def macro_china_vegetable_basket() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00009275")',
         "source": "WEB",
         "client": "WEB",
@@ -1400,7 +1420,7 @@ def macro_china_agricultural_product() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00009274")',
         "source": "WEB",
         "client": "WEB",
@@ -1455,7 +1475,7 @@ def macro_china_agricultural_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00662543")',
         "source": "WEB",
         "client": "WEB",
@@ -1510,7 +1530,7 @@ def macro_china_energy_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00662539")',
         "source": "WEB",
         "client": "WEB",
@@ -1565,7 +1585,7 @@ def macro_china_commodity_price_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00662535")',
         "source": "WEB",
         "client": "WEB",
@@ -1620,7 +1640,7 @@ def macro_global_sox_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00055562")',
         "source": "WEB",
         "client": "WEB",
@@ -1675,7 +1695,7 @@ def macro_china_yw_electronic_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00055551")',
         "source": "WEB",
         "client": "WEB",
@@ -1733,7 +1753,7 @@ def macro_china_construction_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,"
-        "CHANGERATE_1Y,CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_1Y,CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00662541")',
         "source": "WEB",
         "client": "WEB",
@@ -1788,7 +1808,7 @@ def macro_china_construction_price_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00237146")',
         "source": "WEB",
         "client": "WEB",
@@ -1843,7 +1863,7 @@ def macro_china_lpi_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00352262")',
         "source": "WEB",
         "client": "WEB",
@@ -1898,7 +1918,7 @@ def macro_china_bdti_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00107668")',
         "source": "WEB",
         "client": "WEB",
@@ -1953,7 +1973,7 @@ def macro_china_bsi_index() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMI00107667")',
         "source": "WEB",
         "client": "WEB",
@@ -2008,7 +2028,7 @@ def _em_macro_1(em_id) -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,"
-        "CHANGERATE_6M,CHANGERATE_1Y,CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_6M,CHANGERATE_1Y,CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": "(INDICATOR_ID=" + ind_id + ")",
         "source": "WEB",
         "client": "WEB",
@@ -2102,7 +2122,7 @@ def macro_china_new_financial_credit() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,RMB_LOAN,RMB_LOAN_SAME,RMB_LOAN_SEQUENTIAL,"
-        "RMB_LOAN_ACCUMULATE,LOAN_ACCUMULATE_SAME",
+                   "RMB_LOAN_ACCUMULATE,LOAN_ACCUMULATE_SAME",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2113,7 +2133,6 @@ def macro_china_new_financial_credit() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2151,11 +2170,11 @@ def macro_china_fx_gold() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/81.0.4044.138 Safari/537.36",
+                      "Chrome/81.0.4044.138 Safari/537.36",
     }
     params = {
         "columns": "REPORT_DATE,TIME,GOLD_RESERVES,GOLD_RESERVES_SAME,"
-        "GOLD_RESERVES_SEQUENTIAL,FOREX,FOREX_SAME,FOREX_SEQUENTIAL",
+                   "GOLD_RESERVES_SEQUENTIAL,FOREX,FOREX_SAME,FOREX_SEQUENTIAL",
         "pageNumber": "1",
         "pageSize": "1000",
         "sortColumns": "REPORT_DATE",
@@ -2166,7 +2185,6 @@ def macro_china_fx_gold() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1660718498421",
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
@@ -2218,19 +2236,18 @@ def macro_china_stock_market_cap() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/81.0.4044.138 Safari/537.36",
+                      "Chrome/81.0.4044.138 Safari/537.36",
     }
     params = {
         "reportName": "RPT_ECONOMY_STOCK_STATISTICS",
         "columns": "REPORT_DATE,TIME,TOTAL_SHARES_SH,TOTAL_MARKE_SH,DEAL_AMOUNT_SH,VOLUME_SH,HIGH_INDEX_SH,"
-        "LOW_INDEX_SH,TOTAL_SZARES_SZ,TOTAL_MARKE_SZ,DEAL_AMOUNT_SZ,VOLUME_SZ,HIGH_INDEX_SZ,LOW_INDEX_SZ",
+                   "LOW_INDEX_SH,TOTAL_SZARES_SZ,TOTAL_MARKE_SZ,DEAL_AMOUNT_SZ,VOLUME_SZ,HIGH_INDEX_SZ,LOW_INDEX_SZ",
         "sortColumns": "REPORT_DATE",
         "sortTypes": "-1",
         "pageNumber": "1",
         "pageSize": "1000",
         "source": "WEB",
         "client": "WEB",
-        "_": "1660718498421",
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
@@ -2305,7 +2322,7 @@ def macro_china_money_supply() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,BASIC_CURRENCY,BASIC_CURRENCY_SAME,BASIC_CURRENCY_SEQUENTIAL,CURRENCY,"
-        "CURRENCY_SAME,CURRENCY_SEQUENTIAL,FREE_CASH,FREE_CASH_SAME,FREE_CASH_SEQUENTIAL",
+                   "CURRENCY_SAME,CURRENCY_SEQUENTIAL,FREE_CASH,FREE_CASH_SAME,FREE_CASH_SEQUENTIAL",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2316,7 +2333,6 @@ def macro_china_money_supply() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2389,8 +2405,8 @@ def macro_china_cpi() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,NATIONAL_SAME,NATIONAL_BASE,NATIONAL_SEQUENTIAL,NATIONAL_ACCUMULATE,"
-        "CITY_SAME,CITY_BASE,CITY_SEQUENTIAL,CITY_ACCUMULATE,RURAL_SAME,"
-        "RURAL_BASE,RURAL_SEQUENTIAL,RURAL_ACCUMULATE",
+                   "CITY_SAME,CITY_BASE,CITY_SEQUENTIAL,CITY_ACCUMULATE,RURAL_SAME,"
+                   "RURAL_BASE,RURAL_SEQUENTIAL,RURAL_ACCUMULATE",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2401,7 +2417,6 @@ def macro_china_cpi() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2465,7 +2480,7 @@ def macro_china_gdp() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,DOMESTICL_PRODUCT_BASE,FIRST_PRODUCT_BASE,SECOND_PRODUCT_BASE,"
-        "THIRD_PRODUCT_BASE,SUM_SAME,FIRST_SAME,SECOND_SAME,THIRD_SAME",
+                   "THIRD_PRODUCT_BASE,SUM_SAME,FIRST_SAME,SECOND_SAME,THIRD_SAME",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2476,7 +2491,6 @@ def macro_china_gdp() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2553,7 +2567,6 @@ def macro_china_ppi() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2599,7 +2612,6 @@ def macro_china_pmi() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2652,7 +2664,6 @@ def macro_china_gdzctz() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2692,8 +2703,8 @@ def macro_china_hgjck() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,EXIT_BASE,IMPORT_BASE,EXIT_BASE_SAME,IMPORT_BASE_SAME,"
-        "EXIT_BASE_SEQUENTIAL,IMPORT_BASE_SEQUENTIAL,EXIT_ACCUMULATE,"
-        "IMPORT_ACCUMULATE,EXIT_ACCUMULATE_SAME,IMPORT_ACCUMULATE_SAME",
+                   "EXIT_BASE_SEQUENTIAL,IMPORT_BASE_SEQUENTIAL,EXIT_ACCUMULATE,"
+                   "IMPORT_ACCUMULATE,EXIT_ACCUMULATE_SAME,IMPORT_ACCUMULATE_SAME",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2704,7 +2715,6 @@ def macro_china_hgjck() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2794,7 +2804,6 @@ def macro_china_czsr() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2824,7 +2833,7 @@ def macro_china_czsr() -> pd.DataFrame:
     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.sort_values(by=["月份"], ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -2848,7 +2857,6 @@ def macro_china_whxd() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2875,6 +2883,7 @@ def macro_china_whxd() -> pd.DataFrame:
     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.sort_values(by=["月份"], ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -2898,7 +2907,6 @@ def macro_china_wbck() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -2925,7 +2933,6 @@ def macro_china_wbck() -> pd.DataFrame:
     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")
-
     return temp_df
 
 
@@ -2939,8 +2946,8 @@ def macro_china_xfzxx() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,TIME,CONSUMERS_FAITH_INDEX,FAITH_INDEX_SAME,FAITH_INDEX_SEQUENTIAL,"
-        "CONSUMERS_ASTIS_INDEX,ASTIS_INDEX_SAME,ASTIS_INDEX_SEQUENTIAL,CONSUMERS_EXPECT_INDEX,"
-        "EXPECT_INDEX_SAME,EXPECT_INDEX_SEQUENTIAL",
+                   "CONSUMERS_ASTIS_INDEX,ASTIS_INDEX_SAME,ASTIS_INDEX_SEQUENTIAL,CONSUMERS_EXPECT_INDEX,"
+                   "EXPECT_INDEX_SAME,EXPECT_INDEX_SEQUENTIAL",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "REPORT_DATE",
@@ -2951,7 +2958,6 @@ def macro_china_xfzxx() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -3035,7 +3041,6 @@ def macro_china_gyzjz() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1691676211803",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -3071,7 +3076,7 @@ def macro_china_reserve_requirement_ratio() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "columns": "REPORT_DATE,PUBLISH_DATE,TRADE_DATE,INTEREST_RATE_BB,INTEREST_RATE_BA,CHANGE_RATE_B,"
-        "INTEREST_RATE_SB,INTEREST_RATE_SA,CHANGE_RATE_S,NEXT_SH_RATE,NEXT_SZ_RATE,REMARK",
+                   "INTEREST_RATE_SB,INTEREST_RATE_SA,CHANGE_RATE_S,NEXT_SH_RATE,NEXT_SZ_RATE,REMARK",
         "pageNumber": "1",
         "pageSize": "2000",
         "sortColumns": "PUBLISH_DATE,TRADE_DATE",
@@ -3082,7 +3087,6 @@ def macro_china_reserve_requirement_ratio() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1669047266881",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -3156,11 +3160,11 @@ def macro_china_consumer_goods_retail() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/81.0.4044.138 Safari/537.36",
+                      "Chrome/81.0.4044.138 Safari/537.36",
     }
     params = {
         "columns": "REPORT_DATE,TIME,RETAIL_TOTAL,RETAIL_TOTAL_SAME,RETAIL_TOTAL_SEQUENTIAL,"
-        "RETAIL_TOTAL_ACCUMULATE,RETAIL_ACCUMULATE_SAME",
+                   "RETAIL_TOTAL_ACCUMULATE,RETAIL_ACCUMULATE_SAME",
         "pageNumber": "1",
         "pageSize": "1000",
         "sortColumns": "REPORT_DATE",
@@ -3171,7 +3175,6 @@ def macro_china_consumer_goods_retail() -> pd.DataFrame:
         "p": "1",
         "pageNo": "1",
         "pageNum": "1",
-        "_": "1660718498421",
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
@@ -3217,18 +3220,17 @@ def macro_china_society_electricity() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601557771972",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     for i in range(1, page_num):
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
 
@@ -3271,11 +3273,10 @@ def macro_china_society_traffic_volume() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601557771972",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"]["非累计"])
     tqdm = get_tqdm()
@@ -3283,7 +3284,7 @@ def macro_china_society_traffic_volume() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"]["非累计"])
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3330,11 +3331,10 @@ def macro_china_postal_telecommunicational() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"]["非累计"])
     tqdm = get_tqdm()
@@ -3342,7 +3342,7 @@ def macro_china_postal_telecommunicational() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"]["非累计"])
         big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3365,11 +3365,10 @@ def macro_china_international_tourism_fx() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3377,7 +3376,7 @@ def macro_china_international_tourism_fx() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3400,11 +3399,10 @@ def macro_china_passenger_load_factor() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3412,7 +3410,7 @@ def macro_china_passenger_load_factor() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3435,11 +3433,10 @@ def _macro_china_freight_index() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3447,7 +3444,7 @@ def _macro_china_freight_index() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = big_df.append(temp_df, ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3513,11 +3510,10 @@ def macro_china_central_bank_balance() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3525,7 +3521,7 @@ def macro_china_central_bank_balance() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3548,11 +3544,10 @@ def macro_china_insurance() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3560,7 +3555,7 @@ def macro_china_insurance() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3583,11 +3578,10 @@ def macro_china_supply_of_money() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3595,7 +3589,7 @@ def macro_china_supply_of_money() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3618,11 +3612,10 @@ def macro_china_foreign_exchange_gold() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3630,7 +3623,7 @@ def macro_china_foreign_exchange_gold() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3654,11 +3647,10 @@ def macro_china_retail_price_index() -> pd.DataFrame:
         "from": "0",
         "num": "31",
         "condition": "",
-        "_": "1601624495046",
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{") : -3])
+    data_json = demjson.decode(data_text[data_text.find("{"): -3])
     page_num = math.ceil(int(data_json["count"]) / 31)
     big_df = pd.DataFrame(data_json["data"])
     tqdm = get_tqdm()
@@ -3666,7 +3658,7 @@ def macro_china_retail_price_index() -> pd.DataFrame:
         params.update({"from": i * 31})
         r = requests.get(url, params=params)
         data_text = r.text
-        data_json = demjson.decode(data_text[data_text.find("{") : -3])
+        data_json = demjson.decode(data_text[data_text.find("{"): -3])
         temp_df = pd.DataFrame(data_json["data"])
         big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df.columns = [item[1] for item in data_json["config"]["all"]]
@@ -3687,7 +3679,7 @@ def macro_china_real_estate() -> pd.DataFrame:
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/81.0.4044.138 Safari/537.36",
+                      "Chrome/81.0.4044.138 Safari/537.36",
     }
     params = {
         "sortColumns": "REPORT_DATE",
@@ -3696,7 +3688,7 @@ def macro_china_real_estate() -> pd.DataFrame:
         "pageNumber": "1",
         "reportName": "RPT_INDUSTRY_INDEX",
         "columns": "REPORT_DATE,INDICATOR_VALUE,CHANGE_RATE,CHANGERATE_3M,CHANGERATE_6M,CHANGERATE_1Y,"
-        "CHANGERATE_2Y,CHANGERATE_3Y",
+                   "CHANGERATE_2Y,CHANGERATE_3Y",
         "filter": '(INDICATOR_ID="EMM00121987")',
         "source": "WEB",
         "client": "WEB",