From 24eb0076802dcc68a048bac912f0308c80d5e1a3 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Tue, 4 Feb 2020 21:52:00 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E9=BB=98=E8=AE=A4=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E7=94=B16=E7=A7=92?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA60=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-cli-shared/lib/manifest.js          |  8 ++++----
 .../lib/platforms/app-plus/index.js              | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/uni-cli-shared/lib/manifest.js b/packages/uni-cli-shared/lib/manifest.js
index 9f75fb324..12fcebb0a 100644
--- a/packages/uni-cli-shared/lib/manifest.js
+++ b/packages/uni-cli-shared/lib/manifest.js
@@ -18,10 +18,10 @@ const defaultAsync = {
 }
 
 const networkTimeout = {
-  request: 6000,
-  connectSocket: 6000,
-  uploadFile: 6000,
-  downloadFile: 6000
+  request: 60000,
+  connectSocket: 60000,
+  uploadFile: 60000,
+  downloadFile: 60000
 }
 
 function getManifestJson () {
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index d9a6a113c..478f18af3 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -34,23 +34,23 @@ function isPlainObject (obj) {
 function normalizeNetworkTimeout (appJson) {
   if (!isPlainObject(appJson.networkTimeout)) {
     appJson.networkTimeout = {
-      request: 6000,
-      connectSocket: 6000,
-      uploadFile: 6000,
-      downloadFile: 6000
+      request: 60000,
+      connectSocket: 60000,
+      uploadFile: 60000,
+      downloadFile: 60000
     }
   } else {
     if (typeof appJson.networkTimeout.request === 'undefined') {
-      appJson.networkTimeout.request = 6000
+      appJson.networkTimeout.request = 60000
     }
     if (typeof appJson.networkTimeout.connectSocket === 'undefined') {
-      appJson.networkTimeout.connectSocket = 6000
+      appJson.networkTimeout.connectSocket = 60000
     }
     if (typeof appJson.networkTimeout.uploadFile === 'undefined') {
-      appJson.networkTimeout.uploadFile = 6000
+      appJson.networkTimeout.uploadFile = 60000
     }
     if (typeof appJson.networkTimeout.downloadFile === 'undefined') {
-      appJson.networkTimeout.downloadFile = 6000
+      appJson.networkTimeout.downloadFile = 60000
     }
   }
 }
-- 
GitLab