From 8694501a7e693bc7629b4a60fcfad2fd1f418d8d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 25 Jun 2024 13:55:12 +0800
Subject: [PATCH] 升级druid到最新版本1.2.23
---
ruoyi-ui/src/store/modules/user.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 103706d..7c9b0c7 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -4,6 +4,7 @@
const user = {
state: {
token: getToken(),
+ id: '',
name: '',
avatar: '',
roles: [],
@@ -16,6 +17,9 @@
},
SET_EXPIRES_IN: (state, time) => {
state.expires_in = time
+ },
+ SET_ID: (state, id) => {
+ state.id = id
},
SET_NAME: (state, name) => {
state.name = name
@@ -57,13 +61,14 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.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.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
--
Gitblit v1.9.3