diff --git a/CHANGELOG.md b/CHANGELOG.md index c6bbcb215..65627c6c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,8 @@ 8. 增加了对于QA_Performance插件中先卖后买算差价的支持 9. QAMarket=QAShipaneBroker 支持通达信模拟客户端 10. QAIndicator 增加Talib的形态识别指标 +11. 增加了qarun.exe 直接运行策略,实时输出 +12. QAWEB 增加了command/run 不兼容修改: diff --git a/QUANTAXIS/QAWeb/QA_Web.py b/QUANTAXIS/QAWeb/QA_Web.py index faf6abc25..186c8db3d 100755 --- a/QUANTAXIS/QAWeb/QA_Web.py +++ b/QUANTAXIS/QAWeb/QA_Web.py @@ -21,19 +21,25 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import tornado import os + +import tornado from tornado.web import Application, RequestHandler, authenticated -from QUANTAXIS.QAWeb.datahandles import StockdayHandler, StockminHandler, StockBlockHandler, StockPriceHandler, StockCodeHandler -from QUANTAXIS.QAWeb.quotationhandles import (RealtimeSocketHandler, - SimulateSocketHandler, MonitorSocketHandler) -from QUANTAXIS.QAWeb.userhandles import SigninHandler, SignupHandler, PersonBlockHandler +from QUANTAXIS.QAWeb.arphandles import (AccountHandler, MemberHandler, + RiskHandler) from QUANTAXIS.QAWeb.basehandles import QABaseHandler -from QUANTAXIS.QAWeb.arphandles import AccountHandler, RiskHandler, MemberHandler -from QUANTAXIS.QAWeb.strategyhandlers import StrategyHandler, BacktestHandler +from QUANTAXIS.QAWeb.commandhandler import CommandHandler, RunnerHandler +from QUANTAXIS.QAWeb.datahandles import (StockBlockHandler, StockCodeHandler, + StockdayHandler, StockminHandler, + StockPriceHandler) +from QUANTAXIS.QAWeb.quotationhandles import (MonitorSocketHandler, + RealtimeSocketHandler, + SimulateSocketHandler) +from QUANTAXIS.QAWeb.strategyhandlers import BacktestHandler, StrategyHandler from QUANTAXIS.QAWeb.tradehandles import AccModelHandler -from QUANTAXIS.QAWeb.commandhandler import CommandHandler +from QUANTAXIS.QAWeb.userhandles import (PersonBlockHandler, SigninHandler, + SignupHandler) class INDEX(QABaseHandler): @@ -62,7 +68,8 @@ def main(): (r"/accounts", AccountHandler), (r"/accounts/all", MemberHandler), (r"/risk", RiskHandler), - (r"/command/run", CommandHandler) + (r"/command/run", CommandHandler), + (r"/command/runbacktest", RunnerHandler) ], debug=True ) diff --git a/QUANTAXIS/__init__.py b/QUANTAXIS/__init__.py index bfcd2373b..10c40fdf9 100755 --- a/QUANTAXIS/__init__.py +++ b/QUANTAXIS/__init__.py @@ -32,7 +32,7 @@ 2017/4/8 """ -__version__ = '1.1.8.dev9' +__version__ = '1.1.9' __author__ = 'yutiansut' logo = ' \n \ ```````````````````````````````````````````````````````````````````````````````````````````````````````````````````````` \n \