改变目录

Administrator

2023-08-21 a019311b0edee6df82a8ec7c0b28b06b22aa4d31

改变目录

 huaxin_client/client_main.py

 huaxin_client/client_network.py

File was renamed from huaxin_api/client_network.py
@@ -2,7 +2,7 @@
import json
import socket

from huaxin_api import socket_util
from huaxin_client import socket_util

SERVER_IP = "127.0.0.1"
SERVER_PORT = 10008

 huaxin_client/command_manager.py

File was renamed from huaxin_api/command_manager.py
@@ -6,8 +6,8 @@
import logging
import threading

from huaxin_api import socket_util
from huaxin_api.client_network import SendResponseSkManager
from huaxin_client import socket_util
from huaxin_client.client_network import SendResponseSkManager
from log_module.log import logger_local_huaxin_trade_debug

MSG_TYPE_HEART = "heart"

 huaxin_client/constant.py

 huaxin_client/crypt.py

 huaxin_client/huaxin_trade_api.py

File was renamed from huaxin_api/huaxin_trade_api.py
@@ -9,7 +9,7 @@
import time

import crypt
from huaxin_api import socket_util
from huaxin_client import socket_util


class ClientSocketManager:

 huaxin_client/l1_client.py

File was renamed from huaxin_api/l1_client.py
@@ -5,10 +5,10 @@
import threading
import time

from huaxin_api import socket_util
from huaxin_client import socket_util
import xmdapi
from huaxin_api import tool
from huaxin_api.client_network import SendResponseSkManager
from huaxin_client import tool
from huaxin_client.client_network import SendResponseSkManager
from log_module.log import logger_system, logger_local_huaxin_l1

