|
|
@@ -32,6 +32,12 @@ export interface DataInfo<T> {
|
|
|
userModule: string;
|
|
|
_businessDockingId: number;
|
|
|
|
|
|
+ user: {
|
|
|
+ avatar: string;
|
|
|
+ username: string;
|
|
|
+ nickname: string;
|
|
|
+ };
|
|
|
+
|
|
|
access_token: string;
|
|
|
expires_in: number;
|
|
|
}
|
|
|
@@ -61,7 +67,6 @@ export function getToken(): DataInfo<number> {
|
|
|
* 将`avatar`、`username`、`nickname`、`roles`、`permissions`、`refreshToken`、`expires`这七条信息放在key值为`user-info`的localStorage里(利用`multipleTabsKey`当浏览器完全关闭后自动销毁)
|
|
|
*/
|
|
|
export function setToken(data: DataInfo<number>) {
|
|
|
- const expires = 0;
|
|
|
// const { accessToken, refreshToken } = data;
|
|
|
const { access_token, expires_in } = data;
|
|
|
const { isRemembered, loginDay } = useUserStoreHook();
|
|
|
@@ -84,7 +89,9 @@ export function setToken(data: DataInfo<number>) {
|
|
|
}
|
|
|
: {}
|
|
|
);
|
|
|
+}
|
|
|
|
|
|
+export function setUserInfo(data: DataInfo<number>) {
|
|
|
function setUserKey({ avatar, username, nickname, roles, permissions }) {
|
|
|
useUserStoreHook().SET_AVATAR(avatar);
|
|
|
useUserStoreHook().SET_USERNAME(username);
|
|
|
@@ -93,7 +100,6 @@ export function setToken(data: DataInfo<number>) {
|
|
|
useUserStoreHook().SET_PERMS(permissions);
|
|
|
storageLocal().setItem(userKey, {
|
|
|
// refreshToken,
|
|
|
- expires,
|
|
|
avatar,
|
|
|
username,
|
|
|
nickname,
|
|
|
@@ -102,14 +108,15 @@ export function setToken(data: DataInfo<number>) {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- if (data.username && data.roles) {
|
|
|
- const { username, roles } = data;
|
|
|
+ if (data.permissions && data.roles) {
|
|
|
+ const { permissions, roles } = data;
|
|
|
+ const user = data.user;
|
|
|
setUserKey({
|
|
|
- avatar: data?.avatar ?? "",
|
|
|
- username,
|
|
|
- nickname: data?.nickname ?? "",
|
|
|
+ avatar: user?.avatar ?? "",
|
|
|
+ username: user?.username ?? "",
|
|
|
+ nickname: user?.nickname ?? "",
|
|
|
roles,
|
|
|
- permissions: data?.permissions ?? []
|
|
|
+ permissions
|
|
|
});
|
|
|
} else {
|
|
|
const avatar =
|