83e50ac220
Conflicts: .gitignore vn.trader/CTP_connect.json vn.trader/ContractData.vt vn.trader/LTS_connect.json vn.trader/ctaEngine.py vn.trader/ctaStrategies.py vn.trader/ctaStrategyTemplate.py vn.trader/ctpGateway.py vn.trader/ltsGateway.py vn.trader/uiBasicWidget.py vn.trader/uiCtaWidget.py vn.trader/uiMainWindow.py vn.trader/vtConstant.py vn.trader/vtEngine.py vn.trader/vtGateway.py
23 lines
670 B
JSON
23 lines
670 B
JSON
{
|
|
"brokerID": "2011",
|
|
"tdAddress": "tcp://211.144.195.163:54505",
|
|
"qryAddress": "tcp://211.144.195.163:54506",
|
|
"mdAddress": "tcp://211.144.195.163:54513",
|
|
"productInfo": "LTS-Test",
|
|
"authCode": "N3EHKP4CYHZGM9VJ",
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
"tdPassword": "150601",
|
|
"mdPassword": "123",
|
|
"userID": "020090002037"
|
|
=======
|
|
"tdPassword": "华宝证券申请",
|
|
"mdPassword": "华宝证券申请",
|
|
"userID": "华宝证券申请"
|
|
>>>>>>> refs/remotes/vnpy/master
|
|
=======
|
|
"tdPassword": "华宝证券申请",
|
|
"mdPassword": "华宝证券申请",
|
|
"userID": "华宝证券申请"
|
|
>>>>>>> refs/remotes/vnpy/master
|
|
} |