From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
index 267e305..8877914 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -1,8 +1,5 @@
package com.ruoyi.framework.manager.factory;
-import java.util.TimerTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.LogUtils;
import com.ruoyi.common.utils.ServletUtils;
@@ -12,38 +9,42 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.domain.TbOperLog;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.ISysOperLogService;
+import com.ruoyi.system.service.TbOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
+import java.util.TimerTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* 异步工厂（产生任务用）
- *
+ *
* @author ruoyi
*/
-public class AsyncFactory
-{
+public class AsyncFactory {
+
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
/**
* 记录登录信息
- *
+ *
* @param username 用户名
- * @param status 状态
- * @param message 消息
- * @param args 列表
+ * @param status 状态
+ * @param message 消息
+ * @param args 列表
* @return 任务task
*/
- public static TimerTask recordLogininfor(final String username, final String status, final String message,
- final Object... args)
- {
- final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+ public static TimerTask recordLogininfor(final String username, final String status,
+ final String message,
+ final Object... args) {
+ final UserAgent userAgent = UserAgent.parseUserAgentString(
+ ServletUtils.getRequest().getHeader("User-Agent"));
final String ip = IpUtils.getIpAddr();
- return new TimerTask()
- {
+ return new TimerTask() {
@Override
- public void run()
- {
+ public void run() {
String address = AddressUtils.getRealAddressByIP(ip);
StringBuilder s = new StringBuilder();
s.append(LogUtils.getBlock(ip));
@@ -66,12 +67,10 @@
logininfor.setOs(os);
logininfor.setMsg(message);
// 日志状态
- if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
- {
+ if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT,
+ Constants.REGISTER)) {
logininfor.setStatus(Constants.SUCCESS);
- }
- else if (Constants.LOGIN_FAIL.equals(status))
- {
+ } else if (Constants.LOGIN_FAIL.equals(status)) {
logininfor.setStatus(Constants.FAIL);
}
// 插入数据
@@ -82,21 +81,33 @@
/**
* 操作日志记录
- *
+ *
* @param operLog 操作日志信息
* @return 任务task
*/
- public static TimerTask recordOper(final SysOperLog operLog)
- {
- return new TimerTask()
- {
+ public static TimerTask recordOper(final SysOperLog operLog) {
+ return new TimerTask() {
@Override
- public void run()
- {
+ public void run() {
// 远程查询操作地点
operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
}
};
}
+
+ /**
+ * 操作日志记录
+ *
+ * @param operLog 操作日志信息
+ * @return 任务task
+ */
+ public static TimerTask recordOper(final TbOperLog operLog) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ SpringUtils.getBean(TbOperLogService.class).save(operLog);
+ }
+ };
+ }
}
--
Gitblit v1.7.1