level1_data_dict = {

 huaxin_client/l2_client.py

File was renamed from huaxin_api/l2_client.py
@@ -6,14 +6,13 @@
import threading
import time

from huaxin_api import command_manager
from huaxin_api import constant
from huaxin_api import l2_data_manager
from huaxin_client import command_manager
from huaxin_client import constant
from huaxin_client import l2_data_manager
import lev2mdapi
from huaxin_api.command_manager import L2ActionCallback
from huaxin_client.command_manager import L2ActionCallback
from log_module import log
from log_module.log import logger_local_huaxin_l2_subscript, logger_local_huaxin_l2_orderdetail, \
    logger_local_huaxin_l2_transaction, logger_system
from log_module.log import logger_local_huaxin_l2_subscript, logger_system

Front_Address = "tcp://10.0.1.101:6900"
Multicast_Address = "udp://224.224.2.19:7889"

 huaxin_client/l2_data_manager.py

File was renamed from huaxin_api/l2_data_manager.py
@@ -5,9 +5,9 @@
import random
import threading
import time
from huaxin_api import socket_util
from huaxin_client import socket_util

from huaxin_api.client_network import SendResponseSkManager
from huaxin_client.client_network import SendResponseSkManager

# 活动时间
from log_module.log import logger_local_huaxin_l2_upload, logger_local_huaxin_l2_error

 huaxin_client/log.py

 huaxin_client/socket_util.py

File was renamed from huaxin_api/socket_util.py
@@ -6,7 +6,7 @@
# 添加数据头
import json

from huaxin_api import crypt
from huaxin_client import crypt


def load_header(data_bytes):

 huaxin_client/tool.py

 huaxin_client/trade_client.py

File was renamed from huaxin_api/trade_client.py
@@ -5,12 +5,12 @@
import threading
import time

from huaxin_api import command_manager
from huaxin_api import constant
from huaxin_api import socket_util
from huaxin_client import command_manager
from huaxin_client import constant
from huaxin_client import socket_util
import traderapi
from huaxin_api.client_network import SendResponseSkManager
from huaxin_api.log import logger
from huaxin_client.client_network import SendResponseSkManager
from huaxin_client.log import logger

# 正式账号
from log_module.log import logger_local_huaxin_trade_debug, logger_system

 l2/huaxin/huaxin_target_codes_manager.py

@@ -1,11 +1,8 @@
"""
华鑫目标代码管理
"""
import io
import json
import logging
import queue
import socket
import time

from line_profiler import LineProfiler

 l2/l2_data_manager.py

@@ -5,7 +5,6 @@

from db import redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
from log_module.log import logger_debug
from utils import tool
from utils.tool import CodeDataCacheUtil


 main.py

@@ -7,9 +7,9 @@
import sys

from db import redis_manager_delegate as redis_manager
import huaxin_api.trade_client
import huaxin_api.l2_client
import huaxin_api.l1_client
import huaxin_client.trade_client
import huaxin_client.l2_client
import huaxin_client.l1_client
from log_module import log
from log_module.log import logger_l2_trade, logger_system, logger_local_huaxin_l1

@@ -86,13 +86,13 @@

    # 交易进程与L2进程

    l2Process = multiprocessing.Process(target=huaxin_api.l2_client.run, args=(ptl2_l2, psl2_l2,))
    l2Process = multiprocessing.Process(target=huaxin_client.l2_client.run, args=(ptl2_l2, psl2_l2,))
    l2Process.start()
    #
    tradeProcess = multiprocessing.Process(target=huaxin_api.trade_client.run, args=(ptl2_trade, pst_trade,))
    tradeProcess = multiprocessing.Process(target=huaxin_client.trade_client.run, args=(ptl2_trade, pst_trade,))
    tradeProcess.start()
    # L1订阅数据
    huaxin_api.l1_client.run(pl1t_l1)
    huaxin_client.l1_client.run(pl1t_l1)
    # 将tradeServer作为主进程
    tradeServerProcess.join()
    tradeProcess.join()

 outside_api_command_manager.py

@@ -9,8 +9,8 @@
import time

# 心跳信息
from huaxin_api import socket_util
from huaxin_api.client_network import SendResponseSkManager
from huaxin_client import socket_util
from huaxin_client.client_network import SendResponseSkManager
from utils import middle_api_protocol

MSG_TYPE_HEART = "heart"

 trade/huaxin/trade_api_server.py

@@ -23,7 +23,6 @@
from trade.huaxin import huaxin_trade_api, huaxin_trade_record_manager, \
    huaxin_trade_data_update
from trade.huaxin.huaxin_trade_api import ClientSocketManager
from trade.trade_manager import TradeTargetCodeModeManager
from utils import socket_util, tool, huaxin_util, data_export_util



 trade/huaxin/trade_server.py

@@ -12,7 +12,7 @@

import dask
import psutil
import huaxin_api.constant
import huaxin_client.constant
from line_profiler import LineProfiler

import constant
@@ -21,7 +21,7 @@
from code_attribute import gpcode_manager
from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
from db.redis_manager_delegate import RedisUtils
from huaxin_api.client_network import SendResponseSkManager
from huaxin_client.client_network import SendResponseSkManager
from l2 import l2_data_manager_new, l2_log, code_price_manager, l2_data_util, l2_data_manager, transaction_progress
from l2.cancel_buy_strategy import HourCancelBigNumComputer, LCancelBigNumComputer, DCancelBigNumComputer
from l2.huaxin import huaxin_target_codes_manager
@@ -383,8 +383,8 @@
class OutsideApiCommandCallback(outside_api_command_manager.ActionCallback):
    @classmethod
    def __send_response(cls, data_bytes):
        sk = SendResponseSkManager.create_send_response_sk(addr=huaxin_api.constant.SERVER_IP,
                                                           port=huaxin_api.constant.SERVER_PORT)
        sk = SendResponseSkManager.create_send_response_sk(addr=huaxin_client.constant.SERVER_IP,
                                                           port=huaxin_client.constant.SERVER_PORT)
        try:
            data_bytes = socket_util.load_header(data_bytes)
            sk.sendall(data_bytes)

 trade/trade_huaxin.py

@@ -99,17 +99,17 @@
            for order in orders:
                huaxin_trade_api.cancel_order(1, code, order["orderSysID"])
                __TradeOrderIdManager.remove_order_id(code, order["accountId"], order["orderSysID"])
    else:

        # 查询是否有本地订单号
        orders_info = __TradeOrderIdManager.list_local_order_ids_cache(code)
        orders_info = copy.deepcopy(orders_info)
        if orders_info:
            for order_id in orders_info:
    local_orders_info = __TradeOrderIdManager.list_local_order_ids_cache(code)

    if local_orders_info:
        local_orders_info = copy.deepcopy(local_orders_info)
        for order_id in local_orders_info:
                logger_juejin_trade.info(f"{code}：开始执行撤单")
                huaxin_trade_api.cancel_order(1, code, '', localOrderID=order_id)
                __TradeOrderIdManager.remove_local_order_id(code, order_id)
                logger_juejin_trade.info(f"{code}：执行撤单结束")


if __name__ == "__main__":
    pass

 trade/trade_result_manager.py

@@ -2,12 +2,11 @@
import logging

from l2 import l2_data_manager
from l2.cancel_buy_strategy import HourCancelBigNumComputer, SecondCancelBigNumComputer, L2LimitUpSellStatisticUtil, \
from l2.cancel_buy_strategy import HourCancelBigNumComputer, SecondCancelBigNumComputer , \
    LCancelBigNumComputer, DCancelBigNumComputer
from l2.l2_data_util import local_today_datas, local_today_num_operate_map
from l2.safe_count_manager import BuyL2SafeCountManager
from log_module.log import logger_l2_error
from trade import trade_data_manager
from trade.trade_queue_manager import THSBuy1VolumnManager

__thsBuy1VolumnManager = THSBuy1VolumnManager()