diff --git a/src/api/user.js b/src/api/user.js index 09ac56a..4734923 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -17,10 +17,14 @@ export const loginByUsername = (tenantId, username, password, type) => request({ } }) -export const refreshToken = (refresh_token) => request({ +export const refreshToken = (refresh_token, tenantId) => request({ url: '/api/blade-auth/oauth/token', method: 'post', + headers: { + 'Tenant-Id': tenantId + }, params: { + tenantId, refresh_token, grant_type: "refresh_token", scope: "all", diff --git a/src/store/modules/user.js b/src/store/modules/user.js index f770fe9..1352025 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -33,6 +33,7 @@ function addPath(ele, first) { const user = { state: { + tenantId: getStore({name: 'tenantId'}) || '', userInfo: getStore({name: 'userInfo'}) || [], permission: getStore({name: 'permission'}) || {}, roles: [], @@ -55,6 +56,7 @@ const user = { } else { commit('SET_TOKEN', data.access_token); commit('SET_REFRESH_TOKEN', data.refresh_token); + commit('SET_TENANT_ID', data.tenant_id); commit('SET_USER_INFO', data); commit('DEL_ALL_TAG'); commit('CLEAR_LOCK'); @@ -101,7 +103,7 @@ const user = { refreshToken({state, commit}) { console.log('handle refresh token') return new Promise((resolve, reject) => { - refreshToken(state.refreshToken).then(res => { + refreshToken(state.refreshToken, state.tenantId).then(res => { const data = res.data; commit('SET_TOKEN', data.access_token); commit('SET_REFRESH_TOKEN', data.refresh_token); @@ -177,6 +179,10 @@ const user = { state.refreshToken = refreshToken; setStore({name: 'refreshToken', content: state.refreshToken, type: 'session'}) }, + SET_TENANT_ID: (state, tenantId) => { + state.tenantId = tenantId; + setStore({name: 'tenantId', content: state.tenantId, type: 'session'}) + }, SET_USER_INFO: (state, userInfo) => { state.userInfo = userInfo; setStore({name: 'userInfo', content: state.userInfo})