From fb8b4046666c85876af745e71cf580b43b4383cb Mon Sep 17 00:00:00 2001
From: "vn.py" <vn.py@foxmail.com>
Date: Fri, 22 Sep 2017 21:35:47 +0800
Subject: [PATCH] =?UTF-8?q?[Add]=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E5=87=86=E5=88=99=E5=92=8C=E5=B8=AE=E5=8A=A9?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/CODE_OF_CONDUCT.md                        |  9 +++++++++
 ISSUE_TEMPLATE.md => docs/ISSUE_TEMPLATE.md    |  0
 .../PULL_REQUEST_TEMPLATE.md                   |  0
 docs/SUPPORT.md                                | 18 ++++++++++++++++++
 vnpy/trader/app/dataRecorder/drEngine.py       |  2 +-
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 docs/CODE_OF_CONDUCT.md
 rename ISSUE_TEMPLATE.md => docs/ISSUE_TEMPLATE.md (100%)
 rename PULL_REQUEST_TEMPLATE.md => docs/PULL_REQUEST_TEMPLATE.md (100%)
 create mode 100644 docs/SUPPORT.md

diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..059a6639
--- /dev/null
+++ b/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,9 @@
+# 行为准则
+
+这是一份vn.py项目社区的行为准则，也是项目作者自己在刚入行量化金融行业时对于理想中的社区的期望：
+
+* 为交易员而生：作为一款从金融机构量化业务中诞生的交易系统开发框架，所有的设计都优先满足机构专业交易员的使用习惯，而不是其他用户（散户、爱好者、技术人员等）
+
+* 对新用户友好，保持耐心：大部分人在接触新东西的时候都是磕磕碰碰、有很多的问题，请记住此时别人对你伸出的援助之手，并把它传递给未来需要的人
+
+* 尊重他人，慎重言行：礼貌文明的交流方式除了能得到别人同样的回应，更能减少不必要的摩擦，保证高效的交流
diff --git a/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to docs/ISSUE_TEMPLATE.md
diff --git a/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to docs/PULL_REQUEST_TEMPLATE.md
diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md
new file mode 100644
index 00000000..6a5591fb
--- /dev/null
+++ b/docs/SUPPORT.md
@@ -0,0 +1,18 @@
+# 获取帮助
+
+* 操作系统: 如Windows 7或者Ubuntu 16.04
+* Anaconda版本: 如Anaconda 4.0.0 Python 2.7 32位
+* vn.py版本: 如v1.7发行版或者dev branch 20170920（下载日期）
+
+## Issue类型
+三选一：Bug/Enhancement/Question
+
+## 预期程序行为
+
+
+## 实际程序行为
+
+
+## 重现步骤
+
+针对Bug类型Issue，请提供具体重现步骤以及报错截图
diff --git a/vnpy/trader/app/dataRecorder/drEngine.py b/vnpy/trader/app/dataRecorder/drEngine.py
index 06752cdb..f8d334bd 100644
--- a/vnpy/trader/app/dataRecorder/drEngine.py
+++ b/vnpy/trader/app/dataRecorder/drEngine.py
@@ -69,7 +69,7 @@ class DrEngine(object):
     #----------------------------------------------------------------------
     def loadSetting(self):
         """加载配置"""
-        with open(self.settingFileName) as f:
+        with open(self.settingFilePath) as f:
             drSetting = json.load(f)
 
             # 如果working设为False则不启动行情记录功能