From 1d42a3d92d35a0cedb45cbd926cbac0c0067d52b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 16 Sep 2021 08:49:51 +0800
Subject: [PATCH] screen-api 修改判断无人机名称bug
---
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
index 9f9468c..f03cc16 100644
--- a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -3,12 +3,15 @@
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
+import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import com.moral.api.entity.UserLog;
import com.moral.api.service.UserLogService;
@@ -23,9 +26,9 @@
private UserLogService userLogService;
@Transactional
- public void insertLog(HttpServletRequest request, String content, String type) {
- String token = request.getHeader("token");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ public void insertLog(String content, String type) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
UserLog userLog = new UserLog();
userLog.setType(type);
userLog.setIp(WebUtils.getIpAddr(request));
--
Gitblit v1.8.0