From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 19c9cf4..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,11 +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;
@@ -18,16 +22,13 @@
@Component
public class OperationLogUtils {
- private static UserLogService userLogService;
-
@Autowired
- public void setUserLogService(UserLogService userLogService) {
- this.userLogService = userLogService;
- }
+ private UserLogService userLogService;
- public static void insertLog(HttpServletRequest request, String content, String type) {
- String token = request.getHeader("token");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ @Transactional
+ 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