From 5cf45e866329428864bc1c3ec1a0f67ba282fc8a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 07 三月 2023 18:20:55 +0800 Subject: [PATCH] update springboot 3.0.2 => 3.0.4 update easyexcel 3.2.0 => 3.2.1 update hutool 5.8.11 => 5.8.14 update redisson 3.19.2 => 3.20.0 update lombok 1.18.24 => 1.18.26 update maven-compiler-plugin 3.10.1 => 3.11.0 update maven-surefire-plugin 3.0.0-M7 => 3.0.0-M9 --- ruoyi-ui/src/store/modules/user.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index d67c9a4..b375adc 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -3,6 +3,7 @@ const user = { state: { + userId: undefined, token: getToken(), name: '', avatar: '', @@ -11,6 +12,9 @@ }, mutations: { + SET_USER_ID: (state, userId) => { + state.userId = userId + }, SET_TOKEN: (state, token) => { state.token = token }, @@ -31,12 +35,13 @@ actions: { // 鐧诲綍 Login({ commit }, userInfo) { + const tenantId = userInfo.tenantId.trim() const username = userInfo.username.trim() const password = userInfo.password const code = userInfo.code const uuid = userInfo.uuid return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { + login(tenantId, username, password, code, uuid).then(res => { setToken(res.data.token) commit('SET_TOKEN', res.data.token) resolve() @@ -60,6 +65,7 @@ } commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) + commit('SET_USER_ID', user.userId) resolve(res) }).catch(error => { reject(error) -- Gitblit v1.9.3