From 92a2421a9b7e38707e38dbac64f1202f027c1114 Mon Sep 17 00:00:00 2001 From: daxiongok <571115139@qq.com> Date: Sat, 17 Aug 2024 22:53:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AFtoken?= =?UTF-8?q?=E6=97=A0=E6=84=9F=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD=20fix:?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9D=83=E9=99=90=E7=A0=81=E5=A4=AA=E5=A4=9A?= =?UTF-8?q?=E6=97=B6=EF=BC=8Ccookie=E5=A4=AA=E5=A4=A7=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E3=80=82=E6=94=B9=E4=B8=BA?= =?UTF-8?q?localstage=E5=AD=98=E5=82=A8token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: daxiongok <571115139@qq.com> --- Yi.RuoYi.Vue3/src/utils/auth.js | 26 ++++++- Yi.RuoYi.Vue3/src/utils/refreshToken.js | 19 +++++ Yi.RuoYi.Vue3/src/utils/request.js | 98 +++++++++++++++++++------ 3 files changed, 118 insertions(+), 25 deletions(-) create mode 100644 Yi.RuoYi.Vue3/src/utils/refreshToken.js diff --git a/Yi.RuoYi.Vue3/src/utils/auth.js b/Yi.RuoYi.Vue3/src/utils/auth.js index ca2c6e4f..56ab71df 100644 --- a/Yi.RuoYi.Vue3/src/utils/auth.js +++ b/Yi.RuoYi.Vue3/src/utils/auth.js @@ -1,18 +1,38 @@ import Cookies from 'js-cookie' const TokenKey = 'Admin-Token' +const RefreshTokenKey = 'Refresh-Token' const TenantIdKey='Tenant-Id' export function getToken() { - return Cookies.get(TokenKey) + return localStorage.getItem(TokenKey) + // return Cookies.get(TokenKey) } export function setToken(token) { - return Cookies.set(TokenKey, token) + return localStorage.setItem(TokenKey, token) + // return Cookies.set(TokenKey, token) } export function removeToken() { - return Cookies.remove(TokenKey) + return localStorage.removeItem(TokenKey) + // return Cookies.remove(TokenKey) } + +export function getRefreshToken() { + return localStorage.getItem(RefreshTokenKey) + // return Cookies.get(RefreshTokenKey) +} + +export function setRefreshToken(token) { + return localStorage.setItem(RefreshTokenKey, token) + // return Cookies.set(RefreshTokenKey, token) +} + +export function removeRefreshToken() { + return localStorage.removeItem(RefreshTokenKey) + // return Cookies.remove(RefreshTokenKey) +} + export function getTenantId() { return Cookies.get(TenantIdKey) } diff --git a/Yi.RuoYi.Vue3/src/utils/refreshToken.js b/Yi.RuoYi.Vue3/src/utils/refreshToken.js new file mode 100644 index 00000000..33dc0e7f --- /dev/null +++ b/Yi.RuoYi.Vue3/src/utils/refreshToken.js @@ -0,0 +1,19 @@ +import { getRefreshToken } from './auth' +import request from './request' + +export function refreshToken() { + return request({ + url: '/account/refresh', + method: 'post', + headers: { + 'Content-Type': 'application/json;charset=utf-8', + 'Authorization': 'Bearer ' + getRefreshToken(), + 'isToken' :false + }, + __isRefreshToken: true + }) +} + +export function isRefreshRequest(config) { + return !!config.__isRefreshToken +} diff --git a/Yi.RuoYi.Vue3/src/utils/request.js b/Yi.RuoYi.Vue3/src/utils/request.js index 7d755f7b..b5c3b6fb 100644 --- a/Yi.RuoYi.Vue3/src/utils/request.js +++ b/Yi.RuoYi.Vue3/src/utils/request.js @@ -1,6 +1,7 @@ import axios from 'axios' import { ElNotification, ElMessageBox, ElMessage, ElLoading } from 'element-plus' import { getToken,getTenantId } from '@/utils/auth' +import { refreshToken, isRefreshRequest } from './refreshToken.js' import errorCode from '@/utils/errorCode' import { tansParams, blobValidate } from '@/utils/ruoyi' import cache from '@/plugins/cache' @@ -126,16 +127,69 @@ service.interceptors.response.use(res => { // handler(code, msg); return Promise.resolve(res); -}, - error => { +}, async function(error) { + console.log(error.response, "error") + const errorRes = error.response; + console.log('isRefreshingbefore',isRefreshing) - console.log(error.response,"error") - const errorRes=error.response; - const code = errorRes.status || 200; - const msg = `${errorRes.data?.error?.message}` ; + if (errorRes?.status == '401' && !isRefreshRequest(errorRes.config)){ // 如果没有权限且不是刷新token的请求 + console.log('isRefreshing',isRefreshing,new Date()) + if (!isRefreshing) { + isRefreshing = true + let newToken = '' + // 刷新token + try { + const res = await refreshToken() + // 保存新的token + newToken = res.data.token + setToken(newToken) + setRefreshToken(res.data.refreshToken) + + } catch(e) { + console.log("触发重新登录",e) + ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + isRelogin.show = false; + useUserStore().logOut().then(() => { + location.href = '/index'; + }) + }).catch(() => { + isRelogin.show = false; + }); + return Promise.reject(error) + } + // 有新token后再重新请求 + errorRes.config.headers['Authorization'] = 'Bearer ' + newToken // 新token + // token 刷新后将数组的方法重新执行 + waitRequests.forEach((cb) => cb(newToken)) + waitRequests = [] // 重新请求完清空 + const resp = await service.request(errorRes.config) + isRefreshing = false + console.log('closseRefreshing',isRefreshing) + return Promise.resolve(resp); + } else { + // 返回未执行 resolve 的 Promise + return new Promise(resolve => { + // 用函数形式将 resolve 存入，等待刷新后再执行 + waitRequests.push(token => { + errorRes.config.headers['Authorization'] = 'Bearer ' + `${token}` + resolve(service(errorRes.config)) + }) + }) + } + } + else + { + const code = errorRes && errorRes.status || 200; + const msg = `${errorRes?.data?.error?.message}`; handler(code, msg); return Promise.reject(error) } +} ) // 通用下载方法 @@ -180,22 +234,22 @@ const handler = (code, msg) => { title: msg }) break; - //未授权 - case 401: - ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - isRelogin.show = false; - useUserStore().logOut().then(() => { - location.href = '/index'; - }) - }).catch(() => { - isRelogin.show = false; - }); - break; + // //未授权 + // case 401: + // ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { + // confirmButtonText: '重新登录', + // cancelButtonText: '取消', + // type: 'warning' + // }) + // .then(() => { + // isRelogin.show = false; + // useUserStore().logOut().then(() => { + // location.href = '/index'; + // }) + // }).catch(() => { + // isRelogin.show = false; + // }); + // break; case 404: ElMessage({ message: "404未找到资源",