From 7ae2df139027e39541ce92fcc5a204fea1dd3a37 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 17:49:30 +0800
Subject: [PATCH] update 使用hutool 重写 UserAgent

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 c8f15f5..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,5 +1,7 @@
 package com.ruoyi.framework.manager.factory;
 
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
@@ -9,7 +11,6 @@
 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;
 
@@ -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()
         {
@@ -53,7 +54,7 @@
                 // 鎵撳嵃淇℃伅鍒版棩蹇�
                 sys_user_logger.info(s.toString(), args);
                 // 鑾峰彇瀹㈡埛绔搷浣滅郴缁�
-                String os = userAgent.getOperatingSystem().getName();
+                String os = userAgent.getOs().getName();
                 // 鑾峰彇瀹㈡埛绔祻瑙堝櫒
                 String browser = userAgent.getBrowser().getName();
                 // 灏佽瀵硅薄

--
Gitblit v1.9.3