wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 11:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步1.3版本

Browse Source
This commit is contained in:
Jerry
2021-01-03 22:29:02 +08:00
parent ef316438da
commit 25023e29b5
706 changed files with 23404 additions and 14179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
orange-demo-multi-web/src/core/http/request.js
View File

@@ -2,6 +2,7 @@ import axios from 'axios';
import router from '@/router';
import dialog from '@/components/Dialog';
import JSONbig from 'json-bigint';
import { getToken, setToken } from '@/utils';
// 创建axios实例
const service = axios.create({
@@ -26,7 +27,7 @@ const service = axios.create({
// request拦截器
service.interceptors.request.use(
config => {
let token = window.sessionStorage.getItem('token');
let token = getToken();
let menuIdJsonStr = window.sessionStorage.getItem('currentMenuId');
let currentMenuId;
if (menuIdJsonStr != null) {
@@ -48,7 +49,7 @@ service.interceptors.response.use(
router.push({ name: 'login' })
} else {
if (response.headers['refreshedtoken'] != null) {
window.sessionStorage.setItem('token', response.headers['refreshedtoken']);
setToken(response.headers['refreshedtoken']);
}
}
return response

2
orange-demo-multi-web/src/core/mixins/global.js
View File

@@ -22,7 +22,7 @@ const globalMixin = {
* @param {String} permCode 权限字
*/
checkPermCodeExist (permCode) {
if (this.getUserInfo.permCodeSet != null) {
if ((this.getUserInfo || {}).permCodeSet != null) {
return this.getUserInfo.permCodeSet.has(permCode);
} else {
return this.getUserInfo.isAdmin;

6
orange-demo-multi-web/src/core/mixins/index.js
View File

@@ -2,6 +2,8 @@ import projectConfig from '@/core/config';
import { buildGetUrl } from '@/core/http/requestUrl.js';
import { formatDate, parseDate } from 'element-ui/src/utils/date-util';
import { mapMutations } from 'vuex';
import { getToken } from '@/utils';
/**
* 上传文件组件相关方法
*/
@@ -77,7 +79,7 @@ const uploadMixin = {
if (menuIdJsonStr != null) {
currentMenuId = (JSON.parse(menuIdJsonStr) || {}).data;
}
params.Authorization = window.sessionStorage.getItem('token');
params.Authorization = getToken();
params.MenuId = currentMenuId;
return buildGetUrl(item.downloadUri, params);
}
@@ -107,7 +109,7 @@ const uploadMixin = {
},
computed: {
getUploadHeaders () {
let token = window.sessionStorage.getItem('token');
let token = getToken();
return {
Authorization: token
}