From a4473df83dc143f5a1f4f6ac73f01a3fcdbf6e05 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 15 八月 2023 10:15:45 +0800
Subject: [PATCH] ++++++++++++++++ bug修复-
---
trade/huaxin/trade_server.py | 2 +-
main.py | 8 ++++----
huaxin/command_manager.py | 5 -----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/huaxin/command_manager.py b/huaxin/command_manager.py
index eb67acc..7258898 100644
--- a/huaxin/command_manager.py
+++ b/huaxin/command_manager.py
@@ -3,13 +3,8 @@
"""
import json
import logging
-import random
-import socket
import threading
-import time
-# 蹇冭烦淇℃伅
-import crypt
from huaxin import socket_util
from huaxin.client_network import SendResponseSkManager
diff --git a/main.py b/main.py
index 8144411..d502441 100644
--- a/main.py
+++ b/main.py
@@ -11,7 +11,7 @@
# 浜ゆ槗鏈嶅姟
from third_data import data_server
from trade.huaxin import trade_server, trade_api_server
-import huaxin
+from huaxin import trade_client,l2_client,l1_client
def createTradeServer(pipe_server, pipe_trade, pipe_l1):
@@ -62,11 +62,11 @@
serverProcess = multiprocessing.Process(target=createServer, args=(pss_server,))
serverProcess.start()
# 浜ゆ槗杩涚▼涓嶭2杩涚▼
- tradeProcess = multiprocessing.Process(target=huaxin.trade_client.run, args=(ptl2_trade, pst_trade))
- l2Process = multiprocessing.Process(target=huaxin.l2_client.run, args=(ptl2_l2,))
+ tradeProcess = multiprocessing.Process(target=trade_client.run, args=(ptl2_trade, pst_trade))
+ l2Process = multiprocessing.Process(target=l2_client.run, args=(ptl2_l2,))
tradeProcess.start()
l2Process.start()
# L1璁㈤槄鏁版嵁
- huaxin.l1_client.run_async(pl1t_l1)
+ l1_client.run_async(pl1t_l1)
# 灏唗radeServer浣滀负涓昏繘绋�
createTradeServer(pss_strategy, pst_strategy, pl1t_trade)
diff --git a/trade/huaxin/trade_server.py b/trade/huaxin/trade_server.py
index 0a91be6..9873b9f 100644
--- a/trade/huaxin/trade_server.py
+++ b/trade/huaxin/trade_server.py
@@ -154,7 +154,7 @@
client_id = data_json["client_id"]
hx_logger_trade_callback.info(f"response锛歳equest_id-{data_json['request_id']}")
# 璁剧疆鍝嶅簲鍐呭
- trade_api.set_response(client_id, data_json["request_id"], data_json['data'])
+ trade_api.set_response(data_json["request_id"], data_json['data'])
finally:
sk.sendall(socket_util.load_header(json.dumps({"code": 0}).encode(encoding='utf-8')))
elif data_json["type"] == "trade_callback":
--
Gitblit v1.8.0