From 375496da7140523418e533c23a43ac50520874f0 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 八月 2024 08:21:14 +0800
Subject: [PATCH] 修改ip
---
ruoyi-ui/src/store/modules/user.js | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index ab0a6fe..7428be4 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -6,6 +6,7 @@
token: getToken(),
name: '',
avatar: '',
+ clanId: '',
roles: [],
permissions: []
},
@@ -25,22 +26,32 @@
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
- }
+ },
+ SET_CLANID: (state, clanId) => {
+ state.clanId = clanId
+ },
},
actions: {
// 鐧诲綍
Login({ commit }, userInfo) {
+
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 => {
- setToken(res.token)
- commit('SET_TOKEN', res.token)
+
+ setToken(res.data.token)
+
+ commit('SET_TOKEN', res.data.token)
resolve()
}).catch(error => {
+ alert(error)
reject(error)
})
})
@@ -51,13 +62,19 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ // (user.avatar == "" || user.avatar == null) ?: process.env.VUE_APP_BASE_API + user.avatar
+ const avatar =require("@/assets/images/zhang.png") ;
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
+
+
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ // console.log(res)
+ // alert(res.user.clanId)
+ commit('SET_CLANID', res.user.clanId)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)
--
Gitblit v1.9.1