Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

client/components/Postman/Postman.js

@@ -298,7 +298,7 @@ export default class Run extends Component {
       data: reqBody,
       files: bodyType === 'form' ? this.getFiles(bodyForm) : {},
       file: bodyType === 'file' ? 'single-file' : null,
-      timeout: 8240000, //因浏览器限制，超时时间最多为两分钟
+      timeout: 8240000,
       success: this.handleResponse,
       error: this.handleResponse
     })

client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js

@@ -254,7 +254,8 @@ class InterfaceColContent extends Component {
         url: href,
         method: interfaceData.method,
         headers: that.getHeadersObj(interfaceData.req_headers),
-        data: result.body
+        data: result.body,
+        timeout: 8240000
       })
       let res = data.res.body = json_parse(data.res.body);
       let header = data.res.header;