Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

README-en.md

@@ -37,7 +37,8 @@ Using the vn.py project, institutional investors and professional traders, such
 	- LTS（vn.lts）
 	
 	- QDP（vn.qdp）
-	
+
+	- CSHSHLP（vn.cshshlp）	
 
 	**Chinese Precious Metal Market**
 

docker/Dockerfile

@@ -61,7 +61,7 @@ RUN    echo "开始配置系vnpy环境" \
     && echo "更改 pip 源" \
     && mkdir ~/.pip \
     && echo "[global]" >> ~/.pip/pip.conf \
-    && echo "index-url = http://pypi.douban.com/simple" >> ~/.pip/pip.conf \
+    && echo "index-url = https://pypi.doubanio.com/simple/" >> ~/.pip/pip.conf \
     && echo "使用 pip 安装 python 库" \
     && pip install TA-Lib \
     && conda clean -ay \
@@ -70,4 +70,4 @@ RUN    echo "开始配置系vnpy环境" \
 WORKDIR /srv/vnpy
 
 # 暂时不设置入口点，否则不能使用 -it 交互模式
-# ENTRYPOINT python /srv/vnpy/vn.trader/vtServer.py
+# ENTRYPOINT python /srv/vnpy/vn.trader/vtServer.py

tutorial/tick2trade/vn.ctp_t2t/build.sh

@@ -12,6 +12,6 @@ cmake ..
 make VERBOSE=1 -j 1
 ln -fs `pwd`/lib/vnctpmd.so ../vnctpmd/test/vnctpmd.so
 ln -fs `pwd`/lib/vnctptd.so ../vnctptd/test/vnctptd.so
-cp ../vnctpmd/test/vnctpmd.* ../../vn.trader/ctpGateway/
-cp ../vnctptd/test/vnctptd.* ../../vn.trader/ctpGateway/
+cp ../vnctpmd/test/vnctpmd.* ../../../vn.trader/gateway/ctpGateway/
+cp ../vnctptd/test/vnctptd.* ../../../vn.trader/gateway/ctpGateway/
 popd