diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts index 9fbce9f..57ce32c 100644 --- a/src/plugins/permission.ts +++ b/src/plugins/permission.ts @@ -1,7 +1,7 @@ import router from "@/router"; -import { useUserStore } from "@/store/modules/user"; -import { usePermissionStore } from "@/store/modules/permission"; +import { useUserStore, usePermissionStore } from "@/store"; import NProgress from "@/utils/nprogress"; +import { RouteRecordRaw } from "vue-router"; export function setupPermission() { // 白名单路由 @@ -9,7 +9,7 @@ export function setupPermission() { router.beforeEach(async (to, from, next) => { NProgress.start(); - const hasToken = localStorage.getItem("token"); + const hasToken = localStorage.getItem("accessToken"); if (hasToken) { if (to.path === "/login") { // 如果已登录,跳转首页 @@ -31,7 +31,7 @@ export function setupPermission() { try { const { roles } = await userStore.getUserInfo(); const accessRoutes = await permissionStore.generateRoutes(roles); - accessRoutes.forEach((route) => { + accessRoutes.forEach((route: RouteRecordRaw) => { router.addRoute(route); }); next({ ...to, replace: true }); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index e6637dd..f1346a1 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -23,7 +23,7 @@ export const useUserStore = defineStore("user", () => { loginApi(loginData) .then((response) => { const { tokenType, accessToken } = response.data; - localStorage.setItem("token", tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx + localStorage.setItem("accessToken", tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx resolve(); }) .catch((error) => { @@ -59,7 +59,7 @@ export const useUserStore = defineStore("user", () => { return new Promise((resolve, reject) => { logoutApi() .then(() => { - localStorage.setItem("token", ""); + localStorage.setItem("accessToken", ""); location.reload(); // 清空路由 resolve(); }) @@ -73,7 +73,7 @@ export const useUserStore = defineStore("user", () => { function resetToken() { console.log("resetToken"); return new Promise((resolve) => { - localStorage.setItem("token", ""); + localStorage.setItem("accessToken", ""); resetRouter(); resolve(); }); diff --git a/src/utils/request.ts b/src/utils/request.ts index 95f74ac..3e600f9 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -11,7 +11,7 @@ const service = axios.create({ // 请求拦截器 service.interceptors.request.use( (config: InternalAxiosRequestConfig) => { - const accessToken = localStorage.getItem("token"); + const accessToken = localStorage.getItem("accessToken"); if (accessToken) { config.headers.Authorization = accessToken; } diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue index 612faad..ac0a147 100644 --- a/src/views/demo/websocket.vue +++ b/src/views/demo/websocket.vue @@ -57,7 +57,7 @@ function connectWebSocket() { stompClient = Stomp.over(socket); stompClient.connect( - { Authorization: localStorage.getItem("token") }, + { Authorization: localStorage.getItem("accessToken") }, () => { isConnected.value = true; messages.value.push({