diff --git a/config/dev.env.js b/config/dev.env.js index 175e0c9..b6dcf15 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,6 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://127.0.0.1:48090"' - // BASE_API: '"http://192.168.1.241:8080/prod-api"' + // BASE_API: '"http://127.0.0.1:48090"' + BASE_API: '"http://192.168.1.241:8080/prod-api"' }) diff --git a/src/utils/request.js b/src/utils/request.js index 1ea36e0..3fdaf05 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,11 +1,12 @@ import axios from 'axios' import { Message, MessageBox } from 'element-ui' +import router from '../router' import store from '../store' import { getToken } from '@/utils/auth' // 创建axios实例 const service = axios.create({ baseURL: process.env.BASE_API, // api 的 base_url - timeout: 20000 // 请求超时时间 + timeout: 200000 // 请求超时时间 }) // request拦截器 @@ -41,7 +42,13 @@ service.interceptors.response.use( // sessionStorage.clear() // localStorage.clear() localStorage.removeItem('AJReportToken') - window.location.href = "/"; + router.push({ + path: '/login', + query: { + redirect: location.hash.substring(1) + } + }) + // window.location.href = "/index?redirect=" + location.hash.substring(1); }) } else if (res.code !== '200') { diff --git a/src/views/login.vue b/src/views/login.vue index fa3990d..4badc67 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -144,27 +144,24 @@ export default { mounted() { this.handleLoginFocus(); //获取url传参 ticket url - const ticket = this.$route.query.ticket; - debugger - let token = getToken(); - console.log(ticket); - console.log(token); - if (ticket == undefined && token == null) { - //跳转统一身份认证 - var isTs = true; - if (isTs) { - debugger + const ticket = this.$route.query.ticket; + let token = getToken(); + if (ticket == undefined && token == null) { + //跳转统一身份认证 + var isTs = true; + if (isTs) { + console.log(this.redirect ); + window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23'+this.redirect; + // window.location.href = 'http://localhost:8099/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A9528%2F%23'+this.redirect; + + } + } else if (ticket != undefined && token == null) { + //请求登录 + this.logincasapi(); + } else { - window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23%2Flogin'; - // window.location.href = 'http://127.0.0.1/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F127.0.0.1%3A9528%2F%23%2Flogin'; - + } - } else if (ticket != undefined && token == null) { - //请求登录 - this.logincasapi(); - } else { - - } }, created() {}, methods: {