update

Author: Zero

.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+_obj
+.tmp
+_test
+__pycache__
+*.sqlite
+*.sqlite3
+*.pyc
+*.sh

README.md

@@ -156,4 +156,10 @@ BotVS 对于 技术底层做出了强有力的支持，只需使用 BotVS 的 
               return api('NewRobot', settings)
       ```
       可以看到 代码中 settings 是创建 机器人的配置信息， appid 就是用来 标记用户的。
+      
+    - 一个简单的交易中心
+    
+      DEMO附带了一个简单的交易中心, 以帮助用户了解BotVS平台扩展API
+      
+      https://dn-filebox.qbox.me/e9863cf66473b5a9ea974d0f4546cb7afe203414.png 
 

app.py

@@ -2,18 +2,19 @@
 
 # 配置BotVS平台的AccessKey与SecretKey
 
-BOTVS_ACCESS_KEY = 'xxxxx'
-BOTVS_SECRET_KEY = 'yyyyy'
 
 import os, time, urllib, md5, json, sqlite3, datetime
 from flask import jsonify, request, Flask, render_template, redirect, url_for
 from flask_bootstrap import WebCDN, Bootstrap
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, BooleanField
 from wtforms.validators import InputRequired, Email, Length
 from flask_sqlalchemy  import SQLAlchemy
 from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user
 
+BOTVS_ACCESS_KEY = os.getenv('BOTVS_ACCESS_KEY', 'xxxxx')
+BOTVS_SECRET_KEY = os.getenv('BOTVS_SECRET_KEY', 'yyyyy')
+
 
 class cached(object):
     def __init__(self, *args, **kwargs):
@@ -49,7 +50,11 @@ def get_exchange_list():
     global exchanges_list
     if exchanges_list is None:
         # init exchanges
-        exchanges_list = api('GetExchangeList', cache=True)['data']['result']['exchanges']
+        #exchanges_list = api('GetExchangeList', cache=True)['data']['result']['exchanges']
+        exchanges_list = [
+            {u'website': u'https://www.binance.com/', u'name': u'\u5e01\u5b89', u'meta': u'[{"desc": "Access Key", "required": true, "type": "string", "name": "AccessKey", "label": "Access Key"}, {"encrypt": true, "name": "SecretKey", "required": true, "label": "Secret Key", "type": "password", "desc": "Secret Key"}]', u'eid': u'Binance', u'logo': u'binance.png', u'stocks': u'LTC_BTC,ETH_BTC,WTC_BTC', u'id': 0},
+            {u'website': u'https://www.okex.com/', u'name': u'OKEX', u'meta': u'[{"desc": "Access Key", "required": true, "type": "string", "name": "AccessKey", "label": "Access Key"}, {"encrypt": true, "name": "SecretKey", "required": true, "label": "Secret Key", "type": "password", "desc": "Secret Key"}]', u'eid': u'OKEX', u'logo': u'okex.png', u'stocks': u'LTC_BTC,ETH_BTC,WTC_BTC', u'id': 1},
+        ]
         print ' * Initialize %d exchanges' % (len(exchanges_list), )
     return exchanges_list
 
@@ -58,10 +63,12 @@ def get_default_stock(eid):
         if e['eid'] == eid:
             return e['stocks'].split(',')[0]
 
-def plugin_run(exchanges, code):
+def plugin_run(exchanges, code, pair=None):
     settings = { "period": 60, "source": code, "exchanges": []}
     for e in exchanges:
-        settings["exchanges"].append({"eid": e.eid, "pair": get_default_stock(e.eid), "meta" :{"AccessKey": e.accessKey, "SecretKey": e.secretKey}})
+        if pair is None:
+            piar = get_default_stock(e.eid)
+        settings["exchanges"].append({"eid": e.eid, "pair": pair, "meta" :{"AccessKey": e.accessKey, "SecretKey": e.secretKey}})
     return api('PluginRun', settings)
 
 def robot_run(robotId, appId, exchanges):
@@ -124,11 +131,11 @@ class Exchange(db.Model):
 def load_user(user_id):
     return User.query.get(int(user_id))
 
-class LoginForm(Form):
+class LoginForm(FlaskForm):
     username = StringField(u'用户名', validators=[InputRequired(), Length(min=4, max=15)])
     password = PasswordField(u'密码', validators=[InputRequired(), Length(min=8, max=80)])
 
-class RegisterForm(Form):
+class RegisterForm(FlaskForm):
     email = StringField(u'邮箱', validators=[InputRequired(), Email(message='无效的Email'), Length(max=50)])
     username = StringField(u'用户名', validators=[InputRequired(), Length(min=4, max=15)])
     password = PasswordField(u'密码', validators=[InputRequired(), Length(min=8, max=80)])
@@ -229,18 +236,52 @@ def assets():
             db.session.delete(Exchange.query.filter_by(user_id=current_user.id, id=request.args.get('pid', -1)).first())
             db.session.commit()
             return jsonify(results=True)
+    platforms = Exchange.query.filter_by(user_id=current_user.id).all()
+    return render_template('dashboard.html', current_user=current_user, platforms=platforms)
+
+@app.route('/hub', methods=['GET', 'POST'])
+@login_required
+def hub():
+    if request.method == "GET":
+        action = request.args.get('action', None)
+        symbol = request.args.get('symbol', None)
+        if action is not None:
+            action = action.lower().strip()
+        if symbol is not None:
+            symbol = symbol.split('.')[1]
+        if action == "buy" or action == "sell":
+            args = json.loads(request.args.get('args'))
+            r = plugin_run([Exchange.query.filter_by(user_id=current_user.id, id=request.args.get('pid', -1)).first()], '''
+        function main() {
+            exchange.SetTimeout(2000);
+            var pfn = '%s' == 'buy' ? exchange.Buy : exchange.Sell;
+            return pfn(%f, %f);
+        }
+            ''' % (action, args[0], args[1]), symbol)
+            return jsonify(r)
+        elif action == "cancel":
+            args = json.loads(request.args.get('args'))
+            r = plugin_run([Exchange.query.filter_by(user_id=current_user.id, id=request.args.get('pid', -1)).first()], '''
+        function main() {
+            exchange.SetTimeout(2000);
+            return exchange.CancelOrder(%s)
+        }
+            ''' % (args[0]), symbol)
+            return jsonify(r)
         elif action == "balance":
             # 运行查询脚本(也可以定制实现任何想要的功能, 比如资产统计,一键平仓)
             r = plugin_run([Exchange.query.filter_by(user_id=current_user.id, id=request.args.get('pid', -1)).first()], '''
         function main() {
             exchange.SetTimeout(2000);
-            return exchange.GetAccount();
+            return [exchange.GetOrders(), exchange.GetAccount()];
         }
-            ''')
+            ''', symbol)
             return jsonify(r)
     platforms = Exchange.query.filter_by(user_id=current_user.id).all()
-    return render_template('dashboard.html', current_user=current_user, platforms=platforms)
-
+    arr = []
+    for ele in platforms:
+        arr.append({'id': ele.id, 'eid': ele.eid, 'label': ele.label})
+    return render_template('dashboard.html', current_user=current_user, platforms=json.dumps(arr))
 @app.route('/logout')
 @login_required
 def logout():

templates/assets.html

@@ -61,7 +61,7 @@
                 <td>{{ ele.date }}</td>
                 <td width=160>
                     <span class="btn btn-xs btn-danger" id="btn_del_{{ele.id}}" onclick="action('del', {{ele.id}})">删除</span>
-                    <span class="btn btn-xs btn-success" id="btn_balance_{{ele.id}}" onclick="action('balance', {{ele.id}})">余额</span>
+                    <a class="btn btn-xs btn-success" id="btn_balance_{{ele.id}}" href="{{ url_for('hub') }}">交易</a>
                 </td>
             </tr>
             {% endfor %}

templates/dashboard.html

@@ -9,14 +9,27 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <link rel="stylesheet" href="{{url_for('.static', filename='dashboard.css')}}">
+<script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="http://apps.bdimg.com/libs/alertify.js/0.3.11/alertify.min.js"></script>
+<link rel="stylesheet" href="http://apps.bdimg.com/libs/alertify.js/0.3.11/alertify.default.css">
+<link rel="stylesheet" href="http://apps.bdimg.com/libs/alertify.js/0.3.11/alertify.core.css">
+{% if request.path == '/hub' %}
+<script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="http://apps.bdimg.com/libs/angular.js/1.4.6/angular.min.js"></script>
+<script src="http://apps.bdimg.com/libs/moment/2.8.3/moment.js"></script>
+<script src="http://apps.bdimg.com/libs/underscore.js/1.7.0/underscore-min.js"></script>
+<script src="http://lib.sinaapp.com/js/highstock/2.0.1/highstock.js"></script>
+{% endif %}
+
 {% endblock %}
 {% block content %}
 {% include "nav.html" %}
     <div class="container-fluid">
       <div class="row">
         <div class="col-sm-3 col-md-2 sidebar">
           <ul class="nav nav-sidebar">
-              <li class="{% if request.path == '/dashboard' %}active{%else%}inactive{% endif %}"><a href="/dashboard"><span class="glyphicon glyphicon-knight" style="width:20px"></span>投资策略</a></li>
+            <li class="{% if request.path == '/dashboard' %}active{%else%}inactive{% endif %}"><a href="/dashboard"><span class="glyphicon glyphicon-knight" style="width:20px"></span>投资策略</a></li>
+            <li class="{% if request.path == '/hub' %}active{%else%}inactive{% endif %}"><a href="/hub"><span class="glyphicon glyphicon-flash" style="width:20px"></span>交易中心</a></li>
             <li class="{% if request.path == '/assets' %}active{%else%}inactive{% endif %}"><a href="/assets"><span class="glyphicon glyphicon-lock" style="width:20px"></span>资产状态</a></li>
             <li class="{% if request.path == '/exchanges' %}active{%else%}inactive{% endif %}"><a href="/exchanges"><span class="glyphicon glyphicon-magnet" style="width:20px"></span>添加资产</a></li>
           </ul>