更新数据源路径，添加自动同步配置、修复错误代码文件

Author: timercrack

.github/workflows/auto-sync.yml

@@ -0,0 +1,22 @@
+on:
+  push:
+    branches: [master]
+name: Mirror GitHub Repos to Gitee
+jobs:
+  run:
+    name: Sync-GitHub-to-Gitee
+    runs-on: ubuntu-latest
+    steps:
+    - name: Mirror the Github repos to Gitee.
+      uses: Yikun/hub-mirror-action@master
+      with:
+        src: github/BigBrotherTrade
+        dst: gitee/timercrack
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token: ${{ secrets.GITEE_TOKEN }}
+        force_update: true
+        src_account_type: org
+        dst_account_type: user
+        mappings: "dashboard=>dashboards"
+        static_list: "trader"
+        cache_path: /github/workspace/hub-mirror-cache

test/test.py

@@ -1,44 +1,29 @@
-import aioredis
+import sys
+import os
+import django
+if sys.platform == 'darwin':
+    sys.path.append('/Users/jeffchen/Documents/gitdir/dashboard')
+elif sys.platform == 'win32':
+    sys.path.append(r'E:\github\dashboard')
+else:
+    sys.path.append('/root/gitee/dashboard')
+os.environ["DJANGO_SETTINGS_MODULE"] = "dashboard.settings"
+os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
+django.setup()
 import asyncio
+import datetime
+import pytz
+from trader.utils import update_from_czce
 
 
-async def reader(message):
-    print(f"in reader: {message}, type={type(message)}")
-
-
-async def monitor1(pb: aioredis.client.PubSub):
-    async for msg in pb.listen():
-        print(f"in monitor1: {msg}, type={type(msg)}")
-        asyncio.create_task(reader(msg))
-        if msg['type'] == 'punsubscribe':
-            print('quit monitor1')
-            break
-
-
-async def main():
-    redis = await aioredis.from_url("redis://192.168.123.142", decode_responses=True)
-    pubsub1 = redis.pubsub()
-    pubsub2 = redis.pubsub()
-    await pubsub1.psubscribe('channel:*')
-    await pubsub2.psubscribe('channel*')
-    await redis.publish("channel:1", "1")
-    await redis.publish("channel:2", "6")
-    await redis.publish("channel:3", "3")
-    await pubsub1.punsubscribe()
-    await pubsub2.punsubscribe()
-    loop = asyncio.get_running_loop()
-    asyncio.run_coroutine_threadsafe(monitor1(pubsub1), loop)
-    asyncio.run_coroutine_threadsafe(monitor1(pubsub2), loop)
-    # await asyncio.gather(monitor1(pubsub1), monitor1(pubsub2))
-    # await pubsub2.run()
-    print('main done!')
-
 if __name__ == "__main__":
     try:
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
-        loop.create_task(main())
-        loop.run_forever()
+        day = datetime.datetime.now().replace(tzinfo=pytz.FixedOffset(480))
+        day = day - datetime.timedelta(days=1)
+        loop.run_until_complete(update_from_czce(day))
+        print("DONE!")
     except KeyboardInterrupt:
         pass
 

trader/utils/__init__.py

@@ -123,7 +123,7 @@ async def update_from_shfe(day: datetime.datetime) -> bool:
         async with aiohttp.ClientSession() as session:
             day_str = day.strftime('%Y%m%d')
             await max_conn_shfe.acquire()
-            async with session.get(f'http://{shfe_ip}/data/dailydata/kx/kx{day_str}.dat') as response:
+            async with session.get(f'http://{shfe_ip}/data/tradedata/future/dailydata/kx{day_str}.dat') as response:
                 rst = await response.read()
                 rst_json = json.loads(rst)
                 max_conn_shfe.release()
@@ -226,7 +226,7 @@ async def update_from_dce(day: datetime.datetime) -> bool:
                     'year': day.year, 'month': day.month-1, 'day': day.day}) as response:
                 rst = await response.text()
                 max_conn_dce.release()
-                for lines in rst.split('\r\n')[1:-3]:
+                for lines in rst.split('\r\n')[3:-3]:
                     if '小计' in lines or '品种' in lines:
                         continue
                     inst_data_raw = [x.strip() for x in lines.split('\t')]
@@ -297,7 +297,7 @@ async def update_from_cffex(day: datetime.datetime) -> bool:
     try:
         async with aiohttp.ClientSession() as session:
             await max_conn_cffex.acquire()
-            async with session.get(f"http://{cffex_ip}/fzjy/mrhq/{day.strftime('%Y%m/%d')}/index.xml") as response:
+            async with session.get(f"http://{cffex_ip}/sj/hqsj/rtj/{day.strftime('%Y%m/%d')}/index.xml?id=7") as response:
                 rst = await response.text()
                 max_conn_cffex.release()
                 tree = ET.fromstring(rst)
@@ -693,7 +693,7 @@ async def get_contracts_argument(day: datetime.datetime = None) -> bool:
         async with aiohttp.ClientSession() as session:
             # 上期所
             async with session.get(
-                    f'http://{shfe_ip}/data/instrument/ContractDailyTradeArgument{day_str}.dat') as response:
+                    f'http://{shfe_ip}/data/busiparamdata/future/ContractDailyTradeArgument{day_str}.dat') as response:
                 rst = await response.read()
                 rst_json = json.loads(rst)
                 for inst_data in rst_json['ContractDailyTradeArgument']: