diff --git a/ruoyi-ui-vue3/src/store/modules/user.js b/ruoyi-ui-vue3/src/store/modules/user.js index 9784ee44a..2452d5792 100644 --- a/ruoyi-ui-vue3/src/store/modules/user.js +++ b/ruoyi-ui-vue3/src/store/modules/user.js @@ -7,6 +7,7 @@ const useUserStore = defineStore( { state: () => ({ token: getToken(), + id: '', name: '', avatar: '', roles: [], @@ -21,9 +22,8 @@ const useUserStore = defineStore( const uuid = userInfo.uuid return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { - let data = res.data - setToken(data.access_token) - this.token = data.access_token + setToken(res.data.token) + this.token = res.data.token resolve() }).catch(error => { reject(error) @@ -43,8 +43,9 @@ const useUserStore = defineStore( } else { this.roles = ['ROLE_DEFAULT'] } + this.id = user.userId this.name = user.userName - this.avatar = avatar; + this.avatar = avatar resolve(res) }).catch(error => { reject(error) diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 0a4ac07ee..88372bb49 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -1,9 +1,10 @@ -import { login, logout, getInfo, refreshToken } from '@/api/login' -import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' +import { login, logout, getInfo } from '@/api/login' +import { getToken, setToken, removeToken } from '@/utils/auth' const user = { state: { token: getToken(), + id: '', name: '', avatar: '', roles: [], @@ -14,8 +15,8 @@ const user = { SET_TOKEN: (state, token) => { state.token = token }, - SET_EXPIRES_IN: (state, time) => { - state.expires_in = time + SET_ID: (state, id) => { + state.id = id }, SET_NAME: (state, name) => { state.name = name @@ -40,11 +41,8 @@ const user = { const uuid = userInfo.uuid return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { - let data = res.data - setToken(data.access_token) - commit('SET_TOKEN', data.access_token) - setExpiresIn(data.expires_in) - commit('SET_EXPIRES_IN', data.expires_in) + setToken(res.data.token) + commit('SET_TOKEN', res.data.token) resolve() }).catch(error => { reject(error) @@ -64,6 +62,7 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } + commit('SET_ID', user.userId) commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) resolve(res)