From 4cd9aca3325b383d834087b67c155f13df00b2c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 六月 2021 14:40:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 991e816..b42a596 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,12 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.common.utils.Http;
-import com.zy.system.entity.*;
-import com.zy.system.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.zy.common.properties.SystemProperties;
+import com.zy.common.utils.Http;
+import com.zy.system.entity.*;
+import com.zy.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
+import java.util.Date;
/**
* Created by vincent on 2019-06-13
@@ -62,6 +64,11 @@
}
}
}
+ // 鐧藉悕鍗�
+// if (IpTools.gainRealIp(request).equals("127.0.0.1")) {
+// request.setAttribute("userId", 9527);
+// return true;
+// }
// 璺ㄥ煙璁剧疆
// response.setHeader("Access-Control-Allow-Origin", "*");
HandlerMethod handlerMethod = (HandlerMethod) handler;
@@ -69,7 +76,7 @@
if (method.isAnnotationPresent(ManagerAuth.class)){
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
- return check(request, response);
+ return check(request, response, annotation.memo());
}
}
return true;
@@ -85,7 +92,7 @@
}
}
- private boolean check(HttpServletRequest request, HttpServletResponse response) {
+ private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
@@ -94,10 +101,10 @@
return false;
}
User user = userService.selectById(userLogin.getUserId());
- String deToken = Cools.deTokn(token, user.getPassword());
- long timestamp = Long.parseLong(deToken.substring(0, 13));
- // 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+// String deToken = Cools.deTokn(token, user.getPassword());
+// long timestamp = Long.parseLong(deToken.substring(0, 13));
+ // 15鍒嗛挓鍚庤繃鏈�
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -106,15 +113,26 @@
Http.response(response, BaseRes.LIMIT);
return false;
}
- // 鎿嶄綔鏃ュ織
- OperateLog operateLog = new OperateLog();
- operateLog.setAction(request.getRequestURI());
- operateLog.setIp(request.getRemoteAddr());
- operateLog.setUserId(user.getId());
- operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
// 璇锋眰缂撳瓨
request.setAttribute("userId", user.getId());
- request.setAttribute("operateLog", operateLog);
+ // 鏇存柊 token 鏈夋晥鏈�
+ userLogin.setCreateTime(new Date());
+ userLoginService.updateById(userLogin);
+ // 鎿嶄綔鏃ュ織
+ if (!Cools.isEmpty(memo)) {
+ // 杩涜婵�娲诲垽鏂�
+ if (!SystemProperties.SYSTEM_ACTIVATION) {
+ Http.response(response, BaseRes.NO_ACTIVATION);
+ return false;
+ }
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
+ operateLog.setIp(request.getRemoteAddr());
+ operateLog.setUserId(user.getId());
+ operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
+ request.setAttribute("operateLog", operateLog);
+ }
return true;
} catch (Exception e){
Http.response(response, BaseRes.DENIED);
@@ -142,7 +160,7 @@
/**
* 璺ㄥ煙
*/
- private void cors(HttpServletResponse response){
+ public static void cors(HttpServletResponse response){
// 璺ㄥ煙璁剧疆
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Credentials", "true");
--
Gitblit v1.9.1