From 866c69e70638ba22672520aecedad0d76fe3ca51 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 04 四月 2021 11:27:08 +0800
Subject: [PATCH] fix 代码生成器问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 17a8f40..d0147a2 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,10 +1,8 @@
package com.ruoyi.framework.manager.factory;
-import java.util.TimerTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.LogUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils;
@@ -13,7 +11,10 @@
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.ISysOperLogService;
-import eu.bitwalker.useragentutils.UserAgent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.TimerTask;
/**
* 寮傛宸ュ巶锛堜骇鐢熶换鍔＄敤锛�
@@ -36,7 +37,7 @@
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 UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
return new TimerTask()
{
@@ -45,15 +46,15 @@
{
String address = AddressUtils.getRealAddressByIP(ip);
StringBuilder s = new StringBuilder();
- s.append(LogUtils.getBlock(ip));
+ s.append(getBlock(ip));
s.append(address);
- s.append(LogUtils.getBlock(username));
- s.append(LogUtils.getBlock(status));
- s.append(LogUtils.getBlock(message));
+ s.append(getBlock(username));
+ s.append(getBlock(status));
+ s.append(getBlock(message));
// 鎵撳嵃淇℃伅鍒版棩蹇�
sys_user_logger.info(s.toString(), args);
// 鑾峰彇瀹㈡埛绔搷浣滅郴缁�
- String os = userAgent.getOperatingSystem().getName();
+ String os = userAgent.getOs().getName();
// 鑾峰彇瀹㈡埛绔祻瑙堝櫒
String browser = userAgent.getBrowser().getName();
// 灏佽瀵硅薄
@@ -98,4 +99,13 @@
}
};
}
+
+ public static String getBlock(Object msg)
+ {
+ if (msg == null)
+ {
+ msg = "";
+ }
+ return "[" + msg.toString() + "]";
+ }
}
--
Gitblit v1.9.3