From 3b780d07ed8c39cf43daa1e6eba22ae2aeb1c6a9 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 13 十一月 2023 13:35:06 +0800
Subject: [PATCH] A类服务器切换
---
huaxin_client/trade_client.py | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/huaxin_client/trade_client.py b/huaxin_client/trade_client.py
index fd0b61f..29e4c36 100644
--- a/huaxin_client/trade_client.py
+++ b/huaxin_client/trade_client.py
@@ -34,6 +34,16 @@
# 娣卞競鑲′笢璐﹀彿
SZSE_ShareHolderID = '0345104949'
+########B绫�########
+# LOCAL_IP = "192.168.84.75"
+# FRONT_ADDRESS = "tcp://192.168.84.31:6500"
+# FRONT_ADDRESS1 = "tcp://192.168.84.32:26500"
+
+########A绫�########
+LOCAL_IP = "192.168.10.111"
+FRONT_ADDRESS = "tcp://10.224.123.143:6500"
+FRONT_ADDRESS1 = "tcp://10.224.123.147:26500"
+
# # 浠跨湡
# from mylog import logger_trade_debug
#
@@ -92,7 +102,7 @@
cls.__front_id = front_id
# sinfo char(32)
- def buy(self, code, count, price, sinfo, order_ref, shadow_price = None):
+ def buy(self, code, count, price, sinfo, order_ref, shadow_price=None):
if not ENABLE_ORDER:
return
if sinfo in self.__buy_sinfo_set:
@@ -153,7 +163,6 @@
鍏跺畠瀛楁缃┖
'''
# 缁橪2鍙戦�佹秷鎭�
-
ret = api.ReqOrderInsert(req_field, self.req_id)
if ret != 0:
@@ -515,7 +524,7 @@
# UserProductInfo濉啓缁堢鍚嶇О
login_req.UserProductInfo = 'jiabei'
# 鎸夌収鐩戠瑕佹眰濉啓缁堢淇℃伅
- login_req.TerminalInfo = 'PC;IIP=NA;IPORT=NA;LIP=192.168.84.75;MAC=5C6F69CC2B40;HD=004bc76004aff0882b9052ba0eb00506;@jiabei'
+ login_req.TerminalInfo = f'PC;IIP=NA;IPORT=NA;LIP={LOCAL_IP};MAC=5C6F69CC2B40;HD=004bc76004aff0882b9052ba0eb00506;@jiabei'
# 浠ヤ笅鍐呭缃慖P鍦板潃鑻ヤ笉濉垯鏌滃彴绯荤粺鑷姩閲囬泦锛岃嫢濉啓鍒欎互缁堢濉�间负鍑嗘姤閫�
# login_req.MacAddress = '5C-87-9C-96-F3-E3'
# login_req.InnerIPAddress = '10.0.1.102'
@@ -884,7 +893,8 @@
req_rid_dict[sinfo] = (client_id, request_id, sk, order_ref)
# threading.Thread(target=lambda: self.__tradeSimpleApi.buy(code, volume, price, sinfo, order_ref),
# daemon=True).start()
- self.trade_thread_pool.submit(self.__tradeSimpleApi.buy, code, volume, price, sinfo, order_ref, shadow_price)
+ self.trade_thread_pool.submit(self.__tradeSimpleApi.buy, code, volume, price, sinfo, order_ref,
+ shadow_price)
async_log_util.info(logger_trade, f"{code}鍗庨懌鏈湴涓嬪崟绾跨▼缁撴潫")
except Exception as e:
@@ -998,9 +1008,13 @@
if 1: # 妯℃嫙鐜锛孴CP 鐩磋繛Front鏂瑰紡
# 娉ㄥ唽鍗曚釜浜ゆ槗鍓嶇疆鏈嶅姟鍦板潃
+ ##B绫绘湇鍔″櫒##
+ api.RegisterFront(FRONT_ADDRESS) # 姝ｅ紡鐜涓诲湴鍧�
+ api.RegisterFront(FRONT_ADDRESS1) # 姝ｅ紡鐜澶囩敤鍦板潃
- api.RegisterFront("tcp://192.168.84.31:6500") # 姝ｅ紡鐜涓诲湴鍧�
- api.RegisterFront("tcp://192.168.84.32:26500") # 姝ｅ紡鐜澶囩敤鍦板潃
+ ##A绫绘湇鍔″櫒##
+ # api.RegisterFront("tcp://10.224.123.143:6500") # 姝ｅ紡鐜涓诲湴鍧�
+ # api.RegisterFront("tcp://10.224.123.147:26500") # 姝ｅ紡鐜澶囩敤鍦板潃
# TD_TCP_FrontAddress = "tcp://210.14.72.21:4400" # 浠跨湡浜ゆ槗鐜
# TD_TCP_FrontAddress = "tcp://210.14.72.15:4400" # 24灏忔椂鐜A濂�
--
Gitblit v1.8.0