From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 c217379..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,20 +22,19 @@
@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 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));
userLog.setOperateId((Integer) currentUserInfo.get("userId"));
- userLog.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ userLog.setOrganizationId((Integer) orgInfo.get("id"));
userLog.setContent(content);
userLogService.save(userLog);
}
--
Gitblit v1.8.0