From 169d7d0cecd3e50aca33d42cc38230dd8aeb5770 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 七月 2025 16:32:26 +0800
Subject: [PATCH] 实现AuthInterceptor中的空白方法
---
se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java | 82 +++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java b/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
index f9c1700..5ba477f 100644
--- a/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
+++ b/se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java
@@ -4,6 +4,7 @@
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.entity.lf.TokenPo;
import com.terra.common.entity.lf.UserPo;
import com.terra.common.helper.StringHelper;
import com.terra.common.helper.WebHelper;
@@ -14,7 +15,6 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -25,7 +25,7 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
- private CommonService commonService;
+ private final CommonService commonService;
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
@@ -66,7 +66,7 @@
}
// 3.鑾峰彇鐢ㄦ埛浠ょ墝
- UserPo ue = commonService.getUserByToken(token); //new UserPo(); //sysService.tokenService.getUserByToken(token);
+ UserPo ue = commonService.getUserByToken(token);
if (null == ue) {
return WebHelper.writeStr2Page(response, NO_LOGIN);
}
@@ -83,21 +83,21 @@
}
// 6.admin璺宠繃鏉冮檺妫�娴�
- if (StaticData.ADMIN.equals(ue.getUid())) {
- return true;
+ //if (StaticData.ADMIN.equals(ue.getUid())) {
+ // return true;
+ //}
+
+ // 7.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
+ if (commonService.isUidDisable(ue)) {
+ return WebHelper.writeStr2Page(response, USER_LOCK);
}
- // 7.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
+ // 8.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
if (!checkWhiteList(ip, request)) {
if (!checkIpSource(ip, token)) {
return WebHelper.writeStr2Page(response, ILLEGAL_TOKEN);
}
}
-
- // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
- //if (sysService.tokenService.isUidDisable(ue)) {
- // return WebHelper.writeStr2Page(response, USER_LOCK);
- //}
// 9.鏉冮檺鏍￠獙
if (!checkPerms(ue, request)) {
@@ -127,31 +127,22 @@
}
/**
- * 妫�鏌ユ潈闄�
+ * 妫�鏌ョ櫧鍚嶅崟
*/
- private boolean checkPerms(UserPo ue, HttpServletRequest request) {
- return true;
+ private boolean checkWhiteList(String ip, HttpServletRequest request) {
+ List<String> whiteList = commonService.selectIpList(2);
+ if (whiteList == null || whiteList.isEmpty()) {
+ return false;
+ }
-// List<String> list = null; //sysService.permsService.selectPerms(ue.getUid());
-// if (list == null || list.size() == 0) {
-// return false;
-// }
-//
-// String url = request.getRequestURI();
-// for (String perm : list) {
-// if (url.contains(perm)) {
-// return true;
-// }
-// }
-//
-// return false;
+ return whiteList.contains(ip);
}
/**
* 妫�鏌ラ粦鍚嶅崟
*/
private boolean checkBlackList(String ip, HttpServletRequest request) {
- List<String> blackList = null; // sysService.blacklistService.selectIpList(1);
+ List<String> blackList = commonService.selectIpList(1);
if (blackList == null || blackList.isEmpty()) {
return true;
}
@@ -163,25 +154,30 @@
}
/**
- * 妫�鏌ョ櫧鍚嶅崟
- */
- private boolean checkWhiteList(String ip, HttpServletRequest request) {
- List<String> whiteList = null; // sysService.blacklistService.selectIpList(2);
- if (whiteList == null || whiteList.isEmpty()) {
- return false;
- }
-
- return whiteList.contains(ip);
- }
-
- /**
* 妫�鏌P涓�鑷存�э細鍥哄畾浠ょ墝涓嶆鏌�
*/
private boolean checkIpSource(String ip, String token) {
- //TokenEntity te = sysService.tokenService.getEntityByToken(token);
+ TokenPo te = commonService.getTokenPo(token);
- //return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+ return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+ }
- return true;
+ /**
+ * 妫�鏌ユ潈闄�
+ */
+ private boolean checkPerms(UserPo ue, HttpServletRequest request) {
+ List<String> list = commonService.selectPerms(ue.getUid());
+ if (list == null || list.size() == 0) {
+ return false;
+ }
+
+ String url = request.getRequestURI();
+ for (String perm : list) {
+ if (url.contains(perm)) {
+ return true;
+ }
+ }
+
+ return false;
}
}
--
Gitblit v1.9.3