From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/util/LogUtils.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
index fbaac38..8ee086d 100644
--- a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
@@ -4,14 +4,18 @@
import com.moral.api.entity.ManageLog;
import com.moral.api.mapper.ManageLogMapper;
import com.moral.api.pojo.redisBean.AccountInfoDTO;
+import com.moral.api.service.UnitConversionService;
import com.moral.constant.Constants;
import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;
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 javax.servlet.http.HttpServletRequest;
+import java.util.Scanner;
/**
* @ClassName LogUtils
@@ -23,8 +27,15 @@
@Component
public class LogUtils {
+ private static ManageLogMapper manageLogMapper;
+
@Autowired
- public ManageLogMapper manageLogMapper;
+ public void setManageLogMapper(ManageLogMapper manageLogMapper){LogUtils.manageLogMapper = manageLogMapper;}
+
+ public static void saveOperationForManage(String content,String type){
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ saveOperationForManage(request,content,type);
+ }
/**
* @Description: ������������������
@@ -33,8 +44,7 @@
* @Author: ���������
* @Date: 2021/4/8
*/
- @Transactional
- public void saveOperationForManage(HttpServletRequest request, String content,String type) {
+ public static void saveOperationForManage(HttpServletRequest request, String content,String type) {
String token = request.getHeader("token");
AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
ManageAccount manageAccount = accountInfoDTO.getAccount();
@@ -42,7 +52,6 @@
String userName = manageAccount.getUserName();
String account = manageAccount.getAccount();
String ip = WebUtils.getIpAddr(request);
-
ManageLog log = new ManageLog();
log.setType(type);
log.setUserName(userName);
@@ -60,11 +69,9 @@
* @Author: ���������
* @Date: 2021/4/8
*/
- @Transactional
- public void saveLoginForManage(HttpServletRequest request,String content,ManageAccount account,String userName){
+ public static void saveLoginForManage(HttpServletRequest request,String content,ManageAccount account,String userName){
ManageLog log = new ManageLog();
String ip = WebUtils.getIpAddr(request);
-
log.setAccountId(account.getId());
log.setAccount(account.getAccount());
log.setUserName(userName);
@@ -73,4 +80,26 @@
log.setType(Constants.LOGIN_OPERTATE_TYPE);
manageLogMapper.insert(log);
}
+
+
+ /**
+ * @Description: ������token���������������������
+ * @Param: [request, content]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/10/8
+ */
+ public static void saveFailedRequestForManage(HttpServletRequest request,String content){
+ ManageLog log = new ManageLog();
+ String ip = WebUtils.getIpAddr(request);
+ log.setAccountId(0);
+ log.setAccount("null");
+ log.setUserName("null");
+ log.setIp(ip);
+ log.setContent(content);
+ log.setType(Constants.LOGIN_OPERTATE_TYPE);
+ manageLogMapper.insert(log);
+ }
+
+
}
--
Gitblit v1.8.0