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 | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index 3d55891..9dd6838 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -64,7 +64,7 @@
}
// 3.鑾峰彇鐢ㄦ埛浠ょ墝
- UserEntity ue = sysService.tokenService.getCurrentUser(request);
+ UserEntity ue = sysService.tokenService.getUserByToken(token);
if (ue == null) {
return WebHelper.writeStr2Page(response, NO_LOGIN);
}
@@ -85,9 +85,8 @@
return true;
}
- // 7.妫�鏌ョ櫧鍚嶅崟
+ // 7.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
if (!checkWhiteList(ip, request)) {
- // 妫�鏌P涓�鑷存��
if (!checkIpSource(ip, token)) {
return WebHelper.writeStr2Page(response, ILLEGAL_TOKEN);
}
@@ -172,11 +171,11 @@
}
/**
- * 妫�鏌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