From 9ed5b521d613edb51b160cca931ee680019e2896 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 三月 2023 22:26:13 +0800
Subject: [PATCH] fix 修复 用户密码暴露问题
---
ruoyi-ui/src/store/modules/user.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 917f916..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()
@@ -51,7 +56,7 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.data.user
- const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
if (res.data.roles && res.data.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
commit('SET_ROLES', res.data.roles)
commit('SET_PERMISSIONS', res.data.permissions)
@@ -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