From 2c638a508edf713faeda60cae92ae92cc65eb511 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 28 十一月 2024 15:17:33 +0800
Subject: [PATCH] Add children list to PdaResource and enhance AuthController
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index b42a596..bda2481 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -73,6 +74,12 @@
// response.setHeader("Access-Control-Allow-Origin", "*");
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
+ if (method.isAnnotationPresent(AppAuth.class)){
+ AppAuth annotation = method.getAnnotation(AppAuth.class);
+ if (annotation.value().equals(AppAuth.Auth.CHECK)){
+ request.setAttribute("appAuth", annotation.memo());
+ }
+ }
if (method.isAnnotationPresent(ManagerAuth.class)){
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
@@ -92,10 +99,15 @@
}
}
+ @Override
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
+// Object r = request.getAttribute("cool-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));
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token).eq("system", "WMS"));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
return false;
@@ -104,7 +116,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -121,17 +133,17 @@
// 鎿嶄綔鏃ュ織
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);
+// 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){
@@ -170,4 +182,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1