From c5a74fdbf86f7da8ab42a976e6a96c9edb1fc63c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 08:09:00 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/config/authProvider.js | 17 ++++++++++++++++-
zy-acs-flow/src/api/auth/index.js | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/JwtAuthenticationFilter.java | 4 ++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/api/auth/index.js b/zy-acs-flow/src/api/auth/index.js
index 7b423ee..64f5767 100644
--- a/zy-acs-flow/src/api/auth/index.js
+++ b/zy-acs-flow/src/api/auth/index.js
@@ -9,7 +9,7 @@
}
export async function menus(_params) {
- const res = await request.get('/auth/menu', _params);
+ return await request.get('/auth/menu', _params);
if (res.data.code === 200) {
return res.data.data;
}
diff --git a/zy-acs-flow/src/config/authProvider.js b/zy-acs-flow/src/config/authProvider.js
index 83e8a4a..6954a75 100644
--- a/zy-acs-flow/src/config/authProvider.js
+++ b/zy-acs-flow/src/config/authProvider.js
@@ -52,10 +52,25 @@
getPermissions: async () => {
const token = getToken();
if (!token) {
+ localStorage.removeItem("user");
+ if (window.location.pathname !== "/login") {
+ window.location.href = "/login";
+ }
return Promise.reject();
}
const res = await menus();
- return Promise.resolve(res);
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ return Promise.resolve(data);
+ } else if (code === 401) {
+ localStorage.removeItem("user");
+ if (window.location.pathname !== "/login") {
+ window.location.href = "/login";
+ return Promise.reject();
+ }
+ } else {
+ return Promise.reject(msg);
+ }
},
// getIdentity
getIdentity: () => {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/JwtAuthenticationFilter.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/JwtAuthenticationFilter.java
index 08c6736..3fab429 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/JwtAuthenticationFilter.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/JwtAuthenticationFilter.java
@@ -12,6 +12,7 @@
import com.zy.acs.framework.common.Cools;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -34,6 +35,7 @@
* 澶勭悊鎼哄甫token鐨勮姹傝繃婊ゅ櫒
*
*/
+@Slf4j
@Component
public class JwtAuthenticationFilter extends OncePerRequestFilter {
@@ -96,10 +98,12 @@
}
}
} catch (ExpiredJwtException e) {
+ log.error("JwtAuthenticationFilter ExpiredJwtException", e);
CommonUtil.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
e.getMessage());
return;
} catch (Exception e) {
+ log.error("JwtAuthenticationFilter", e);
CommonUtil.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
e.toString());
return;
--
Gitblit v1.9.1