diff --git a/tests/trader/run.py b/tests/trader/run.py index 31b247a3..947c1047 100644 --- a/tests/trader/run.py +++ b/tests/trader/run.py @@ -7,9 +7,9 @@ from vnpy.trader.ui import MainWindow, create_qapp from vnpy.gateway.bitmex import BitmexGateway from vnpy.gateway.futu import FutuGateway from vnpy.gateway.ib import IbGateway -#from vnpy.gateway.ctp import CtpGateway +from vnpy.gateway.ctp import CtpGateway from vnpy.gateway.ctptest import CtptestGateway -# from vnpy.gateway.femas import FemasGateway +from vnpy.gateway.femas import FemasGateway from vnpy.gateway.tiger import TigerGateway from vnpy.gateway.oes import OesGateway from vnpy.gateway.okex import OkexGateway @@ -35,9 +35,9 @@ def main(): main_engine = MainEngine(event_engine) main_engine.add_gateway(XtpGateway) - # main_engine.add_gateway(CtpGateway) + main_engine.add_gateway(CtpGateway) main_engine.add_gateway(CtptestGateway) - # main_engine.add_gateway(FemasGateway) + main_engine.add_gateway(FemasGateway) main_engine.add_gateway(IbGateway) main_engine.add_gateway(FutuGateway) main_engine.add_gateway(BitmexGateway) diff --git a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.cpp b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.cpp index 6e53c87c..e05bcdd4 100644 --- a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.cpp +++ b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.cpp @@ -809,7 +809,7 @@ public: PYBIND11_MODULE(vnctpmd, m) { - class_ mdapi(m, "MdApi"); + class_ mdapi(m, "MdApi", module_local()); mdapi .def(init<>()) .def("createFtdcMdApi", &MdApi::createFtdcMdApi) diff --git a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.cpp b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.cpp index 75686130..af1b9b82 100644 --- a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.cpp +++ b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.cpp @@ -11150,7 +11150,7 @@ public: PYBIND11_MODULE(vnctptd, m) { - class_ TdApi(m, "TdApi"); + class_ TdApi(m, "TdApi", module_local()); TdApi .def(init<>()) .def("createFtdcTraderApi", &TdApi::createFtdcTraderApi) diff --git a/vnpy/api/ctp/vnctpmd.pyd b/vnpy/api/ctp/vnctpmd.pyd index 20f263a8..476c6511 100644 Binary files a/vnpy/api/ctp/vnctpmd.pyd and b/vnpy/api/ctp/vnctpmd.pyd differ diff --git a/vnpy/api/ctp/vnctptd.pyd b/vnpy/api/ctp/vnctptd.pyd index de767e0f..c78343e5 100644 Binary files a/vnpy/api/ctp/vnctptd.pyd and b/vnpy/api/ctp/vnctptd.pyd differ diff --git a/vnpy/gateway/ctptest/vnctpmd.pyd b/vnpy/gateway/ctptest/vnctpmd.pyd index 20f263a8..476c6511 100644 Binary files a/vnpy/gateway/ctptest/vnctpmd.pyd and b/vnpy/gateway/ctptest/vnctpmd.pyd differ diff --git a/vnpy/gateway/ctptest/vnctptd.pyd b/vnpy/gateway/ctptest/vnctptd.pyd index de767e0f..c78343e5 100644 Binary files a/vnpy/gateway/ctptest/vnctptd.pyd and b/vnpy/gateway/ctptest/vnctptd.pyd differ