From 3072c9633afc178c0e9172743b188bff70aa3602 Mon Sep 17 00:00:00 2001
From: Tsln <tsln1998@users.noreply.github.com>
Date: Sun, 25 Apr 2021 11:50:49 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=8D=A2=20UserAgent=20?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=BA=93=20(#630)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/zhengjie/utils/StringUtils.java     | 17 ++++++++++++-----
 pom.xml                                         |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
index d51d4aef..dfaf40e6 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
@@ -18,8 +18,8 @@ package me.zhengjie.utils;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import eu.bitwalker.useragentutils.Browser;
-import eu.bitwalker.useragentutils.UserAgent;
+import nl.basjes.parse.useragent.UserAgent;
+import nl.basjes.parse.useragent.UserAgentAnalyzer;
 import org.lionsoul.ip2region.DataBlock;
 import org.lionsoul.ip2region.DbConfig;
 import org.lionsoul.ip2region.DbSearcher;
@@ -50,6 +50,14 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     private static final char SEPARATOR = '_';
     private static final String UNKNOWN = "unknown";
 
+    private static final UserAgentAnalyzer userAgentAnalyzer = UserAgentAnalyzer
+            .newBuilder()
+            .hideMatcherLoadStats()
+            .withCache(10000)
+            .withField(UserAgent.AGENT_NAME_VERSION)
+            .build();
+
+
     static {
         SpringContextHolder.addCallBacks(() -> {
             StringUtils.ipLocal = SpringContextHolder.getProperties("ip.local-parsing", false, Boolean.class);
@@ -225,9 +233,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
     public static String getBrowser(HttpServletRequest request) {
-        UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
-        Browser browser = userAgent.getBrowser();
-        return browser.getName();
+        UserAgent.ImmutableUserAgent userAgent = userAgentAnalyzer.parse(request.getHeader("User-Agent"));
+        return userAgent.get(UserAgent.AGENT_NAME_VERSION).getValue();
     }
 
     /**
diff --git a/pom.xml b/pom.xml
index 0b8a4062..4a20b4dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,9 +203,9 @@
 
         <!-- 解析客户端操作系统、浏览器信息 -->
         <dependency>
-            <groupId>eu.bitwalker</groupId>
-            <artifactId>UserAgentUtils</artifactId>
-            <version>1.21</version>
+            <groupId>nl.basjes.parse.useragent</groupId>
+            <artifactId>yauaa</artifactId>
+            <version>5.23</version>
         </dependency>
     </dependencies>