Merge branch 'master' into dev

Author: sinall

README.rst

@@ -77,7 +77,7 @@ Windows
 配置
 ^^^^
 
-- cmd 中运行：:code:`explorer %UserProfile%\\.shipane_sdk\\config`
+- cmd 中运行：:code:`explorer %UserProfile%\.shipane_sdk\config`
 - 修改 scheduler.ini 中的配置（建议使用Notepad++）
 
 运行
@@ -90,18 +90,18 @@ Windows
 
 - cmd 中运行
 
-+--------+-------------------------------------------------------------------------+
-| 正式版 | :code:`pip install --upgrade --no-binary shipane_sdk shipane_sdk`       |
-+--------+-------------------------------------------------------------------------+
-| 测试版 | :code:`pip install --upgrade --pre --no-binary shipane_sdk shipane_sdk` |
-+--------+-------------------------------------------------------------------------+
++--------+-----------------------------------------------------------------------------------+
+| 正式版 | :code:`pip install --upgrade --no-deps --no-binary shipane_sdk shipane_sdk`       |
++--------+-----------------------------------------------------------------------------------+
+| 测试版 | :code:`pip install --upgrade --pre --no-deps --no-binary shipane_sdk shipane_sdk` |
++--------+-----------------------------------------------------------------------------------+
 
 - 参考 scheduler-template.ini 修改 scheduler.ini
 
 日志
 ^^^^
 
-- cmd 中运行：:code:`explorer %UserProfile%\\AppData\\Local\\爱股网\\实盘易`
+- cmd 中运行：:code:`explorer %UserProfile%\AppData\Local\爱股网\实盘易`
 
 Mac/Linux
 ~~~~~~~~~
@@ -133,11 +133,11 @@ Mac/Linux
 
 - terminal 中运行
 
-+--------+-------------------------------------------------------------------------+
-| 正式版 | :code:`pip install --upgrade --no-binary shipane_sdk shipane_sdk`       |
-+--------+-------------------------------------------------------------------------+
-| 测试版 | :code:`pip install --upgrade --pre --no-binary shipane_sdk shipane_sdk` |
-+--------+-------------------------------------------------------------------------+
++--------+-----------------------------------------------------------------------------------+
+| 正式版 | :code:`pip install --upgrade --no-deps --no-binary shipane_sdk shipane_sdk`       |
++--------+-----------------------------------------------------------------------------------+
+| 测试版 | :code:`pip install --upgrade --pre --no-deps --no-binary shipane_sdk shipane_sdk` |
++--------+-----------------------------------------------------------------------------------+
 
 - 参考 scheduler-template.ini 修改 scheduler.ini
 
@@ -180,6 +180,7 @@ Mac/Linux
 - 同步操作依赖于实盘易 API /adjustments；因此也依赖于“查询投资组合”API，使用前请先做好测试及配置。
 - 同步操作使用“市价单”。
 - 如遇到策略报错“ImportError: No module named shipane_sdk”，请稍后重试。
+- 量化平台模拟交易运行中升级 SDK，需重启生效。
 
 二. 抓取方式
 ~~~~~~~~~~~~

shipane_sdk/client.py

@@ -192,12 +192,10 @@ def create_adjustment(self, client=None, request_json=None, timeout=None):
         return json
 
     def start_clients(self, timeout=None):
-        request = Request('PUT', self.__create_url(None, 'clients'))
-        self.__send_request(request, timeout)
+        self.__change_clients_status('LOGGED')
 
     def shutdown_clients(self, timeout=None):
-        request = Request('DELETE', self.__create_url(None, 'clients'))
-        self.__send_request(request, timeout)
+        self.__change_clients_status('STOPPED')
 
     def __execute(self, client=None, timeout=None, **kwargs):
         if not kwargs.get('type'):
@@ -206,6 +204,12 @@ def __execute(self, client=None, timeout=None, **kwargs):
         response = self.__send_request(request)
         return response.json()
 
+    def __change_clients_status(self, status, timeout=None):
+        request = Request('PATCH', self.__create_url(None, 'clients'), json={
+            'status': status
+        })
+        self.__send_request(request, timeout)
+
     def __query_new_stocks(self):
         DATA_URL = 'http://vip.stock.finance.sina.com.cn/corp/view/vRPD_NewStockIssue.php?page=1&cngem=0&orderBy=NetDate&orderType=desc'
         html = lxml.html.parse(DATA_URL)

shipane_sdk/joinquant/client.py

@@ -11,7 +11,7 @@
 
 
 class JoinQuantClient(BaseQuantClient):
-    BASE_URL = 'https://www.joinquant.net'
+    BASE_URL = 'https://www.joinquant.com'
 
     def __init__(self, **kwargs):
         super(JoinQuantClient, self).__init__('JoinQuant')

shipane_sdk/uqer/client.py

@@ -9,7 +9,7 @@
 
 
 class UqerClient(BaseQuantClient):
-    BASE_URL = 'https://gw.wmcloud.com'
+    BASE_URL = 'https://gw.datayes.com'
 
     def __init__(self, **kwargs):
         super(UqerClient, self).__init__('Uqer')
@@ -31,7 +31,6 @@ def login(self):
             'Origin': self.BASE_URL,
             'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         }
-        self._session.get(self.BASE_URL, timeout=self._timeout)
         response = self._session.post('{}/usermaster/authenticate/v1.json'.format(self.BASE_URL), data={
             'username': self._username,
             'password': self._password,