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 });