增加vn.trader的链行接口

wanglixiong · Feb 24, 2017 · 8b253d0 · 8b253d0
1 parent 926d093
commit 8b253d0
Show file tree

Hide file tree

Showing 10 changed files with 858 additions and 6 deletions.
diff --git a/vn.huobi/vnhuobi.py b/vn.huobi/vnhuobi.py
@@ -185,7 +185,9 @@ def init(self, accessKey, secretKey):
     def exit(self):
         """退出"""
         self.active = False
-        self.reqThread.join()    
+
+        if self.reqThread.isAlive():
+            self.reqThread.join()    
 
     #----------------------------------------------------------------------
     def getAccountInfo(self, market='cny'):

diff --git a/vn.lhang/test.py b/vn.lhang/test.py
@@ -6,13 +6,13 @@
 
 
 if __name__ == '__main__':
-    apiKey = '259ad3a4-3e19-489e-935d-71b43ad65be8'
-    secretKey = '9A4D9094315681F62FB4C7FB6494FBD2'
+    apiKey = ''
+    secretKey = ''
 
     # 创建API对象并初始化
     api = LhangApi()
     api.DEBUG = True
-    api.init(apiKey, secretKey)
+    api.init(apiKey, secretKey, 2)
 
     # 查询行情
     api.getTicker('btc_cny')

diff --git a/vn.trader/huobiGateway/vnhuobi.py b/vn.trader/huobiGateway/vnhuobi.py
@@ -185,7 +185,9 @@ def init(self, accessKey, secretKey):
     def exit(self):
         """退出"""
         self.active = False
-        self.reqThread.join()    
+
+        if self.reqThread.isAlive():
+            self.reqThread.join()    
 
     #----------------------------------------------------------------------
     def getAccountInfo(self, market='cny'):

diff --git a/vn.trader/lhangGateway/LHANG_connect.json b/vn.trader/lhangGateway/LHANG_connect.json
@@ -0,0 +1,6 @@
+{
+    "apiKey": "请在链行官网申请",
+    "secretKey": "请在链行官网申请",
+    "interval": 1,
+    "debug": false
+}
diff --git a/vn.trader/lhangGateway/__init__.py b/vn.trader/lhangGateway/__init__.py