new feature

resources/admin/router/guard/index.ts

@@ -44,8 +44,9 @@ const guard = (router: Router) => {
             }
             next({ ...to, replace: true })
           } catch (e) {
+            console.log(e)
             removeAuthToken()
-            next({ path: `${WhiteListPage.LOGIN_PATH}?redirect=${to.path}` })
+            next({ path: `${WhiteListPage.LOGIN_PATH}?redirect=/${to.path}` })
           }
         }
       }

resources/admin/stores/modules/user/index.ts

@@ -11,7 +11,7 @@ export const useUserStore = defineStore('UserStore', {
     return {
       id: 0,
 
-      nickname: '',
+      username: '',
 
       avatar: '',
 
@@ -32,7 +32,7 @@ export const useUserStore = defineStore('UserStore', {
       return this.id
     },
     getNickname(): string {
-      return this.nickname
+      return this.username
     },
 
     getAvatar(): string {
@@ -52,8 +52,8 @@ export const useUserStore = defineStore('UserStore', {
     isSuperAdmin(): boolean {
       return this.id === 1
     },
-    setNickname(nickname: string) {
-      this.nickname = nickname
+    setUsername(username: string) {
+      this.username = username
     },
 
     setId(id: number) {
@@ -130,10 +130,10 @@ export const useUserStore = defineStore('UserStore', {
         http
           .get('/user/online')
           .then(response => {
-            const { id, nickname, email, avatar, permissions, roles, rememberToken, status } = response.data.data
+            const { id, username, email, avatar, permissions, roles, rememberToken, status } = response.data.data
             // set user info
             this.setId(id)
-            this.setNickname(nickname)
+            this.setUsername(username)
             this.setEmail(email)
             this.setRoles(roles)
             this.setRememberToken(rememberToken)

resources/admin/support/http.ts

@@ -188,6 +188,7 @@ class Http {
             router.push('/login')
           })
         } else if (code === Code.LOGIN_BLACKLIST || code === Code.USER_FORBIDDEN) {
+          console.log(123123)
           Message.error(message || 'Error')
           removeAuthToken()
           // to login page

resources/admin/types/User.ts

@@ -1,22 +1,21 @@
-
 // login user type
 
 import { Permission } from './permission'
 
 export interface User {
-    id: number,
+  id: number
 
-    nickname: string,
+  username: string
 
-    avatar: string,
+  avatar: string
 
-    email: string,
+  email: string
 
-    status: number,
+  status: number
 
-    remember_token: string,
+  remember_token: string
 
-    roles?: string[],
+  roles?: string[]
 
-    permissions?: Permission[]
+  permissions?: Permission[]
 }