From 49e0f34512b730a19f971d08eedb464f40fc80e6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 13 十一月 2023 16:48:16 +0800
Subject: [PATCH] A类/B类一键切换
---
huaxin_client/l2_client.py | 17 ++++----
huaxin_client/constant.py | 6 +++
constant.py | 4 +
huaxin_client/trade_client.py | 51 +++++++++++++------------
huaxin_client/l1_client.py | 5 +-
5 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/constant.py b/constant.py
index 25b4899..c4206af 100644
--- a/constant.py
+++ b/constant.py
@@ -1,6 +1,8 @@
# 鏄惁涓烘祴璇�
import platform
+from huaxin_client import constant
+
TEST = False
# 鏄惁鍏佽浜ゆ槗
TRADE_ENABLE = True
@@ -146,7 +148,7 @@
########鍗庨懌閰嶇疆########
if not is_windows() or True:
# 涓嬪崟1鎵�
- BUY_MONEY_PER_CODE = 500
+ BUY_MONEY_PER_CODE = 500 if constant.IS_A else 5000
L2_SOURCE_TYPE = L2_SOURCE_TYPE_HUAXIN
JUEJIN_LOCAL_API = False
TRADE_WAY = TRADE_WAY_HUAXIN
diff --git a/huaxin_client/constant.py b/huaxin_client/constant.py
index 1664f37..4e4eae5 100644
--- a/huaxin_client/constant.py
+++ b/huaxin_client/constant.py
@@ -1,8 +1,14 @@
# -*- coding: utf-8 -*-
# addr, port = "111.230.16.67", 10008
# SERVER_IP = '192.168.3.122'
+# 鏄惁鏄疉绫�
+IS_A = False
+
SERVER_IP = "43.138.167.68"
SERVER_PORT = 10008
+if IS_A:
+ SERVER_PORT = 10009
+
TEST = True
L1_MIN_RATE = 4.0
L2_CODES_INFO_PATH = "/home/userzjj/logs/l2_codes.txt"
diff --git a/huaxin_client/l1_client.py b/huaxin_client/l1_client.py
index b71608a..565dd19 100644
--- a/huaxin_client/l1_client.py
+++ b/huaxin_client/l1_client.py
@@ -12,10 +12,11 @@
from log_module.log import logger_system, logger_local_huaxin_l1, logger_l2_codes_subscript
################B绫�##################
-# ADDRESS = "udp://224.224.1.19:7880"
+ADDRESS = "udp://224.224.1.19:7880"
################A绫�##################
-ADDRESS = "udp://224.224.1.9:7880"
+if constant.IS_A:
+ ADDRESS = "udp://224.224.1.9:7880"
level1_data_dict = {
diff --git a/huaxin_client/l2_client.py b/huaxin_client/l2_client.py
index 6156386..c8c8450 100644
--- a/huaxin_client/l2_client.py
+++ b/huaxin_client/l2_client.py
@@ -21,16 +21,17 @@
from utils import tool
###B绫�###
-# Front_Address = "tcp://10.0.1.101:6900"
-# Multicast_Address = "udp://224.224.2.19:7889"
-# Multicast_Address2 = "udp://224.224.224.234:7890"
-# Local_Interface_Address = "192.168.84.75"
+Front_Address = "tcp://10.0.1.101:6900"
+Multicast_Address = "udp://224.224.2.19:7889"
+Multicast_Address2 = "udp://224.224.224.234:7890"
+Local_Interface_Address = "192.168.84.75"
###A绫�###
-Front_Address = "tcp://10.0.1.101:6900"
-Multicast_Address = "udp://224.224.22.3:8889"
-Multicast_Address2 = "udp://224.224.224.231:4889"
-Local_Interface_Address = "172.16.22.111"
+if constant.IS_A:
+ Front_Address = "tcp://10.0.1.101:6900"
+ Multicast_Address = "udp://224.224.22.3:8889"
+ Multicast_Address2 = "udp://224.224.224.231:4889"
+ Local_Interface_Address = "172.16.22.111"
g_SubMarketData = False
g_SubTransaction = False
diff --git a/huaxin_client/trade_client.py b/huaxin_client/trade_client.py
index 7b739e4..c896d75 100644
--- a/huaxin_client/trade_client.py
+++ b/huaxin_client/trade_client.py
@@ -23,42 +23,43 @@
########B绫�########
-# UserID = '388000013349'
-# # 鐧婚檰瀵嗙爜
-# Password = '110808'
-# # 鎶曡祫鑰呰处鎴�
-# InvestorID = '388000013349'
-# # 缁忔祹鍏徃閮ㄩ棬浠ｇ爜
-# DepartmentID = '0003'
-# # 璧勯噾璐︽埛
-# AccountID = '388000013349'
-# # 娌競鑲′笢璐﹀彿
-# SSE_ShareHolderID = 'A641420991'
-# # 娣卞競鑲′笢璐﹀彿
-# SZSE_ShareHolderID = '0345104949'
-
-# LOCAL_IP = "192.168.84.75"
-# FRONT_ADDRESS = "tcp://192.168.84.31:6500"
-# FRONT_ADDRESS1 = "tcp://192.168.84.32:26500"
-
-########A绫�########
-UserID = '388000013942'
+UserID = '388000013349'
# 鐧婚檰瀵嗙爜
Password = '110808'
# 鎶曡祫鑰呰处鎴�
-InvestorID = '388000013942'
+InvestorID = '388000013349'
# 缁忔祹鍏徃閮ㄩ棬浠ｇ爜
DepartmentID = '0003'
# 璧勯噾璐︽埛
-AccountID = '388000013942'
+AccountID = '388000013349'
# 娌競鑲′笢璐﹀彿
SSE_ShareHolderID = 'A641420991'
# 娣卞競鑲′笢璐﹀彿
SZSE_ShareHolderID = '0345104949'
-LOCAL_IP = "192.168.10.111"
-FRONT_ADDRESS = "tcp://10.224.123.143:6500"
-FRONT_ADDRESS1 = "tcp://10.224.123.147:26500"
+LOCAL_IP = "192.168.84.75"
+FRONT_ADDRESS = "tcp://192.168.84.31:6500"
+FRONT_ADDRESS1 = "tcp://192.168.84.32:26500"
+
+########A绫�########
+if constant.IS_A:
+ UserID = '388000013942'
+ # 鐧婚檰瀵嗙爜
+ Password = '110808'
+ # 鎶曡祫鑰呰处鎴�
+ InvestorID = '388000013942'
+ # 缁忔祹鍏徃閮ㄩ棬浠ｇ爜
+ DepartmentID = '0003'
+ # 璧勯噾璐︽埛
+ AccountID = '388000013942'
+ # 娌競鑲′笢璐﹀彿
+ SSE_ShareHolderID = 'A641420991'
+ # 娣卞競鑲′笢璐﹀彿
+ SZSE_ShareHolderID = '0345104949'
+
+ 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
--
Gitblit v1.8.0