Merge branch 'dw_master' into boe_dongwu0919

This commit is contained in:
joshen@zcwytd.com
2023-09-20 17:26:31 +08:00
7 changed files with 13 additions and 10 deletions

View File

@@ -9,6 +9,8 @@
import {message} from "ant-design-vue";
import axios from "axios";
import router from "@/router";
import {REFRESH_TOKEN_API} from "@/api/ThirdApi";
import {boeRequest} from "@/api/request";
// import { getCookie } from '../api/method'
// const Qs = require("qs");
@@ -57,13 +59,15 @@ http.interceptors.response.use(
return response;
}
if (code === 1000) {
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
(window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
// TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用
localStorage.removeItem('refreshPage')
return Promise.reject(response);
}
if (code === 1001) {
window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
return Promise.reject(response);
}
show ? message.error(msg):message.error('系统接口数据异常,请联系管理员');
console.log("api %o", msg);
return Promise.reject(response);

View File

@@ -49,7 +49,7 @@ http.interceptors.response.use(
message.error('token过期请重新登陆');
}
if (code === 1000) {
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
return Promise.reject(response);
}
// show && message.error(msg);

View File

@@ -51,7 +51,7 @@ http.interceptors.response.use(
message.error('token过期请重新登陆');
}
if (code === 1000) {
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
return Promise.reject(response);
}
// show && message.error(msg);

View File

@@ -495,9 +495,7 @@ export async function request(_url, params) {
return res;
}
if (res.code === 1000 || res.code === 1002) {
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
(window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
localStorage.removeItem('refreshPage')
return Promise.reject(res);
}else if(res.code=== 1001){