From 62bf8ebbf0944bba7d755461739b3b4703bd1956 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 18 四月 2025 15:22:53 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
index 4960cac..41f4790 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/AdminInterceptor.java
@@ -2,8 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.enums.LoginSystemType;
-import com.zy.asrs.common.properties.SystemProperties;
import com.zy.asrs.common.sys.entity.OperateLog;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.entity.UserLogin;
@@ -108,7 +106,7 @@
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
- UserLogin userLogin = userLoginService.getOne(new LambdaQueryWrapper<UserLogin>().eq(UserLogin::getToken, token).eq(UserLogin::getSystem, String.valueOf(LoginSystemType.WMS)));
+ UserLogin userLogin = userLoginService.getOne(new LambdaQueryWrapper<UserLogin>().eq(UserLogin::getToken, token).eq(UserLogin::getSystem, "WMS"));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
return false;
@@ -123,23 +121,19 @@
}
// 璇锋眰缂撳瓨
request.setAttribute("userId", user.getId());
+ request.setAttribute("hostId", userLogin.getHostId());
// 鏇存柊 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()));
- operateLog.setSystem(String.valueOf(LoginSystemType.WMS));
+ operateLog.setSystem("WMS");
request.setAttribute("operateLog", operateLog);
}
return true;
--
Gitblit v1.9.1