erge remote-tracking branch 'origin/main'

akshare/__init__.py

@@ -2780,9 +2780,10 @@
 1.13.66 fix: fix stock_lhb_yytj_sina interface
 1.13.67 fix: fix bond_info_cm interface
 1.13.68 fix: fix rate_interbank interface
+1.13.69 fix: fix get_shfe_rank_table interface
 """
 
-__version__ = "1.13.68"
+__version__ = "1.13.69"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/cons.py

@@ -228,7 +228,7 @@
 SYS_SPOT_PRICE_URL = "http://www.100ppi.com/sf/day-{}.html"
 SYS_SPOT_PRICE_LATEST_URL = "http://www.100ppi.com/sf/"
 
-SHFE_VOL_RANK_URL = "http://www.shfe.com.cn/data/dailydata/kx/pm%s.dat"
+SHFE_VOL_RANK_URL = "https://tsite.shfe.com.cn/data/dailydata/kx/pm%s.dat"
 CFFEX_VOL_RANK_URL = "http://www.cffex.com.cn/sj/ccpm/%s/%s/%s_1.csv"
 DCE_VOL_RANK_URL_1 = "http://www.dce.com.cn/publicweb/quotesdata/exportMemberDealPosiQuotesData.html?memberDealPosiQuotes.variety=%s&memberDealPosiQuotes.trade_type=0&contract.contract_id=%s&contract.variety_id=%s&year=%s&month=%s&day=%s&exportFlag=txt"
 DCE_VOL_RANK_URL_2 = "http://www.dce.com.cn/publicweb/quotesdata/memberDealPosiQuotes.html?memberDealPosiQuotes.variety=%s&memberDealPosiQuotes.trade_type=0&contract.contract_id=all&contract.variety_id=%s&year=%s&month=%s&day=%s"
@@ -240,8 +240,8 @@
 
 DCE_RECEIPT_URL = "http://www.dce.com.cn/publicweb/quotesdata/wbillWeeklyQuotes.html"
 
-SHFE_RECEIPT_URL_1 = "http://www.shfe.com.cn/data/dailydata/%sdailystock.html"
-SHFE_RECEIPT_URL_2 = "http://www.shfe.com.cn/data/dailydata/%sdailystock.dat"
+SHFE_RECEIPT_URL_1 = "http://tsite.shfe.com.cn/data/dailydata/%sdailystock.html"
+SHFE_RECEIPT_URL_2 = "http://tsite.shfe.com.cn/data/dailydata/%sdailystock.dat"
 CZCE_RECEIPT_URL_1 = "http://www.czce.com.cn/cn/exchange/jyxx/sheet/sheet%s.html"
 CZCE_RECEIPT_URL_2 = "http://www.czce.com.cn/cn/exchange/%s/datawhsheet/%s.htm"
 CZCE_RECEIPT_URL_3 = (
@@ -250,7 +250,7 @@
 
 CFFEX_DAILY_URL = "http://www.cffex.com.cn/fzjy/mrhq/{}/{}/{}_1.csv"
 SHFE_DAILY_URL = "http://tsite.shfe.com.cn/data/dailydata/kx/kx%s.dat"
-SHFE_V_WAP_URL = "http://www.shfe.com.cn/data/dailydata/ck/%sdailyTimePrice.dat"
+SHFE_V_WAP_URL = "http://tsite.shfe.com.cn/data/dailydata/ck/%sdailyTimePrice.dat"
 DCE_DAILY_URL = "http://www.dce.com.cn//publicweb/quotesdata/dayQuotesCh.html"
 CZCE_DAILY_URL_1 = "http://www.czce.com.cn/cn/exchange/jyxx/hq/hq%s.html"
 CZCE_DAILY_URL_2 = "http://www.czce.com.cn/cn/exchange/%s/datadaily/%s.txt"

akshare/futures/cot.py

@@ -300,14 +300,14 @@ def get_shfe_rank_table(
     date                        日期                        string YYYYMMDD
     """
     date = cons.convert_date(date) if date is not None else datetime.date.today()
-    if date < datetime.date(2002, 1, 7):
-        print("shfe数据源开始日期为20020107，跳过")
+    if date < datetime.date(year=2002, month=1, day=7):
+        print("shfe数据源开始日期为 20020107，跳过")
         return {}
     if date.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % date.strftime("%Y%m%d"))
         return {}
     url = cons.SHFE_VOL_RANK_URL % (date.strftime("%Y%m%d"))
-    r = requests_link(url, "utf-8", headers=cons.shfe_headers)
+    r = requests_link(url, encoding="utf-8", headers=cons.shfe_headers)
     try:
         context = json.loads(r.text)
     except:  # noqa: E722
@@ -1338,7 +1338,7 @@ def futures_gfex_position_rank(date: str = "20231113", vars_list: list = None):
     print(get_cffex_rank_table_df)
 
     # 上海期货交易所
-    get_shfe_rank_table_df = get_shfe_rank_table(date="20230808")
+    get_shfe_rank_table_df = get_shfe_rank_table(date="20240509")
     print(get_shfe_rank_table_df)
 
     # 大连商品交易所-老接口

docs/changelog.md

@@ -78,6 +78,10 @@
 
 ## 更新说明详情
 
+1.13.69 fix: fix get_shfe_rank_table interface
+
+    1. 修复 get_shfe_rank_table 接口
+
 1.13.68 fix: fix rate_interbank interface
 
     1. 修复 rate_interbank 接口
@@ -4063,6 +4067,8 @@
 
 ## 版本更新说明
 
+1.13.69 fix: fix get_shfe_rank_table interface
+
 1.13.68 fix: fix rate_interbank interface
 
 1.13.67 fix: fix bond_info_cm interface