From 42cb1bfc883f1811a129250fb7ff0074da06aeed Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Wed, 11 Aug 2021 17:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0js=E7=89=88=E6=9C=AC=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/restful/index.js | 2 ++
 fir_client/src/utils/index.js   | 4 ++--
 fir_client/vue.config.js        | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fir_client/src/restful/index.js b/fir_client/src/restful/index.js
index 9eaeaef..e5a1dec 100644
--- a/fir_client/src/restful/index.js
+++ b/fir_client/src/restful/index.js
@@ -9,6 +9,8 @@ Axios.defaults.withCredentials = true;
 //     keepAlive: true
 // });
 
+// eslint-disable-next-line no-console
+console.log("flyapps js version:"+process.env.base_env.version);
 
 const DOMAIN = process.env.base_env.baseUrl;
 const APIPATH = '/api/v1/fir/server';
diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js
index 0aa18ac..fdf0b9c 100644
--- a/fir_client/src/utils/index.js
+++ b/fir_client/src/utils/index.js
@@ -158,7 +158,7 @@ export function uploadaliyunoss(file, certinfo, app, successcallback, processcal
             progress,
             parallel: 10,
             partSize: 1024 * 1024,
-            timeout: 180000,
+            timeout: 600000,
         };
 
         if (currentCheckpoint) {
@@ -179,7 +179,7 @@ export function uploadaliyunoss(file, certinfo, app, successcallback, processcal
                 uploadFile('')
             } else {
                 app.$message({
-                    message: file.name + '上传失败，请刷新页面重试',
+                    message: file.name + ' 重试了'+retryCount+'次，还是上传失败了，请刷新页面重试',
                     type: 'error',
                     duration: 0
                 });
diff --git a/fir_client/vue.config.js b/fir_client/vue.config.js
index c607846..c5203c5 100644
--- a/fir_client/vue.config.js
+++ b/fir_client/vue.config.js
@@ -87,6 +87,7 @@ const pro_base_env = {
     index_static: 'https://static.flyapps.cn/index/',
     baseShortUrl: 'https://flyapps.top',
     short_static: 'https://static.flyapps.top/short/',
+    version: '1.2.5',
 };
 
 const dev_base_env = {
@@ -94,6 +95,7 @@ const dev_base_env = {
     baseShortUrl: 'https://app.hehelucky.cn',
     short_static: '/',
     index_static: '/',
+    version: '1.2.5',
 };
 let base_evn = dev_base_env;
 
@@ -137,7 +139,7 @@ module.exports = {
         config
             .plugin('define')
             .tap(args => {
-                args[0]['process.env']['base_env'] = JSON.stringify({baseUrl: base_evn.baseUrl,baseShortUrl:base_evn.baseShortUrl});
+                args[0]['process.env']['base_env'] = JSON.stringify({baseUrl: base_evn.baseUrl,baseShortUrl:base_evn.baseShortUrl,version:base_evn.version});
                 return args
             });