From c4861d2429c2bf3a3f11309ad879b549e62e722d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 26 四月 2024 15:26:52 +0800
Subject: [PATCH] 下单/撤单通信方式修改/G撤修改
---
huaxin_client/trade_client.py | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/huaxin_client/trade_client.py b/huaxin_client/trade_client.py
index 91cd2ec..48c9b49 100644
--- a/huaxin_client/trade_client.py
+++ b/huaxin_client/trade_client.py
@@ -7,6 +7,8 @@
import threading
import time
+import zmq
+
from huaxin_client import command_manager
from huaxin_client import constant
from huaxin_client import socket_util
@@ -1106,28 +1108,18 @@
# send_response(
# json.dumps({"type": "response", "data": {"code": 0, "data": data}, "client_id": client_id,
# "request_id": request_id}), type, client_id, request_id, temp_params[2])
- if trade_response:
- trade_response.OnTradeResponse(
- {"type": "response", "data": {"code": 0, "data": data}, "client_id": client_id,
- "request_id": request_id})
- else:
- send_response(
- json.dumps({"type": "response", "data": {"code": 0, "data": data}, "client_id": client_id,
- "request_id": request_id}), type, client_id, request_id)
+ send_response(
+ json.dumps({"type": "response", "data": {"code": 0, "data": data}, "client_id": client_id,
+ "request_id": request_id}), type, client_id, request_id)
async_log_util.info(logger_local_huaxin_trade_debug, "API鍥炶皟缁撴潫 req_id-{} request_id-{}", req_id, request_id)
else:
async_log_util.info(logger_local_huaxin_trade_debug, "闈濧PI鍥炶皟 req_id-{}", req_id)
- if trade_response:
- trade_response.OnTradeCallback(
- {"type": "trade_callback", "data": {"code": 0, "data": data, "type": type}})
- # # 闈濧PI鍥炶皟
- else:
- send_response(
- json.dumps({"type": "trade_callback", "data": {"code": 0, "data": data, "type": type}}),
- type,
- None,
- req_id)
+ send_response(
+ json.dumps({"type": "trade_callback", "data": {"code": 0, "data": data, "type": type}}),
+ type,
+ None,
+ req_id)
except Exception as e:
logging.exception(e)
@@ -1140,9 +1132,17 @@
addr, port = constant.SERVER_IP, constant.SERVER_PORT
-def run(trade_response_: TradeResponse = None, queue_other_w_l2_r_: multiprocessing.Queue = None,
- queue_strategy_trade_write_=None,
+def run(ipc_order_addr, ipc_cancel_order_addr, queue_strategy_trade_write_=None,
queue_strategy_trade_read=None, queue_strategy_trade_read_for_read=None):
+ """
+ 杩愯
+ @param ipc_order_addr: zmq涓嬪崟鍛戒护ipc鍦板潃
+ @param ipc_cancel_order_addr: zmq鎾ゅ崟鍛戒护ipc鍦板潃
+ @param queue_strategy_trade_write_:
+ @param queue_strategy_trade_read:
+ @param queue_strategy_trade_read_for_read:
+ @return:
+ """
try:
logger_system.info("浜ゆ槗杩涚▼ID锛歿}", os.getpid())
logger_system.info(f"trade 绾跨▼ID:{tool.get_thread_id()}")
@@ -1151,9 +1151,6 @@
global queue_strategy_trade_write
queue_strategy_trade_write = queue_strategy_trade_write_
- global trade_response
- trade_response = trade_response_
-
# 杩愯鏃ュ織鍚屾
threading.Thread(target=lambda: async_log_util.run_sync(), daemon=True).start()
@@ -1161,7 +1158,7 @@
tradeCommandManager = command_manager.TradeCommandManager()
tradeCommandManager.init(MyTradeActionCallback(), queue_strategy_trade_read, queue_strategy_trade_read_for_read)
logger_system.info("鍗庨懌浜ゆ槗鏈嶅姟鍚姩")
- tradeCommandManager.run()
+ tradeCommandManager.run(ipc_order_addr, ipc_cancel_order_addr)
except Exception as e:
logger_system.exception(e)
# 涓嶉渶瑕佽繍琛屽懡浠よВ鏋�
--
Gitblit v1.8.0