|
@@ -1,5 +1,5 @@
|
|
import {getInfo, login, logout} from '@/api/login'
|
|
import {getInfo, login, logout} from '@/api/login'
|
|
-import {getToken, removeToken, setToken} from '@/utils/auth'
|
|
|
|
|
|
+import {getTenant, getToken, removeToken, setTenant as setTenantCookie, setToken} from '@/utils/auth'
|
|
import {listTenant} from "@/api/system/tenant";
|
|
import {listTenant} from "@/api/system/tenant";
|
|
|
|
|
|
const user = {
|
|
const user = {
|
|
@@ -10,7 +10,7 @@ const user = {
|
|
avatar: '',
|
|
avatar: '',
|
|
roles: [],
|
|
roles: [],
|
|
permissions: [],
|
|
permissions: [],
|
|
- tenant: null
|
|
|
|
|
|
+ tenant: getTenant()
|
|
},
|
|
},
|
|
|
|
|
|
mutations: {
|
|
mutations: {
|
|
@@ -34,6 +34,7 @@ const user = {
|
|
},
|
|
},
|
|
SET_TENANT: (state, tenant) => {
|
|
SET_TENANT: (state, tenant) => {
|
|
state.tenant = tenant
|
|
state.tenant = tenant
|
|
|
|
+ setTenantCookie(tenant)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -66,7 +67,7 @@ const user = {
|
|
let defaultTenant;
|
|
let defaultTenant;
|
|
const {rows} = await listTenant()
|
|
const {rows} = await listTenant()
|
|
if (rows.length > 0) {
|
|
if (rows.length > 0) {
|
|
- defaultTenant = rows[0].id
|
|
|
|
|
|
+ defaultTenant = state.tenant || rows[0].id
|
|
}
|
|
}
|
|
getInfo().then(res => {
|
|
getInfo().then(res => {
|
|
const user = res.user
|
|
const user = res.user
|
|
@@ -98,6 +99,7 @@ const user = {
|
|
commit('SET_TOKEN', '')
|
|
commit('SET_TOKEN', '')
|
|
commit('SET_ROLES', [])
|
|
commit('SET_ROLES', [])
|
|
commit('SET_PERMISSIONS', [])
|
|
commit('SET_PERMISSIONS', [])
|
|
|
|
+ commit('SET_TENANT', '')
|
|
removeToken()
|
|
removeToken()
|
|
resolve()
|
|
resolve()
|
|
}).catch(error => {
|
|
}).catch(error => {
|