refactor: ♻️ 更换本地缓存的 token 变量名
This commit is contained in:
parent
8f842ec602
commit
023c585c95
|
|
@ -1,7 +1,7 @@
|
||||||
import router from "@/router";
|
import router from "@/router";
|
||||||
import { useUserStore } from "@/store/modules/user";
|
import { useUserStore, usePermissionStore } from "@/store";
|
||||||
import { usePermissionStore } from "@/store/modules/permission";
|
|
||||||
import NProgress from "@/utils/nprogress";
|
import NProgress from "@/utils/nprogress";
|
||||||
|
import { RouteRecordRaw } from "vue-router";
|
||||||
|
|
||||||
export function setupPermission() {
|
export function setupPermission() {
|
||||||
// 白名单路由
|
// 白名单路由
|
||||||
|
|
@ -9,7 +9,7 @@ export function setupPermission() {
|
||||||
|
|
||||||
router.beforeEach(async (to, from, next) => {
|
router.beforeEach(async (to, from, next) => {
|
||||||
NProgress.start();
|
NProgress.start();
|
||||||
const hasToken = localStorage.getItem("token");
|
const hasToken = localStorage.getItem("accessToken");
|
||||||
if (hasToken) {
|
if (hasToken) {
|
||||||
if (to.path === "/login") {
|
if (to.path === "/login") {
|
||||||
// 如果已登录,跳转首页
|
// 如果已登录,跳转首页
|
||||||
|
|
@ -31,7 +31,7 @@ export function setupPermission() {
|
||||||
try {
|
try {
|
||||||
const { roles } = await userStore.getUserInfo();
|
const { roles } = await userStore.getUserInfo();
|
||||||
const accessRoutes = await permissionStore.generateRoutes(roles);
|
const accessRoutes = await permissionStore.generateRoutes(roles);
|
||||||
accessRoutes.forEach((route) => {
|
accessRoutes.forEach((route: RouteRecordRaw) => {
|
||||||
router.addRoute(route);
|
router.addRoute(route);
|
||||||
});
|
});
|
||||||
next({ ...to, replace: true });
|
next({ ...to, replace: true });
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ export const useUserStore = defineStore("user", () => {
|
||||||
loginApi(loginData)
|
loginApi(loginData)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
const { tokenType, accessToken } = response.data;
|
const { tokenType, accessToken } = response.data;
|
||||||
localStorage.setItem("token", tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
|
localStorage.setItem("accessToken", tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
|
||||||
resolve();
|
resolve();
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
|
@ -59,7 +59,7 @@ export const useUserStore = defineStore("user", () => {
|
||||||
return new Promise<void>((resolve, reject) => {
|
return new Promise<void>((resolve, reject) => {
|
||||||
logoutApi()
|
logoutApi()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
localStorage.setItem("token", "");
|
localStorage.setItem("accessToken", "");
|
||||||
location.reload(); // 清空路由
|
location.reload(); // 清空路由
|
||||||
resolve();
|
resolve();
|
||||||
})
|
})
|
||||||
|
|
@ -73,7 +73,7 @@ export const useUserStore = defineStore("user", () => {
|
||||||
function resetToken() {
|
function resetToken() {
|
||||||
console.log("resetToken");
|
console.log("resetToken");
|
||||||
return new Promise<void>((resolve) => {
|
return new Promise<void>((resolve) => {
|
||||||
localStorage.setItem("token", "");
|
localStorage.setItem("accessToken", "");
|
||||||
resetRouter();
|
resetRouter();
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ const service = axios.create({
|
||||||
// 请求拦截器
|
// 请求拦截器
|
||||||
service.interceptors.request.use(
|
service.interceptors.request.use(
|
||||||
(config: InternalAxiosRequestConfig) => {
|
(config: InternalAxiosRequestConfig) => {
|
||||||
const accessToken = localStorage.getItem("token");
|
const accessToken = localStorage.getItem("accessToken");
|
||||||
if (accessToken) {
|
if (accessToken) {
|
||||||
config.headers.Authorization = accessToken;
|
config.headers.Authorization = accessToken;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ function connectWebSocket() {
|
||||||
stompClient = Stomp.over(socket);
|
stompClient = Stomp.over(socket);
|
||||||
|
|
||||||
stompClient.connect(
|
stompClient.connect(
|
||||||
{ Authorization: localStorage.getItem("token") },
|
{ Authorization: localStorage.getItem("accessToken") },
|
||||||
() => {
|
() => {
|
||||||
isConnected.value = true;
|
isConnected.value = true;
|
||||||
messages.value.push({
|
messages.value.push({
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue