From bbbc39611d232e013b900ba5e6a5a483a062e2f3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 七月 2025 16:46:49 +0800
Subject: [PATCH] 实现CommonMapper中空白方法
---
se-common/src/main/java/com/terra/common/interceptor/AuthInterceptor.java | 84 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 41 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 fd6b66d..ae2ed28 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,9 +4,11 @@
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;
+import com.terra.common.service.CommonService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.annotation.Configuration;
@@ -23,6 +25,8 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
+ private final CommonService commonService;
+
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
private static final String NO_TOKEN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.TOKEN_ERROR, "鎵句笉鍒颁护鐗�"));
@@ -39,9 +43,9 @@
private static final String ILLEGAL_TOKEN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "浠ょ墝鏉ユ簮闈炴硶"));
- //public AuthInterceptor(SysService sysService) {
- // this.sysService = sysService;
- //}
+ public AuthInterceptor(CommonService commonService) {
+ this.commonService = commonService;
+ }
/**
* Controller鎵ц涔嬪墠鎵ц锛屽鏋滆繑鍥炲�兼槸true鍒欎唬琛ㄦ斁琛岋紝杩斿洖false鍒欐嫤鎴�
@@ -62,8 +66,8 @@
}
// 3.鑾峰彇鐢ㄦ埛浠ょ墝
- UserPo ue = new UserPo(); //sysService.tokenService.getUserByToken(token);
- if (ue == null) {
+ UserPo ue = commonService.getUserByToken(token);
+ if (null == ue) {
return WebHelper.writeStr2Page(response, NO_LOGIN);
}
@@ -79,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)) {
@@ -123,29 +127,22 @@
}
/**
- * 妫�鏌ユ潈闄�
+ * 妫�鏌ョ櫧鍚嶅崟
*/
- private boolean checkPerms(UserPo ue, HttpServletRequest request) {
- List<String> list = null; //sysService.permsService.selectPerms(ue.getUid());
- if (list == null || list.size() == 0) {
+ private boolean checkWhiteList(String ip, HttpServletRequest request) {
+ List<String> whiteList = commonService.selectIpList(2);
+ if (whiteList == null || whiteList.isEmpty()) {
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;
}
@@ -157,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.isEmpty()) {
+ return false;
+ }
+
+ String url = request.getRequestURI();
+ for (String perm : list) {
+ if (url.contains(perm)) {
+ return true;
+ }
+ }
+
+ return false;
}
}
--
Gitblit v1.9.3