add tenant to all request header

This commit is contained in:
ailanyin
2023-05-11 17:19:05 +08:00
parent 685f1527e5
commit 11b23ec129
5 changed files with 17 additions and 6 deletions

View File

@ -27,6 +27,7 @@
"jsencrypt": "3.3.1", "jsencrypt": "3.3.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "2.0.22", "pinia": "2.0.22",
"pinia-plugin-persistedstate": "^3.1.0",
"vue": "3.2.45", "vue": "3.2.45",
"vue-cropper": "1.0.3", "vue-cropper": "1.0.3",
"vue-router": "4.1.4" "vue-router": "4.1.4"

View File

@ -1,7 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// 登录方法 // 登录方法
export function login(username, password, code, uuid, tenant) { export function login(username, password, code, uuid) {
const data = { const data = {
username, username,
password, password,
@ -12,7 +12,6 @@ export function login(username, password, code, uuid, tenant) {
url: '/login', url: '/login',
headers: { headers: {
isToken: false, isToken: false,
tenant
}, },
method: 'post', method: 'post',
data: data data: data

View File

@ -1,3 +1,5 @@
const store = createPinia() import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
const store = createPinia()
store.use(piniaPluginPersistedstate)
export default store export default store

View File

@ -10,6 +10,7 @@ const useUserStore = defineStore(
name: '', name: '',
avatar: '', avatar: '',
roles: [], roles: [],
tenant: '',
permissions: [] permissions: []
}), }),
actions: { actions: {
@ -21,7 +22,8 @@ const useUserStore = defineStore(
const code = userInfo.code const code = userInfo.code
const uuid = userInfo.uuid const uuid = userInfo.uuid
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password, code, uuid, tenant).then(res => { this.tenant = tenant
login(username, password, code, uuid).then(res => {
setToken(res.token) setToken(res.token)
this.token = res.token this.token = res.token
resolve() resolve()
@ -65,7 +67,11 @@ const useUserStore = defineStore(
}) })
}) })
} }
} },
}) persist: [
{paths: ['tenant'],storage:localStorage}
]
},
)
export default useUserStore export default useUserStore

View File

@ -29,6 +29,9 @@ service.interceptors.request.use(config => {
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
} }
if(useUserStore().tenant){
config.headers['tenant'] = useUserStore().tenant
}
// get请求映射params参数 // get请求映射params参数
if (config.method === 'get' && config.params) { if (config.method === 'get' && config.params) {
let url = config.url + '?' + tansParams(config.params); let url = config.url + '?' + tansParams(config.params);