vnpy/vn.trader/CTP_connect.json

{
    "brokerID": "9999", 
    "tdAddress": "tcp://180.168.146.187:10000", 
<<<<<<< HEAD
<<<<<<< HEAD
    "password": "19890624", 
    "mdAddress": "tcp://180.168.212.228:41213", 
    "userID": "000300"
=======
    "password": "simnow申请", 
    "mdAddress": "tcp://180.168.212.228:41213", 
    "userID": "simnow申请"
>>>>>>> refs/remotes/vnpy/master
=======
    "password": "simnow申请", 
    "mdAddress": "tcp://180.168.212.228:41213", 
    "userID": "simnow申请"
>>>>>>> refs/remotes/vnpy/master
}
添加新的20150914认证版的LTS API封装（华宝计划在年底前全部切换），现在老版在实盘交易柜台上依旧可以使用，移到了vn.lts_old下 2015-09-28 03:42:35 +00:00			`{`
bug fixing 2015-10-19 07:06:50 +00:00			`"brokerID": "9999",`
			`"tdAddress": "tcp://180.168.146.187:10000",`
Merge remote-tracking branch 'refs/remotes/vnpy/master' 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 2015-10-24 00:40:05 +00:00			`<<<<<<< HEAD`
Merge remote-tracking branch 'refs/remotes/vnpy/master' 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 2015-10-19 09:05:00 +00:00			`<<<<<<< HEAD`
bug fixing 2015-10-19 07:06:50 +00:00			`"password": "19890624",`
			`"mdAddress": "tcp://180.168.212.228:41213",`
			`"userID": "000300"`
Merge remote-tracking branch 'refs/remotes/vnpy/master' 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 2015-10-19 09:05:00 +00:00			`=======`
			`"password": "simnow申请",`
			`"mdAddress": "tcp://180.168.212.228:41213",`
			`"userID": "simnow申请"`
			`>>>>>>> refs/remotes/vnpy/master`
Merge remote-tracking branch 'refs/remotes/vnpy/master' 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 2015-10-24 00:40:05 +00:00			`=======`
初步完成了vn.trader，包含CTP、LTS、WIND的接口，以及CTA策略模块，策略模块的测试尚未全部完成 2015-10-16 08:50:44 +00:00			`"password": "simnow申请",`
			`"mdAddress": "tcp://180.168.212.228:41213",`
			`"userID": "simnow申请"`
Merge remote-tracking branch 'refs/remotes/vnpy/master' 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 2015-10-24 00:40:05 +00:00			`>>>>>>> refs/remotes/vnpy/master`
添加新的20150914认证版的LTS API封装（华宝计划在年底前全部切换），现在老版在实盘交易柜台上依旧可以使用，移到了vn.lts_old下 2015-09-28 03:42:35 +00:00			`}`