From 7a8f1cb7741436c43fc5859707da5041d6648953 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 21 七月 2025 17:21:41 +0800
Subject: [PATCH] -
---
src/utils/auth.ts | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index f2b28cb..fd8a4cc 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -16,7 +16,7 @@
/** 鏄电О */
nickname?: string;
/** 褰撳墠鐧诲綍鐢ㄦ埛鐨勮鑹� */
- roles?: Array<string>;
+ exRoles?: Array<string>;
/** 褰撳墠鐧诲綍鐢ㄦ埛鐨勬寜閽骇鍒潈闄� */
permissions?: Array<string>;
}
@@ -43,7 +43,7 @@
* @description 璁剧疆`token`浠ュ強涓�浜涘繀瑕佷俊鎭苟閲囩敤鏃犳劅鍒锋柊`token`鏂规
* 鏃犳劅鍒锋柊锛氬悗绔繑鍥瀈accessToken`锛堣闂帴鍙ｄ娇鐢ㄧ殑`token`锛夈�乣refreshToken`锛堢敤浜庤皟鐢ㄥ埛鏂癭accessToken`鐨勬帴鍙ｆ椂鎵�闇�鐨刞token`锛宍refreshToken`鐨勮繃鏈熸椂闂达紙姣斿30澶╋級搴斿ぇ浜巂accessToken`鐨勮繃鏈熸椂闂达紙姣斿2灏忔椂锛夛級銆乣expires`锛坄accessToken`鐨勮繃鏈熸椂闂达級
* 灏哷accessToken`銆乣expires`銆乣refreshToken`杩欎笁鏉′俊鎭斁鍦╧ey鍊间负authorized-token鐨刢ookie閲岋紙杩囨湡鑷姩閿�姣侊級
- * 灏哷avatar`銆乣username`銆乣nickname`銆乣roles`銆乣permissions`銆乣refreshToken`銆乣expires`杩欎竷鏉′俊鎭斁鍦╧ey鍊间负`user-info`鐨刲ocalStorage閲岋紙鍒╃敤`multipleTabsKey`褰撴祻瑙堝櫒瀹屽叏鍏抽棴鍚庤嚜鍔ㄩ攢姣侊級
+ * 灏哷avatar`銆乣username`銆乣nickname`銆乣exRoles`銆乣permissions`銆乣refreshToken`銆乣expires`杩欎竷鏉′俊鎭斁鍦╧ey鍊间负`user-info`鐨刲ocalStorage閲岋紙鍒╃敤`multipleTabsKey`褰撴祻瑙堝櫒瀹屽叏鍏抽棴鍚庤嚜鍔ㄩ攢姣侊級
*/
export function setToken(data: DataInfo<Date>) {
let expires = 0;
@@ -68,11 +68,11 @@
: {}
);
- function setUserKey({ avatar, username, nickname, roles, permissions }) {
+ function setUserKey({ avatar, username, nickname, exRoles, permissions }) {
useUserStoreHook().SET_AVATAR(avatar);
useUserStoreHook().SET_USERNAME(username);
useUserStoreHook().SET_NICKNAME(nickname);
- useUserStoreHook().SET_ROLES(roles);
+ useUserStoreHook().SET_ROLES(exRoles);
useUserStoreHook().SET_PERMS(permissions);
storageLocal().setItem(userKey, {
refreshToken,
@@ -80,18 +80,18 @@
avatar,
username,
nickname,
- roles,
+ exRoles,
permissions
});
}
- if (data.username && data.roles) {
- const { username, roles } = data;
+ if (data.exRoles) {
+ const { username, exRoles } = data;
setUserKey({
avatar: data?.avatar ?? "",
username,
nickname: data?.nickname ?? "",
- roles,
+ exRoles,
permissions: data?.permissions ?? []
});
} else {
@@ -101,15 +101,15 @@
storageLocal().getItem<DataInfo<number>>(userKey)?.username ?? "";
const nickname =
storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "";
- const roles =
- storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
+ const exRoles =
+ storageLocal().getItem<DataInfo<number>>(userKey)?.exRoles ?? [];
const permissions =
storageLocal().getItem<DataInfo<number>>(userKey)?.permissions ?? [];
setUserKey({
avatar,
username,
nickname,
- roles,
+ exRoles,
permissions
});
}
--
Gitblit v1.9.1