mns-scheduler 1.3.3.5__py3-none-any.whl → 1.3.3.7__py3-none-any.whl

mns_scheduler/trade/auto_login/trader_auto_service.py

@@ -8,7 +8,7 @@ sys.path.append(project_path)
 import mns_common.component.deal.deal_service_api as deal_service_api
 from mns_common.component.deal.terminal_enum import TerminalEnum
 import time
-
+from loguru import logger
 
 # qmt 自动登录
 def qmt_auto_login():
@@ -21,9 +21,11 @@ def ths_auto_login():
 
 
 def auto_login():
-    qmt_auto_login()
-    time.sleep(5)
+    logger.info("打开ths下单程序")
     ths_auto_login()
+    time.sleep(5)
+    logger.info("打开qmt下单程序")
+    qmt_auto_login()
 
 
 if __name__ == '__main__':

mns_scheduler/trade/task/trader_task_service.py

@@ -11,23 +11,28 @@ import mns_scheduler.trade.auto_login.trader_auto_service as trader_auto_service
 import mns_common.utils.data_frame_util as data_frame_util
 from loguru import logger
 
-# 交易任务
-TRADER_SERVER_PATH = 'H:\\mns-trader.bat'
+# 交易服务端
+TRADER_SERVER_PATH = 'H:\\mns_trader_server.bat'
 # 实时行情同步任务 python名称
-TRADER_SERVER_NAME = "mns-trader"
+TRADER_SERVER_NAME = "mns_trader_server"
 
 
 # 打开交易客户端
 def open_trader_terminal():
-    # 打开任务进程
+    # 打开 [交易web服务端]
+    logger.info('打开 [交易web服务端]')
     cmd_util.open_bat_file(TRADER_SERVER_PATH)
-    # 自动登陆
+    time.sleep(10)
+    logger.info('自动登陆ths和qmt')
+    # 自动登陆ths和qmt
     trader_auto_service.auto_login()
     time.sleep(5)
-    # 需先打开同花顺终端在开始交易服务
+    # 杀死[交易web服务端]，使用同花顺需要先打开xiadan.exe，在重新打开[交易web服务端]
+    logger.info('杀死[交易web服务端]')
     kill_server()
     time.sleep(5)
-    # 打开任务进程
+    logger.info('重新打开 [交易web服务端]')
+    # 重新打开 [交易web服务端]
     cmd_util.open_bat_file(TRADER_SERVER_PATH)
 
 
@@ -45,4 +50,5 @@ def kill_server():
 
 
 if __name__ == '__main__':
+    # kill_server()
     open_trader_terminal()

mns_scheduler/zz_task/data_sync_task.py

@@ -455,6 +455,9 @@ blockingScheduler.add_job(update_one_symbol_all_concepts, 'cron', hour='07,08,18
 # 打开交易客户端
 blockingScheduler.add_job(trader_client_auto_login, 'cron', hour='08,09', minute='04')
 
+# 获取当前持仓
+blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
+
 # 同步公司基本信息
 blockingScheduler.add_job(update_company_base_info, 'cron', hour='08,18', minute='05')
 
@@ -476,26 +479,12 @@ blockingScheduler.add_job(self_choose_stock_task, 'cron', hour='08,17,21', minut
 # 开盘前同步同花顺新概念指数
 blockingScheduler.add_job(sync_new_concept_index, 'cron', hour='09,22', minute='01,10,20,28,41,58')
 
-# 获取同花顺持仓
-blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
-
 # 更新同花顺概念信息
 blockingScheduler.add_job(concept_info_clean, 'cron', hour='9,12,20', minute='24')
 
 # 更新开盘啦指数关系
 blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18', minute='25')
 
-# # 打开实时行情任务同步
-#
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='15')
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='29')
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='12', minute='59')
-# # 关闭实时行情任务
-#
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='09', minute='28')
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='11', minute='31')
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='15', minute='01')
-
 # 自动打新 打新中签高时间段 10:30-11:30
 blockingScheduler.add_job(auto_ipo_buy, 'cron', hour='10', minute='40,50')
 

{mns_scheduler-1.3.3.5.dist-info → mns_scheduler-1.3.3.7.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.5
+Version: 1.3.3.7
 

{mns_scheduler-1.3.3.5.dist-info → mns_scheduler-1.3.3.7.dist-info}/RECORD

@@ -126,11 +126,11 @@ mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16l
 mns_scheduler/trade/auto_sell_service_api.py,sha256=A2RB3WFxVHqbNPaPvhIgO-3uaicFZVmBKUy2TsfMU90,4624
 mns_scheduler/trade/sync_position_api.py,sha256=eGJAL1WoP_WwDloKQqeUXZUqtQv8G6VlODe8EDhmgMY,2748
 mns_scheduler/trade/auto_login/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=1cvKwbfAKmjG312aHLvMXVFs59y8Sg6WnDEWqS_nyMs,686
+mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=bsagj26s74Zv5OEyGahhBX_OK4Iuo5ZmuItsON9DDmY,795
 mns_scheduler/trade/balance/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/balance/ths_account_balance_service.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/trade/task/trader_task_service.py,sha256=YQst2m0MWLnQ7FceCL5EkCEN-Ry7lw_ZTZm6DJdOIQc,1560
+mns_scheduler/trade/task/trader_task_service.py,sha256=OSePnbRgThybYDoegk0we3JgLOZgJgBrO2K5xEg6yOs,1901
 mns_scheduler/trade/tfp/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/tfp/stock_tfp_info_sync.py,sha256=ViAVG-1GWLkRxiSBPLIfNICZRnpNZ3mHf44R7X7O4IE,2440
 mns_scheduler/zb/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
@@ -155,8 +155,8 @@ mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py,sha256=LOEUyTA5g7N6FWxUpHWimWTeX
 mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=9Sv1G88poLG3_8aLPkfr8bdwD_AzbSrwvHTGPErOtQU,7501
 mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=caW-MuF0RFLavJZafeLDYQ29-GxwGsmr5YVrN4lost8,2135
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=5HchdkllTsxE1SE7eDSs0v3plPL0aJwqwgP6d336pa0,23230
-mns_scheduler-1.3.3.5.dist-info/METADATA,sha256=JlGIL4FSSrijaspTvPC6rCZ7umUQrW_YzPTHJiP0cFk,64
-mns_scheduler-1.3.3.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.3.3.5.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.3.3.5.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=bJgvVldBnpjfxDUGnZbYr0OTCL6c07yVBSEwp5VucUg,22628
+mns_scheduler-1.3.3.7.dist-info/METADATA,sha256=VPWVGOpVPpmlwQ__19EkJkCzUMUJ1GfWo0T9wdZ2K34,64
+mns_scheduler-1.3.3.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.3.3.7.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.3.3.7.dist-info/RECORD,,