From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index 6fc779c..9dd6838 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -23,7 +23,7 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
- private SysService sysService;
+ private final SysService sysService;
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
@@ -52,46 +52,55 @@
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
// noinspection AlibabaRemoveCommentedCode
try {
- // 闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
+ // 1.闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
if (!(handler instanceof HandlerMethod) || noNeedAuth(request)) {
return true;
}
- // 鑾峰彇浠ょ墝
+ // 2.鑾峰彇浠ょ墝
String token = WebHelper.getToken(request);
if (StringHelper.isNull(token)) {
- return WebHelper.write2Page(response, NO_TOKEN);
+ return WebHelper.writeStr2Page(response, NO_TOKEN);
}
- // 鑾峰彇IP锛屾鏌ラ粦鍚嶅崟锛屾鏌ョ櫧鍚嶅崟锛屾鏌P涓�鑷存��
+ // 3.鑾峰彇鐢ㄦ埛浠ょ墝
+ UserEntity ue = sysService.tokenService.getUserByToken(token);
+ if (ue == null) {
+ return WebHelper.writeStr2Page(response, NO_LOGIN);
+ }
+
+ // 4.鑾峰彇IP
String ip = WebHelper.getIpAddress(request);
if (StringHelper.isEmpty(ip)) {
- return WebHelper.write2Page(response, IP_NULL);
+ return WebHelper.writeStr2Page(response, IP_NULL);
}
+
+ // 5.妫�鏌ラ粦鍚嶅崟
if (!checkBlackList(ip, request)) {
- return WebHelper.write2Page(response, BLACK_LIST);
+ return WebHelper.writeStr2Page(response, BLACK_LIST);
}
+
+ // 6.admin璺宠繃鏉冮檺妫�娴�
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return true;
+ }
+
+ // 7.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
if (!checkWhiteList(ip, request)) {
if (!checkIpSource(ip, token)) {
- return WebHelper.write2Page(response, ILLEGAL_TOKEN);
+ return WebHelper.writeStr2Page(response, ILLEGAL_TOKEN);
}
}
- // 鑾峰彇鐢ㄦ埛浠ょ墝
- UserEntity ue = sysService.tokenService.getCurrentUser(request);
- if (ue == null) {
- return WebHelper.write2Page(response, NO_LOGIN);
- }
-
- // 妫�鏌ョ敤鎴稩D鏄惁绂佺敤
+ // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
if (sysService.tokenService.isUidDisable(ue)) {
- return WebHelper.write2Page(response, USER_LOCK);
+ return WebHelper.writeStr2Page(response, USER_LOCK);
}
- // 鏉冮檺鏍￠獙
+ // 9.鏉冮檺鏍￠獙
if (!checkPerms(ue, request)) {
System.out.println("鏃犳潈闄愯闂細" + request.getRequestURI().toLowerCase());
- return WebHelper.write2Page(response, NO_AUTH);
+ return WebHelper.writeStr2Page(response, NO_AUTH);
}
return true;
@@ -126,7 +135,7 @@
String url = request.getRequestURI();
for (String perm : list) {
- if (url.startsWith(perm)) {
+ if (url.contains(perm)) {
return true;
}
}
@@ -155,18 +164,18 @@
private boolean checkWhiteList(String ip, HttpServletRequest request) {
List<String> whiteList = sysService.blacklistService.selectIpList(2);
if (whiteList == null || whiteList.isEmpty()) {
- return true;
+ return false;
}
return whiteList.contains(ip);
}
/**
- * 妫�鏌P涓�鑷存��
+ * 妫�鏌P涓�鑷存�э細鍥哄畾浠ょ墝涓嶆鏌�
*/
private boolean checkIpSource(String ip, String token) {
TokenEntity te = sysService.tokenService.getEntityByToken(token);
- return te.getIp().equals(ip);
+ return StaticData.I1 == te.getType() || te.getIp().equals(ip);
}
}
--
Gitblit v1.9.3