From 0b768d3a53861ae6b456551082b3ac314bd3d561 Mon Sep 17 00:00:00 2001 From: iizmg Date: Thu, 30 Apr 2020 15:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/config/dev.env.js | 3 ++- admin/config/prod.env.js | 3 ++- admin/config/test.env.js | 3 ++- admin/src/assets/js/glob.js | 12 ++---------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/admin/config/dev.env.js b/admin/config/dev.env.js index 900d7c4..6eb845f 100644 --- a/admin/config/dev.env.js +++ b/admin/config/dev.env.js @@ -4,5 +4,6 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - VUE_APP_TITLE: '"ITKK控制台"' + VUE_APP_TITLE: '"ITKK控制台"', + VUE_APP_BASE_URL:'"http://127.0.0.1:9000/"' }) diff --git a/admin/config/prod.env.js b/admin/config/prod.env.js index 39cc3e8..3184f30 100644 --- a/admin/config/prod.env.js +++ b/admin/config/prod.env.js @@ -1,5 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - VUE_APP_TITLE: '"ITKK控制台"' + VUE_APP_TITLE: '"ITKK控制台"', + VUE_APP_BASE_URL:'"/"' } diff --git a/admin/config/test.env.js b/admin/config/test.env.js index 2f599f3..24c50c5 100644 --- a/admin/config/test.env.js +++ b/admin/config/test.env.js @@ -4,5 +4,6 @@ const devEnv = require('./dev.env') module.exports = merge(devEnv, { NODE_ENV: '"testing"', - VUE_APP_TITLE: '"ITKK控制台"' + VUE_APP_TITLE: '"ITKK控制台"', + VUE_APP_BASE_URL:'"http://127.0.0.1:9000/"' }) diff --git a/admin/src/assets/js/glob.js b/admin/src/assets/js/glob.js index 47c23c9..8a7f082 100644 --- a/admin/src/assets/js/glob.js +++ b/admin/src/assets/js/glob.js @@ -35,11 +35,7 @@ const glob = { message: '认证过期,请重新登陆,正在跳转', onClose: () => { const redirectUrl = escape(window.location.href); - if (process.env.NODE_ENV === 'production') { - window.location = '/login.html?redirectUrl=' + redirectUrl; - } else { - window.location.href = 'http://127.0.0.1:9000/login.html?redirectUrl=' + redirectUrl; - } + window.location = process.env.VUE_APP_BASE_URL + 'login.html?redirectUrl=' + redirectUrl; } }); }, @@ -63,11 +59,7 @@ const glob = { // 添加请求拦截器(从session存储中拿token) axios.interceptors.request.use(config => { //设置请求根路径 - if (process.env.NODE_ENV === 'production') { - config.baseURL = '/api/udf/web'; - } else { - config.baseURL = 'http://127.0.0.1:9000/api/udf/web'; - } + config.baseURL = process.env.VUE_APP_BASE_URL + 'api/udf/web'; //添加token到header中 config.headers.token = this.getToken() ? this.getToken() : ''; //设置请求超时时间