From c9f9f5c6ffd59ecf6ea93c1659b35c6e46a6da22 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 23 Apr 2025 21:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=95=B0=E6=8D=AE=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=94=A8=E6=88=B7=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 store/getters.js      | 1 +
 store/modules/user.js | 9 ++++++++-
 utils/constant.js     | 9 +++++----
 utils/storage.js      | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/store/getters.js b/store/getters.js
index f0eece3..6bd7d3a 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -1,6 +1,7 @@
 const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  id: state => state.user.id,
   name: state => state.user.name,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions
diff --git a/store/modules/user.js b/store/modules/user.js
index 36e6ee3..539b984 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -11,6 +11,7 @@ const baseUrl = config.baseUrl
 const user = {
   state: {
     token: getToken(),
+    id: storage.get(constant.id),
     name: storage.get(constant.name),
     avatar: storage.get(constant.avatar),
     roles: storage.get(constant.roles),
@@ -21,6 +22,10 @@ const user = {
     SET_TOKEN: (state, token) => {
       state.token = token
     },
+    SET_ID: (state, id) => {
+      state.id = id
+      storage.set(constant.id, id)
+    },
     SET_NAME: (state, name) => {
       state.name = name
       storage.set(constant.name, name)
@@ -66,13 +71,15 @@ const user = {
 		  if (!isHttp(avatar)) {
             avatar = (isEmpty(avatar)) ? defAva : baseUrl + avatar
           }
-          const username = (isEmpty(user) || isEmpty(user.userName)) ? "" : user.userName
+          const userid = (isEmpty(user) || isEmpty(user.userId)) ? "" : user.userId
+		  const username = (isEmpty(user) || isEmpty(user.userName)) ? "" : user.userName
 		  if (res.roles && res.roles.length > 0) {
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+          commit('SET_ID', userid)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           resolve(res)
diff --git a/utils/constant.js b/utils/constant.js
index 891d5b8..56fd92c 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -1,8 +1,9 @@
 const constant = {
-   avatar: 'vuex_avatar',
-   name: 'vuex_name',
-   roles: 'vuex_roles',
-   permissions: 'vuex_permissions'
+  avatar: 'user_avatar',
+  id: 'user_id',
+  name: 'user_name',
+  roles: 'user_roles',
+  permissions: 'user_permissions'
  }
 
  export default constant
diff --git a/utils/storage.js b/utils/storage.js
index 462ca62..cb803e4 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -4,7 +4,7 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions]
+let storageNodeKeys = [constant.avatar, constant.id, constant.name, constant.roles, constant.permissions]
 
 const storage = {
   set: function(key, value) {