From 5b959b32d7058f0dfe19c430eb5985f195bd7c55 Mon Sep 17 00:00:00 2001
From: AZP <2198774759@qq.com>
Date: 星期一, 21 十月 2024 11:39:18 +0800
Subject: [PATCH] update ruoyi-ui/src/components/ImageUpload/index.vue. 【fix】修复后台前端上传图片如果图片路径已经携带域名就无需增加前缀域名
---
ruoyi-ui/src/store/modules/user.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 20f44bf..01c8683 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: [],
@@ -13,6 +14,9 @@
mutations: {
SET_TOKEN: (state, token) => {
state.token = token
+ },
+ SET_ID: (state, id) => {
+ state.id = id
},
SET_NAME: (state, name) => {
state.name = name
@@ -49,16 +53,17 @@
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getInfo(state.token).then(res => {
+ getInfo().then(res => {
const user = res.user
- const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + 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_NAME', user.username)
+ commit('SET_ID', user.userId)
+ commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
@@ -66,7 +71,7 @@
})
})
},
-
+
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
--
Gitblit v1.9.2