From 4579046143a9c510911e9ee16c23405fc512476e Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Wed, 5 Jul 2023 17:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20yauaa=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?UA=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=87=87=E7=94=A8hutoolUA?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB-UserAgentUtil=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=BF=A1=E6=81=AF=20close=20https:/?=
 =?UTF-8?q?/github.com/elunez/eladmin-mp/issues/5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/utils/StringUtils.java | 16 ++++------------
 eladmin/pom.xml                                  |  7 -------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
index 6efc780..928aeea 100644
--- a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
@@ -15,11 +15,11 @@
  */
 package me.zhengjie.utils;
 
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
 import net.dreamlu.mica.ip2region.core.IpInfo;
-import nl.basjes.parse.useragent.UserAgent;
-import nl.basjes.parse.useragent.UserAgentAnalyzer;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.net.InetAddress;
@@ -43,14 +43,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      */
     private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
 
-
-    private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer
-            .newBuilder()
-            .hideMatcherLoadStats()
-            .withCache(10000)
-            .withField(UserAgent.AGENT_NAME_VERSION)
-            .build();
-
     /**
      * 驼峰命名法工具
      *
@@ -178,8 +170,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
     public static String getBrowser(HttpServletRequest request) {
-        UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent"));
-        return userAgent.get(UserAgent.AGENT_NAME_VERSION).getValue();
+        UserAgent ua = UserAgentUtil.parse(request.getHeader("User-Agent"));
+        return ua.getBrowser().toString() + " " + ua.getVersion();
     }
 
     /**
diff --git a/eladmin/pom.xml b/eladmin/pom.xml
index b546e87..b010873 100644
--- a/eladmin/pom.xml
+++ b/eladmin/pom.xml
@@ -181,13 +181,6 @@
             <artifactId>commons-text</artifactId>
             <version>1.10.0</version>
         </dependency>
-
-        <!-- 解析客户端操作系统、浏览器信息 -->
-        <dependency>
-            <groupId>nl.basjes.parse.useragent</groupId>
-            <artifactId>yauaa</artifactId>
-            <version>6.11</version>
-        </dependency>
     </dependencies>
 
     <build>