From f14bb52ddab40bf589304b6b43331ddaccea69f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 27 十二月 2025 16:03:36 +0800
Subject: [PATCH] 1.完善AGV任务创建和下发 2.完善数据孪生 3.新增拍照获取照片 4.新增PDA配盘出库单立即出库 5.新增PDA配盘入库单下拉框获取订单号
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 3932e07..795e7a1 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -10,6 +10,7 @@
import com.zy.common.utils.Http;
import com.zy.system.entity.*;
import com.zy.system.service.*;
+import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
@@ -41,6 +42,8 @@
private PermissionService permissionService;
@Autowired
private RolePermissionService rolePermissionService;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -55,7 +58,7 @@
if (deToken!=null){
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+ if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()){
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -106,7 +109,11 @@
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
- String token = request.getHeader("token");
+ String token = new String();
+ token = request.getHeader("token");
+ if (Cools.isEmpty(token)){
+ return true;
+ }
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
@@ -137,13 +144,13 @@
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);
+// // 璁板綍鎿嶄綔鏃ュ織
+// 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){
--
Gitblit v1.9.1